From 2e464cb909ed12fbc6b9c51e8360daf3f53b6a2c Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 16 Nov 2013 19:27:06 -0800 Subject: make submit buttons look more or less like links --- view/theme/redbasic/css/style.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 07a838f0b..572eafdfb 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -64,7 +64,10 @@ input { } input[type="submit"] { - background-color: #F8F8F8; + background-color: #F0F0F0; + font-weight: bold; + color: #0080FF; + text-decoration: none; } code { -- cgit v1.2.3 From 8893643da065fb12bf9b60e3d31f65cf64c6754b Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 16 Nov 2013 19:48:45 -0800 Subject: more photo menu positioning work for varying photo sizes --- view/theme/redbasic/css/style.css | 7 ++++--- view/theme/redbasic/php/style.php | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 572eafdfb..f7d641e6b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -882,7 +882,7 @@ footer { } .wall-item-photo-wrapper { - margin-top: 10px; + margin-top: 0px; margin-left: 10px; margin-bottom: 10px; width: 100px; @@ -907,7 +907,8 @@ footer { border: 2px solid #444444; background: #FFFFFF; position: absolute; - left: 10px; top: 90px; + left: 10px; + top: $top_photo; display: none; z-index: 10000; } @@ -917,7 +918,7 @@ footer { .comment .wall-item-photo-menu-button { top: $pmenu_reply;} -.comment .wall-item-photo-menu { top: 60px; } +.comment .wall-item-photo-menu { top: $reply_photo; } .wallwall .wwto { left: 50px; diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 515356cb6..1eb5abfbb 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -93,13 +93,13 @@ $converse_width="1024px"; if(! $top_photo) $top_photo = '64px'; - $pmenu_top = intval($top_photo) - 6 . 'px'; - $wwtop = intval($top_photo) - 5 . 'px'; + $pmenu_top = intval($top_photo) - 16 . 'px'; + $wwtop = intval($top_photo) - 15 . 'px'; $comment_indent = intval($top_photo) + 10 . 'px'; if(! $reply_photo) $reply_photo = '32px'; - $pmenu_reply = intval($reply_photo) - 6 . 'px'; + $pmenu_reply = intval($reply_photo) - 16 . 'px'; if($nav_min_opacity === false || $nav_min_opacity === '') { $nav_float_min_opacity = 1.0; -- cgit v1.2.3 From 92f37fd0d5222d4f8cb7234d3de5fa8c784f81d3 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 17 Nov 2013 01:10:46 -0800 Subject: document extra features --- boot.php | 6 ++-- doc/Features.md | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ doc/Home.md | 1 + mod/post.php | 4 +-- version.inc | 2 +- 5 files changed, 111 insertions(+), 5 deletions(-) create mode 100644 doc/Features.md diff --git a/boot.php b/boot.php index ef7c140ee..8c20074fe 100755 --- a/boot.php +++ b/boot.php @@ -2318,8 +2318,8 @@ function zid_init(&$a) { $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'); - $r = q("select * from hubloc where hubloc_addr = '%s' limit 1", + logger('zid_init: not authenticated. Invoking reverse magic-auth for ' . $tmp_str); + $r = q("select * from hubloc where hubloc_addr = '%s' order by hubloc_id desc limit 1", dbesc($tmp_str) ); // try to avoid recursion - but send them home to do a proper magic auth @@ -2328,6 +2328,8 @@ function zid_init(&$a) { if($r && ($r[0]['hubloc_url'] != z_root()) && (! strstr($dest,'/magic')) && (! strstr($dest,'/rmagic'))) { goaway($r[0]['hubloc_url'] . '/magic' . '?f=&rev=1&dest=' . z_root() . $dest); } + else + logger('zid_init: no hubloc found.'); } } } diff --git a/doc/Features.md b/doc/Features.md new file mode 100644 index 000000000..f4b26a647 --- /dev/null +++ b/doc/Features.md @@ -0,0 +1,103 @@ +Extra Features +============== + +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](settings/features) link of your [Settings](settings) page. + +**Content Expiration** + +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. + +**Multiple Profiles** + +The ability to create multiple profiles which are visible only to specific persons or groups. Your default profile may be visible to anybody, but secodnary profiles can all contain different or additional information and can only be seen by those to whom that profile is assigned. + +**Web Pages** + +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. + +**Enhanced Photo Albums** + +Provides a photo album viewer that is a bit prettier than the normal interface. + +**Extended Identity Sharing** + +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. + +**Expert Mode** + +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. + +**Premium Channel** + +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. + + +**Richtext Editor** + +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. + +**Post Preview** + +Allows previewing posts and comments exactly as they would look on the page before publishing them. + +**Channel Sources** + +Automatically import 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 author/owner must give you permission to source their channel. + +**Even More Encryption** + +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 key is up to you. You can provide a hint such as "the name of aunt Claire's first dog". + + +**Search by Date** + +This provides the ability to select posts by date ranges + +**Collections Filter** + +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". + +**Saved Searches** + +Provides a search widget on your matrix page which can save selected search terms for re-use. + +**Personal Tab** + +Enable tab to display only matrix posts that you've interacted with in some way, as an author or a contributor to the conversation. + +**New Tab** + +Enables a tab to display all new matrix activity as a firehose or timeline. + +**Affinity Tool** + +Filter matrix stream activity by the depth of your relationships + +**Edit Sent Posts** + +Edit and correct posts and comments after sending + +**Tagging** + +Ability to tag existing posts, including those written by others. + +**Post Categories** + +Add categories to your channel posts + +**Saved Folders** + +Ability to file posts under folders or tags for later recall + +**Dislike Posts** + +Ability to dislike posts/comments + +**Star Posts** + +Ability to mark special posts with a star indicator + +**Tag Cloud** + +Provide a personal tag cloud on your channel page + diff --git a/doc/Home.md b/doc/Home.md index a940d586d..f97f987da 100644 --- a/doc/Home.md +++ b/doc/Home.md @@ -9,6 +9,7 @@ Red Matrix Documentation and Resources * [Channels](help/Channels) * [Connecting to Channels](help/Connecting-to-Channels) * [Permissions](help/Permissions) +* [But Wait - There's More. MUCH More...](help/Features) * [Tags and Mentions](help/Tags-and-Mentions) * [Web Pages](help/Webpages) * [Remove Account](help/Remove-Account) diff --git a/mod/post.php b/mod/post.php index 92d810356..3b98fce81 100644 --- a/mod/post.php +++ b/mod/post.php @@ -130,8 +130,8 @@ function post_init(&$a) { } else { logger('mod_zot: still not authenticated: ' . $x[0]['xchan_addr']); q("update hubloc set hubloc_status = (hubloc_status | %d ) where hubloc_addr = '%s'", - intval(HUBLOC_RECEIVE_ERROR), - $x[0][xchan_addr] + intval(HUBLOC_RECEIVE_ERROR), + $x[0][xchan_addr] ); } diff --git a/version.inc b/version.inc index e2a33a1da..771e7842a 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-11-16.499 +2013-11-17.500 -- cgit v1.2.3 From bec85f1494026a94eb521b802a74b67762b01a6c Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 17 Nov 2013 13:54:43 -0800 Subject: implement admin remove account --- mod/admin.php | 6 +++--- view/theme/redbasic/css/style.css | 5 +++++ view/tpl/admin_users.tpl | 8 ++++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index fad03e34a..3608f6eda 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -563,7 +563,7 @@ function admin_page_users_post(&$a){ if (x($_POST,'page_users_delete')){ require_once("include/Contact.php"); foreach($users as $uid){ - user_remove($uid); + account_remove($uid,true); } notice( sprintf( tt("%s user deleted", "%s users deleted", count($users)), count($users)) ); } @@ -605,9 +605,9 @@ function admin_page_users(&$a){ check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't'); // delete user require_once("include/Contact.php"); - user_remove($uid); + account_remove($uid,true); - notice( sprintf(t("User '%s' deleted"), $user[0]['username']) . EOL); + notice( sprintf(t("User '%s' deleted"), $account[0]['account_email']) . EOL); }; break; case "block":{ check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't'); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f7d641e6b..8e15d1eaf 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3564,3 +3564,8 @@ text-decoration: none; .savedsearchdrop { opacity: 0; } + +.admin-icons { + color: $toolicon_colour; + margin-right: 10px; +} \ No newline at end of file diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index 770df7eba..b51fa3559 100755 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -34,8 +34,8 @@ {{$u.email}} - - + + {{/foreach}} @@ -71,8 +71,8 @@ {{$u.account_service_class}} - - + + {{/foreach}} -- cgit v1.2.3 From 28b0eb9c330261ea6a8cd36248c194b6b153f5e6 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 17 Nov 2013 14:28:13 -0800 Subject: more work on redmtx.com magic-auth situation --- mod/magic.php | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/mod/magic.php b/mod/magic.php index 4794f86a8..21f703192 100644 --- a/mod/magic.php +++ b/mod/magic.php @@ -28,16 +28,34 @@ function magic_init(&$a) { ); } else { + // See if we know anybody at the dest site that will unlock the door for us + // This is the equivalent of buzzing every apartment in an apartment block + // to get inside the front gate. The thing about magic auth is that we're + // authenticating to the other site. Permissions provided by various + // channels will still affect what we can do once authenticated. + $b = explode('/',$dest); if(count($b) >= 2) { $u = $b[0] . '//' . $b[2]; - $x = q("select xchan.xchan_url, hubloc.* from xchan left join hubloc on xchan_hash = hubloc_hash - where hubloc_url = '%s' order by hubloc_id desc limit 5", - dbesc($u) - ); + if(local_user()) { + // first look for a connection or anybody who knows us + $x = q("select xchan.xchan_url, hubloc.* from xchan left join hubloc on xchan_hash = hubloc_hash + left join abook on abook_xchan = hubloc_hash + where abook_channel = %d and hubloc_url = '%s' order by hubloc_id desc limit 5", + intval(local_user()), + dbesc($u) + ); + } + if(! $x) { + // no luck - ok anybody will do + $x = q("select xchan.xchan_url, hubloc.* from xchan left join hubloc on xchan_hash = hubloc_hash + where hubloc_url = '%s' order by hubloc_id desc limit 5", + dbesc($u) + ); + } if($x) { // They must have a valid hubloc_addr -- cgit v1.2.3 From 06e0272db873ad0b7dbc96596e92b8c635f940a2 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 17 Nov 2013 16:50:32 -0800 Subject: populate some posts when somebody is granted "read stream" permission --- include/items.php | 5 +++++ include/onepoll.php | 9 ++++++--- include/poller.php | 3 +++ include/zot.php | 14 +++++++++++++- mod/connections.php | 3 +++ mod/follow.php | 2 +- mod/zotfeed.php | 4 +++- 7 files changed, 34 insertions(+), 6 deletions(-) diff --git a/include/items.php b/include/items.php index 520ea7230..5793a7d66 100755 --- a/include/items.php +++ b/include/items.php @@ -3757,6 +3757,7 @@ function fetch_post_tags($items,$link = false) { function zot_feed($uid,$observer_xchan,$mindate) { + $result = array(); $mindate = datetime_convert('UTC','UTC',$mindate); if(! $mindate) @@ -3764,10 +3765,14 @@ function zot_feed($uid,$observer_xchan,$mindate) { $mindate = dbesc($mindate); + logger('zot_feed: ' . $uid); + if(! perm_is_allowed($uid,$observer_xchan,'view_stream')) { + logger('zot_feed: permission denied.'); return $result; } + require_once('include/security.php'); $sql_extra = item_permissions_sql($uid); if($mindate != '0000-00-00 00:00:00') { diff --git a/include/onepoll.php b/include/onepoll.php index 50c2566be..5e5589228 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -98,8 +98,11 @@ function onepoll_run($argv, $argc){ return; if($contact['xchan_connurl']) { - $feedurl = str_replace('/poco/','/zotfeed/',$channel['xchan_connurl']); - $x = z_fetch_url($feedurl . '?f=&mindate=' . $last_update); + $feedurl = str_replace('/poco/','/zotfeed/',$contact['xchan_connurl']); + $x = z_fetch_url($feedurl . '?f=&mindate=' . urlencode($last_update)); + + logger('feed_update: ' . print_r($x,true), LOGGER_DATA); + if($x['success']) { $total = 0; logger('onepoll: feed update ' . $contact['xchan_name']); @@ -107,7 +110,7 @@ function onepoll_run($argv, $argc){ $j = json_decode($x['body'],true); if($j['success'] && $j['messages']) { foreach($j['messages'] as $message) { - $results = process_delivery(array('hash' => $contact['xchan_hash']),$message, + $results = process_delivery(array('hash' => $contact['xchan_hash']), get_item_elements($message), array(array('hash' => $importer['xchan_hash'])), false); $total ++; } diff --git a/include/poller.php b/include/poller.php index 3c4e6402c..0dcec4c0f 100644 --- a/include/poller.php +++ b/include/poller.php @@ -117,7 +117,10 @@ function poller_run($argv, $argc){ 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'); diff --git a/include/zot.php b/include/zot.php index 09a3c28fa..71f720a6d 100644 --- a/include/zot.php +++ b/include/zot.php @@ -306,6 +306,11 @@ function zot_refresh($them,$channel = null) { ); if(! $y) logger('abook update failed'); + else { + // if we were just granted read stream permission and didn't have it before, try to pull in some posts + if((! ($r[0]['abook_their_perms'] & PERMS_R_STREAM)) && ($their_perms & PERMS_R_STREAM)) + proc_run('php','include/onepoll.php',$r[0]['abook_id']); + } } else { $default_perms = 0; @@ -330,7 +335,6 @@ function zot_refresh($them,$channel = null) { ); if($y) { - logger("New introduction received for {$channel['channel_name']}"); if($default_perms) { // send back a permissions update for auto-friend/auto-permissions @@ -342,6 +346,14 @@ function zot_refresh($them,$channel = null) { if($z) proc_run('php','include/notifier.php','permission_update',$z[0]['abook_id']); } + $new_connection = q("select abook_id from abook where abook_channel = %d and abook_xchan = '%s' order by abook_created desc limit 1", + intval($channel['channel_id']), + dbesc($x['hash']) + ); + + if($new_connection && ($their_perms & PERMS_R_STREAM)) + proc_run('php','include/onepoll.php',$new_connection[0]['abook_id']); + } } } diff --git a/mod/connections.php b/mod/connections.php index 1ad9fedbc..a40a8fa90 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -133,6 +133,9 @@ function connections_post(&$a) { // 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 diff --git a/mod/follow.php b/mod/follow.php index 9f5a8183b..1d29dab2e 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -15,7 +15,7 @@ function follow_init(&$a) { $confirm = intval($_REQUEST['confirm']); $result = new_contact($uid,$url,$a->get_channel(),true,$confirm); - + if($result['success'] == false) { if($result['message']) notice($result['message']); diff --git a/mod/zotfeed.php b/mod/zotfeed.php index 2ca049563..6d84a5a1e 100644 --- a/mod/zotfeed.php +++ b/mod/zotfeed.php @@ -21,7 +21,7 @@ function zotfeed_init(&$a) { $channel_address = ((argc() > 1) ? argv(1) : ''); if($channel_address) { - $r = q("select channel_id from channel where channel_address = '%s' limit 1", + $r = q("select channel_id, channel_name from channel where channel_address = '%s' limit 1", dbesc(argv(1)) ); } @@ -30,6 +30,8 @@ function zotfeed_init(&$a) { json_return_and_die($result); } + logger('zotfeed request: ' . $r[0]['channel_name'], LOGGER_DEBUG); + $result['messages'] = zot_feed($r[0]['channel_id'],$observer['xchan_hash'],$mindate); $result['success'] = true; json_return_and_die($result); -- cgit v1.2.3 From d6a3465a5b462ad2f29454d6331e1efae03e6166 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 17 Nov 2013 16:59:06 -0800 Subject: s/Developer Preview/Public Preview/g --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 77a3dde41..ef1b8c892 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ 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 "Developer 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. +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 help us change the world by providing a small donation.](http://pledgie.com/campaigns/18417) (Large donations are also graciously accepted). -- cgit v1.2.3 From 772e3795bf1513b5f8ac3ab520c6c8cdb68de3af Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 17 Nov 2013 17:26:41 -0800 Subject: typo --- doc/Features.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/Features.md b/doc/Features.md index f4b26a647..addc57704 100644 --- a/doc/Features.md +++ b/doc/Features.md @@ -9,7 +9,7 @@ Remove posts/comments and/or private messages at a future time. An extra button **Multiple Profiles** -The ability to create multiple profiles which are visible only to specific persons or groups. Your default profile may be visible to anybody, but secodnary profiles can all contain different or additional information and can only be seen by those to whom that profile is assigned. +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. **Web Pages** @@ -42,11 +42,11 @@ Allows previewing posts and comments exactly as they would look on the page befo **Channel Sources** -Automatically import 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 author/owner must give you permission to source their channel. +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. **Even More Encryption** -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 key is up to you. You can provide a hint such as "the name of aunt Claire's first dog". +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". **Search by Date** -- cgit v1.2.3 From 13538cdd21c6e13a2ff108f1b42dbecaab8b375a Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 17 Nov 2013 19:22:24 -0800 Subject: pull in some posts when we first connect with a new channel (if allowed to) - if not allowed to, do it if that condition changes --- boot.php | 2 +- include/items.php | 27 ++++++++++++++++++++------- include/onepoll.php | 24 ++++++++++++++++++------ include/zot.php | 4 ++-- mod/follow.php | 6 ++++++ mod/item.php | 8 -------- mod/network.php | 4 ++-- 7 files changed, 49 insertions(+), 26 deletions(-) diff --git a/boot.php b/boot.php index 8c20074fe..2a214e5c2 100755 --- a/boot.php +++ b/boot.php @@ -1586,7 +1586,7 @@ function get_max_import_size() { function profile_load(&$a, $nickname, $profile = '') { - logger('profile_load: ' . $profile); + logger('profile_load: ' . $nickname . (($profile) ? ' profile: ' . $profile : '')); $user = q("select channel_id from channel where channel_address = '%s' limit 1", dbesc($nickname) diff --git a/include/items.php b/include/items.php index 5793a7d66..f8b698a4a 100755 --- a/include/items.php +++ b/include/items.php @@ -552,15 +552,20 @@ function get_item_elements($x) { $arr['created'] = datetime_convert('UTC','UTC',$x['created']); $arr['edited'] = datetime_convert('UTC','UTC',$x['edited']); - $arr['expires'] = ((x($x,'expires') && $x['expires']) - ? datetime_convert('UTC','UTC',$x['expires']) - : '0000-00-00 00:00:00'); if($arr['created'] > datetime_convert()) $arr['created'] = datetime_convert(); if($arr['edited'] > datetime_convert()) $arr['edited'] = datetime_convert(); + $arr['expires'] = ((x($x,'expires') && $x['expires']) + ? datetime_convert('UTC','UTC',$x['expires']) + : '0000-00-00 00:00:00'); + + $arr['commented'] = ((x($x,'commented') && $x['commented']) + ? datetime_convert('UTC','UTC',$x['commented']) + : $arr['created']); + $arr['title'] = (($x['title']) ? htmlentities($x['title'], ENT_COMPAT,'UTF-8',false) : ''); if(mb_strlen($arr['title']) > 255) @@ -714,6 +719,7 @@ function encode_item($item) { $x['created'] = $item['created']; $x['edited'] = $item['edited']; $x['expires'] = $item['expires']; + $x['commented'] = $item['commented']; $x['mimetype'] = $item['mimetype']; $x['title'] = $item['title']; $x['body'] = $item['body']; @@ -1539,8 +1545,8 @@ function item_store($arr,$allow_exec = false) { $arr['owner_xchan'] = ((x($arr,'owner_xchan')) ? notags(trim($arr['owner_xchan'])) : ''); $arr['created'] = ((x($arr,'created') !== false) ? datetime_convert('UTC','UTC',$arr['created']) : datetime_convert()); $arr['edited'] = ((x($arr,'edited') !== false) ? datetime_convert('UTC','UTC',$arr['edited']) : datetime_convert()); - $arr['expires'] = ((x($arr,'expires') !== false) ? datetime_convert('UTC','UTC',$arr['expires']) : '0000-00-00 00:00:00'); - $arr['commented'] = datetime_convert(); + $arr['expires'] = ((x($arr,'expires') !== false) ? datetime_convert('UTC','UTC',$arr['expires']) : '0000-00-00 00:00:00'); + $arr['commented'] = ((x($arr,'commented') !== false) ? datetime_convert('UTC','UTC',$arr['commented']) : datetime_convert()); $arr['received'] = datetime_convert(); $arr['changed'] = datetime_convert(); $arr['location'] = ((x($arr,'location')) ? notags(trim($arr['location'])) : ''); @@ -1777,8 +1783,15 @@ function item_store($arr,$allow_exec = false) { // update the commented timestamp on the parent - q("UPDATE item set commented = '%s', changed = '%s' WHERE id = %d LIMIT 1", - dbesc(datetime_convert()), + q("update item set commented = ( select max(created) from item where parent_mid = '%s' and uid = %d ) + where id = %d limit 1", + dbesc($arr['parent_mid']), + intval($arr['uid']), + intval($parent_id) + ); + + + q("UPDATE item set changed = '%s' WHERE id = %d LIMIT 1", dbesc(datetime_convert()), intval($parent_id) ); diff --git a/include/onepoll.php b/include/onepoll.php index 5e5589228..a821b76cf 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -36,11 +36,12 @@ function onepoll_run($argv, $argc){ $contacts = q("SELECT abook.*, xchan.*, account.* FROM abook LEFT JOIN account on abook_account = account_id left join xchan on xchan_hash = abook_xchan where abook_id = %d - AND (( abook_flags = %d ) OR ( abook_flags = %d )) + AND (( abook_flags = %d ) OR ( abook_flags = %d ) OR ( abook_flags & %d )) AND (( account_flags = %d ) OR ( account_flags = %d )) limit 1", intval($contact_id), intval(ABOOK_FLAG_HIDDEN), intval(0), + intval(ABOOK_FLAG_PENDING), intval(ACCOUNT_OK), intval(ACCOUNT_UNVERIFIED) ); @@ -67,7 +68,7 @@ function onepoll_run($argv, $argc){ logger("onepoll: poll: ({$contact['id']}) IMPORTER: {$importer['xchan_name']}, CONTACT: {$contact['xchan_name']}"); - $last_update = (($contact['abook_updated'] === '0000-00-00 00:00:00') + $last_update = ((($contact['abook_updated'] === $contact['abook_created']) || ($contact['abook_updated'] === '0000-00-00 00:00:00')) ? datetime_convert('UTC','UTC','now - 7 days') : datetime_convert('UTC','UTC',$contact['abook_updated'] . ' - 2 days') ); @@ -98,12 +99,22 @@ function onepoll_run($argv, $argc){ return; if($contact['xchan_connurl']) { - $feedurl = str_replace('/poco/','/zotfeed/',$contact['xchan_connurl']); - $x = z_fetch_url($feedurl . '?f=&mindate=' . urlencode($last_update)); + $fetch_feed = true; + $x = null; - logger('feed_update: ' . print_r($x,true), LOGGER_DATA); + if(! ($contact['abook_their_perms'] & PERMS_R_STREAM )) + $fetch_feed = false; - if($x['success']) { + if($fetch_feed) { + + $feedurl = str_replace('/poco/','/zotfeed/',$contact['xchan_connurl']); + $x = z_fetch_url($feedurl . '?f=&mindate=' . urlencode($last_update)); + + logger('feed_update: ' . print_r($x,true), LOGGER_DATA); + + } + + if(($x) && ($x['success'])) { $total = 0; logger('onepoll: feed update ' . $contact['xchan_name']); @@ -112,6 +123,7 @@ function onepoll_run($argv, $argc){ foreach($j['messages'] as $message) { $results = process_delivery(array('hash' => $contact['xchan_hash']), get_item_elements($message), array(array('hash' => $importer['xchan_hash'])), false); + logger('onepoll: feed_update: process_delivery: ' . print_r($results,true)); $total ++; } logger("onepoll: $total messages processed"); diff --git a/include/zot.php b/include/zot.php index 71f720a6d..018f00ba5 100644 --- a/include/zot.php +++ b/include/zot.php @@ -346,12 +346,12 @@ function zot_refresh($them,$channel = null) { if($z) proc_run('php','include/notifier.php','permission_update',$z[0]['abook_id']); } - $new_connection = q("select abook_id from abook where abook_channel = %d and abook_xchan = '%s' order by abook_created desc limit 1", + $new_connection = q("select abook_id, abook_flags from abook where abook_channel = %d and abook_xchan = '%s' order by abook_created desc limit 1", intval($channel['channel_id']), dbesc($x['hash']) ); - if($new_connection && ($their_perms & PERMS_R_STREAM)) + if($new_connection && (! ($new_connection[0]['abook_flags'] & ABOOK_FLAG_PENDING)) && ($their_perms & PERMS_R_STREAM)) proc_run('php','include/onepoll.php',$new_connection[0]['abook_id']); } diff --git a/mod/follow.php b/mod/follow.php index 1d29dab2e..364fe76b9 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -24,6 +24,12 @@ function follow_init(&$a) { info( t('Channel added.') . EOL); + // If we can view their stream, pull in some posts + + if($result['abook']['abook_their_perms'] & PERMS_R_STREAM) + proc_run('php','include/onepoll.php',$result['abook']['abook_id']); + + goaway(z_root() . '/connections/' . $result['abook']['abook_id']); } diff --git a/mod/item.php b/mod/item.php index b564c7545..7eebbe287 100644 --- a/mod/item.php +++ b/mod/item.php @@ -774,14 +774,6 @@ function item_post(&$a) { // NOTREACHED } - // update the commented timestamp on the parent - - q("UPDATE `item` set `commented` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1", - dbesc(datetime_convert()), - dbesc(datetime_convert()), - intval($parent) - ); - $page_type = ''; if($webpage & ITEM_WEBPAGE) diff --git a/mod/network.php b/mod/network.php index 81b38a5ae..9ee21dc05 100644 --- a/mod/network.php +++ b/mod/network.php @@ -512,7 +512,7 @@ function network_content(&$a, $update = 0, $load = false) { . "'; var profile_page = " . $a->pager['page'] . ";"; -logger('Search: ' . $search); + $a->page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array( '$baseurl' => z_root(), @@ -734,7 +734,7 @@ logger('Search: ' . $search); $o .= alt_pager($a,count($items)); if($load) { - logger('mod_network: load: ' . count($items) . ' items', LOGGER_DATA); +// logger('mod_network: load: ' . count($items) . ' items', LOGGER_DATA); profiler($start,$first,'network parents'); profiler($first,$second,'network children'); -- cgit v1.2.3 From 23352b939b0fadaadad9c6e02d6d1545f00ee0e9 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 17 Nov 2013 19:49:48 -0800 Subject: better job of setting parent created --- include/items.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/include/items.php b/include/items.php index f8b698a4a..5625f2c68 100755 --- a/include/items.php +++ b/include/items.php @@ -1783,16 +1783,13 @@ function item_store($arr,$allow_exec = false) { // update the commented timestamp on the parent - q("update item set commented = ( select max(created) from item where parent_mid = '%s' and uid = %d ) - where id = %d limit 1", + $z = q("select max(created) as created from item where parent_mid = '%s' and uid = %d ", dbesc($arr['parent_mid']), - intval($arr['uid']), - intval($parent_id) + intval($arr['uid']) ); - - q("UPDATE item set changed = '%s' WHERE id = %d LIMIT 1", - dbesc(datetime_convert()), + q("UPDATE item set created = '%s', changed = '%s' WHERE id = %d LIMIT 1", + dbesc(($z) ? $z[0]['created'] : (datetime_convert())), intval($parent_id) ); -- cgit v1.2.3 From 6378600747e70ed19f43614cd022aa332d731c45 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 17 Nov 2013 20:09:40 -0800 Subject: fix commented timestamp --- include/items.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/items.php b/include/items.php index 5625f2c68..7db22d0da 100755 --- a/include/items.php +++ b/include/items.php @@ -1783,13 +1783,14 @@ function item_store($arr,$allow_exec = false) { // update the commented timestamp on the parent - $z = q("select max(created) as created from item where parent_mid = '%s' and uid = %d ", + $z = q("select max(commented) as commented from item where parent_mid = '%s' and uid = %d ", dbesc($arr['parent_mid']), intval($arr['uid']) ); - q("UPDATE item set created = '%s', changed = '%s' WHERE id = %d LIMIT 1", - dbesc(($z) ? $z[0]['created'] : (datetime_convert())), + q("UPDATE item set commented = '%s', changed = '%s' WHERE id = %d LIMIT 1", + dbesc(($z) ? $z[0]['commented'] : (datetime_convert())), + dbesc(datetime_convert()), intval($parent_id) ); -- cgit v1.2.3 From f8b07e1935dd6d035b7458141eca099a2445b077 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 17 Nov 2013 20:43:50 -0800 Subject: filter out duplicate recipients on local deliveries. We only need to deliver stuff once to any particular channel. --- include/zot.php | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/include/zot.php b/include/zot.php index 018f00ba5..1191cc221 100644 --- a/include/zot.php +++ b/include/zot.php @@ -910,11 +910,29 @@ function zot_import($arr, $sender_url) { $deliveries = allowed_public_recips($i); } + + // Go through the hash array and remove duplicates. array_unique() won't do this because the array is more than one level. + + $no_dups = array(); + if($deliveries) { + foreach($deliveries as $d) { + if(! in_array($d['hash'],$no_dups)) + $no_dups[] = $d['hash']; + } + + if($no_dups) { + $deliveries = array(); + foreach($no_dups as $n) { + $deliveries[] = array('hash' => $n); + } + } + } + if(! $deliveries) { logger('zot_import: no deliveries on this site'); continue; } - + if($i['message']) { if($i['message']['type'] === 'activity') { $arr = get_item_elements($i['message']); -- cgit v1.2.3 From dd6c64f95adc89895d4adf9ede8fbc8fdae41750 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 17 Nov 2013 23:12:34 -0800 Subject: magic auth issues --- include/items.php | 2 +- mod/magic.php | 2 +- mod/post.php | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/items.php b/include/items.php index 7db22d0da..7e21b9c4d 100755 --- a/include/items.php +++ b/include/items.php @@ -1783,7 +1783,7 @@ function item_store($arr,$allow_exec = false) { // update the commented timestamp on the parent - $z = q("select max(commented) as commented from item where parent_mid = '%s' and uid = %d ", + $z = q("select max(created) as commented from item where parent_mid = '%s' and uid = %d ", dbesc($arr['parent_mid']), intval($arr['uid']) ); diff --git a/mod/magic.php b/mod/magic.php index 21f703192..6c8ad24ed 100644 --- a/mod/magic.php +++ b/mod/magic.php @@ -159,7 +159,7 @@ function magic_init(&$a) { logger('mod_magic: redirecting to: ' . $target_url, LOGGER_DEBUG); goaway($target_url - . '/?f=&auth=' . $channel['channel_address'] . '@' . $a->get_hostname() + . '/?f=&auth=' . urlencode($channel['channel_address'] . '@' . $a->get_hostname()) . '&sec=' . $token . '&dest=' . urlencode($dest) . '&version=' . ZOT_REVISION); } diff --git a/mod/post.php b/mod/post.php index 3b98fce81..6eab0988e 100644 --- a/mod/post.php +++ b/mod/post.php @@ -55,7 +55,7 @@ function post_init(&$a) { if(! $x) { // finger them if they can't be found. - $ret = zot_finger($addr,null); + $ret = zot_finger($address,null); if($ret['success']) { $j = json_decode($ret['body'],true); if($j) @@ -66,7 +66,7 @@ function post_init(&$a) { } } if(! $x) { - logger('mod_zot: auth: unable to finger ' . $addr); + logger('mod_zot: auth: unable to finger ' . $address); goaway($desturl); } @@ -131,7 +131,7 @@ function post_init(&$a) { logger('mod_zot: still not authenticated: ' . $x[0]['xchan_addr']); q("update hubloc set hubloc_status = (hubloc_status | %d ) where hubloc_addr = '%s'", intval(HUBLOC_RECEIVE_ERROR), - $x[0][xchan_addr] + dbesc($x[0]['xchan_addr']) ); } -- cgit v1.2.3 From fa8f26c544060b01fc8f6d0df22eea71ae8770fd Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 18 Nov 2013 00:55:41 -0800 Subject: change the way magic-auth works - we rarely need a destination channel and if that channel has problems it shouldn't mess up authentication to the hub. --- mod/post.php | 211 +++++++++++++++++++++++++++++------------------------------ version.inc | 2 +- 2 files changed, 106 insertions(+), 107 deletions(-) diff --git a/mod/post.php b/mod/post.php index 6eab0988e..ceb41b19d 100644 --- a/mod/post.php +++ b/mod/post.php @@ -15,140 +15,139 @@ function post_init(&$a) { // as a get request, and the only communications to arrive this way. if(argc() > 1) { - $webbie = argv(1); - - if(array_key_exists('auth',$_REQUEST)) { - logger('mod_zot: auth request received.'); - $address = $_REQUEST['auth']; - $dest = $_REQUEST['dest']; - $sec = $_REQUEST['sec']; - $version = $_REQUEST['version']; - - switch($dest) { - case 'channel': - $desturl = z_root() . '/channel/' . $webbie; - break; - case 'photos': - $desturl = z_root() . '/photos/' . $webbie; - break; - case 'profile': - $desturl = z_root() . '/profile/' . $webbie; - break; - default: - $desturl = $dest; - break; - } + } + + if(array_key_exists('auth',$_REQUEST)) { + logger('mod_zot: auth request received.'); + $address = $_REQUEST['auth']; + $dest = $_REQUEST['dest']; + $sec = $_REQUEST['sec']; + $version = $_REQUEST['version']; + + switch($dest) { + case 'channel': + $desturl = z_root() . '/channel/' . $webbie; + break; + case 'photos': + $desturl = z_root() . '/photos/' . $webbie; + break; + case 'profile': + $desturl = z_root() . '/profile/' . $webbie; + break; + default: + $desturl = $dest; + break; + } + if($webbie) { $c = q("select * from channel where channel_address = '%s' limit 1", dbesc($webbie) ); if(! $c) { logger('mod_zot: auth: unable to find channel ' . $webbie); // They'll get a notice when they hit the page, we don't need two of them. - goaway($desturl); + // In fact we only need the name to map the destination, auth can proceed + // without it. + // goaway($desturl); } + } - // Try and find a hubloc for the person attempting to auth - $x = q("select * from hubloc left join xchan on xchan_hash = hubloc_hash where hubloc_addr = '%s' order by hubloc_id desc limit 1", - dbesc($address) - ); + // Try and find a hubloc for the person attempting to auth + $x = q("select * from hubloc left join xchan on xchan_hash = hubloc_hash where hubloc_addr = '%s' order by hubloc_id desc limit 1", + dbesc($address) + ); - if(! $x) { - // finger them if they can't be found. - $ret = zot_finger($address,null); - if($ret['success']) { - $j = json_decode($ret['body'],true); - if($j) - import_xchan($j); - $x = q("select * from hubloc left join xchan on xchan_hash = hubloc_hash where hubloc_addr = '%s' order by hubloc_id desc limit 1", - dbesc($address) - ); - } - } - if(! $x) { - logger('mod_zot: auth: unable to finger ' . $address); - goaway($desturl); + if(! $x) { + // finger them if they can't be found. + $ret = zot_finger($address,null); + if($ret['success']) { + $j = json_decode($ret['body'],true); + if($j) + import_xchan($j); + $x = q("select * from hubloc left join xchan on xchan_hash = hubloc_hash where hubloc_addr = '%s' order by hubloc_id desc limit 1", + dbesc($address) + ); } + } + if(! $x) { + logger('mod_zot: auth: unable to finger ' . $address); + goaway($desturl); + } - logger('mod_zot: auth request received from ' . $x[0]['xchan_addr'] . ' for ' . $webbie); + logger('mod_zot: auth request received from ' . $x[0]['xchan_addr'] . ' for ' . (($webbie) ? $webbie : 'undefined')); - // check credentials and access + // check credentials and access - // If they are already authenticated and haven't changed credentials, - // we can save an expensive network round trip and improve performance. + // If they are already authenticated and haven't changed credentials, + // we can save an expensive network round trip and improve performance. - $remote = remote_user(); - $result = null; + $remote = remote_user(); + $result = null; - $already_authed = ((($remote) && ($x[0]['hubloc_hash'] == $remote)) ? true : false); + $already_authed = ((($remote) && ($x[0]['hubloc_hash'] == $remote)) ? true : false); - if(! $already_authed) { - // Auth packets MUST use ultra top-secret hush-hush mode - $p = zot_build_packet($c[0],$type = 'auth_check', - array(array('guid' => $x[0]['hubloc_guid'],'guid_sig' => $x[0]['hubloc_guid_sig'])), - $x[0]['hubloc_sitekey'], $sec); - $result = zot_zot($x[0]['hubloc_callback'],$p); - if(! $result['success']) { - logger('mod_zot: auth_check callback failed.'); - goaway($desturl); - } - $j = json_decode($result['body'],true); + if(! $already_authed) { + // Auth packets MUST use ultra top-secret hush-hush mode + $p = zot_build_packet($c[0],$type = 'auth_check', + array(array('guid' => $x[0]['hubloc_guid'],'guid_sig' => $x[0]['hubloc_guid_sig'])), + $x[0]['hubloc_sitekey'], $sec); + $result = zot_zot($x[0]['hubloc_callback'],$p); + if(! $result['success']) { + logger('mod_zot: auth_check callback failed.'); + goaway($desturl); } + $j = json_decode($result['body'],true); + } - if($already_authed || $j['success']) { - if($j['success']) { - // legit response, but we do need to check that this wasn't answered by a man-in-middle - if(! rsa_verify($sec . $x[0]['xchan_hash'],base64url_decode($j['confirm']),$x[0]['xchan_pubkey'])) { - logger('mod_zot: auth: final confirmation failed.'); - goaway($desturl); - } + if($already_authed || $j['success']) { + if($j['success']) { + // legit response, but we do need to check that this wasn't answered by a man-in-middle + if(! rsa_verify($sec . $x[0]['xchan_hash'],base64url_decode($j['confirm']),$x[0]['xchan_pubkey'])) { + logger('mod_zot: auth: final confirmation failed.'); + goaway($desturl); } - // everything is good... maybe - if(local_user()) { + } + // everything is good... maybe + if(local_user()) { - // tell them to logout if they're logged in locally as anything but the target remote account - // in which case just shut up because they don't need to be doing this at all. + // tell them to logout if they're logged in locally as anything but the target remote account + // in which case just shut up because they don't need to be doing this at all. - if($a->channel['channel_hash'] != $x[0]['xchan_hash']) { - logger('mod_zot: auth: already authenticated locally as somebody else.'); - notice( t('Remote authentication blocked. You are logged into this site locally. Please logout and retry.') . EOL); - } - goaway($desturl); + if($a->channel['channel_hash'] != $x[0]['xchan_hash']) { + logger('mod_zot: auth: already authenticated locally as somebody else.'); + notice( t('Remote authentication blocked. You are logged into this site locally. Please logout and retry.') . EOL); } - // log them in - $_SESSION['authenticated'] = 1; - $_SESSION['visitor_id'] = $x[0]['xchan_hash']; - $_SESSION['my_address'] = $address; - $arr = array('xchan' => $x[0], 'url' => $desturl, 'channel_address' => $webbie); - call_hooks('magic_auth_success',$arr); - $a->set_observer($x[0]); - require_once('include/security.php'); - $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'] . ' for ' . $webbie); - - } else { - logger('mod_zot: still not authenticated: ' . $x[0]['xchan_addr']); - q("update hubloc set hubloc_status = (hubloc_status | %d ) where hubloc_addr = '%s'", - intval(HUBLOC_RECEIVE_ERROR), - dbesc($x[0]['xchan_addr']) - ); + goaway($desturl); } + // log them in + $_SESSION['authenticated'] = 1; + $_SESSION['visitor_id'] = $x[0]['xchan_hash']; + $_SESSION['my_address'] = $address; + $arr = array('xchan' => $x[0], 'url' => $desturl, 'channel_address' => $webbie); + call_hooks('magic_auth_success',$arr); + $a->set_observer($x[0]); + require_once('include/security.php'); + $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'] . ' for ' . $webbie); + + } else { + logger('mod_zot: still not authenticated: ' . $x[0]['xchan_addr']); + q("update hubloc set hubloc_status = (hubloc_status | %d ) where hubloc_addr = '%s'", + intval(HUBLOC_RECEIVE_ERROR), + dbesc($x[0]['xchan_addr']) + ); + } -// FIXME - we really want to save the return_url in the session before we visit rmagic. -// This does however prevent a recursion if you visit rmagic directly, as it would otherwise send you back here again. -// But z_root() probably isn't where you really want to go. - - if(strstr($desturl,z_root() . '/rmagic')) - goaway(z_root()); + // FIXME - we really want to save the return_url in the session before we visit rmagic. + // This does however prevent a recursion if you visit rmagic directly, as it would otherwise send you back here again. + // But z_root() probably isn't where you really want to go. - goaway($desturl); - } + if(strstr($desturl,z_root() . '/rmagic')) + goaway(z_root()); - logger('mod_zot: invalid args: ' . print_r($a->argv,true)); - killme(); + goaway($desturl); } - return; } diff --git a/version.inc b/version.inc index 771e7842a..cda99cbcd 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-11-17.500 +2013-11-18.501 -- cgit v1.2.3 From 718f69c6fc090752238bb64e7486d6a3eef5b518 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 18 Nov 2013 00:57:56 -0800 Subject: to clarify the fact, we'll remove the line we no longer need instead of commenting it --- mod/post.php | 1 - 1 file changed, 1 deletion(-) diff --git a/mod/post.php b/mod/post.php index ceb41b19d..6a5c919e1 100644 --- a/mod/post.php +++ b/mod/post.php @@ -48,7 +48,6 @@ function post_init(&$a) { // They'll get a notice when they hit the page, we don't need two of them. // In fact we only need the name to map the destination, auth can proceed // without it. - // goaway($desturl); } } -- cgit v1.2.3 From b1a4dc7d7ed9ae19c7f8c0cb1d706eb57872ff28 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 18 Nov 2013 01:00:04 -0800 Subject: set a default value for $webbie - it's the right thing to do. --- mod/post.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mod/post.php b/mod/post.php index 6a5c919e1..2778621d3 100644 --- a/mod/post.php +++ b/mod/post.php @@ -17,6 +17,8 @@ function post_init(&$a) { if(argc() > 1) { $webbie = argv(1); } + else + $webbie = ''; if(array_key_exists('auth',$_REQUEST)) { logger('mod_zot: auth request received.'); -- cgit v1.2.3 From fce5f2042db1a9d0b13c3bd5f6d37980fa98ca7f Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 18 Nov 2013 14:06:34 -0800 Subject: resetting password tries to update email address even if it didn't change - and if you've got the admin email this spits out a warning. --- mod/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/settings.php b/mod/settings.php index 4e122607b..ba7540b91 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -319,8 +319,8 @@ function settings_post(&$a) { } $email = ((x($_POST,'email')) ? trim(notags($_POST['email'])) : ''); + $account = $a->get_account(); if($email != $account['account_email']) { - $account = $a->get_account(); if(! valid_email($email)) $errs[] = t('Not valid email.'); $adm = trim(get_config('system','admin_email')); -- cgit v1.2.3 From dc6cd8a701f2225070bf6c37833279768f1a3b10 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 18 Nov 2013 15:38:02 -0800 Subject: admin/users - add expiration date to table and ability to sort by reverse expiration and also filter by service class through url options --- mod/admin.php | 49 ++++++++++++++++++++++++++++-------------------- view/tpl/admin_users.tpl | 1 + 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 3608f6eda..1615412b5 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -640,26 +640,35 @@ function admin_page_users(&$a){ // WEe'll still need to link email addresses to admin/users/channels or some such, but this bit doesn't exist yet. // That's where we need to be doing last post/channel flags/etc, not here. - $users =q("SELECT `account_id` , `account_email`, `account_lastlog`, `account_created`, `account_service_class` FROM `account`", - intval($a->pager['start']), - intval($a->pager['itemspage']) - ); - - function _setup_users($e){ - $accounts = Array( - t('Normal Account'), - t('Soapbox Account'), - t('Community/Celebrity Account'), - t('Automatic Friend Account') - ); - $e['page_flags'] = $accounts[$e['page-flags']]; - $e['register_date'] = relative_date($e['register_date']); - $e['login_date'] = relative_date($e['login_date']); - $e['lastitem_date'] = relative_date($e['lastitem_date']); - return $e; - } - $users = array_map("_setup_users", $users); + + $serviceclass = (($_REQUEST['class']) ? " and account_service_class = '" . dbesc($_REQUEST['class']) . "' " : ''); + + + $order = " order by account_email asc "; + if($_REQUEST['order'] === 'expires') + $order = " order by account_expires desc "; + + $users =q("SELECT `account_id` , `account_email`, `account_lastlog`, `account_created`, `account_expires`, `account_service_class` FROM `account` where true $serviceclass $order limit %d , %d ", + intval($a->pager['start']), + intval($a->pager['itemspage']) + ); + +// function _setup_users($e){ +// $accounts = Array( +// t('Normal Account'), +// t('Soapbox Account'), +// t('Community/Celebrity Account'), +// t('Automatic Friend Account') +// ); + +// $e['page_flags'] = $accounts[$e['page-flags']]; +// $e['register_date'] = relative_date($e['register_date']); +// $e['login_date'] = relative_date($e['login_date']); +// $e['lastitem_date'] = relative_date($e['lastitem_date']); +// return $e; +// } +// $users = array_map("_setup_users", $users); $t = get_markup_template("admin_users.tpl"); @@ -679,7 +688,7 @@ function admin_page_users(&$a){ '$unblock' => t('Unblock'), '$h_users' => t('Users'), - '$th_users' => array( t('Email'), t('Register date'), t('Last login'), t('Service Class')), + '$th_users' => array( t('Email'), t('Register date'), t('Last login'), t('Expires'), t('Service Class')), '$confirm_delete_multi' => t('Selected users will be deleted!\n\nEverything these users had posted on this site will be permanently deleted!\n\nAre you sure?'), '$confirm_delete' => t('The user {0} will be deleted!\n\nEverything this user has posted on this site will be permanently deleted!\n\nAre you sure?'), diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index b51fa3559..cedd55216 100755 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -68,6 +68,7 @@ {{$u.account_email}} {{$u.account_created}} {{$u.account_lastlog}} + {{$u.account_expires}} {{$u.account_service_class}} -- cgit v1.2.3 From ed129f19b01f4f8f34129e297f93c9926e36548a Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 18 Nov 2013 18:37:38 -0800 Subject: fix plugin and them toggles for the colourblind, add theme info block and recent screenshot to redbasic --- include/plugin.php | 4 ++-- view/theme/redbasic/css/style.css | 1 + view/theme/redbasic/img/screenshot.jpg | Bin 72559 -> 135205 bytes view/theme/redbasic/php/theme.php | 10 ++++++++++ view/tpl/admin_plugins.tpl | 2 +- view/tpl/admin_plugins_details.tpl | 2 +- 6 files changed, 15 insertions(+), 4 deletions(-) diff --git a/include/plugin.php b/include/plugin.php index ea88a61df..d90434b3a 100755 --- a/include/plugin.php +++ b/include/plugin.php @@ -298,10 +298,10 @@ function get_theme_info($theme){ 'name' => $theme, 'description' => "", 'author' => array(), - 'maintainer' => array(), 'version' => "", - 'credits' => "", 'compat' => "", + 'credits' => "", + 'maintainer' => array(), 'experimental' => false, 'unsupported' => false ); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 8e15d1eaf..d3779152d 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3499,6 +3499,7 @@ margin-right: 50px; } .comment-icon, +.admin-icons, .jot-icons { font-size: 1.2em; color: $toolicon_colour; diff --git a/view/theme/redbasic/img/screenshot.jpg b/view/theme/redbasic/img/screenshot.jpg index 5f00ec39e..51d4cbb0d 100644 Binary files a/view/theme/redbasic/img/screenshot.jpg and b/view/theme/redbasic/img/screenshot.jpg differ diff --git a/view/theme/redbasic/php/theme.php b/view/theme/redbasic/php/theme.php index ca280ef6a..e68533bb4 100644 --- a/view/theme/redbasic/php/theme.php +++ b/view/theme/redbasic/php/theme.php @@ -1,5 +1,15 @@ {{foreach $plugins as $p}}
  • - + {{$p.2.name}} - {{$p.2.version}} {{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}} diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl index f72142e41..1c1a59879 100755 --- a/view/tpl/admin_plugins_details.tpl +++ b/view/tpl/admin_plugins_details.tpl @@ -1,7 +1,7 @@

    {{$title}} - {{$page}}

    -

    {{$info.name}} - {{$info.version}} : {{$action}}

    +

    {{$info.name}} - {{$info.version}} : {{$action}}

    {{$info.description}}

    {{$str_author}} -- cgit v1.2.3 From 1593c83728884acda952661890354736a7eca105 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 18 Nov 2013 19:00:33 -0800 Subject: update to reflect that account and channel removal is now possible, though bugs likely remain. --- doc/Remove-Account.md | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/doc/Remove-Account.md b/doc/Remove-Account.md index 5759378a3..4591bbdad 100644 --- a/doc/Remove-Account.md +++ b/doc/Remove-Account.md @@ -1,4 +1,21 @@ Remove Account ============== -It is presently not possible to remove an account. We'll have better doco when somebody finishes that bit. \ No newline at end of file +It is presently not possible to remove an account without asking your site administrator for assistance. +We'll have better doco when somebody finishes that bit. + + +Remove Channel +============== + +Visit the URL + + https://yoursite/removeme + +(replace 'yoursite' with the domain name of your Red Matrix site). +You will need to confirm your password and the channel 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. + + -- cgit v1.2.3 From d049df8fa50f256f5c88547fe448e8a1f3bb9ab4 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 18 Nov 2013 19:02:38 -0800 Subject: wordsmithing --- doc/Remove-Account.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/Remove-Account.md b/doc/Remove-Account.md index 4591bbdad..bc1301b16 100644 --- a/doc/Remove-Account.md +++ b/doc/Remove-Account.md @@ -13,7 +13,9 @@ Visit the URL https://yoursite/removeme (replace 'yoursite' with the domain name of your Red Matrix site). -You will need to confirm your password and the channel will be removed. This is irreversible. +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. -- cgit v1.2.3 From be0197a3a035f7676a37ee766462d7a36a3043bb Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 18 Nov 2013 19:17:25 -0800 Subject: pull in some doco from the project wiki, keep it with the code --- doc/Home.md | 8 ++- doc/Intro-for-Developers.md | 105 ++++++++++++++++++++++++++++++++ doc/README.md | 38 ++++++++++++ doc/api_functions.md | 138 +++++++++++++++++++++++++++++++++++++++++++ doc/dev-function-overview.md | 52 ++++++++++++++++ 5 files changed, 340 insertions(+), 1 deletion(-) create mode 100644 doc/Intro-for-Developers.md create mode 100644 doc/README.md create mode 100644 doc/api_functions.md create mode 100644 doc/dev-function-overview.md diff --git a/doc/Home.md b/doc/Home.md index f97f987da..0034c4aa9 100644 --- a/doc/Home.md +++ b/doc/Home.md @@ -20,13 +20,19 @@ Red Matrix Documentation and Resources * [Comanche Page Descriptions](help/Comanche) * [Plugins](help/Plugins) * [Developers](help/Developers) -* [Code](doc/html) +* [Intro for Developers](help/Intro-for-Developers.md) +* [API functions](help/api_functions.md) +* [Red Functions 101](help/dev-function-overview.md) +* [Code Reference (doxygen generated)](doc/html) * [To-Do list for the Red Documentation Project](help/To-Do) * [To-Do list for Developers](help/To-Do-Code) **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** diff --git a/doc/Intro-for-Developers.md b/doc/Intro-for-Developers.md new file mode 100644 index 000000000..bf74cb7c1 --- /dev/null +++ b/doc/Intro-for-Developers.md @@ -0,0 +1,105 @@ +File system layout: +=================== + +[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. http://sitename/foo 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 + + +The Database: +============= + +* abook - contact table, replaces Friendica 'contact' +* account - service provider account +* addon - registered plugins +* attach - file attachments +* auth_codes - OAuth usage +* cache - TBD +* challenge - old DFRN structure, may re-use or may deprecate +* channel - replaces Friendica 'user' +* clients - OAuth usage +* config - main configuration storage +* event - Events +* fcontact - friend suggestion stuff +* ffinder - friend suggestion stuff +* fserver - obsolete +* fsuggest - friend suggestion stuff +* gcign - ignored friend suggestions +* gcontact - social graph storage, obsolete +* glink - social graph storage - obsolete +* group - privacy groups +* group_member - privacy groups +* hook - plugin hook registry +* hubloc - Red location storage, ties a location to an xchan +* intro - DFRN introductions, may be obsolete +* item - posts +* item_id - other identifiers on other services for posts +* mail - private messages +* manage - may be unused in Red, table of accounts that can "su" each other +* notify - notifications +* notify-threads - need to factor this out and use item thread info on notifications +* outq - Red output queue +* pconfig - personal (per channel) configuration storage +* photo - photo storage +* profile - channel profiles +* profile_check - DFRN remote auth use, may be obsolete +* queue - old Friendica queue, obsolete +* register - registrations requiring admin approval +* session - web session storage +* site - site table to find directory peers +* spam - unfinished +* term - item taxonomy (categories, tags, etc.) table +* tokens - OAuth usage +* verify - general purpose verification structure +* xchan - replaces 'gcontact', list of known channels in the universe +* xlink - "friends of friends" linkages derived from poco +* xprof - if this hub is a directory server, contains basic public profile info of everybody in the network +* xtag - if this hub is a directory server, contains tags or interests of everybody in the network + + +How to theme Red - by Olivier Migeot +==================================== + +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. + + + diff --git a/doc/README.md b/doc/README.md new file mode 100644 index 000000000..3fbfedae7 --- /dev/null +++ b/doc/README.md @@ -0,0 +1,38 @@ +The Red Matrix +============== + +***"Connected Websites"*** + +The modern web is "missing" a few important pieces which would make it much more useful. Many corporations have stepped in with products to supply these missing pieces, but with a loss of freedom and privacy and increased **centralisation**. + +Centralisation is generally considered a bad thing in network design as the loss of one critical node or centralised service could seriously impact the entire network - possibly taking a long time to recover. Recognising this, the original web was based on decentralised services. Over the years, this fundamental design strength has been largely overlooked, as people congregate into centralised services which provide the missing pieces. + +These missing pieces are (in no particular order): + +- 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) + + + +The Red Matrix (sometimes referred to as just "Red") is a collection of web servers and services which provides these missing pieces, but within a decentralised identity and messaging framework (known as "Zot"). Red operates as an independent network within the larger internet where all the nodes or servers (we call them "hubs") are able to fully interact with each other in ways that are simply not possible using other services. Additionally the owners of each network hub have the ability to set their own rules with regard to communications privacy and data ownership, because each operates with complete independence. These hubs require only slightly more resources than a blog or content management system, and the software is being designed with the ability to natively incorporate both kinds of functionality, as well as cloud storage. + +![The Red Matrix model](images/red_antiprism.png) + + +Whilst other decentralised communications networks exist, an additional weakness we've found in the implementation of these systems is the binding of network identity with the physical server where it resides; for example if you are "eric@example.website", your identity is often tied permanently to "example.website". We see this as a problem. Many hubs on the Indie Web are run by enthusiasts with varying skill levels and financial resources - and the technology is changing quite rapidly. Often the cost or workload involved in maintaining these services becomes a burden (or hardware fails) and people or entire social communities are left stranded when their server goes offline. Their identity no longer exists. They may have to "start over" building their social circle from scratch when this happens. In some cases communities are unable to recover from this kind of disruption and the entire community dissolves. + +We've been working on decentralisation for several years and have seen this happen time and time again. +Within the Red Matrix, identity is nomadic. It defines you and it belongs to you - and is not locked to a particular network address. You can take your identity, and all your friends and associates with you - to any other hub in the network, at any time. If your hub goes offline for any reason, you have the ability to relocate to any other hub and carry on as if nothing happened. You still have all your friends and associations. + + +The Red Matrix is free and open source distributed under the MIT license. + + +Currently the project is in "Developer 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 help us change the world by providing a small donation.](http://pledgie.com/campaigns/18417) (Large donations are also graciously accepted). \ No newline at end of file diff --git a/doc/api_functions.md b/doc/api_functions.md new file mode 100644 index 000000000..8c63770e6 --- /dev/null +++ b/doc/api_functions.md @@ -0,0 +1,138 @@ +Red Twitter API +=============== + +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 + + diff --git a/doc/dev-function-overview.md b/doc/dev-function-overview.md new file mode 100644 index 000000000..445b4823b --- /dev/null +++ b/doc/dev-function-overview.md @@ -0,0 +1,52 @@ +Red development - some useful basic functions +============================================= + + + +* get_account_id() + +Returns numeric account_id if authenticated or 0. It is possible to be authenticated and not connected to a channel. + +* local_user() + +Returns authenticated numeric channel_id if authenticated and connected to a channel or 0. Sometimes referred to as $uid in the code. + +* remote_user() + +Returns authenticated string hash of Red global identifier, if authenticated via remote auth, or an empty string. + +* get_app() + +Returns the global app structure ($a). + +* App::get_observer() + +(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). + +* get_config($family,$key), get_pconfig($uid,$family,$key) + +Returns the config setting for $family and $key or false if unset. + +* set_config($family,$key,$value), set_pconfig($uid,$family,$key,$value) + +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). + +* dbesc() + +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() + +* q($sql,$var1...) + +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. + +* t($string) + +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. + +* x($var), $x($array,$key) + +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; + + + -- cgit v1.2.3 From 5cf5cbd193258936515a487f9259e960a76e4106 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 18 Nov 2013 19:20:11 -0800 Subject: leave off the file extension --- doc/Home.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/Home.md b/doc/Home.md index 0034c4aa9..307c24229 100644 --- a/doc/Home.md +++ b/doc/Home.md @@ -20,9 +20,9 @@ Red Matrix Documentation and Resources * [Comanche Page Descriptions](help/Comanche) * [Plugins](help/Plugins) * [Developers](help/Developers) -* [Intro for Developers](help/Intro-for-Developers.md) -* [API functions](help/api_functions.md) -* [Red Functions 101](help/dev-function-overview.md) +* [Intro for Developers](help/Intro-for-Developers) +* [API functions](help/api_functions) +* [Red Functions 101](help/dev-function-overview) * [Code Reference (doxygen generated)](doc/html) * [To-Do list for the Red Documentation Project](help/To-Do) * [To-Do list for Developers](help/To-Do-Code) -- cgit v1.2.3 From bbd69c1e815c8c8be8265b4dc0554ae60e1ca7f6 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 18 Nov 2013 19:54:02 -0800 Subject: drop the queue table which we no longer use --- boot.php | 2 +- install/database.sql | 16 ---------------- install/update.php | 9 ++++++++- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/boot.php b/boot.php index 2a214e5c2..df729a52a 100755 --- a/boot.php +++ b/boot.php @@ -45,7 +45,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1081 ); +define ( 'DB_UPDATE_VERSION', 1082 ); 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 3a05c28ec..60e17c900 100644 --- a/install/database.sql +++ b/install/database.sql @@ -775,22 +775,6 @@ CREATE TABLE IF NOT EXISTS `profile_check` ( KEY `expire` (`expire`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -CREATE TABLE IF NOT EXISTS `queue` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `cid` int(11) NOT NULL, - `network` char(32) NOT NULL, - `created` datetime NOT NULL, - `last` datetime NOT NULL, - `content` mediumtext NOT NULL, - `batch` tinyint(1) NOT NULL DEFAULT '0', - PRIMARY KEY (`id`), - KEY `cid` (`cid`), - KEY `network` (`network`), - KEY `created` (`created`), - KEY `last` (`last`), - KEY `batch` (`batch`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - CREATE TABLE IF NOT EXISTS `register` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, `hash` char(255) NOT NULL, diff --git a/install/update.php b/install/update.php index e1fd8c7a4..f608075fc 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Mon, 18 Nov 2013 20:10:53 -0800 Subject: remove the challenge table as well --- boot.php | 2 +- install/database.sql | 10 ---------- install/update.php | 9 ++++++++- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/boot.php b/boot.php index df729a52a..ed96ca4c1 100755 --- a/boot.php +++ b/boot.php @@ -45,7 +45,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1082 ); +define ( 'DB_UPDATE_VERSION', 1083 ); 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 60e17c900..5496072a9 100644 --- a/install/database.sql +++ b/install/database.sql @@ -128,16 +128,6 @@ CREATE TABLE IF NOT EXISTS `cache` ( PRIMARY KEY (`k`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -CREATE TABLE IF NOT EXISTS `challenge` ( - `id` int(10) unsigned NOT NULL AUTO_INCREMENT, - `challenge` char(255) NOT NULL, - `dfrn-id` char(255) NOT NULL, - `expire` int(11) NOT NULL, - `type` char(255) NOT NULL, - `last_update` char(255) NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - CREATE TABLE IF NOT EXISTS `channel` ( `channel_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `channel_account_id` int(10) unsigned NOT NULL DEFAULT '0', diff --git a/install/update.php b/install/update.php index f608075fc..31eac2963 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Wed, 20 Nov 2013 00:25:04 -0800 Subject: add logo to readme --- README.md | 3 +-- images/rm300.png | Bin 0 -> 7389 bytes version.inc | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 images/rm300.png diff --git a/README.md b/README.md index ef1b8c892..8bc45e55e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -The Red Matrix -============== +![the Red Matrix](images/rm300.png) ***"Connected Websites"*** diff --git a/images/rm300.png b/images/rm300.png new file mode 100644 index 000000000..52c234dc2 Binary files /dev/null and b/images/rm300.png differ diff --git a/version.inc b/version.inc index cda99cbcd..ab46c45fd 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-11-18.501 +2013-11-20.503 -- cgit v1.2.3 From d7ee552c570f4fca760c3d1573f32c005cf73bb8 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 20 Nov 2013 15:20:12 -0800 Subject: Protocol: now set data['alg'] on all encapsulated encrypted packets, so that we can more easily retire 'aes256cbc' once it is no longer viable. --- boot.php | 10 +++------- include/crypto.php | 16 ++++++++++++++++ include/follow.php | 2 +- include/items.php | 26 +++++++++++++------------- include/message.php | 16 ++++++++-------- include/text.php | 4 ++-- include/zot.php | 10 +++++----- mod/editpost.php | 4 ++-- mod/message.php | 2 +- mod/post.php | 4 ++-- mod/probe.php | 2 +- mod/register.php | 8 ++++++++ 12 files changed, 62 insertions(+), 42 deletions(-) diff --git a/boot.php b/boot.php index ed96ca4c1..c84604dc1 100755 --- a/boot.php +++ b/boot.php @@ -803,12 +803,6 @@ class App { $scheme = $this->scheme; -// if((x($this->config,'system')) && (x($this->config['system'],'ssl_policy'))) { -// if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL)) { -// $scheme = 'https'; -// } -// } - $this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' ); return $this->baseurl; } @@ -995,6 +989,9 @@ class App { )) . $this->page['htmlhead']; } + // The following curl functions will go away once we've converted + // all instances of (fetch|post)_url() to z_(fetch|post)_url() + function set_curl_code($code) { $this->curl_code = $code; } @@ -1186,7 +1183,6 @@ function is_ajax() { // $_SERVER variables, and synchronising the state of installed plugins. - function check_config(&$a) { $build = get_config('system','db_version'); diff --git a/include/crypto.php b/include/crypto.php index a0268ef93..ca01814da 100644 --- a/include/crypto.php +++ b/include/crypto.php @@ -49,6 +49,13 @@ function AES256CBC_decrypt($data,$key,$iv) { str_pad($iv,16,"\0"))); } +function crypto_encapsulate($data,$pubkey,$alg='aes256cbc') { + if($alg === 'aes256cbc') + return aes_encapsulate($data,$pubkey); + +} + + function aes_encapsulate($data,$pubkey) { if(! $pubkey) logger('aes_encapsulate: no key. data: ' . $data); @@ -60,12 +67,21 @@ function aes_encapsulate($data,$pubkey) { $x = debug_backtrace(); logger('aes_encapsulate: RSA failed. ' . print_r($x[0],true)); } + $result['alg'] = 'aes256cbc'; $result['key'] = base64url_encode($k,true); openssl_public_encrypt($iv,$i,$pubkey); $result['iv'] = base64url_encode($i,true); return $result; } +function crypto_unencapsulate($data,$prvkey) { + $alg = ((array_key_exists('alg',$data)) ? $data['alg'] : 'aes256cbc'); + if($alg === 'aes256cbc') + return aes_unencapsulate($data,$prvkey); + +} + + function aes_unencapsulate($data,$prvkey) { openssl_private_decrypt(base64url_decode($data['key']),$k,$prvkey); openssl_private_decrypt(base64url_decode($data['iv']),$i,$prvkey); diff --git a/include/follow.php b/include/follow.php index 10bcddf2b..5cf161304 100644 --- a/include/follow.php +++ b/include/follow.php @@ -96,7 +96,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) $global_perms = get_perms(); if( array_key_exists('permissions',$j) && array_key_exists('data',$j['permissions'])) { - $permissions = aes_unencapsulate(array( + $permissions = crypto_unencapsulate(array( 'data' => $j['permissions']['data'], 'key' => $j['permissions']['key'], 'iv' => $j['permissions']['iv']), diff --git a/include/items.php b/include/items.php index 7e21b9c4d..fabad6a63 100755 --- a/include/items.php +++ b/include/items.php @@ -644,9 +644,9 @@ function get_item_elements($x) { $arr['item_flags'] = $arr['item_flags'] | ITEM_OBSCURED; $key = get_config('system','pubkey'); if($arr['title']) - $arr['title'] = json_encode(aes_encapsulate($arr['title'],$key)); + $arr['title'] = json_encode(crypto_encapsulate($arr['title'],$key)); if($arr['body']) - $arr['body'] = json_encode(aes_encapsulate($arr['body'],$key)); + $arr['body'] = json_encode(crypto_encapsulate($arr['body'],$key)); } @@ -699,9 +699,9 @@ function encode_item($item) { if(array_key_exists('item_flags',$item) && ($item['item_flags'] & ITEM_OBSCURED)) { $key = get_config('system','prvkey'); if($item['title']) - $item['title'] = aes_unencapsulate(json_decode_plus($item['title']),$key); + $item['title'] = crypto_unencapsulate(json_decode_plus($item['title']),$key); if($item['body']) - $item['body'] = aes_unencapsulate(json_decode_plus($item['body']),$key); + $item['body'] = crypto_unencapsulate(json_decode_plus($item['body']),$key); } if($item['item_restrict'] & ITEM_DELETED) { @@ -908,9 +908,9 @@ function encode_mail($item) { if(array_key_exists('mail_flags',$item) && ($item['mail_flags'] & MAIL_OBSCURED)) { $key = get_config('system','prvkey'); if($item['title']) - $item['title'] = aes_unencapsulate(json_decode_plus($item['title']),$key); + $item['title'] = crypto_unencapsulate(json_decode_plus($item['title']),$key); if($item['body']) - $item['body'] = aes_unencapsulate(json_decode_plus($item['body']),$key); + $item['body'] = crypto_unencapsulate(json_decode_plus($item['body']),$key); } $x['message_id'] = $item['mid']; @@ -963,10 +963,10 @@ function get_mail_elements($x) { $arr['mail_flags'] |= MAIL_OBSCURED; $arr['body'] = htmlentities($arr['body'],ENT_COMPAT,'UTF-8',false); if($arr['body']) - $arr['body'] = json_encode(aes_encapsulate($arr['body'],$key)); + $arr['body'] = json_encode(crypto_encapsulate($arr['body'],$key)); $arr['title'] = htmlentities($arr['title'],ENT_COMPAT,'UTF-8',false); if($arr['title']) - $arr['title'] = json_encode(aes_encapsulate($arr['title'],$key)); + $arr['title'] = json_encode(crypto_encapsulate($arr['title'],$key)); if($arr['created'] > datetime_convert()) $arr['created'] = datetime_convert(); @@ -1516,9 +1516,9 @@ function item_store($arr,$allow_exec = false) { $key = get_config('system','pubkey'); $arr['item_flags'] = $arr['item_flags'] | ITEM_OBSCURED; if($arr['title']) - $arr['title'] = json_encode(aes_encapsulate($arr['title'],$key)); + $arr['title'] = json_encode(crypto_encapsulate($arr['title'],$key)); if($arr['body']) - $arr['body'] = json_encode(aes_encapsulate($arr['body'],$key)); + $arr['body'] = json_encode(crypto_encapsulate($arr['body'],$key)); } } @@ -1887,9 +1887,9 @@ function item_store_update($arr,$allow_exec = false) { $key = get_config('system','pubkey'); $arr['item_flags'] = $arr['item_flags'] | ITEM_OBSCURED; if($arr['title']) - $arr['title'] = json_encode(aes_encapsulate($arr['title'],$key)); + $arr['title'] = json_encode(crypto_encapsulate($arr['title'],$key)); if($arr['body']) - $arr['body'] = json_encode(aes_encapsulate($arr['body'],$key)); + $arr['body'] = json_encode(crypto_encapsulate($arr['body'],$key)); } } @@ -2243,7 +2243,7 @@ function tag_deliver($uid,$item_id) { if($item['item_flags'] & ITEM_OBSCURED) { $key = get_config('system','prvkey'); if($item['body']) - $body = aes_unencapsulate(json_decode_plus($item['body']),$key); + $body = crypto_unencapsulate(json_decode_plus($item['body']),$key); } else $body = $item['body']; diff --git a/include/message.php b/include/message.php index 2fca9bef0..a95021583 100644 --- a/include/message.php +++ b/include/message.php @@ -109,9 +109,9 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto=' $key = get_config('system','pubkey'); if($subject) - $subject = json_encode(aes_encapsulate($subject,$key)); + $subject = json_encode(crypto_encapsulate($subject,$key)); if($body) - $body = json_encode(aes_encapsulate($body,$key)); + $body = json_encode(crypto_encapsulate($body,$key)); @@ -231,9 +231,9 @@ function private_messages_list($uid, $mailbox = '', $start = 0, $numitems = 0) { $key = get_config('system','prvkey'); if($r[$k]['title']) - $r[$k]['title'] = aes_unencapsulate(json_decode_plus($r[$k]['title']),$key); + $r[$k]['title'] = crypto_unencapsulate(json_decode_plus($r[$k]['title']),$key); if($r[$k]['body']) - $r[$k]['body'] = aes_unencapsulate(json_decode_plus($r[$k]['body']),$key); + $r[$k]['body'] = crypto_unencapsulate(json_decode_plus($r[$k]['body']),$key); } } @@ -270,9 +270,9 @@ function private_messages_fetch_message($channel_id, $messageitem_id, $updatesee if($messages[$k]['mail_flags'] & MAIL_OBSCURED) { $key = get_config('system','prvkey'); if($messages[$k]['title']) - $messages[$k]['title'] = aes_unencapsulate(json_decode_plus($messages[$k]['title']),$key); + $messages[$k]['title'] = crypto_unencapsulate(json_decode_plus($messages[$k]['title']),$key); if($messages[$k]['body']) - $messages[$k]['body'] = aes_unencapsulate(json_decode_plus($messages[$k]['body']),$key); + $messages[$k]['body'] = crypto_unencapsulate(json_decode_plus($messages[$k]['body']),$key); } } @@ -358,9 +358,9 @@ function private_messages_fetch_conversation($channel_id, $messageitem_id, $upda if($messages[$k]['mail_flags'] & MAIL_OBSCURED) { $key = get_config('system','prvkey'); if($messages[$k]['title']) - $messages[$k]['title'] = aes_unencapsulate(json_decode_plus($messages[$k]['title']),$key); + $messages[$k]['title'] = crypto_unencapsulate(json_decode_plus($messages[$k]['title']),$key); if($messages[$k]['body']) - $messages[$k]['body'] = aes_unencapsulate(json_decode_plus($messages[$k]['body']),$key); + $messages[$k]['body'] = crypto_unencapsulate(json_decode_plus($messages[$k]['body']),$key); } } diff --git a/include/text.php b/include/text.php index fc70e3509..780992f4a 100755 --- a/include/text.php +++ b/include/text.php @@ -1010,9 +1010,9 @@ function unobscure(&$item) { if(array_key_exists('item_flags',$item) && ($item['item_flags'] & ITEM_OBSCURED)) { $key = get_config('system','prvkey'); if($item['title']) - $item['title'] = aes_unencapsulate(json_decode_plus($item['title']),$key); + $item['title'] = crypto_unencapsulate(json_decode_plus($item['title']),$key); if($item['body']) - $item['body'] = aes_unencapsulate(json_decode_plus($item['body']),$key); + $item['body'] = crypto_unencapsulate(json_decode_plus($item['body']),$key); } } diff --git a/include/zot.php b/include/zot.php index 1191cc221..a4a27ce9c 100644 --- a/include/zot.php +++ b/include/zot.php @@ -82,7 +82,7 @@ function zot_build_packet($channel,$type = 'notify',$recipients = null, $remote_ // Hush-hush ultra top-secret mode if($remote_key) { - $data = aes_encapsulate(json_encode($data),$remote_key); + $data = crypto_encapsulate(json_encode($data),$remote_key); } return json_encode($data); @@ -269,7 +269,7 @@ function zot_refresh($them,$channel = null) { if($channel) { $global_perms = get_perms(); if($j['permissions']['data']) { - $permissions = aes_unencapsulate(array( + $permissions = crypto_unencapsulate(array( 'data' => $j['permissions']['data'], 'key' => $j['permissions']['key'], 'iv' => $j['permissions']['iv']), @@ -823,7 +823,7 @@ function zot_fetch($arr) { 'secret_sig' => base64url_encode(rsa_sign($arr['secret'],get_config('system','prvkey'))) ); - $datatosend = json_encode(aes_encapsulate(json_encode($data),$ret_hub['hubloc_sitekey'])); + $datatosend = json_encode(crypto_encapsulate(json_encode($data),$ret_hub['hubloc_sitekey'])); $fetch = zot_zot($url,$datatosend); $result = zot_import($fetch, $arr['sender']['url']); @@ -849,7 +849,7 @@ function zot_import($arr, $sender_url) { } if(array_key_exists('iv',$data)) { - $data = json_decode(aes_unencapsulate($data,get_config('system','prvkey')),true); + $data = json_decode(crypto_unencapsulate($data,get_config('system','prvkey')),true); } $incoming = $data['pickup']; @@ -861,7 +861,7 @@ function zot_import($arr, $sender_url) { $result = null; if(array_key_exists('iv',$i['notify'])) { - $i['notify'] = json_decode(aes_unencapsulate($i['notify'],get_config('system','prvkey')),true); + $i['notify'] = json_decode(crypto_unencapsulate($i['notify'],get_config('system','prvkey')),true); } logger('zot_import: notify: ' . print_r($i['notify'],true), LOGGER_DATA); diff --git a/mod/editpost.php b/mod/editpost.php index b01afe9b3..f25d6d21d 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -57,9 +57,9 @@ function editpost_content(&$a) { if($itm[0]['item_flags'] & ITEM_OBSCURED) { $key = get_config('system','prvkey'); if($itm[0]['title']) - $itm[0]['title'] = aes_unencapsulate(json_decode_plus($itm[0]['title']),$key); + $itm[0]['title'] = crypto_unencapsulate(json_decode_plus($itm[0]['title']),$key); if($itm[0]['body']) - $itm[0]['body'] = aes_unencapsulate(json_decode_plus($itm[0]['body']),$key); + $itm[0]['body'] = crypto_unencapsulate(json_decode_plus($itm[0]['body']),$key); } $tpl = get_markup_template("jot.tpl"); diff --git a/mod/message.php b/mod/message.php index f992a6fa1..a0382f63d 100644 --- a/mod/message.php +++ b/mod/message.php @@ -79,7 +79,7 @@ function message_post(&$a) { $global_perms = get_perms(); if($j['permissions']['data']) { - $permissions = aes_unencapsulate($j['permissions'],$channel['channel_prvkey']); + $permissions = crypto_unencapsulate($j['permissions'],$channel['channel_prvkey']); if($permissions) $permissions = json_decode($permissions); logger('decrypted permissions: ' . print_r($permissions,true), LOGGER_DATA); diff --git a/mod/post.php b/mod/post.php index 2778621d3..64e08e632 100644 --- a/mod/post.php +++ b/mod/post.php @@ -172,7 +172,7 @@ function post_post(&$a) { */ if(array_key_exists('iv',$data)) { - $data = aes_unencapsulate($data,get_config('system','prvkey')); + $data = crypto_unencapsulate($data,get_config('system','prvkey')); logger('mod_zot: decrypt1: ' . $data, LOGGER_DATA); // susceptible to Bleichenbacher's attack @@ -312,7 +312,7 @@ function post_post(&$a) { ); } } - $encrypted = aes_encapsulate(json_encode($ret),$sitekey); + $encrypted = crypto_encapsulate(json_encode($ret),$sitekey); json_return_and_die($encrypted); /** pickup: end */ diff --git a/mod/probe.php b/mod/probe.php index bd792d52e..e2dd4ef77 100644 --- a/mod/probe.php +++ b/mod/probe.php @@ -26,7 +26,7 @@ function probe_content(&$a) { $j = json_decode($res['body'],true); } if($j && $j['permissions'] && $j['permissions']['iv']) - $j['permissions'] = json_decode(aes_unencapsulate($j['permissions'],$channel['channel_prvkey']),true); + $j['permissions'] = json_decode(crypto_unencapsulate($j['permissions'],$channel['channel_prvkey']),true); $o .= str_replace("\n",'
    ',print_r($j,true)); $o .= ''; } diff --git a/mod/register.php b/mod/register.php index bc1603f25..2040732ff 100644 --- a/mod/register.php +++ b/mod/register.php @@ -7,6 +7,14 @@ function register_init(&$a) { $result = null; $cmd = ((argc() > 1) ? argv(1) : ''); + // Provide a stored request for somebody desiring a connection + // when they first need to register someplace. Once they've + // created a channel, we'll try to revive the connection request + // and process it. + + if($_REQUEST['connect']) + $_SESSION['connect'] = $_REQUEST['connect']; + switch($cmd) { case 'invite_check.json': $result = check_account_invite($_REQUEST['invite_code']); -- cgit v1.2.3 From 5315c88621719c93235f4d2d8a93eed29d7ae851 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 20 Nov 2013 16:20:32 -0800 Subject: webpage edit - losing the ability to pass unfiltered html and perhaps some php due to unsetting uid too early in item_store_update() --- include/items.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/items.php b/include/items.php index fabad6a63..9fbd3fd8a 100755 --- a/include/items.php +++ b/include/items.php @@ -1844,8 +1844,6 @@ function item_store_update($arr,$allow_exec = false) { $arr['item_flags'] = intval($arr['item_flags']) | $orig[0]['item_flags']; $arr['item_restrict'] = intval($arr['item_restrict']) | $orig[0]['item_restrict']; - unset($arr['id']); - unset($arr['uid']); if(array_key_exists('edit',$arr)) unset($arr['edit']); @@ -1911,7 +1909,8 @@ function item_store_update($arr,$allow_exec = false) { } - + unset($arr['id']); + unset($arr['uid']); unset($arr['aid']); unset($arr['mid']); unset($arr['parent']); -- cgit v1.2.3 From eb3d8e2cd7e2bd51035918b4106d1c29b6605505 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 20 Nov 2013 16:28:17 -0800 Subject: provide a page template "none" which lets a webpage take over the entire page. Everything. The application is essentially bypassed. You'll need doctype and html and head and body tags in your content as none of them are supplied. There are no page regions. Nada. We should probably restrict this to those who have code exec in their account_roles but other folks won't be able to do very much useful with it anyway as their HTML is filtered. --- view/php/none.php | 1 + 1 file changed, 1 insertion(+) create mode 100644 view/php/none.php diff --git a/view/php/none.php b/view/php/none.php new file mode 100644 index 000000000..51d0e83dc --- /dev/null +++ b/view/php/none.php @@ -0,0 +1 @@ + -- cgit v1.2.3 From 4791b2fd9c6dabc9ebb1f42a4993185d85493261 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 20 Nov 2013 21:09:13 -0800 Subject: add aid to notifiy table which we may need to supress duplicate notify emails across your channels also try to handle the wretched mess of broken and duplicated hublocs that fred.cepheus.uberspace.de typically reports --- boot.php | 2 +- include/enotify.php | 8 +++++--- include/notifier.php | 12 ++++++++---- include/zot.php | 16 +++++++++++++--- install/database.sql | 4 +++- install/update.php | 11 ++++++++++- 6 files changed, 40 insertions(+), 13 deletions(-) diff --git a/boot.php b/boot.php index c84604dc1..3fabff55a 100755 --- a/boot.php +++ b/boot.php @@ -45,7 +45,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1083 ); +define ( 'DB_UPDATE_VERSION', 1084 ); define ( 'EOL', '
    ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/include/enotify.php b/include/enotify.php index 67fe748d1..91b37a913 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -322,6 +322,7 @@ function notification($params) { $datarray['url'] = $sender['xchan_url']; $datarray['photo'] = $sender['xchan_photo_s']; $datarray['date'] = datetime_convert(); + $datarray['aid'] = $recip['channel_account_id']; $datarray['uid'] = $recip['channel_id']; $datarray['link'] = $itemlink; $datarray['parent'] = $parent_id; @@ -340,13 +341,14 @@ function notification($params) { // create notification entry in DB - $r = q("insert into notify (hash,name,url,photo,date,uid,link,parent,type,verb,otype) - values('%s','%s','%s','%s','%s',%d,'%s',%d,%d,'%s','%s')", + $r = q("insert into notify (hash,name,url,photo,date,aid,uid,link,parent,type,verb,otype) + values('%s','%s','%s','%s','%s',%d,%d,'%s',%d,%d,'%s','%s')", dbesc($datarray['hash']), dbesc($datarray['name']), dbesc($datarray['url']), dbesc($datarray['photo']), dbesc($datarray['date']), + intval($datarray['aid']), intval($datarray['uid']), dbesc($datarray['link']), intval($datarray['parent']), @@ -559,7 +561,7 @@ class enotify { // send the message $res = mail( - $params['toEmail'], // send to address + $params['toEmail'], // send to address $messageSubject, // subject $multipartMessageBody, // message body $messageHeader // message headers diff --git a/include/notifier.php b/include/notifier.php index 1407be4b3..2ca3531d6 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -408,9 +408,9 @@ function notifier_run($argv, $argc){ // for public posts always include our own hub - $sql_extra = (($private) ? "" : " or hubloc_url = '" . z_root() . "' "); + $sql_extra = (($private) ? "" : " or hubloc_url = '" . dbesc(z_root()) . "' "); - $r = q("select distinct hubloc_sitekey, hubloc_flags, hubloc_callback, hubloc_host from hubloc + $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'); @@ -419,10 +419,14 @@ function notifier_run($argv, $argc){ $hubs = $r; $hublist = array(); + $keys = array(); + foreach($hubs as $hub) { - // don't try to deliver to deleted hublocs - if(! ($hub['hubloc_flags'] & HUBLOC_FLAGS_DELETED)) { + // don't try to deliver to deleted hublocs - and inexplicably SQL "distinct" and "group by" + // both return records with duplicate keys in rare circumstances + if((! ($hub['hubloc_flags'] & HUBLOC_FLAGS_DELETED)) && (! in_array($hub['hubloc_sitekey'],$keys))) { $hublist[] = $hub['hubloc_host']; + $keys[] = $hub['hubloc_sitekey']; } } diff --git a/include/zot.php b/include/zot.php index a4a27ce9c..9906b7ec8 100644 --- a/include/zot.php +++ b/include/zot.php @@ -584,7 +584,7 @@ function import_xchan($arr,$ud_flags = 1) { if($arr['locations']) { - $xisting = q("select hubloc_id, hubloc_url from hubloc where hubloc_hash = '%s'", + $xisting = q("select hubloc_id, hubloc_url, hubloc_sitekey from hubloc where hubloc_hash = '%s'", dbesc($xchan_hash) ); @@ -596,14 +596,14 @@ function import_xchan($arr,$ud_flags = 1) { } for($x = 0; $x < count($xisting); $x ++) { - if($xisting[$x]['hubloc_url'] == $location['url']) { + if(($xisting[$x]['hubloc_url'] === $location['url']) && ($xisting[$x]['hubloc_sitekey'] === $location['sitekey'])) { $xisting[$x]['updated'] = true; } } // 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' limit 1", + $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' ", dbesc($xchan_hash), dbesc($arr['guid']), dbesc($arr['guid_sig']), @@ -624,6 +624,16 @@ function import_xchan($arr,$ud_flags = 1) { intval($r[0]['hubloc_id']) ); } + + // Remove pure duplicates + if($count($r) > 1) { + for($h = 1; $h < count($r); $h ++) { + q("delete from hubloc where hubloc_id = %d limit 1", + intval($r[$h]['hubloc_id']) + ); + } + } + if((($r[0]['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY) && (! $location['primary'])) || ((! ($r[0]['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY)) && ($location['primary']))) { $r = q("update hubloc set hubloc_flags = (hubloc_flags ^ %d), hubloc_updated = '%s' where hubloc_id = %d limit 1", diff --git a/install/database.sql b/install/database.sql index 5496072a9..ef79862c3 100644 --- a/install/database.sql +++ b/install/database.sql @@ -563,6 +563,7 @@ CREATE TABLE IF NOT EXISTS `notify` ( `photo` char(255) NOT NULL, `date` datetime NOT NULL, `msg` mediumtext NOT NULL, + `aid` int(11) NOT NULL, `uid` int(11) NOT NULL, `link` char(255) NOT NULL, `parent` int(11) NOT NULL, @@ -578,7 +579,8 @@ CREATE TABLE IF NOT EXISTS `notify` ( KEY `hash` (`hash`), KEY `parent` (`parent`), KEY `link` (`link`), - KEY `otype` (`otype`) + KEY `otype` (`otype`), + KEY `aid` (`aid`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `obj` ( diff --git a/install/update.php b/install/update.php index 31eac2963..f498ec042 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Thu, 21 Nov 2013 15:18:18 +0100 Subject: not needed anymore with new defaults --- view/theme/redbasic/css/style.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index d3779152d..f5e99bdf7 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2067,7 +2067,6 @@ a.mail-list-link { #nav-search-text { height: 20px; padding: 0px 5px 0px 5px; - font-size: 0.9em; border-radius: 10px; border: none; background-color: $search_background; @@ -3569,4 +3568,4 @@ text-decoration: none; .admin-icons { color: $toolicon_colour; margin-right: 10px; -} \ No newline at end of file +} -- cgit v1.2.3 From 35c465d4b7459b4cce40f50c53515b9061b484cd Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Thu, 21 Nov 2013 19:41:09 +0000 Subject: Document schemas --- doc/Home.md | 1 + doc/Schema-development.md | 79 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 doc/Schema-development.md diff --git a/doc/Home.md b/doc/Home.md index 307c24229..4a37e6c82 100644 --- a/doc/Home.md +++ b/doc/Home.md @@ -19,6 +19,7 @@ Red Matrix Documentation and Resources * [Install](help/Install) * [Comanche Page Descriptions](help/Comanche) * [Plugins](help/Plugins) +* [Schemas](help/Schema-development) * [Developers](help/Developers) * [Intro for Developers](help/Intro-for-Developers) * [API functions](help/api_functions) diff --git a/doc/Schema-development.md b/doc/Schema-development.md new file mode 100644 index 000000000..f3e6b97f4 --- /dev/null +++ b/doc/Schema-development.md @@ -0,0 +1,79 @@ +Red development - a guide to the schema system +============================================== + + +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 users. + +By default, we filter only by whether or not expert mode is enabled. If expert mode is +enabled, all options are presented to the user. If it is not, only scheme, background +image, font face, and iconset are available as choices. + +A schema is loaded *after* the user settings. Therefore, to allow a user to overwrite a +particular aspect of a schmea you would use the following syntax: + + if (! $foo) + $foo = 'bar'; + +However, there are circumstances - particularly with positional elements - where it +may be desirable (or necessary) to override a users settings. In this case, the syntax +is even simpler: + + $foo = 'bar'; + +Users will not thank you for this, however, so only use it when it is required. + +If no user 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. + +The canonical default schema is darkness.php. Any bugs should be tested with this schema +first, in order to determine whether we're dealing with a theme bug or a schema bug. + +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: + +* 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. +* banner_colour + The font colour of the banner element. Accepts an RGB or Hex value. +* bgcolour + Set the body background colour. Accepts an RGB or Hex value. +* background_image + Sets a background image. Accepts a URL or path. +* item_colour + Set the background colour of items. Accepts an RGB or Hex value. +* item_opacity + Set the opacity of items. Accepts a value from 0.01 to 1 +* toolicon_colour + Set the colour of tool icons. Accepts an RGB or Hex value. +* toolicon_activecolour + Set the colour of active or hovered icon tools. +* font_size + Set the size of fonts in items and posts. Accepts px or em. +* body_font_size + Sets the size of fonts at the body level. Accepts px or em. +* font_colour + Sets the font colour. Accepts an RGB or Hex value. +* radius + Set the radius of corners. Accepts a numeral, and is always in px. +* shadow + Set the size of shadows shown with inline images. Accepts a numerical + value. Note shadows are not applied to smileys. +* converse_width + Set the maximum width of conversations. Accepts px, or %. +* nav_min_opacity +* top_photo +* reply_photo +* sloppy_photos + Determins whether photos are "sloppy" or aligned. Set or unset (1 or '') -- cgit v1.2.3 From b170d8047153a9c9f0f0f16d39e0ecb45d17b0b6 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Thu, 21 Nov 2013 19:42:04 +0000 Subject: Remove telltale signs the doco was mostly stolen from APW --- doc/Schema-development.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/doc/Schema-development.md b/doc/Schema-development.md index f3e6b97f4..415c68efa 100644 --- a/doc/Schema-development.md +++ b/doc/Schema-development.md @@ -31,9 +31,6 @@ with the file name "default.php". This file should never be included with a the is, merge conflicts will occur as people update their code. Rather, this should be defined by administrators on a site by site basis. -The canonical default schema is darkness.php. Any bugs should be tested with this schema -first, in order to determine whether we're dealing with a theme bug or a schema bug. - 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. -- cgit v1.2.3 From 6ddb57e0da54b291504638247a77889f5b631caa Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Nov 2013 14:19:31 -0800 Subject: mod/help - load Site.md (if it exists) before Home.md. Site.md will typically provide local resources. Site.md can either include the complete contents of Help.md or link to it, as you choose. --- mod/help.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mod/help.php b/mod/help.php index 770a0a8af..10061b851 100644 --- a/mod/help.php +++ b/mod/help.php @@ -25,9 +25,13 @@ function help_content(&$a) { $text = ''; - if($a->argc > 1) { + if(argc() > 1) { $text = load_doc_file('doc/' . $a->argv[1] . '.md'); - $a->page['title'] = t('Help:') . ' ' . str_replace('-',' ',notags($a->argv[1])); + $a->page['title'] = t('Help:') . ' ' . str_replace('-',' ',notags(argv(1))); + } + if(! $text) { + $text = load_doc_file('doc/Site.md'); + $a->page['title'] = t('Help'); } if(! $text) { $text = load_doc_file('doc/Home.md'); -- cgit v1.2.3 From 7f4e4ab688be440a3efae2e0b0af7b9bbc6b7053 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Nov 2013 14:41:31 -0800 Subject: Add #include mechanism for help pages - see the top of mod/help.php for details --- mod/help.php | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/mod/help.php b/mod/help.php index 10061b851..e78f9e61c 100644 --- a/mod/help.php +++ b/mod/help.php @@ -1,5 +1,16 @@ language; @@ -45,7 +56,20 @@ function help_content(&$a) { '$message' => t('Page not found.' ) )); } + + $text = preg_replace_callback("/#include (.*?)\;/ism", 'preg_callback_help_include', $text); + return Markdown($text); } + + +function preg_callback_help_include($matches) { + print_r($matches); + + if($matches[1]) + return str_replace($matches[0],load_doc_file($matches[1]),$matches[0]); + +} + -- cgit v1.2.3 From 8f236771c675ba18fa053182c4d25199e3f98277 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Nov 2013 14:42:48 -0800 Subject: mark hublocs with incorrect sitekeys deleted --- mod/post.php | 14 ++++++++++++++ version.inc | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/mod/post.php b/mod/post.php index 64e08e632..0ce58ec9f 100644 --- a/mod/post.php +++ b/mod/post.php @@ -265,6 +265,7 @@ function post_post(&$a) { if((! $forgery) && (! $secret_fail)) break; } + if($forgery) { $ret['message'] = 'possible site forgery'; logger('mod_zot: pickup: ' . $ret['message']); @@ -312,6 +313,7 @@ function post_post(&$a) { ); } } + $encrypted = crypto_encapsulate(json_encode($ret),$sitekey); json_return_and_die($encrypted); @@ -355,6 +357,18 @@ function post_post(&$a) { intval($hub['hubloc_id']) ); + /** + * This hub has now been proven to be valid. + * Any hub with the same URL and a different sitekey cannot be valid. + * Get rid of them (mark them deleted). There's a good chance they were re-installs. + * + */ + + q("update hubloc set hubloc_flags = ( hubloc_flags | %d ) where hubloc_url = '%s' and hubloc_sitekey != '%s' ", + intval(HUBLOC_FLAGS_DELETED), + dbesc($hub['hubloc_url']), + dbesc($hub['hubloc_sitekey']) + ); // TODO: check which hub is primary and take action if mismatched diff --git a/version.inc b/version.inc index ab46c45fd..3e026cef2 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-11-20.503 +2013-11-21.504 -- cgit v1.2.3 From f896819c781807612318ad389ea5fe655926cc2a Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Nov 2013 14:51:12 -0800 Subject: There was one small typo - and I'm trying with great difficulty not to use the word "user" to refer to site members - especially in public documentation. In dev forums is another matter. It does exist in function names and the string "username" isn't considered derogatory, but most other times it's considered derogatory to site members. Channel is often another acceptable replacement. --- doc/Schema-development.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/Schema-development.md b/doc/Schema-development.md index 415c68efa..481792fcc 100644 --- a/doc/Schema-development.md +++ b/doc/Schema-development.md @@ -6,27 +6,27 @@ A schema, in a nutshell, is a collection of settings for a bunch of variables to 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 users. +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 user. If it is not, only scheme, background +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 user settings. Therefore, to allow a user to overwrite a -particular aspect of a schmea you would use the following syntax: +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: if (! $foo) $foo = 'bar'; However, there are circumstances - particularly with positional elements - where it -may be desirable (or necessary) to override a users settings. In this case, the syntax +may be desirable (or necessary) to override a member's settings. In this case, the syntax is even simpler: $foo = 'bar'; -Users will not thank you for this, however, so only use it when it is required. +Members will not thank you for this, however, so only use it when it is required. -If no user options are set, and no schema is selected, we will first try to load a schema +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. -- cgit v1.2.3 From be8a7e2de6326ea9fb16bebbafeaeaf6fa52a767 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Nov 2013 15:58:42 -0800 Subject: this is necessary for any possibility of a federated future. --- include/notifier.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/include/notifier.php b/include/notifier.php index 2ca3531d6..0868ac77e 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -382,12 +382,27 @@ function notifier_run($argv, $argc){ $env_recips = (($private) ? array() : null); - $details = q("select xchan_hash, xchan_addr, xchan_guid, xchan_guid_sig from xchan where xchan_hash in (" . implode(',',$recipients) . ")"); + $details = q("select xchan_hash, xchan_instance_url, xchan_addr, xchan_guid, xchan_guid_sig from xchan where xchan_hash in (" . implode(',',$recipients) . ")"); $recip_list = array(); if($details) { foreach($details as $d) { + + // If the recipient is federated from a traditional network they won't be able to + // handle nomadic identity. If we're publishing from a site that they aren't + // directly connected with, ignore them. + + // FIXME: make sure we run through a notifier loop on the hub they're connected + // with if this post comes in from a different hub - so that we will deliver to them. + + // On the down side, these channels will stop working if the hub they connected with + // goes down permanently, as they are (doh) not nomadic. + + if(($d['xchan_instance_url']) && ($d['xchan_instance_url'] != z_root())) + continue; + + $recip_list[] = $d['xchan_addr'] . ' (' . $d['xchan_hash'] . ')'; if($private) $env_recips[] = array('guid' => $d['xchan_guid'],'guid_sig' => $d['xchan_guid_sig']); -- cgit v1.2.3 From 3e0ac769aad2ae15934c32eef2f4992bde73e178 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Nov 2013 17:23:14 -0800 Subject: white screen --- include/group.php | 6 +++--- include/zot.php | 2 +- mod/settings.php | 15 ++++++++------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/include/group.php b/include/group.php index eece07983..d339301b4 100644 --- a/include/group.php +++ b/include/group.php @@ -202,7 +202,7 @@ function group_get_members($gid) { return $ret; } -function mini_group_select($uid,$gid = 0) { +function mini_group_select($uid,$group = '') { $grps = array(); $o = ''; @@ -210,10 +210,10 @@ function mini_group_select($uid,$gid = 0) { $r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d ORDER BY `name` ASC", intval($uid) ); - $grps[] = array('name' => '', 'id' => '0', 'selected' => ''); + $grps[] = array('name' => '', 'hash' => '0', 'selected' => ''); if(count($r)) { foreach($r as $rr) { - $grps[] = array('name' => $rr['name'], 'id' => $rr['id'], 'selected' => (($gid == $rr['id']) ? 'true' : '')); + $grps[] = array('name' => $rr['name'], 'id' => $rr['hash'], 'selected' => (($group == $rr['hash']) ? 'true' : '')); } } diff --git a/include/zot.php b/include/zot.php index 9906b7ec8..65f3b606f 100644 --- a/include/zot.php +++ b/include/zot.php @@ -626,7 +626,7 @@ function import_xchan($arr,$ud_flags = 1) { } // Remove pure duplicates - if($count($r) > 1) { + if(count($r) > 1) { for($h = 1; $h < count($r); $h ++) { q("delete from hubloc where hubloc_id = %d limit 1", intval($r[$h]['hubloc_id']) diff --git a/mod/settings.php b/mod/settings.php index ba7540b91..af9113202 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -357,7 +357,7 @@ function settings_post(&$a) { $openid = ((x($_POST,'openid_url')) ? notags(trim($_POST['openid_url'])) : ''); $maxreq = ((x($_POST,'maxreq')) ? intval($_POST['maxreq']) : 0); $expire = ((x($_POST,'expire')) ? intval($_POST['expire']) : 0); - $def_gid = ((x($_POST,'group-selection')) ? intval($_POST['group-selection']) : 0); + $def_group = ((x($_POST,'group-selection')) ? notags(trim($_POST['group-selection'])) : ''); $expire_items = ((x($_POST,'expire_items')) ? intval($_POST['expire_items']) : 0); @@ -506,9 +506,9 @@ function settings_post(&$a) { if($page_flags == PAGE_PRVGROUP) { $hidewall = 1; if((! $str_contact_allow) && (! $str_group_allow) && (! $str_contact_deny) && (! $str_group_deny)) { - if($def_gid) { + if($def_group) { info( t('Private forum has no privacy permissions. Using default privacy group.'). EOL); - $str_group_allow = '<' . $def_gid . '>'; + $str_group_allow = '<' . $def_group . '>'; } else { notice( t('Private forum has no privacy permissions and no default privacy group.') . EOL); @@ -519,7 +519,7 @@ function settings_post(&$a) { */ /* - $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `maxreq` = %d, `expire` = %d, `openidserver` = '%s', `def_gid` = %d, `blockwall` = %d, `hidewall` = %d, `blocktags` = %d, `unkmail` = %d, `cntunkmail` = %d WHERE `uid` = %d LIMIT 1", + $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `maxreq` = %d, `expire` = %d, `openidserver` = '%s', `def_group` = %d, `blockwall` = %d, `hidewall` = %d, `blocktags` = %d, `unkmail` = %d, `cntunkmail` = %d WHERE `uid` = %d LIMIT 1", dbesc($username), dbesc($email), dbesc($openid), @@ -535,7 +535,7 @@ function settings_post(&$a) { intval($maxreq), intval($expire), dbesc($openidserver), - intval($def_gid), + intval($def_group), intval($blockwall), intval($hidewall), intval($blocktags), @@ -545,7 +545,7 @@ function settings_post(&$a) { ); */ - $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_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 where channel_id = %d limit 1", + $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 where channel_id = %d limit 1", dbesc($username), intval($pageflags), dbesc($timezone), @@ -554,6 +554,7 @@ function settings_post(&$a) { intval($unkmail), intval($maxreq), intval($expire), + dbesc($def_group), intval($arr['channel_r_stream']), intval($arr['channel_r_profile']), intval($arr['channel_r_photos']), @@ -1045,7 +1046,7 @@ function settings_content(&$a) { require_once('include/group.php'); - $group_select = mini_group_select(local_user(),$a->user['def_gid']); + $group_select = mini_group_select(local_user(),$channel['channel_default_group']); $o .= replace_macros($stpl,array( '$ptitle' => t('Channel Settings'), -- cgit v1.2.3 From 8cdbd0e2a65cac16a5bad0fca1c3e2e5ec91e348 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Nov 2013 17:31:37 -0800 Subject: make default group for new connections work --- mod/connections.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/mod/connections.php b/mod/connections.php index a40a8fa90..ba5e8920e 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -129,6 +129,15 @@ function connections_post(&$a) { } 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 -- cgit v1.2.3 From f2435ed4cdee6e20a92f2acfd60399cb92b2c1e3 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Nov 2013 17:49:14 -0800 Subject: follow and accept_follow hooks --- include/follow.php | 4 ++++ mod/connections.php | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/include/follow.php b/include/follow.php index 5cf161304..845ce11da 100644 --- a/include/follow.php +++ b/include/follow.php @@ -175,6 +175,10 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) proc_run('php', 'include/notifier.php', 'permission_update', $result['abook']['abook_id']); } + $arr = array('channel_id' => $uid, 'abook' => $result['abook']); + + call_hooks('follow', $arr); + /** If there is a default group for this channel, add this member to it */ if($default_group) { diff --git a/mod/connections.php b/mod/connections.php index ba5e8920e..d7adf775b 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -138,6 +138,8 @@ function connections_post(&$a) { 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 @@ -145,6 +147,7 @@ function connections_post(&$a) { // 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 @@ -159,6 +162,11 @@ function connections_post(&$a) { $a->data['abook'] = $r[0]; } + if($new_friend) { + $arr = array('channel_id' => local_user(), 'abook' => $a->data['abook']); + call_hooks('accept_follow', $arr); + } + connections_clone($a); return; -- cgit v1.2.3 From e4c64c7167c9566a01c9382f774f4e9a184ea4e0 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Nov 2013 20:08:04 -0800 Subject: e2ee algorithms are now pluggable so if you want to roll your own algorithm or do something like swap_bytes(rabbit(left_shift(3,triple_aes256(right_shift(base64(text)))))) - go for it. As long as the person at the other end can reverse it, you can do pretty much whatever you want. I'd like to see the NSA crack that one - especially if the algorithm was called something like "dishwasher" or something which didn't provide a lot of clues. --- js/crypto.js | 46 +++++++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/js/crypto.js b/js/crypto.js index a7b278537..df4c26dfd 100644 --- a/js/crypto.js +++ b/js/crypto.js @@ -18,6 +18,11 @@ function str_rot13 (str) { } +// Arrays for pluggable encryptors/decryptors + +var red_encryptors = new Array(); +var red_decryptors = new Array(); + // 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 @@ -86,6 +91,13 @@ function red_encrypt(alg, elem,text) { newdiv = "[crypt alg='3des' hint='" + enc_hint + "']" + encrypted + '[/crypt]'; } + if((red_encryptors.length) && (! newdiv.length)) { + for(var i = 0; i < red_encryptors.length; i ++) { + newdiv = red_encryptors[i](alg,text); + if(newdiv.length) + break; + } + } enc_key = ''; @@ -118,22 +130,30 @@ function red_encrypt(alg, elem,text) { function red_decrypt(alg,hint,text,elem) { - var enc_text = ''; + var dec_text = ''; if(alg == 'rot13' || alg == 'triple-rot13') - enc_text = str_rot13(text); + dec_text = str_rot13(text); + else { + var enc_key = prompt((hint.length) ? hint : aStr['passphrase']); + } if(alg == 'aes256') { - var enc_key = prompt((hint.length) ? hint : aStr['passphrase']); - enc_text = CryptoJS.AES.decrypt(text,enc_key); + dec_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); + dec_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); + dec_text = CryptoJS.TripleDES.decrypt(text,enc_key); + } + + if((red_decryptors.length) && (! dec_text.length)) { + for(var i = 0; i < red_decryptors.length; i ++) { + dec_text = red_decryptors[i](text,enc_key); + if(dec_text.length) + break; + } } enc_key = ''; @@ -144,16 +164,16 @@ function red_decrypt(alg,hint,text,elem) { // 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; + var dec_result = dec_text.toString(CryptoJS.enc.Utf8); + delete dec_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 = ''; + if(dec_result.length) { + $(elem).html(b2h(dec_result)); + dec_result = ''; } } -- cgit v1.2.3 From df14825b49ce0dd3a4575fcf8772b8d18b2a4852 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Nov 2013 20:23:02 -0800 Subject: pass algorithm to the decryptor so we know if our plugin is allowed to run --- js/crypto.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/crypto.js b/js/crypto.js index df4c26dfd..a144e03ea 100644 --- a/js/crypto.js +++ b/js/crypto.js @@ -150,7 +150,7 @@ function red_decrypt(alg,hint,text,elem) { if((red_decryptors.length) && (! dec_text.length)) { for(var i = 0; i < red_decryptors.length; i ++) { - dec_text = red_decryptors[i](text,enc_key); + dec_text = red_decryptors[i](alg,text,enc_key); if(dec_text.length) break; } -- cgit v1.2.3 From 4be581494e03aa7c79c5691e64b75bee313d778f Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Nov 2013 20:40:31 -0800 Subject: add recipient name to some of the notification emails for those who have a lot of channels and it isn't always obvious which channel is getting the notification. If this works out we should probably add this to the rest of them. --- include/enotify.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/enotify.php b/include/enotify.php index 91b37a913..cfa8c25ae 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -79,7 +79,7 @@ function notification($params) { logger('notification: mail'); $subject = sprintf( t('[Red:Notify] New mail received at %s'),$sitename); - $preamble = sprintf( t('%1$s sent you a new private message at %2$s.'),$sender['xchan_name'],$sitename); + $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'] ); @@ -198,7 +198,7 @@ function notification($params) { } $subject = sprintf( t('[Red:Notify] %s tagged you') , $sender['xchan_name']); - $preamble = sprintf( t('%1$s tagged you at %2$s') , $sender['xchan_name'], $sitename); + $preamble = sprintf( t('%1$s, %2$s tagged you at %3$s') , $recip['channel_name'], $sender['xchan_name'], $sitename); $epreamble = sprintf( t('%1$s [zrl=%2$s]tagged you[/zrl].') , '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', $params['link']); @@ -212,7 +212,7 @@ function notification($params) { if($params['type'] == NOTIFY_POKE) { $subject = sprintf( t('[Red:Notify] %1$s poked you') , $sender['xchan_name']); - $preamble = sprintf( t('%1$s poked you at %2$s') , $sender['xchan_name'], $sitename); + $preamble = sprintf( t('%1$s, %2$s poked you at %3$s') , $recip['channel_name'], $sender['xchan_name'], $sitename); $epreamble = sprintf( t('%1$s [zrl=%2$s]poked you[/zrl].') , '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', $params['link']); -- cgit v1.2.3 From 353f5f049e5a42149cce2133f48b38529eeec678 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Nov 2013 23:11:50 -0800 Subject: Empty commit message. --- view/php/theme_init.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 0867c989d..1fefa110e 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -1,6 +1,7 @@ get_channel(); +if($channel && file_exists($channel['channel_address'] . '.js')) + head_add_js('/' . $channel['channel_address'] . '.js'); + -- cgit v1.2.3 From 3a4c32475e33e1cad6610c8e4fa0e9cc18bbc31a Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 22 Nov 2013 14:17:47 +0100 Subject: search should respect max items to load as well --- mod/search.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mod/search.php b/mod/search.php index 539241268..bad071936 100644 --- a/mod/search.php +++ b/mod/search.php @@ -186,6 +186,8 @@ function search_content(&$a,$update = 0, $load = false) { $pub_sql = public_permissions_sql(get_observer_hash()); if(($update) && ($load)) { + $itemspage = get_pconfig(local_user(),'system','itemspage'); + $a->set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20)); $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage'])); if($load) { -- cgit v1.2.3 From f6b43a0a7bc96e199fad8ad65e0aa63bd9a04f8b Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 22 Nov 2013 11:52:26 -0800 Subject: doc updates --- doc/html/Contact_8php.html | 4 +- doc/html/apw_2php_2style_8php.html | 2 +- doc/html/boot_8php.html | 26 +- doc/html/conversation_8php.html | 2 + doc/html/crypto_8php.html | 68 +++- doc/html/crypto_8php.js | 2 + doc/html/datetime_8php.html | 2 +- doc/html/dba__driver_8php.html | 4 +- doc/html/dir_23ec12649285f9fabf3a6b7380226c28.html | 2 + doc/html/dir_23ec12649285f9fabf3a6b7380226c28.js | 1 + doc/html/dir_720432dea4a717197ae070dbc42b8f20.html | 112 +++++ doc/html/dir_720432dea4a717197ae070dbc42b8f20.js | 4 + doc/html/dir_817f6d302394b98e59575acdb59998bc.html | 2 + doc/html/dir_817f6d302394b98e59575acdb59998bc.js | 3 +- doc/html/extract_8php.html | 2 +- doc/html/files.html | 25 +- doc/html/globals.html | 34 +- doc/html/globals_0x63.html | 6 + doc/html/globals_0x6d.html | 2 +- doc/html/globals_0x70.html | 51 +++ doc/html/globals_0x78.html | 3 + doc/html/globals_func_0x63.html | 6 + doc/html/globals_func_0x6d.html | 2 +- doc/html/globals_func_0x70.html | 42 ++ doc/html/globals_func_0x78.html | 3 + doc/html/globals_vars.html | 34 +- doc/html/globals_vars_0x70.html | 9 + doc/html/help_8php.html | 21 + doc/html/help_8php.js | 3 +- doc/html/include_2group_8php.html | 12 +- doc/html/include_2group_8php.js | 2 +- doc/html/items_8php.html | 2 +- doc/html/language_8php.html | 2 +- doc/html/navtree.js | 8 +- doc/html/navtreeindex3.js | 86 ++-- doc/html/navtreeindex4.js | 16 +- doc/html/navtreeindex5.js | 14 +- doc/html/navtreeindex6.js | 118 +++--- doc/html/navtreeindex7.js | 75 +++- doc/html/none_8php.html | 112 +++++ doc/html/plugin_8php.html | 2 +- doc/html/post_8php.html | 3 +- doc/html/post__to__red_8php.html | 453 +++++++++++++++++++++ doc/html/post__to__red_8php.js | 22 + doc/html/redbasic_2php_2style_8php.html | 98 +++++ doc/html/redbasic_2php_2style_8php.js | 7 + doc/html/redbasic_2php_2theme_8php.html | 8 + doc/html/rpost_8php.html | 2 +- doc/html/search/all_24.js | 11 +- doc/html/search/all_63.js | 2 + doc/html/search/all_6d.js | 2 +- doc/html/search/all_6e.js | 1 + doc/html/search/all_70.js | 18 + doc/html/search/all_78.js | 1 + doc/html/search/files_6e.js | 1 + doc/html/search/files_70.js | 3 +- doc/html/search/functions_63.js | 2 + doc/html/search/functions_6d.js | 2 +- doc/html/search/functions_70.js | 14 + doc/html/search/functions_78.js | 1 + doc/html/search/variables_24.js | 11 +- doc/html/search/variables_70.js | 5 +- doc/html/text_8php.html | 6 +- doc/html/theme__init_8php.html | 24 ++ doc/html/theme__init_8php.js | 4 + 65 files changed, 1423 insertions(+), 204 deletions(-) create mode 100644 doc/html/dir_720432dea4a717197ae070dbc42b8f20.html create mode 100644 doc/html/dir_720432dea4a717197ae070dbc42b8f20.js create mode 100644 doc/html/none_8php.html create mode 100644 doc/html/post__to__red_8php.html create mode 100644 doc/html/post__to__red_8php.js create mode 100644 doc/html/theme__init_8php.js diff --git a/doc/html/Contact_8php.html b/doc/html/Contact_8php.html index 0926c675e..88019706d 100644 --- a/doc/html/Contact_8php.html +++ b/doc/html/Contact_8php.html @@ -244,7 +244,7 @@ Functions

    -

    Referenced by chanman_remove_everything_from_network().

    +

    Referenced by admin_page_users(), admin_page_users_post(), and chanman_remove_everything_from_network().

    @@ -507,8 +507,6 @@ Functions
    -

    Referenced by admin_page_users(), and admin_page_users_post().

    -
    diff --git a/doc/html/apw_2php_2style_8php.html b/doc/html/apw_2php_2style_8php.html index 4d05fd68d..610640439 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(), contacts_not_grouped(), 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(), contacts_not_grouped(), 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().

    diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index f361dcaec..b0f57fa96 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -224,7 +224,7 @@ Variables   const ZOT_REVISION 1   -const DB_UPDATE_VERSION 1081 +const DB_UPDATE_VERSION 1084   const EOL '<br />' . "\r\n"   @@ -722,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(), 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(), 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(), notify_init(), oembed_init(), oexchange_content(), oexchange_init(), page_content(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), post_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(), 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(), notify_init(), oembed_init(), oexchange_content(), oexchange_init(), page_content(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), post_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().

    @@ -740,7 +740,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(), 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(), notify_init(), oembed_init(), oexchange_content(), oexchange_init(), page_content(), page_init(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), post_init(), profile_init(), profile_photo_post(), profile_tabs(), 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(), 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(), notify_init(), oembed_init(), oexchange_content(), oexchange_init(), page_content(), page_init(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), post_init(), profile_init(), profile_photo_post(), profile_tabs(), 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().

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

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

    @@ -1549,7 +1549,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_max_import_size(), 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(), lrdd(), magic_init(), mail_store(), message_content(), message_post(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), network_init(), network_query_get_sel_tab(), new_channel_content(), nogroup_init(), notice(), notifications_content(), oexchange_content(), parse_url_content(), photo_upload(), photos_content(), photos_post(), ping_init(), poco_init(), poco_load(), poke_content(), poke_init(), post_activity_item(), printable(), probe_content(), proc_run(), process_delivery(), profile_photo_post(), profile_sidebar(), profile_tabs(), profiles_post(), qsearch_init(), redir_init(), ref_session_read(), register_content(), register_post(), App\register_template_engine(), regmod_content(), remote_user(), removeme_post(), 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_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_max_import_size(), 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(), lrdd(), magic_init(), mail_store(), message_content(), message_post(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), network_init(), network_query_get_sel_tab(), new_channel_content(), nogroup_init(), notice(), notifications_content(), oexchange_content(), parse_url_content(), photo_upload(), photos_content(), photos_post(), ping_init(), poco_init(), poco_load(), poke_content(), poke_init(), post_activity_item(), printable(), probe_content(), proc_run(), process_delivery(), profile_photo_post(), profile_sidebar(), profile_tabs(), 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().

    @@ -1744,7 +1744,7 @@ Variables
    -

    Referenced by acl_init(), collect_recipients(), connections_content(), connections_post(), get_all_perms(), group_content(), group_get_members(), intro_content(), 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(), intro_content(), onepoll_run(), perm_is_allowed(), ping_init(), and zot_refresh().

    @@ -2412,7 +2412,7 @@ Variables
    - +
    const DB_UPDATE_VERSION 1081const DB_UPDATE_VERSION 1084
    @@ -2579,7 +2579,7 @@ Variables
    -

    Referenced by channel_remove(), import_xchan(), notifier_run(), remove_all_xchan_resources(), and zfinger_init().

    +

    Referenced by channel_remove(), import_xchan(), notifier_run(), post_post(), remove_all_xchan_resources(), and zfinger_init().

    @@ -3083,7 +3083,7 @@ Variables
    -

    Referenced by admin_page_logs(), advanced_profile(), build_sync_packet(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), detect_language(), dfrn_deliver(), directory_content(), fetch_xrd_links(), fix_private_photos(), import_xchan(), item_store(), item_store_update(), lrdd(), magic_init(), mail_store(), message_post(), mini_group_select(), network_content(), new_contact(), notifier_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(), dfrn_deliver(), directory_content(), fetch_xrd_links(), fix_private_photos(), import_xchan(), item_store(), item_store_update(), lrdd(), 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().

    @@ -3097,7 +3097,7 @@ Variables
    -

    Referenced by Item\add_child(), Conversation\add_thread(), admin_page_logs(), api_login(), api_statuses_user_timeline(), authenticate_success(), avatar_img(), consume_feed(), conversation(), delete_imported_item(), deliver_run(), dfrn_deliver(), directory_content(), directory_run(), expire_run(), fix_private_photos(), Conversation\get_template_data(), group_content(), guess_image_type(), import_author_xchan(), import_channel_photo(), import_directory_profile(), import_profile_photo(), import_xchan(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), FKOAuth1\loginUser(), lrdd(), 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(), and zot_register_hub().

    +

    Referenced by Item\add_child(), Conversation\add_thread(), admin_page_logs(), api_login(), api_statuses_user_timeline(), authenticate_success(), avatar_img(), consume_feed(), conversation(), delete_imported_item(), deliver_run(), dfrn_deliver(), directory_content(), directory_run(), expire_run(), fix_private_photos(), Conversation\get_template_data(), group_content(), guess_image_type(), import_author_xchan(), import_channel_photo(), import_directory_profile(), import_profile_photo(), import_xchan(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), FKOAuth1\loginUser(), lrdd(), 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().

    @@ -4058,7 +4058,7 @@ Variables

    Permissions

    -

    Referenced by get_perms().

    +

    Referenced by follow_init(), get_perms(), onepoll_run(), and zot_refresh().

    @@ -4353,7 +4353,7 @@ Variables

    This allows any individual website to participate in a matrix of linked sites and people and media sharing which is far greater than the reach of an individual site.

    If you are reading the source code and come across a function or code block which is not documented, but you have a good idea what it does, please add some descriptive comments and push it to the main project. Even if your description isn't perfect, it gives us a base which we can build on and correct - so that eventually everything is fully documented.

    -

    Referenced by api_statusnet_config(), App\build_pagehead(), get_feed_for(), identity_basic_export(), notification(), parse_url_content(), siteinfo_init(), and zfinger_init().

    +

    Referenced by api_statusnet_config(), App\build_pagehead(), get_feed_for(), identity_basic_export(), parse_url_content(), siteinfo_init(), and zfinger_init().

    diff --git a/doc/html/conversation_8php.html b/doc/html/conversation_8php.html index d6cb96481..2f91c0913 100644 --- a/doc/html/conversation_8php.html +++ b/doc/html/conversation_8php.html @@ -553,6 +553,8 @@ Functions
    +

    Referenced by page_content().

    +
    diff --git a/doc/html/crypto_8php.html b/doc/html/crypto_8php.html index 450cd42bd..2d52b3526 100644 --- a/doc/html/crypto_8php.html +++ b/doc/html/crypto_8php.html @@ -124,8 +124,12 @@ Functions    AES256CBC_decrypt ($data, $key, $iv)   + crypto_encapsulate ($data, $pubkey, $alg='aes256cbc') +   aes_encapsulate ($data, $pubkey)   + crypto_unencapsulate ($data, $prvkey) +   aes_unencapsulate ($data, $prvkey)    new_keypair ($bits) @@ -224,7 +228,7 @@ Functions
    -

    Referenced by get_item_elements(), get_mail_elements(), item_post(), item_store(), item_store_update(), post_post(), send_message(), zfinger_init(), zot_build_packet(), and zot_fetch().

    +

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

    @@ -252,6 +256,68 @@ Functions
    +

    Referenced by crypto_unencapsulate().

    + +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    crypto_encapsulate ( $data,
     $pubkey,
     $alg = 'aes256cbc' 
    )
    +
    + +

    Referenced by get_item_elements(), get_mail_elements(), item_store(), item_store_update(), post_post(), send_message(), zot_build_packet(), and zot_fetch().

    + +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + +
    crypto_unencapsulate ( $data,
     $prvkey 
    )
    +
    +

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

    diff --git a/doc/html/crypto_8php.js b/doc/html/crypto_8php.js index bcbc2cc4d..8894f46c6 100644 --- a/doc/html/crypto_8php.js +++ b/doc/html/crypto_8php.js @@ -4,6 +4,8 @@ var crypto_8php = [ "AES256CBC_encrypt", "crypto_8php.html#a5c61821d205f95f127114159cbffa764", null ], [ "aes_encapsulate", "crypto_8php.html#a2148d7aac7b30c720f7ebda7e9790286", null ], [ "aes_unencapsulate", "crypto_8php.html#aca7c3a574bfb6c6ef1f2403a56823914", null ], + [ "crypto_encapsulate", "crypto_8php.html#a32fc08d57a5694f94d8543ecbb03323c", null ], + [ "crypto_unencapsulate", "crypto_8php.html#a0781202b0a43b82426929cc87c2fa2b5", null ], [ "new_keypair", "crypto_8php.html#aae0ab70d6a199b29555b1ac3cf250d6a", null ], [ "pkcs5_pad", "crypto_8php.html#ad5e51fd44cff93cfaa07a37e24a5edec", null ], [ "pkcs5_unpad", "crypto_8php.html#ac95ac3b1b23b65b04a86613d4206ae85", null ], diff --git a/doc/html/datetime_8php.html b/doc/html/datetime_8php.html index 184b75a65..1937b9b6b 100644 --- a/doc/html/datetime_8php.html +++ b/doc/html/datetime_8php.html @@ -474,7 +474,7 @@ Functions
    -

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

    +

    Referenced by advanced_profile(), 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 e41295ea0..1f4931492 100644 --- a/doc/html/dba__driver_8php.html +++ b/doc/html/dba__driver_8php.html @@ -202,7 +202,7 @@ Functions
    -

    Referenced by account_verify_password(), acl_init(), add_fcontact(), advanced_profile(), allowed_public_recips(), api_direct_messages_new(), api_get_user(), api_status_show(), api_statuses_mentions(), api_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_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(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), filerm_content(), filestorage_content(), fix_attached_photo_permissions(), fix_contact_ssl_policy(), fix_private_photos(), fix_system_urls(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config_from_storage(), get_events(), 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_xchan(), 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_hubloc(), zot_gethub(), zot_process_response(), zot_refresh(), and zotfeed_init().

    +

    Referenced by account_verify_password(), acl_init(), add_fcontact(), admin_page_users(), advanced_profile(), allowed_public_recips(), api_direct_messages_new(), api_get_user(), api_status_show(), api_statuses_mentions(), api_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_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(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), filerm_content(), filestorage_content(), fix_attached_photo_permissions(), fix_contact_ssl_policy(), fix_private_photos(), fix_system_urls(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config_from_storage(), get_events(), 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_xchan(), 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_hubloc(), zot_gethub(), zot_process_response(), zot_refresh(), and zotfeed_init().

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

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

    -

    Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_remove(), account_total(), account_verify_password(), acl_init(), add_fcontact(), 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_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(), contacts_not_grouped(), 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(), dfrn_deliver(), 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_contact_ssl_policy(), 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_xchan(), 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_hubloc(), 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(), add_fcontact(), 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_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(), contacts_not_grouped(), 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(), dfrn_deliver(), 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_contact_ssl_policy(), 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_xchan(), 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_hubloc(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zotfeed_init().

    diff --git a/doc/html/dir_23ec12649285f9fabf3a6b7380226c28.html b/doc/html/dir_23ec12649285f9fabf3a6b7380226c28.html index 4c21b0927..0b859ac31 100644 --- a/doc/html/dir_23ec12649285f9fabf3a6b7380226c28.html +++ b/doc/html/dir_23ec12649285f9fabf3a6b7380226c28.html @@ -106,6 +106,8 @@ $(document).ready(function(){initNavTree('dir_23ec12649285f9fabf3a6b7380226c28.h Directories directory  fpostit   +directory  wp +  diff --git a/doc/html/dir_23ec12649285f9fabf3a6b7380226c28.js b/doc/html/dir_23ec12649285f9fabf3a6b7380226c28.js index 1ea37ec69..e59a2a7c4 100644 --- a/doc/html/dir_23ec12649285f9fabf3a6b7380226c28.js +++ b/doc/html/dir_23ec12649285f9fabf3a6b7380226c28.js @@ -1,6 +1,7 @@ var dir_23ec12649285f9fabf3a6b7380226c28 = [ [ "fpostit", "dir_0eaa4a0adae8ba4811e133c6e594aeee.html", "dir_0eaa4a0adae8ba4811e133c6e594aeee" ], + [ "wp", "dir_720432dea4a717197ae070dbc42b8f20.html", "dir_720432dea4a717197ae070dbc42b8f20" ], [ "db_update.php", "db__update_8php.html", null ], [ "docblox_errorchecker.php", "docblox__errorchecker_8php.html", "docblox__errorchecker_8php" ], [ "extract.php", "extract_8php.html", "extract_8php" ], diff --git a/doc/html/dir_720432dea4a717197ae070dbc42b8f20.html b/doc/html/dir_720432dea4a717197ae070dbc42b8f20.html new file mode 100644 index 000000000..a61c006b5 --- /dev/null +++ b/doc/html/dir_720432dea4a717197ae070dbc42b8f20.html @@ -0,0 +1,112 @@ + + + + + + +The Red Matrix: util/wp Directory Reference + + + + + + + + + + + + + +
    +
    +

    Files

    + + + + + + +
    +
    The Red Matrix +
    +
    + + + + + + +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +
    wp Directory Reference
    +
    +
    + + + + +

    +Files

    file  post_to_red.php
     
    +
    +
    + diff --git a/doc/html/dir_720432dea4a717197ae070dbc42b8f20.js b/doc/html/dir_720432dea4a717197ae070dbc42b8f20.js new file mode 100644 index 000000000..8d76d72be --- /dev/null +++ b/doc/html/dir_720432dea4a717197ae070dbc42b8f20.js @@ -0,0 +1,4 @@ +var dir_720432dea4a717197ae070dbc42b8f20 = +[ + [ "post_to_red.php", "post__to__red_8php.html", "post__to__red_8php" ] +]; \ No newline at end of file diff --git a/doc/html/dir_817f6d302394b98e59575acdb59998bc.html b/doc/html/dir_817f6d302394b98e59575acdb59998bc.html index 5c55343df..0140685a8 100644 --- a/doc/html/dir_817f6d302394b98e59575acdb59998bc.html +++ b/doc/html/dir_817f6d302394b98e59575acdb59998bc.html @@ -116,6 +116,8 @@ Files   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 f42b8d444..c7289c3d1 100644 --- a/doc/html/dir_817f6d302394b98e59575acdb59998bc.js +++ b/doc/html/dir_817f6d302394b98e59575acdb59998bc.js @@ -6,5 +6,6 @@ var dir_817f6d302394b98e59575acdb59998bc = [ "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" ], - [ "theme_init.php", "theme__init_8php.html", null ] + [ "none.php", "none_8php.html", null ], + [ "theme_init.php", "theme__init_8php.html", "theme__init_8php" ] ]; \ No newline at end of file diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html index 20e95c86d..0c6a3452b 100644 --- a/doc/html/extract_8php.html +++ b/doc/html/extract_8php.html @@ -132,7 +132,7 @@ Variables
    -

    Referenced by activity_sanitise(), add_fcontact(), api_rss_extra(), array_sanitise(), attach_mkdir(), attach_store(), check_account_admin(), check_account_email(), check_account_invite(), check_account_password(), check_list_permissions(), check_webbie(), connect_content(), connections_content(), construct_page(), contact_block(), contact_select(), conversation(), create_account(), create_identity(), dbesc_array(), directory_content(), event_store(), feature_enabled(), fetch_xrd_links(), find_xchan_in_array(), format_like(), get_all_perms(), get_atom_elements(), get_features(), get_item_elements(), get_mail_elements(), get_mood_verbs(), get_poke_verbs(), get_profile_elements(), Item\get_template_data(), get_terms_oftype(), App\get_widgets(), group_select(), identity_basic_import(), ids_to_querystr(), import_directory_profile(), import_post(), import_site(), import_xchan(), item_getfeedattach(), item_store(), item_store_update(), items_fetch(), like_content(), like_puller(), load_database(), lrdd(), 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(), profile_tabs(), profiles_content(), redbasic_form(), register_post(), remove_community_tag(), 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_get_hubloc(), zot_gethub(), zot_import(), zot_process_response(), and zot_register_hub().

    +

    Referenced by activity_sanitise(), add_fcontact(), api_rss_extra(), array_sanitise(), attach_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(), event_store(), feature_enabled(), fetch_xrd_links(), find_xchan_in_array(), format_like(), get_all_perms(), get_atom_elements(), get_features(), get_item_elements(), get_mail_elements(), get_mood_verbs(), get_poke_verbs(), get_profile_elements(), Item\get_template_data(), get_terms_oftype(), App\get_widgets(), group_select(), identity_basic_import(), ids_to_querystr(), import_directory_profile(), import_post(), import_site(), import_xchan(), item_getfeedattach(), item_store(), item_store_update(), items_fetch(), like_content(), like_puller(), load_database(), lrdd(), 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(), profile_tabs(), profiles_content(), redbasic_form(), register_post(), remove_community_tag(), 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_get_hubloc(), zot_gethub(), zot_import(), zot_process_response(), and zot_register_hub().

    diff --git a/doc/html/files.html b/doc/html/files.html index 36eb1a64a..88f5ddabe 100644 --- a/doc/html/files.html +++ b/doc/html/files.html @@ -320,16 +320,18 @@ $(document).ready(function(){initNavTree('files.html','');}); o+util |o+fpostit ||\*fpostit.php -|o*db_update.php -|o*docblox_errorchecker.php -|o*extract.php -|o*friendica-to-smarty-tpl.py -|o*php2po.php -|o*po2php.php -|o*tpldebug.php -|o*typo.php -|o*typohelper.php -|\*updatetpl.py +|o+wp +||\*post_to_red.php +|o*db_update.php +|o*docblox_errorchecker.php +|o*extract.php +|o*friendica-to-smarty-tpl.py +|o*php2po.php +|o*po2php.php +|o*tpldebug.php +|o*typo.php +|o*typohelper.php +|\*updatetpl.py o+view |o+php ||o*default.php @@ -338,7 +340,8 @@ $(document).ready(function(){initNavTree('files.html','');}); ||o*mod_import.php ||o*mod_new_channel.php ||o*mod_register.php -||\*theme_init.php +||o*none.php +||\*theme_init.php |\+theme | o+apw | |o+php diff --git a/doc/html/globals.html b/doc/html/globals.html index 730f50fcb..ec31017c1 100644 --- a/doc/html/globals.html +++ b/doc/html/globals.html @@ -165,9 +165,18 @@ $(document).ready(function(){initNavTree('globals.html','');});
  • $bgcolour : style.php
    • +
  • $body_font_size +: style.php +
  • $called_api : api.php
    • +
  • $channel +: theme_init.php +
    • +
  • $comment_indent +: style.php +
  • $converse_width : style.php
    • @@ -184,9 +193,9 @@ $(document).ready(function(){initNavTree('globals.html','');}); : docblox_errorchecker.php
  • $files -: typo.php -, extract.php +: extract.php , tpldebug.php +, typo.php
  • $font_colour : style.php @@ -245,12 +254,27 @@ $(document).ready(function(){initNavTree('globals.html','');});
  • $phpfile : php2po.php
    • +
  • $plugin +: post_to_red.php +
    • +
  • $plugin_dir +: post_to_red.php +
    • +
  • $pmenu_reply +: style.php +
    • +
  • $pmenu_top +: style.php +
  • $pofile : php2po.php
  • $radius : style.php
    • +
  • $reply_photo +: style.php +
  • $res : docblox_errorchecker.php
    • @@ -287,12 +311,18 @@ $(document).ready(function(){initNavTree('globals.html','');});
  • $toolicon_colour : style.php
    • +
  • $top_photo +: style.php +
  • $uid : style.php
  • $width : minimalisticdarkness.php
    • +
  • $wwtop +: style.php +
  • $zones : extract.php
    • diff --git a/doc/html/globals_0x63.html b/doc/html/globals_0x63.html index f3d89103d..8b6dbf253 100644 --- a/doc/html/globals_0x63.html +++ b/doc/html/globals_0x63.html @@ -450,6 +450,12 @@ $(document).ready(function(){initNavTree('globals_0x63.html','');});
  • cronhooks_run() : cronhooks.php
    • +
  • crypto_encapsulate() +: crypto.php +
    • +
  • crypto_unencapsulate() +: crypto.php +
  • curPageURL() : boot.php
    • diff --git a/doc/html/globals_0x6d.html b/doc/html/globals_0x6d.html index 83a755fa0..7e5d7b9df 100644 --- a/doc/html/globals_0x6d.html +++ b/doc/html/globals_0x6d.html @@ -259,7 +259,7 @@ $(document).ready(function(){initNavTree('globals_0x6d.html','');}); : text.php
  • mini_group_select() -: group.php +: group.php
  • mitem_content() : mitem.php diff --git a/doc/html/globals_0x70.html b/doc/html/globals_0x70.html index 661e88771..7f8dd0a80 100644 --- a/doc/html/globals_0x70.html +++ b/doc/html/globals_0x70.html @@ -386,6 +386,54 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
  • post_post() : post.php
    • +
  • post_to_red_acct_name +: post_to_red.php +
    • +
  • post_to_red_admin() +: post_to_red.php +
    • +
  • post_to_red_deactivate() +: post_to_red.php +
    • +
  • post_to_red_display_admin_page() +: post_to_red.php +
    • +
  • post_to_red_displayAdminContent() +: post_to_red.php +
    • +
  • post_to_red_get_acct_name() +: post_to_red.php +
    • +
  • post_to_red_get_password() +: post_to_red.php +
    • +
  • post_to_red_get_seed_location() +: post_to_red.php +
    • +
  • post_to_red_get_user_name() +: post_to_red.php +
    • +
  • post_to_red_path +: post_to_red.php +
    • +
  • post_to_red_post() +: post_to_red.php +
    • +
  • post_to_red_post_checkbox() +: post_to_red.php +
    • +
  • post_to_red_post_field_data() +: post_to_red.php +
    • +
  • post_to_red_post_meta_content() +: post_to_red.php +
    • +
  • post_to_red_settings_link() +: post_to_red.php +
    • +
  • post_to_red_version +: post_to_red.php +
  • post_url() : network.php
    • @@ -395,6 +443,9 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
  • posted_dates() : items.php
    • +
  • preg_callback_help_include() +: help.php +
  • preg_heart() : text.php
    • diff --git a/doc/html/globals_0x78.html b/doc/html/globals_0x78.html index e111a1710..434ab8b68 100644 --- a/doc/html/globals_0x78.html +++ b/doc/html/globals_0x78.html @@ -180,6 +180,9 @@ $(document).ready(function(){initNavTree('globals_0x78.html','');});
  • xmlify() : text.php
    • +
  • xpost_to_html2bbcode() +: post_to_red.php +
  • xrd_init() : xrd.php
    • diff --git a/doc/html/globals_func_0x63.html b/doc/html/globals_func_0x63.html index 00bb1dc6a..fcf1bc606 100644 --- a/doc/html/globals_func_0x63.html +++ b/doc/html/globals_func_0x63.html @@ -431,6 +431,12 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');});
  • cronhooks_run() : cronhooks.php
    • +
  • crypto_encapsulate() +: crypto.php +
    • +
  • crypto_unencapsulate() +: crypto.php +
  • curPageURL() : boot.php
    • diff --git a/doc/html/globals_func_0x6d.html b/doc/html/globals_func_0x6d.html index 25e39fcab..2e63556bf 100644 --- a/doc/html/globals_func_0x6d.html +++ b/doc/html/globals_func_0x6d.html @@ -228,7 +228,7 @@ $(document).ready(function(){initNavTree('globals_func_0x6d.html','');}); : text.php
  • mini_group_select() -: group.php +: group.php
  • mitem_content() : mitem.php diff --git a/doc/html/globals_func_0x70.html b/doc/html/globals_func_0x70.html index 4b81db067..9aab42fcc 100644 --- a/doc/html/globals_func_0x70.html +++ b/doc/html/globals_func_0x70.html @@ -263,6 +263,45 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');});
  • post_post() : post.php
    • +
  • post_to_red_admin() +: post_to_red.php +
    • +
  • post_to_red_deactivate() +: post_to_red.php +
    • +
  • post_to_red_display_admin_page() +: post_to_red.php +
    • +
  • post_to_red_displayAdminContent() +: post_to_red.php +
    • +
  • post_to_red_get_acct_name() +: post_to_red.php +
    • +
  • post_to_red_get_password() +: post_to_red.php +
    • +
  • post_to_red_get_seed_location() +: post_to_red.php +
    • +
  • post_to_red_get_user_name() +: post_to_red.php +
    • +
  • post_to_red_post() +: post_to_red.php +
    • +
  • post_to_red_post_checkbox() +: post_to_red.php +
    • +
  • post_to_red_post_field_data() +: post_to_red.php +
    • +
  • post_to_red_post_meta_content() +: post_to_red.php +
    • +
  • post_to_red_settings_link() +: post_to_red.php +
  • post_url() : network.php
    • @@ -272,6 +311,9 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');});
  • posted_dates() : items.php
    • +
  • preg_callback_help_include() +: help.php +
  • preg_heart() : text.php
    • diff --git a/doc/html/globals_func_0x78.html b/doc/html/globals_func_0x78.html index 6df4adb06..992f1acef 100644 --- a/doc/html/globals_func_0x78.html +++ b/doc/html/globals_func_0x78.html @@ -164,6 +164,9 @@ $(document).ready(function(){initNavTree('globals_func_0x78.html','');});
  • xmlify() : text.php
    • +
  • xpost_to_html2bbcode() +: post_to_red.php +
  • xrd_init() : xrd.php
    • diff --git a/doc/html/globals_vars.html b/doc/html/globals_vars.html index 71353f1fc..e466fa2e3 100644 --- a/doc/html/globals_vars.html +++ b/doc/html/globals_vars.html @@ -160,9 +160,18 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
  • $bgcolour : style.php
    • +
  • $body_font_size +: style.php +
  • $called_api : api.php
    • +
  • $channel +: theme_init.php +
    • +
  • $comment_indent +: style.php +
  • $converse_width : style.php
    • @@ -179,9 +188,9 @@ $(document).ready(function(){initNavTree('globals_vars.html','');}); : docblox_errorchecker.php
  • $files -: typo.php -, extract.php +: extract.php , tpldebug.php +, typo.php
  • $font_colour : style.php @@ -240,12 +249,27 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
  • $phpfile : php2po.php
    • +
  • $plugin +: post_to_red.php +
    • +
  • $plugin_dir +: post_to_red.php +
    • +
  • $pmenu_reply +: style.php +
    • +
  • $pmenu_top +: style.php +
  • $pofile : php2po.php
  • $radius : style.php
    • +
  • $reply_photo +: style.php +
  • $res : docblox_errorchecker.php
    • @@ -282,12 +306,18 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
  • $toolicon_colour : style.php
    • +
  • $top_photo +: style.php +
  • $uid : style.php
  • $width : minimalisticdarkness.php
    • +
  • $wwtop +: style.php +
  • $zones : extract.php
    • diff --git a/doc/html/globals_vars_0x70.html b/doc/html/globals_vars_0x70.html index 6d7299997..46d6b28a2 100644 --- a/doc/html/globals_vars_0x70.html +++ b/doc/html/globals_vars_0x70.html @@ -261,6 +261,15 @@ $(document).ready(function(){initNavTree('globals_vars_0x70.html','');});
  • POLL_TENSCALE : boot.php
    • +
  • post_to_red_acct_name +: post_to_red.php +
    • +
  • post_to_red_path +: post_to_red.php +
    • +
  • post_to_red_version +: post_to_red.php +
    • diff --git a/doc/html/help_8php.html b/doc/html/help_8php.html index f095349b6..3cf14b906 100644 --- a/doc/html/help_8php.html +++ b/doc/html/help_8php.html @@ -114,6 +114,8 @@ $(document).ready(function(){initNavTree('help_8php.html','');}); Functions if(!function_exists('load_doc_file')) help_content (&$a)   + preg_callback_help_include ($matches) + 

    Function Documentation

    @@ -129,6 +131,25 @@ Functions
    +

    You can create local site resources in doc/Site.md and either link to doc/Home.md for the standard resources or use our include mechanism to include it on your local page.

    +

    #include doc/Home.md;

    +

    The syntax is somewhat strict.

    + +
    + + +
    +
    + + + + + + + + +
    preg_callback_help_include ( $matches)
    +
    diff --git a/doc/html/help_8php.js b/doc/html/help_8php.js index 1178a13f2..bc1247ed4 100644 --- a/doc/html/help_8php.js +++ b/doc/html/help_8php.js @@ -1,4 +1,5 @@ var help_8php = [ - [ "help_content", "help_8php.html#af055e15f600ffa6fbca9386fdf715224", null ] + [ "help_content", "help_8php.html#af055e15f600ffa6fbca9386fdf715224", null ], + [ "preg_callback_help_include", "help_8php.html#a06b2a51aaabed99e53a9b639047c4ce4", null ] ]; \ No newline at end of file diff --git a/doc/html/include_2group_8php.html b/doc/html/include_2group_8php.html index eba6ee1ae..a491fc476 100644 --- a/doc/html/include_2group_8php.html +++ b/doc/html/include_2group_8php.html @@ -126,8 +126,8 @@ Functions    group_get_members ($gid)   - mini_group_select ($uid, $gid=0) -  + mini_group_select ($uid, $group= '') +   group_side ($every="contacts", $each="group", $edit=false, $group_id=0, $cid= '')    expand_groups ($a) @@ -226,7 +226,7 @@ Functions
    -

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

    +

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

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

    Referenced by new_contact().

    +

    Referenced by connections_post(), and new_contact().

    @@ -456,7 +456,7 @@ Functions - +
    @@ -470,7 +470,7 @@ Functions - + diff --git a/doc/html/include_2group_8php.js b/doc/html/include_2group_8php.js index d0800938c..ef82dca8f 100644 --- a/doc/html/include_2group_8php.js +++ b/doc/html/include_2group_8php.js @@ -11,5 +11,5 @@ var include_2group_8php = [ "group_side", "include_2group_8php.html#a1042d74055bafe54a6a30103d87a7f17", null ], [ "groups_containing", "include_2group_8php.html#afb802ae2ce73aae4bc36d157f7b6a92f", null ], [ "member_of", "include_2group_8php.html#a048f6892bfd28852de1b76470df411de", null ], - [ "mini_group_select", "include_2group_8php.html#ab4d9e5b59f48787cb01baae5dc6c381f", null ] + [ "mini_group_select", "include_2group_8php.html#ab0e422a0f31c0c64fd9084ca03d85f32", null ] ]; \ No newline at end of file diff --git a/doc/html/items_8php.html b/doc/html/items_8php.html index 7554583ae..5f9663fca 100644 --- a/doc/html/items_8php.html +++ b/doc/html/items_8php.html @@ -1047,7 +1047,7 @@ Functions
     $gid = 0 $group = '' 
    -

    Referenced by zot_import().

    +

    Referenced by onepoll_run(), and zot_import().

    diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html index f586d08f4..e18eace92 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(), 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(), nogroup_content(), 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(), profile_tabs(), 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(), 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(), nogroup_content(), 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(), profile_tabs(), 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().

    diff --git a/doc/html/navtree.js b/doc/html/navtree.js index cf971021a..522a59cf0 100644 --- a/doc/html/navtree.js +++ b/doc/html/navtree.js @@ -39,10 +39,10 @@ var NAVTREEINDEX = "boot_8php.html#a8da836617174eed9fc2ac8054125354b", "classConversation.html#af84ea6ccd72214c9bb4c504461cc8b09", "contact__selectors_8php.html#a9839e8fdaac7ffb37bf1420493f5c28f", -"globals_0x6d.html", -"include_2photos_8php.html#a7e7abc69872180697c5471dc69349afe", -"php2po_8php.html#a401d84ce156e49e8168bd0c4781e1be1", -"text_8php.html#a1360fed7f918d859daaca1c9f384f9af" +"globals_0x6a.html", +"include_2oembed_8php.html#ab953a6e7c11bc6498ce01ed73e2ba319", +"photo__driver_8php.html#a7273b82b017fd96d29b2c57bab03aea6", +"tagger_8php.html" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js index e8a0c821c..8ead73d31 100644 --- a/doc/html/navtreeindex3.js +++ b/doc/html/navtreeindex3.js @@ -41,15 +41,17 @@ var NAVTREEINDEX3 = "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,7], -"crypto_8php.html#aae0ab70d6a199b29555b1ac3cf250d6a":[5,0,0,23,4], -"crypto_8php.html#ab4f21d8f6b8ece0915e7c8bb73379f96":[5,0,0,23,8], +"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,6], +"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,5], +"crypto_8php.html#ad5e51fd44cff93cfaa07a37e24a5edec":[5,0,0,23,7], "dark_8php.html":[5,0,3,1,1,1,0], "darkness_8php.html":[5,0,3,1,0,1,0], "darknessleftaside_8php.html":[5,0,3,1,0,1,1], @@ -68,7 +70,7 @@ var NAVTREEINDEX3 = "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], -"db__update_8php.html":[5,0,2,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], "dba__driver_8php.html#a55bf30d8176967e682656b5be4ad9249":[5,0,0,0,0,7], @@ -93,6 +95,7 @@ var NAVTREEINDEX3 = "dir_23ec12649285f9fabf3a6b7380226c28.html":[5,0,2], "dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html":[5,0,3,1,1,1], "dir_55dbaf9b7b53c4fc605c9011743a7353.html":[5,0,3,1,1], +"dir_720432dea4a717197ae070dbc42b8f20.html":[5,0,2,1], "dir_817f6d302394b98e59575acdb59998bc.html":[5,0,3,0], "dir_8543001e5d25368a6edede3e63efb554.html":[5,0,3,1], "dir__fns_8php.html":[5,0,0,26], @@ -114,18 +117,18 @@ var NAVTREEINDEX3 = "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], -"docblox__errorchecker_8php.html":[5,0,2,2], -"docblox__errorchecker_8php.html#a1659f0a629d408e0f849dbe4ee061e62":[5,0,2,2,3], -"docblox__errorchecker_8php.html#a21b4bbe5aae2d85db33affc7126a67ec":[5,0,2,2,2], -"docblox__errorchecker_8php.html#a2b767cfc461fdd5061fffc9e4a806d5b":[5,0,2,2,0], -"docblox__errorchecker_8php.html#a49a8a4009b02e49717caa88b128affc5":[5,0,2,2,8], -"docblox__errorchecker_8php.html#a648a570b0f9f6e0e51b7267647c4b09b":[5,0,2,2,5], -"docblox__errorchecker_8php.html#a721c6ff80a6d3e4ad4ffa52a04c60085":[5,0,2,2,9], -"docblox__errorchecker_8php.html#a83018d9153d17d91fbcf3bc10158d34f":[5,0,2,2,6], -"docblox__errorchecker_8php.html#a852004caba0a34390297a079f4aaac73":[5,0,2,2,7], -"docblox__errorchecker_8php.html#ab66bc0493d25f39bf8b4dcbb429f04e6":[5,0,2,2,4], -"docblox__errorchecker_8php.html#ae9562cf60aa693114603d27b55d2185f":[5,0,2,2,1], -"docblox__errorchecker_8php.html#af4ca738a05beffe9c8c23e1f7aea3c2d":[5,0,2,2,10], +"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], +"docblox__errorchecker_8php.html#a2b767cfc461fdd5061fffc9e4a806d5b":[5,0,2,3,0], +"docblox__errorchecker_8php.html#a49a8a4009b02e49717caa88b128affc5":[5,0,2,3,8], +"docblox__errorchecker_8php.html#a648a570b0f9f6e0e51b7267647c4b09b":[5,0,2,3,5], +"docblox__errorchecker_8php.html#a721c6ff80a6d3e4ad4ffa52a04c60085":[5,0,2,3,9], +"docblox__errorchecker_8php.html#a83018d9153d17d91fbcf3bc10158d34f":[5,0,2,3,6], +"docblox__errorchecker_8php.html#a852004caba0a34390297a079f4aaac73":[5,0,2,3,7], +"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], @@ -149,11 +152,11 @@ var NAVTREEINDEX3 = "events_8php.html#ab3e8a8f901175f8e40a8089eea45c075":[5,0,1,26,1], "expire_8php.html":[5,0,0,30], "expire_8php.html#a444e45c9b67727b27db4c779fd51a298":[5,0,0,30,0], -"extract_8php.html":[5,0,2,3], -"extract_8php.html#a0cbe524ffc9a496114fd7ba9f423ef44":[5,0,2,3,3], -"extract_8php.html#a50b05cf2e02ef0b67fcad97106dd7634":[5,0,2,3,2], -"extract_8php.html#a63bb4c41bc532baacf6a4976cfaa0feb":[5,0,2,3,0], -"extract_8php.html#a9590b15215a21e9b42eb546aeef79704":[5,0,2,3,1], +"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,27], "fbrowser_8php.html#aee476addcf7a3e0fe9454f7dfd5a56c4":[5,0,1,27,0], "features_8php.html":[5,0,0,31], @@ -171,22 +174,22 @@ var NAVTREEINDEX3 = "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], -"friendica-to-smarty-tpl_8py.html":[5,0,2,4], -"friendica-to-smarty-tpl_8py.html#a005c1b7a69cac31fad72a941974ba7bb":[5,0,2,4,11], -"friendica-to-smarty-tpl_8py.html#a0b4cf73d1a8d201a28d269eeb62a5d5c":[5,0,2,4,8], -"friendica-to-smarty-tpl_8py.html#a3719dd46e286a57d315e6adae1845854":[5,0,2,4,1], -"friendica-to-smarty-tpl_8py.html#a38503e37fe68ac27c88cce91a9ac9efa":[5,0,2,4,0], -"friendica-to-smarty-tpl_8py.html#a5dfc21ab8282dda8e3a7dff43cd0e283":[5,0,2,4,13], -"friendica-to-smarty-tpl_8py.html#a5f9bf7a67d955c0d6be70a82097611c5":[5,0,2,4,6], -"friendica-to-smarty-tpl_8py.html#a68d15934660cd1f4301ce251b1646f09":[5,0,2,4,12], -"friendica-to-smarty-tpl_8py.html#a8540514fb7c4aa18ad2dffa2a975036b":[5,0,2,4,14], -"friendica-to-smarty-tpl_8py.html#a87182a9bab47640428bd0b2b9946bef9":[5,0,2,4,10], -"friendica-to-smarty-tpl_8py.html#a89388ea9b2826e8218ed480e917d8105":[5,0,2,4,2], -"friendica-to-smarty-tpl_8py.html#a965e1d6d6293654a56e029a7e454dec7":[5,0,2,4,5], -"friendica-to-smarty-tpl_8py.html#ad9ef87ccb2c9960501f5e02424a22d80":[5,0,2,4,9], -"friendica-to-smarty-tpl_8py.html#ae74419b16516956c66f7db714a93a6ac":[5,0,2,4,7], -"friendica-to-smarty-tpl_8py.html#aecf730e0884bb4ddc6c0deb1ef85f8eb":[5,0,2,4,4], -"friendica-to-smarty-tpl_8py.html#af6b2c793958aae2aadc294577431f749":[5,0,2,4,3], +"friendica-to-smarty-tpl_8py.html":[5,0,2,5], +"friendica-to-smarty-tpl_8py.html#a005c1b7a69cac31fad72a941974ba7bb":[5,0,2,5,11], +"friendica-to-smarty-tpl_8py.html#a0b4cf73d1a8d201a28d269eeb62a5d5c":[5,0,2,5,8], +"friendica-to-smarty-tpl_8py.html#a3719dd46e286a57d315e6adae1845854":[5,0,2,5,1], +"friendica-to-smarty-tpl_8py.html#a38503e37fe68ac27c88cce91a9ac9efa":[5,0,2,5,0], +"friendica-to-smarty-tpl_8py.html#a5dfc21ab8282dda8e3a7dff43cd0e283":[5,0,2,5,13], +"friendica-to-smarty-tpl_8py.html#a5f9bf7a67d955c0d6be70a82097611c5":[5,0,2,5,6], +"friendica-to-smarty-tpl_8py.html#a68d15934660cd1f4301ce251b1646f09":[5,0,2,5,12], +"friendica-to-smarty-tpl_8py.html#a8540514fb7c4aa18ad2dffa2a975036b":[5,0,2,5,14], +"friendica-to-smarty-tpl_8py.html#a87182a9bab47640428bd0b2b9946bef9":[5,0,2,5,10], +"friendica-to-smarty-tpl_8py.html#a89388ea9b2826e8218ed480e917d8105":[5,0,2,5,2], +"friendica-to-smarty-tpl_8py.html#a965e1d6d6293654a56e029a7e454dec7":[5,0,2,5,5], +"friendica-to-smarty-tpl_8py.html#ad9ef87ccb2c9960501f5e02424a22d80":[5,0,2,5,9], +"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,33], "fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d":[5,0,1,33,1], @@ -246,8 +249,5 @@ var NAVTREEINDEX3 = "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_0x69.html":[5,1,0,10] }; diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js index a9a8c6b22..9187fb896 100644 --- a/doc/html/navtreeindex4.js +++ b/doc/html/navtreeindex4.js @@ -1,5 +1,8 @@ var NAVTREEINDEX4 = { +"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 +16,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], @@ -40,8 +43,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], @@ -70,6 +73,7 @@ var NAVTREEINDEX4 = "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], "hierarchy.html":[4,2], "home_8php.html":[5,0,1,37], @@ -189,7 +193,7 @@ var NAVTREEINDEX4 = "include_2group_8php.html#a540e3ef36f47d47532646be4241f6518":[5,0,0,35,7], "include_2group_8php.html#a5bd191d9692e6c34d48c0ede10810f09":[5,0,0,35,4], "include_2group_8php.html#a90e157b3e1b99c981809cb5a2abd3245":[5,0,0,35,5], -"include_2group_8php.html#ab4d9e5b59f48787cb01baae5dc6c381f":[5,0,0,35,11], +"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], @@ -245,9 +249,5 @@ var NAVTREEINDEX4 = "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_2oembed_8php.html#a9e57f3e36a0a0a47e6db79544b701d9a":[5,0,0,50,6] }; diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js index b336d6b70..db8b56edb 100644 --- a/doc/html/navtreeindex5.js +++ b/doc/html/navtreeindex5.js @@ -1,5 +1,9 @@ var NAVTREEINDEX5 = { +"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], @@ -179,8 +183,8 @@ var NAVTREEINDEX5 = "msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[5,0,1,56,0], "namespaceFriendica.html":[3,0,1], "namespaceFriendica.html":[4,0,1], -"namespaceacl__selectors.html":[3,0,0], "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], @@ -201,6 +205,7 @@ var NAVTREEINDEX5 = "nogroup_8php.html":[5,0,1,59], "nogroup_8php.html#a099cb353bf62e8453069ce107b763212":[5,0,1,59,1], "nogroup_8php.html#a52085b183f97c552f1db5c4926e8ec30":[5,0,1,59,0], +"none_8php.html":[5,0,3,0,6], "notifications_8php.html":[5,0,1,60], "notifications_8php.html#a5baffec7b2e625c9f9cefbc097550d33":[5,0,1,60,1], "notifications_8php.html#aadd0b5525bd8c283a5d8a37982bbfe62":[5,0,1,60,0], @@ -244,10 +249,5 @@ var NAVTREEINDEX5 = "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#a32e2817faa25d7f11f60a8abff565035":[5,0,0,1,0,4], -"photo__driver_8php.html#a7273b82b017fd96d29b2c57bab03aea6":[5,0,0,1,0,1], -"photo__gd_8php.html":[5,0,0,1,1], -"photo__imagick_8php.html":[5,0,0,1,2], -"php2po_8php.html":[5,0,2,5], -"php2po_8php.html#a1594a11499d06cc8a789ee7ca0c7a12b":[5,0,2,5,7] +"photo__driver_8php.html#a32e2817faa25d7f11f60a8abff565035":[5,0,0,1,0,4] }; diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index 9078e9c9d..6accdb665 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -1,12 +1,17 @@ var NAVTREEINDEX6 = { -"php2po_8php.html#a401d84ce156e49e8168bd0c4781e1be1":[5,0,2,5,5], -"php2po_8php.html#a45b05625748f412ec97afcd61cf7980b":[5,0,2,5,6], -"php2po_8php.html#a48cb304902320d173a4eaa41543327b9":[5,0,2,5,3], -"php2po_8php.html#a61f8ddeb5557d46ebc546cc355bda214":[5,0,2,5,0], -"php2po_8php.html#a6b0b8ebd9ce811d1325ef2c129443bc0":[5,0,2,5,1], -"php2po_8php.html#abbb0e5fd8fbc1f13a9bf68f86eb3d2a4":[5,0,2,5,4], -"php2po_8php.html#ad6726cfaa85d4b8299d2b0f034cbf178":[5,0,2,5,2], +"photo__driver_8php.html#a7273b82b017fd96d29b2c57bab03aea6":[5,0,0,1,0,1], +"photo__gd_8php.html":[5,0,0,1,1], +"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_8php.html":[5,0,1,69], "php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[5,0,1,69,0], "pine_8php.html":[5,0,3,1,0,1,8], @@ -39,8 +44,8 @@ var NAVTREEINDEX6 = "plugin_8php.html#af92789f559b89a380e49d303218aeeca":[5,0,0,56,10], "plugin_8php.html#af9ac19004dca49adae1ac7a0d9f3b025":[5,0,0,56,16], "plugin_8php.html#aff0178bd8d0b34a94d5efddc883edd35":[5,0,0,56,5], -"po2php_8php.html":[5,0,2,6], -"po2php_8php.html#a3b75e36f913198299e99559b175cd8b4":[5,0,2,6,0], +"po2php_8php.html":[5,0,2,7], +"po2php_8php.html#a3b75e36f913198299e99559b175cd8b4":[5,0,2,7,0], "poco_8php.html":[5,0,1,71], "poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498":[5,0,1,71,0], "poke_8php.html":[5,0,1,72], @@ -51,6 +56,26 @@ var NAVTREEINDEX6 = "post_8php.html":[5,0,1,73], "post_8php.html#af4b48181ce773ef0cdfc972441445c34":[5,0,1,73,0], "post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[5,0,1,73,1], +"post__to__red_8php.html":[5,0,2,1,0], +"post__to__red_8php.html#a0f139dea77a94c98f26007963eea639c":[5,0,2,1,0,9], +"post__to__red_8php.html#a49fd35f7b1cdddfe6e26ddfcf8d3c4ec":[5,0,2,1,0,1], +"post__to__red_8php.html#a4d90ac085c14f53ff4d8ab4c23477ea6":[5,0,2,1,0,5], +"post__to__red_8php.html#a588cea66afe0b32f27f2713d44940119":[5,0,2,1,0,16], +"post__to__red_8php.html#a6210f39392a5f0fa0255cc7d3760493a":[5,0,2,1,0,17], +"post__to__red_8php.html#a75db5d87226a0287a0ac0fa315f2bcfd":[5,0,2,1,0,3], +"post__to__red_8php.html#a7e68a8d9c83cb28d032aad3ea85ce0a6":[5,0,2,1,0,10], +"post__to__red_8php.html#a8ec8f8809e3c5d1b2c9598c8185d63aa":[5,0,2,1,0,2], +"post__to__red_8php.html#a906be8f72cf1aa2e199c0683ea6a4017":[5,0,2,1,0,12], +"post__to__red_8php.html#a9497cd6a80c6897dbbf9aabde62b53e7":[5,0,2,1,0,7], +"post__to__red_8php.html#a96d0ccecb96600ef1bfd50ab3f77315f":[5,0,2,1,0,6], +"post__to__red_8php.html#a99811555b30bde504a863e44015f2f19":[5,0,2,1,0,15], +"post__to__red_8php.html#aa97aeda12ef080665f16311a4e1eb901":[5,0,2,1,0,11], +"post__to__red_8php.html#ada8a7130088351710bb02ed622d6bf65":[5,0,2,1,0,14], +"post__to__red_8php.html#ae6f3a2c0561cbeacda5be565b06de8a7":[5,0,2,1,0,4], +"post__to__red_8php.html#aeec4125719184e7b097b3b9fba3101b5":[5,0,2,1,0,0], +"post__to__red_8php.html#af2713018a2dc97e88f121fc6215beb66":[5,0,2,1,0,13], +"post__to__red_8php.html#af3e7ebd361d4ed7cb6d43209970cd94a":[5,0,2,1,0,18], +"post__to__red_8php.html#af5fd50e2c42ede85f8a9e8d9ee3cf540":[5,0,2,1,0,8], "pretheme_8php.html":[5,0,1,74], "pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[5,0,1,74,0], "probe_8php.html":[5,0,1,75], @@ -90,26 +115,33 @@ var NAVTREEINDEX6 = "randprof_8php.html":[5,0,1,82], "randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[5,0,1,82,0], "redbasic_2php_2style_8php.html":[5,0,3,1,1,0,1], -"redbasic_2php_2style_8php.html#a01c151bf47f7da2b979aaa4cb868da4c":[5,0,3,1,1,0,1,10], +"redbasic_2php_2style_8php.html#a01c151bf47f7da2b979aaa4cb868da4c":[5,0,3,1,1,0,1,12], +"redbasic_2php_2style_8php.html#a0b070f2c9140a7a12a0b1f88601a29e4":[5,0,3,1,1,0,1,16], "redbasic_2php_2style_8php.html#a0bdce350cf14bac44976e786d1be6574":[5,0,3,1,1,0,1,2], -"redbasic_2php_2style_8php.html#a0cb037986e32302685d4f580dedd6473":[5,0,3,1,1,0,1,3], -"redbasic_2php_2style_8php.html#a109bbd7f4add27541707b191b73ef84a":[5,0,3,1,1,0,1,17], -"redbasic_2php_2style_8php.html#a136b0a2cdeb37f3fa506d28f82dcdbf8":[5,0,3,1,1,0,1,7], -"redbasic_2php_2style_8php.html#a27cb59bbc750341f448cd0c298a7ea16":[5,0,3,1,1,0,1,6], +"redbasic_2php_2style_8php.html#a0cb037986e32302685d4f580dedd6473":[5,0,3,1,1,0,1,5], +"redbasic_2php_2style_8php.html#a109bbd7f4add27541707b191b73ef84a":[5,0,3,1,1,0,1,23], +"redbasic_2php_2style_8php.html#a136b0a2cdeb37f3fa506d28f82dcdbf8":[5,0,3,1,1,0,1,9], +"redbasic_2php_2style_8php.html#a27cb59bbc750341f448cd0c298a7ea16":[5,0,3,1,1,0,1,8], "redbasic_2php_2style_8php.html#a339624aeef6604a2f00209a3962c6e1c":[5,0,3,1,1,0,1,0], -"redbasic_2php_2style_8php.html#a4161f6b8aa923f67e53f54dfb6554cdb":[5,0,3,1,1,0,1,16], -"redbasic_2php_2style_8php.html#a6502bedd57105ad1fb2dee2be9cf6351":[5,0,3,1,1,0,1,11], -"redbasic_2php_2style_8php.html#a68e3ff836ec87ae1370c9f4a12c21c6b":[5,0,3,1,1,0,1,4], -"redbasic_2php_2style_8php.html#a6ffadaf926b41ad84c30da319011e9ad":[5,0,3,1,1,0,1,14], -"redbasic_2php_2style_8php.html#a83022b1d70799d2bde3d64dca9cb40ee":[5,0,3,1,1,0,1,12], -"redbasic_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a":[5,0,3,1,1,0,1,19], -"redbasic_2php_2style_8php.html#a8fdd5874587a9ad86fb05ed0be265649":[5,0,3,1,1,0,1,8], -"redbasic_2php_2style_8php.html#ab00dfc29448b183055d2ae61a0e1874a":[5,0,3,1,1,0,1,13], -"redbasic_2php_2style_8php.html#ab3afb90d611eca90819f597a2c0bb459":[5,0,3,1,1,0,1,18], -"redbasic_2php_2style_8php.html#ab5ec5703848e0132f8a8f3d3a53a58e1":[5,0,3,1,1,0,1,9], -"redbasic_2php_2style_8php.html#acfd00ec469ca3c5e8bfac787573093f3":[5,0,3,1,1,0,1,15], +"redbasic_2php_2style_8php.html#a4161f6b8aa923f67e53f54dfb6554cdb":[5,0,3,1,1,0,1,21], +"redbasic_2php_2style_8php.html#a5bff5012c56e34da6b3b2ed475726b27":[5,0,3,1,1,0,1,4], +"redbasic_2php_2style_8php.html#a61891d0d3e6894f52410d507b04e565d":[5,0,3,1,1,0,1,24], +"redbasic_2php_2style_8php.html#a6502bedd57105ad1fb2dee2be9cf6351":[5,0,3,1,1,0,1,15], +"redbasic_2php_2style_8php.html#a68e3ff836ec87ae1370c9f4a12c21c6b":[5,0,3,1,1,0,1,6], +"redbasic_2php_2style_8php.html#a6ffadaf926b41ad84c30da319011e9ad":[5,0,3,1,1,0,1,19], +"redbasic_2php_2style_8php.html#a810142b4bdd35a1d377ab279b02b47eb":[5,0,3,1,1,0,1,22], +"redbasic_2php_2style_8php.html#a83022b1d70799d2bde3d64dca9cb40ee":[5,0,3,1,1,0,1,17], +"redbasic_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a":[5,0,3,1,1,0,1,26], +"redbasic_2php_2style_8php.html#a8fdd5874587a9ad86fb05ed0be265649":[5,0,3,1,1,0,1,10], +"redbasic_2php_2style_8php.html#a9b489f1c595b867212d30eca0c85b38c":[5,0,3,1,1,0,1,13], +"redbasic_2php_2style_8php.html#ab00dfc29448b183055d2ae61a0e1874a":[5,0,3,1,1,0,1,18], +"redbasic_2php_2style_8php.html#ab3afb90d611eca90819f597a2c0bb459":[5,0,3,1,1,0,1,25], +"redbasic_2php_2style_8php.html#ab5ec5703848e0132f8a8f3d3a53a58e1":[5,0,3,1,1,0,1,11], +"redbasic_2php_2style_8php.html#ac98bd8264411bd207a5740d08e81a158":[5,0,3,1,1,0,1,14], +"redbasic_2php_2style_8php.html#acfd00ec469ca3c5e8bfac787573093f3":[5,0,3,1,1,0,1,20], +"redbasic_2php_2style_8php.html#ad78cb8a1793834626d73aca22a1501f8":[5,0,3,1,1,0,1,3], "redbasic_2php_2style_8php.html#ae587aa6949ab6e4aa77a591e60f67ee0":[5,0,3,1,1,0,1,1], -"redbasic_2php_2style_8php.html#afcbcf57d0b90d2e4226c2e8a1171befc":[5,0,3,1,1,0,1,5], +"redbasic_2php_2style_8php.html#afcbcf57d0b90d2e4226c2e8a1171befc":[5,0,3,1,1,0,1,7], "redbasic_2php_2theme_8php.html":[5,0,3,1,1,0,2], "redbasic_2php_2theme_8php.html#af6eb813e9fc7e2d76ac1b82bc5c0ed9b":[5,0,3,1,1,0,2,0], "redbasic_8php.html":[5,0,3,1,0,1,9], @@ -217,37 +249,5 @@ var NAVTREEINDEX6 = "suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[5,0,1,101,1], "suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[5,0,1,101,2], "system__unavailable_8php.html":[5,0,0,67], -"system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa":[5,0,0,67,0], -"tagger_8php.html":[5,0,1,102], -"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[5,0,1,102,0], -"tagrm_8php.html":[5,0,1,103], -"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[5,0,1,103,1], -"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[5,0,1,103,0], -"taxonomy_8php.html":[5,0,0,68], -"taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce":[5,0,0,68,8], -"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,9], -"taxonomy_8php.html#a599ee71dd3194c8127b00dabec77abc1":[5,0,0,68,1], -"taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c":[5,0,0,68,13], -"taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43":[5,0,0,68,12], -"taxonomy_8php.html#aaf90ba8b839d6459065f39a4f1109b8a":[5,0,0,68,10], -"taxonomy_8php.html#ac12a651a42ed77f8dc7072c6168811a2":[5,0,0,68,7], -"taxonomy_8php.html#ac21d1dff16d569e7d110167aea4e63c2":[5,0,0,68,11], -"taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1":[5,0,0,68,5], -"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] +"system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa":[5,0,0,67,0] }; diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js index 7df7b09fd..364e45cf3 100644 --- a/doc/html/navtreeindex7.js +++ b/doc/html/navtreeindex7.js @@ -1,5 +1,37 @@ var NAVTREEINDEX7 = { +"tagger_8php.html":[5,0,1,102], +"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[5,0,1,102,0], +"tagrm_8php.html":[5,0,1,103], +"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[5,0,1,103,1], +"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[5,0,1,103,0], +"taxonomy_8php.html":[5,0,0,68], +"taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce":[5,0,0,68,8], +"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,9], +"taxonomy_8php.html#a599ee71dd3194c8127b00dabec77abc1":[5,0,0,68,1], +"taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c":[5,0,0,68,13], +"taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43":[5,0,0,68,12], +"taxonomy_8php.html#aaf90ba8b839d6459065f39a4f1109b8a":[5,0,0,68,10], +"taxonomy_8php.html#ac12a651a42ed77f8dc7072c6168811a2":[5,0,0,68,7], +"taxonomy_8php.html#ac21d1dff16d569e7d110167aea4e63c2":[5,0,0,68,11], +"taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1":[5,0,0,68,5], +"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,77], "text_8php.html#a138a3a611fa7f4f3630674145fc826bf":[5,0,0,70,32], "text_8php.html#a1557112a774ec00fa06ed6b6f6495506":[5,0,0,70,35], @@ -81,7 +113,8 @@ var NAVTREEINDEX7 = "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__init_8php.html":[5,0,3,0,6], +"theme__init_8php.html":[5,0,3,0,7], +"theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864":[5,0,3,0,7,0], "thing_8php.html":[5,0,1,104], "thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[5,0,1,104,0], "thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[5,0,1,104,1], @@ -89,19 +122,19 @@ var NAVTREEINDEX7 = "toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[5,0,1,105,0], "toggle__safesearch_8php.html":[5,0,1,106], "toggle__safesearch_8php.html#a23d5cfb2727a266e44993ffbf5595a79":[5,0,1,106,0], -"tpldebug_8php.html":[5,0,2,7], -"tpldebug_8php.html#a44778457a6c02554812fbfad19d32ba3":[5,0,2,7,0], -"tpldebug_8php.html#a5358407d65f2ca826f96356a6642d149":[5,0,2,7,1], -"tpldebug_8php.html#afbc7aadb3f7ff1edf0aaaa326a42179c":[5,0,2,7,2], -"typo_8php.html":[5,0,2,8], -"typo_8php.html#a1b709c1d79631ebc8320b41bda028b54":[5,0,2,8,1], -"typo_8php.html#a329c9c12217d2c8660c47bbc7c8df4c5":[5,0,2,8,4], -"typo_8php.html#a3ecd17ac846be1b35f3662f5c12ab6bd":[5,0,2,8,3], -"typo_8php.html#a9590b15215a21e9b42eb546aeef79704":[5,0,2,8,2], -"typo_8php.html#acebf83966ef6d7e5645a6b62ba368f9f":[5,0,2,8,0], -"typohelper_8php.html":[5,0,2,9], -"typohelper_8php.html#a7542d95618011800c61773127fa625cf":[5,0,2,9,0], -"typohelper_8php.html#ab6fd357fb5b2a3ba8aab9e8b98c6a805":[5,0,2,9,1], +"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], +"tpldebug_8php.html#afbc7aadb3f7ff1edf0aaaa326a42179c":[5,0,2,8,2], +"typo_8php.html":[5,0,2,9], +"typo_8php.html#a1b709c1d79631ebc8320b41bda028b54":[5,0,2,9,1], +"typo_8php.html#a329c9c12217d2c8660c47bbc7c8df4c5":[5,0,2,9,4], +"typo_8php.html#a3ecd17ac846be1b35f3662f5c12ab6bd":[5,0,2,9,3], +"typo_8php.html#a9590b15215a21e9b42eb546aeef79704":[5,0,2,9,2], +"typo_8php.html#acebf83966ef6d7e5645a6b62ba368f9f":[5,0,2,9,0], +"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,107], "uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[5,0,1,107,0], "update__channel_8php.html":[5,0,1,108], @@ -114,13 +147,13 @@ var NAVTREEINDEX7 = "update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[5,0,1,111,0], "update__search_8php.html":[5,0,1,112], "update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[5,0,1,112,0], -"updatetpl_8py.html":[5,0,2,10], -"updatetpl_8py.html#a52a85ffa6b6d63d840b185a133478c12":[5,0,2,10,5], -"updatetpl_8py.html#a79c20eb62d568c999b56eb08530355d3":[5,0,2,10,2], -"updatetpl_8py.html#a988d937ed5d5c2b592b763036af5cf94":[5,0,2,10,1], -"updatetpl_8py.html#ab42dd79af65ee82201fd6f04715f62f6":[5,0,2,10,3], -"updatetpl_8py.html#ac9d11279fed403a329a719298feafc4f":[5,0,2,10,0], -"updatetpl_8py.html#ae694f5e1f25f8a92a945eb90c432dfe6":[5,0,2,10,4], +"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], +"updatetpl_8py.html#a988d937ed5d5c2b592b763036af5cf94":[5,0,2,11,1], +"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], diff --git a/doc/html/none_8php.html b/doc/html/none_8php.html new file mode 100644 index 000000000..de5c43817 --- /dev/null +++ b/doc/html/none_8php.html @@ -0,0 +1,112 @@ + + + + + + +The Red Matrix: view/php/none.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +
    none.php File Reference
    +
    +
    +
    +
    + diff --git a/doc/html/plugin_8php.html b/doc/html/plugin_8php.html index 4582c3263..4f77cd3b5 100644 --- a/doc/html/plugin_8php.html +++ b/doc/html/plugin_8php.html @@ -282,7 +282,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(), 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(), nogroup_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(), profile_tabs(), 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(), 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(), nogroup_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(), profile_tabs(), 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().

    diff --git a/doc/html/post_8php.html b/doc/html/post_8php.html index d20efd0e8..bbaa4c652 100644 --- a/doc/html/post_8php.html +++ b/doc/html/post_8php.html @@ -155,7 +155,8 @@ Functions

    pickup: end

    All other message types require us to verify the sender. This is a generic check, so we will do it once here and bail if anything goes wrong.

    Check if the sender is already verified here

    -

    Have never seen this guid or this guid coming from this location. Check it and register it.

    +

    Have never seen this guid or this guid coming from this location. Check it and register it.

    +

    This hub has now been proven to be valid. Any hub with the same URL and a different sitekey cannot be valid. Get rid of them (mark them deleted). There's a good chance they were re-installs.

    diff --git a/doc/html/post__to__red_8php.html b/doc/html/post__to__red_8php.html new file mode 100644 index 000000000..51e9f5069 --- /dev/null +++ b/doc/html/post__to__red_8php.html @@ -0,0 +1,453 @@ + + + + + + +The Red Matrix: util/wp/post_to_red.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +Functions | +Variables
    +
    +
    post_to_red.php File Reference
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    +Functions

     post_to_red_deactivate ()
     
     post_to_red_get_seed_location ()
     
     post_to_red_get_acct_name ()
     
     post_to_red_get_user_name ()
     
     post_to_red_get_password ()
     
     post_to_red_post ($post_id)
     
     post_to_red_displayAdminContent ()
     
     post_to_red_post_checkbox ()
     
     post_to_red_post_meta_content ($post_id)
     
     post_to_red_post_field_data ($post_id)
     
     post_to_red_display_admin_page ()
     
     post_to_red_settings_link ($links)
     
     post_to_red_admin ()
     
     xpost_to_html2bbcode ($text)
     
    + + + + + + + + + + + +

    +Variables

    const post_to_red_path WP_PLUGIN_URL . "/" . str_replace(basename( __FILE__), "", plugin_basename(__FILE__))
     
    const post_to_red_version "1.2"
     
     $plugin_dir = basename(dirname(__FILE__))
     
     $plugin = plugin_basename(__FILE__)
     
    const post_to_red_acct_name "post_to_red_admin_options"
     
    +

    Function Documentation

    + +
    +
    + + + + + + + +
    post_to_red_admin ()
    +
    + +
    +
    + +
    +
    + + + + + + + +
    post_to_red_deactivate ()
    +
    + +
    +
    + +
    +
    + + + + + + + +
    post_to_red_display_admin_page ()
    +
    + +
    +
    + +
    +
    + + + + + + + +
    post_to_red_displayAdminContent ()
    +
    + +

    Referenced by post_to_red_display_admin_page().

    + +
    +
    + +
    +
    + + + + + + + +
    post_to_red_get_acct_name ()
    +
    + +

    Referenced by post_to_red_displayAdminContent().

    + +
    +
    + +
    +
    + + + + + + + +
    post_to_red_get_password ()
    +
    + +

    Referenced by post_to_red_displayAdminContent(), and post_to_red_post().

    + +
    +
    + +
    +
    + + + + + + + +
    post_to_red_get_seed_location ()
    +
    + +

    Referenced by post_to_red_displayAdminContent(), and post_to_red_post().

    + +
    +
    + +
    +
    + + + + + + + +
    post_to_red_get_user_name ()
    +
    + +

    Referenced by post_to_red_post().

    + +
    +
    + +
    +
    + + + + + + + + +
    post_to_red_post ( $post_id)
    +
    + +
    +
    + +
    +
    + + + + + + + +
    post_to_red_post_checkbox ()
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    post_to_red_post_field_data ( $post_id)
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    post_to_red_post_meta_content ( $post_id)
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    post_to_red_settings_link ( $links)
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    xpost_to_html2bbcode ( $text)
    +
    + +

    Referenced by post_to_red_post().

    + +
    +
    +

    Variable Documentation

    + +
    +
    + + + + +
    $plugin = plugin_basename(__FILE__)
    +
    + +

    Referenced by admin_content(), admin_page_plugins(), get_plugin_info(), install_plugin(), load_plugin(), uninstall_plugin(), and unload_plugin().

    + +
    +
    + +
    +
    + + + + +
    $plugin_dir = basename(dirname(__FILE__))
    +
    + +
    +
    + +
    +
    + + + + +
    const post_to_red_acct_name "post_to_red_admin_options"
    +
    + +

    Referenced by post_to_red_deactivate(), post_to_red_display_admin_page(), and post_to_red_get_acct_name().

    + +
    +
    + +
    +
    + + + + +
    const post_to_red_path WP_PLUGIN_URL . "/" . str_replace(basename( __FILE__), "", plugin_basename(__FILE__))
    +
    + +
    +
    + +
    +
    + + + + +
    const post_to_red_version "1.2"
    +
    + +
    +
    +
    +
    + diff --git a/doc/html/post__to__red_8php.js b/doc/html/post__to__red_8php.js new file mode 100644 index 000000000..42057c549 --- /dev/null +++ b/doc/html/post__to__red_8php.js @@ -0,0 +1,22 @@ +var post__to__red_8php = +[ + [ "post_to_red_admin", "post__to__red_8php.html#aeec4125719184e7b097b3b9fba3101b5", null ], + [ "post_to_red_deactivate", "post__to__red_8php.html#a49fd35f7b1cdddfe6e26ddfcf8d3c4ec", null ], + [ "post_to_red_display_admin_page", "post__to__red_8php.html#a8ec8f8809e3c5d1b2c9598c8185d63aa", null ], + [ "post_to_red_displayAdminContent", "post__to__red_8php.html#a75db5d87226a0287a0ac0fa315f2bcfd", null ], + [ "post_to_red_get_acct_name", "post__to__red_8php.html#ae6f3a2c0561cbeacda5be565b06de8a7", null ], + [ "post_to_red_get_password", "post__to__red_8php.html#a4d90ac085c14f53ff4d8ab4c23477ea6", null ], + [ "post_to_red_get_seed_location", "post__to__red_8php.html#a96d0ccecb96600ef1bfd50ab3f77315f", null ], + [ "post_to_red_get_user_name", "post__to__red_8php.html#a9497cd6a80c6897dbbf9aabde62b53e7", null ], + [ "post_to_red_post", "post__to__red_8php.html#af5fd50e2c42ede85f8a9e8d9ee3cf540", null ], + [ "post_to_red_post_checkbox", "post__to__red_8php.html#a0f139dea77a94c98f26007963eea639c", null ], + [ "post_to_red_post_field_data", "post__to__red_8php.html#a7e68a8d9c83cb28d032aad3ea85ce0a6", null ], + [ "post_to_red_post_meta_content", "post__to__red_8php.html#aa97aeda12ef080665f16311a4e1eb901", null ], + [ "post_to_red_settings_link", "post__to__red_8php.html#a906be8f72cf1aa2e199c0683ea6a4017", null ], + [ "xpost_to_html2bbcode", "post__to__red_8php.html#af2713018a2dc97e88f121fc6215beb66", null ], + [ "$plugin", "post__to__red_8php.html#ada8a7130088351710bb02ed622d6bf65", null ], + [ "$plugin_dir", "post__to__red_8php.html#a99811555b30bde504a863e44015f2f19", null ], + [ "post_to_red_acct_name", "post__to__red_8php.html#a588cea66afe0b32f27f2713d44940119", null ], + [ "post_to_red_path", "post__to__red_8php.html#a6210f39392a5f0fa0255cc7d3760493a", null ], + [ "post_to_red_version", "post__to__red_8php.html#af3e7ebd361d4ed7cb6d43209970cd94a", null ] +]; \ No newline at end of file diff --git a/doc/html/redbasic_2php_2style_8php.html b/doc/html/redbasic_2php_2style_8php.html index 9a7c7502e..962e09fb4 100644 --- a/doc/html/redbasic_2php_2style_8php.html +++ b/doc/html/redbasic_2php_2style_8php.html @@ -134,6 +134,8 @@ Variables    $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") @@ -148,6 +150,18 @@ Variables    $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' +  + $comment_indent = intval($top_photo) + 10 . 'px' +  + $pmenu_reply = intval($reply_photo) - 16 . 'px' +  if($nav_min_opacity===false||$nav_min_opacity=== '') else    $nav_percent_min_opacity = (int) 100 * $nav_min_opacity @@ -190,6 +204,30 @@ Variables

    Referenced by apw_form(), and theme_content().

    + + + +
    +
    + + + + +
    $body_font_size = get_pconfig($uid, "redbasic", "body_font_size")
    +
    + +
    +
    + +
    +
    + + + + +
    $comment_indent = intval($top_photo) + 10 . 'px'
    +
    +
    @@ -292,6 +330,30 @@ Variables
    +
    + + +
    +
    + + + + +
    $pmenu_reply = intval($reply_photo) - 16 . 'px'
    +
    + +
    +
    + +
    +
    + + + + +
    $pmenu_top = intval($top_photo) - 16 . 'px'
    +
    +
    @@ -306,6 +368,18 @@ Variables

    Referenced by apw_form(), and theme_content().

    + + + +
    +
    + + + + +
    $reply_photo =get_pconfig($uid,'redbasic','reply_photo')
    +
    +
    @@ -368,6 +442,18 @@ Variables
    +
    + + +
    +
    + + + + +
    $top_photo =get_pconfig($uid,'redbasic','top_photo')
    +
    +
    @@ -380,6 +466,18 @@ Variables
    +
    + + +
    +
    + + + + +
    $wwtop = intval($top_photo) - 15 . 'px'
    +
    +
    diff --git a/doc/html/redbasic_2php_2style_8php.js b/doc/html/redbasic_2php_2style_8php.js index e096b5ce6..c5e370461 100644 --- a/doc/html/redbasic_2php_2style_8php.js +++ b/doc/html/redbasic_2php_2style_8php.js @@ -3,6 +3,8 @@ 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 ], @@ -11,13 +13,18 @@ var redbasic_2php_2style_8php = [ "$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 ] ]; \ No newline at end of file diff --git a/doc/html/redbasic_2php_2theme_8php.html b/doc/html/redbasic_2php_2theme_8php.html index dbbbd82df..eb9630b87 100644 --- a/doc/html/redbasic_2php_2theme_8php.html +++ b/doc/html/redbasic_2php_2theme_8php.html @@ -129,6 +129,14 @@ Functions
    +
      +
    • Name: Redbasic
      • +
    • Description: RedMatrix standard theme
      • +
    • Version: 1.0
      • +
    • Author: Fabrixxm
      • +
    • Maintainer: Mike Macgirvin
      • +
    • Compat: Red [*]
      • +
    diff --git a/doc/html/rpost_8php.html b/doc/html/rpost_8php.html index b1f75081d..559a2fbff 100644 --- a/doc/html/rpost_8php.html +++ b/doc/html/rpost_8php.html @@ -132,7 +132,7 @@ Functions

    remote post

    https://yoursite/rpost?f=&title=&body=&remote_return=

    This can be called via either GET or POST, use POST for long body content as suhosin often limits GET parameter length

    -

    f= placeholder, often required title= Title of post body= Body of post remote_return= absolute URL to return after posting is finished type= choices are 'html' or 'bbcode', default is 'bbcode'

    +

    f= placeholder, often required title= Title of post body= Body of post source= Source application remote_return= absolute URL to return after posting is finished type= choices are 'html' or 'bbcode', default is 'bbcode'

    diff --git a/doc/html/search/all_24.js b/doc/html/search/all_24.js index cca20bbe5..0947880f2 100644 --- a/doc/html/search/all_24.js +++ b/doc/html/search/all_24.js @@ -15,17 +15,19 @@ var searchData= ['_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']]], ['_24cached_5fprofile_5fimage',['$cached_profile_image',['../classApp.html#abe0e4fa91097f7a6588e1213a834121c',1,'App']]], ['_24cached_5fprofile_5fpicdate',['$cached_profile_picdate',['../classApp.html#aab4a685d15a363bb1d7edbbc20bfb94e',1,'App']]], ['_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()']]], + ['_24channel',['$channel',['../classApp.html#a050b0696118da47e8b30859ad1a2c149',1,'App\$channel()'],['../classItem.html#acc32426c0f465391be8a99ad810c7b8e',1,'Item\$channel()'],['../theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864',1,'$channel(): theme_init.php']]], ['_24channel_5fid',['$channel_id',['../classRedDirectory.html#ae624dcaa4d73a517f4b1616d33df690d',1,'RedDirectory']]], ['_24children',['$children',['../classItem.html#a80dcd0fb7673776c0967839d429c2a0f',1,'Item']]], ['_24cid',['$cid',['../classApp.html#ad1c8eb91a6fd470b94f34b7fdad3a2d0',1,'App']]], ['_24cipher',['$cipher',['../classConversation.html#aa95c1a62af38bdfba7add9549bec083b',1,'Conversation']]], ['_24cmd',['$cmd',['../classApp.html#a495ec082c2719314e536070ca1ce073d',1,'App']]], ['_24comment_5fbox_5ftemplate',['$comment_box_template',['../classItem.html#a90743c8348b13213275c223bb9333aa0',1,'Item']]], + ['_24comment_5findent',['$comment_indent',['../redbasic_2php_2style_8php.html#a5bff5012c56e34da6b3b2ed475726b27',1,'style.php']]], ['_24commentable',['$commentable',['../classConversation.html#afd4965d22a6e4bfea2f35e931b3273c6',1,'Conversation\$commentable()'],['../classItem.html#aa2c221231ad0fc3720ccc1f00f0c6304',1,'Item\$commentable()']]], ['_24config',['$config',['../classApp.html#ac73dc90e4764497e2f1b7e6612c8fb88',1,'App']]], ['_24connected',['$connected',['../classdba__driver.html#a205f6535e399700b6fca2492f96f2229',1,'dba_driver']]], @@ -97,7 +99,11 @@ var searchData= ['_24perms',['$perms',['../classApp.html#ab47de68fa39806d1fb0976407e188b77',1,'App']]], ['_24phpath',['$phpath',['../typo_8php.html#a3ecd17ac846be1b35f3662f5c12ab6bd',1,'typo.php']]], ['_24phpfile',['$phpfile',['../php2po_8php.html#abbb0e5fd8fbc1f13a9bf68f86eb3d2a4',1,'php2po.php']]], + ['_24plugin',['$plugin',['../post__to__red_8php.html#ada8a7130088351710bb02ed622d6bf65',1,'post_to_red.php']]], + ['_24plugin_5fdir',['$plugin_dir',['../post__to__red_8php.html#a99811555b30bde504a863e44015f2f19',1,'post_to_red.php']]], ['_24plugins',['$plugins',['../classApp.html#ae9f96338f32187d308b67b980eea0008',1,'App']]], + ['_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']]], ['_24prepared_5fitem',['$prepared_item',['../classConversation.html#a5b6adbb2fe24f0f53d6c22660dff91b2',1,'Conversation']]], ['_24preview',['$preview',['../classConversation.html#ae9937f9e0f3d927acc2bed46cc72e9ae',1,'Conversation']]], @@ -111,6 +117,7 @@ var searchData= ['_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']]], ['_24s',['$s',['../extract_8php.html#a50b05cf2e02ef0b67fcad97106dd7634',1,'extract.php']]], ['_24schema',['$schema',['../redbasic_2php_2style_8php.html#a83022b1d70799d2bde3d64dca9cb40ee',1,'style.php']]], @@ -137,6 +144,7 @@ var searchData= ['_24timezone',['$timezone',['../classApp.html#ab35b01a366a2ea95725e97af278f87ab',1,'App']]], ['_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']]], @@ -151,5 +159,6 @@ var searchData= ['_24widgets',['$widgets',['../classApp.html#aa5a87c46ab3fee21362c466bf78042ef',1,'App']]], ['_24width',['$width',['../classphoto__driver.html#a3e4215890f4a4894bf3799a7d2e0c0b1',1,'photo_driver\$width()'],['../minimalisticdarkness_8php.html#a5795120b4b324bc4ca83f1e6fdce7d57',1,'$width(): minimalisticdarkness.php']]], ['_24writable',['$writable',['../classConversation.html#ae81221251307e315f566a11f921ce0a9',1,'Conversation']]], + ['_24wwtop',['$wwtop',['../redbasic_2php_2style_8php.html#a61891d0d3e6894f52410d507b04e565d',1,'style.php']]], ['_24zones',['$zones',['../extract_8php.html#a0cbe524ffc9a496114fd7ba9f423ef44',1,'extract.php']]] ]; diff --git a/doc/html/search/all_63.js b/doc/html/search/all_63.js index 580f6ed45..73a94e96b 100644 --- a/doc/html/search/all_63.js +++ b/doc/html/search/all_63.js @@ -141,6 +141,8 @@ var searchData= ['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_2ephp',['crypto.php',['../crypto_8php.html',1,'']]], + ['crypto_5fencapsulate',['crypto_encapsulate',['../crypto_8php.html#a32fc08d57a5694f94d8543ecbb03323c',1,'crypto.php']]], + ['crypto_5funencapsulate',['crypto_unencapsulate',['../crypto_8php.html#a0781202b0a43b82426929cc87c2fa2b5',1,'crypto.php']]], ['curpageurl',['curPageURL',['../boot_8php.html#aa4221641e5c21db69fa52c426b9017f5',1,'boot.php']]], ['current_5ftheme',['current_theme',['../boot_8php.html#ad206598b909e8eb67eb0e0bb5ef69c13',1,'boot.php']]], ['current_5ftheme_5furl',['current_theme_url',['../boot_8php.html#a926cad0b3d8b9d9ee5da1898fc063ba3',1,'boot.php']]], diff --git a/doc/html/search/all_6d.js b/doc/html/search/all_6d.js index d3c7c9b76..44c214360 100644 --- a/doc/html/search/all_6d.js +++ b/doc/html/search/all_6d.js @@ -45,7 +45,7 @@ var searchData= ['message_5fpost',['message_post',['../mod_2message_8php.html#a0db7030362a7e9ed9549b341d7b35718',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#ab4d9e5b59f48787cb01baae5dc6c381f',1,'group.php']]], + ['mini_5fgroup_5fselect',['mini_group_select',['../include_2group_8php.html#ab0e422a0f31c0c64fd9084ca03d85f32',1,'group.php']]], ['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/all_6e.js b/doc/html/search/all_6e.js index 5fc653c57..ae1398cd5 100644 --- a/doc/html/search/all_6e.js +++ b/doc/html/search/all_6e.js @@ -56,6 +56,7 @@ var searchData= ['nogroup_2ephp',['nogroup.php',['../nogroup_8php.html',1,'']]], ['nogroup_5fcontent',['nogroup_content',['../nogroup_8php.html#a52085b183f97c552f1db5c4926e8ec30',1,'nogroup.php']]], ['nogroup_5finit',['nogroup_init',['../nogroup_8php.html#a099cb353bf62e8453069ce107b763212',1,'nogroup.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']]], diff --git a/doc/html/search/all_70.js b/doc/html/search/all_70.js index 632f60bdd..1480b53d2 100644 --- a/doc/html/search/all_70.js +++ b/doc/html/search/all_70.js @@ -108,9 +108,27 @@ var searchData= ['post_5factivity_5fitem',['post_activity_item',['../items_8php.html#a410f9c743877c125ca06312373346903',1,'items.php']]], ['post_5finit',['post_init',['../post_8php.html#af4b48181ce773ef0cdfc972441445c34',1,'post.php']]], ['post_5fpost',['post_post',['../post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75',1,'post.php']]], + ['post_5fto_5fred_2ephp',['post_to_red.php',['../post__to__red_8php.html',1,'']]], + ['post_5fto_5fred_5facct_5fname',['post_to_red_acct_name',['../post__to__red_8php.html#a588cea66afe0b32f27f2713d44940119',1,'post_to_red.php']]], + ['post_5fto_5fred_5fadmin',['post_to_red_admin',['../post__to__red_8php.html#aeec4125719184e7b097b3b9fba3101b5',1,'post_to_red.php']]], + ['post_5fto_5fred_5fdeactivate',['post_to_red_deactivate',['../post__to__red_8php.html#a49fd35f7b1cdddfe6e26ddfcf8d3c4ec',1,'post_to_red.php']]], + ['post_5fto_5fred_5fdisplay_5fadmin_5fpage',['post_to_red_display_admin_page',['../post__to__red_8php.html#a8ec8f8809e3c5d1b2c9598c8185d63aa',1,'post_to_red.php']]], + ['post_5fto_5fred_5fdisplayadmincontent',['post_to_red_displayAdminContent',['../post__to__red_8php.html#a75db5d87226a0287a0ac0fa315f2bcfd',1,'post_to_red.php']]], + ['post_5fto_5fred_5fget_5facct_5fname',['post_to_red_get_acct_name',['../post__to__red_8php.html#ae6f3a2c0561cbeacda5be565b06de8a7',1,'post_to_red.php']]], + ['post_5fto_5fred_5fget_5fpassword',['post_to_red_get_password',['../post__to__red_8php.html#a4d90ac085c14f53ff4d8ab4c23477ea6',1,'post_to_red.php']]], + ['post_5fto_5fred_5fget_5fseed_5flocation',['post_to_red_get_seed_location',['../post__to__red_8php.html#a96d0ccecb96600ef1bfd50ab3f77315f',1,'post_to_red.php']]], + ['post_5fto_5fred_5fget_5fuser_5fname',['post_to_red_get_user_name',['../post__to__red_8php.html#a9497cd6a80c6897dbbf9aabde62b53e7',1,'post_to_red.php']]], + ['post_5fto_5fred_5fpath',['post_to_red_path',['../post__to__red_8php.html#a6210f39392a5f0fa0255cc7d3760493a',1,'post_to_red.php']]], + ['post_5fto_5fred_5fpost',['post_to_red_post',['../post__to__red_8php.html#af5fd50e2c42ede85f8a9e8d9ee3cf540',1,'post_to_red.php']]], + ['post_5fto_5fred_5fpost_5fcheckbox',['post_to_red_post_checkbox',['../post__to__red_8php.html#a0f139dea77a94c98f26007963eea639c',1,'post_to_red.php']]], + ['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']]], + ['post_5fto_5fred_5fversion',['post_to_red_version',['../post__to__red_8php.html#af3e7ebd361d4ed7cb6d43209970cd94a',1,'post_to_red.php']]], ['post_5furl',['post_url',['../include_2network_8php.html#aa44d9e33a579d930e9e79c4ebb3d6b5e',1,'network.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']]], ['prepare_5fbody',['prepare_body',['../text_8php.html#ae4df74296fbe55051ed3c035e55205e5',1,'text.php']]], ['prepare_5fpage',['prepare_page',['../conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c',1,'conversation.php']]], diff --git a/doc/html/search/all_78.js b/doc/html/search/all_78.js index 6872444ed..b001e9752 100644 --- a/doc/html/search/all_78.js +++ b/doc/html/search/all_78.js @@ -13,6 +13,7 @@ var searchData= ['xml2array',['xml2array',['../include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff',1,'network.php']]], ['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_2ephp',['xrd.php',['../xrd_8php.html',1,'']]], ['xrd_5finit',['xrd_init',['../xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270',1,'xrd.php']]] ]; diff --git a/doc/html/search/files_6e.js b/doc/html/search/files_6e.js index 1d6cb6c17..fcb0aa467 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,'']]], ['nogroup_2ephp',['nogroup.php',['../nogroup_8php.html',1,'']]], + ['none_2ephp',['none.php',['../none_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,'']]], diff --git a/doc/html/search/files_70.js b/doc/html/search/files_70.js index 660b1f132..295000ad9 100644 --- a/doc/html/search/files_70.js +++ b/doc/html/search/files_70.js @@ -10,8 +10,8 @@ var searchData= ['photo_5fdriver_2ephp',['photo_driver.php',['../photo__driver_8php.html',1,'']]], ['photo_5fgd_2ephp',['photo_gd.php',['../photo__gd_8php.html',1,'']]], ['photo_5fimagick_2ephp',['photo_imagick.php',['../photo__imagick_8php.html',1,'']]], - ['photos_2ephp',['photos.php',['../include_2photos_8php.html',1,'']]], ['photos_2ephp',['photos.php',['../mod_2photos_8php.html',1,'']]], + ['photos_2ephp',['photos.php',['../include_2photos_8php.html',1,'']]], ['php_2ephp',['php.php',['../php_8php.html',1,'']]], ['php2po_2ephp',['php2po.php',['../php2po_8php.html',1,'']]], ['pine_2ephp',['pine.php',['../pine_8php.html',1,'']]], @@ -22,6 +22,7 @@ var searchData= ['poke_2ephp',['poke.php',['../poke_8php.html',1,'']]], ['poller_2ephp',['poller.php',['../poller_8php.html',1,'']]], ['post_2ephp',['post.php',['../post_8php.html',1,'']]], + ['post_5fto_5fred_2ephp',['post_to_red.php',['../post__to__red_8php.html',1,'']]], ['pretheme_2ephp',['pretheme.php',['../pretheme_8php.html',1,'']]], ['probe_2ephp',['probe.php',['../probe_8php.html',1,'']]], ['profile_2ephp',['profile.php',['../profile_8php.html',1,'']]], diff --git a/doc/html/search/functions_63.js b/doc/html/search/functions_63.js index db6f6b013..2fd8ce91d 100644 --- a/doc/html/search/functions_63.js +++ b/doc/html/search/functions_63.js @@ -108,6 +108,8 @@ var searchData= ['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']]], + ['crypto_5funencapsulate',['crypto_unencapsulate',['../crypto_8php.html#a0781202b0a43b82426929cc87c2fa2b5',1,'crypto.php']]], ['curpageurl',['curPageURL',['../boot_8php.html#aa4221641e5c21db69fa52c426b9017f5',1,'boot.php']]], ['current_5ftheme',['current_theme',['../boot_8php.html#ad206598b909e8eb67eb0e0bb5ef69c13',1,'boot.php']]], ['current_5ftheme_5furl',['current_theme_url',['../boot_8php.html#a926cad0b3d8b9d9ee5da1898fc063ba3',1,'boot.php']]] diff --git a/doc/html/search/functions_6d.js b/doc/html/search/functions_6d.js index 61dd6cb2e..c43f6598b 100644 --- a/doc/html/search/functions_6d.js +++ b/doc/html/search/functions_6d.js @@ -28,7 +28,7 @@ var searchData= ['message_5fpost',['message_post',['../mod_2message_8php.html#a0db7030362a7e9ed9549b341d7b35718',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#ab4d9e5b59f48787cb01baae5dc6c381f',1,'group.php']]], + ['mini_5fgroup_5fselect',['mini_group_select',['../include_2group_8php.html#ab0e422a0f31c0c64fd9084ca03d85f32',1,'group.php']]], ['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']]], diff --git a/doc/html/search/functions_70.js b/doc/html/search/functions_70.js index 54a0df5d4..26db791a3 100644 --- a/doc/html/search/functions_70.js +++ b/doc/html/search/functions_70.js @@ -41,9 +41,23 @@ var searchData= ['post_5factivity_5fitem',['post_activity_item',['../items_8php.html#a410f9c743877c125ca06312373346903',1,'items.php']]], ['post_5finit',['post_init',['../post_8php.html#af4b48181ce773ef0cdfc972441445c34',1,'post.php']]], ['post_5fpost',['post_post',['../post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75',1,'post.php']]], + ['post_5fto_5fred_5fadmin',['post_to_red_admin',['../post__to__red_8php.html#aeec4125719184e7b097b3b9fba3101b5',1,'post_to_red.php']]], + ['post_5fto_5fred_5fdeactivate',['post_to_red_deactivate',['../post__to__red_8php.html#a49fd35f7b1cdddfe6e26ddfcf8d3c4ec',1,'post_to_red.php']]], + ['post_5fto_5fred_5fdisplay_5fadmin_5fpage',['post_to_red_display_admin_page',['../post__to__red_8php.html#a8ec8f8809e3c5d1b2c9598c8185d63aa',1,'post_to_red.php']]], + ['post_5fto_5fred_5fdisplayadmincontent',['post_to_red_displayAdminContent',['../post__to__red_8php.html#a75db5d87226a0287a0ac0fa315f2bcfd',1,'post_to_red.php']]], + ['post_5fto_5fred_5fget_5facct_5fname',['post_to_red_get_acct_name',['../post__to__red_8php.html#ae6f3a2c0561cbeacda5be565b06de8a7',1,'post_to_red.php']]], + ['post_5fto_5fred_5fget_5fpassword',['post_to_red_get_password',['../post__to__red_8php.html#a4d90ac085c14f53ff4d8ab4c23477ea6',1,'post_to_red.php']]], + ['post_5fto_5fred_5fget_5fseed_5flocation',['post_to_red_get_seed_location',['../post__to__red_8php.html#a96d0ccecb96600ef1bfd50ab3f77315f',1,'post_to_red.php']]], + ['post_5fto_5fred_5fget_5fuser_5fname',['post_to_red_get_user_name',['../post__to__red_8php.html#a9497cd6a80c6897dbbf9aabde62b53e7',1,'post_to_red.php']]], + ['post_5fto_5fred_5fpost',['post_to_red_post',['../post__to__red_8php.html#af5fd50e2c42ede85f8a9e8d9ee3cf540',1,'post_to_red.php']]], + ['post_5fto_5fred_5fpost_5fcheckbox',['post_to_red_post_checkbox',['../post__to__red_8php.html#a0f139dea77a94c98f26007963eea639c',1,'post_to_red.php']]], + ['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']]], ['post_5furl',['post_url',['../include_2network_8php.html#aa44d9e33a579d930e9e79c4ebb3d6b5e',1,'network.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']]], ['prepare_5fbody',['prepare_body',['../text_8php.html#ae4df74296fbe55051ed3c035e55205e5',1,'text.php']]], ['prepare_5fpage',['prepare_page',['../conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c',1,'conversation.php']]], diff --git a/doc/html/search/functions_78.js b/doc/html/search/functions_78.js index 0f98f99b9..038aa6810 100644 --- a/doc/html/search/functions_78.js +++ b/doc/html/search/functions_78.js @@ -7,5 +7,6 @@ var searchData= ['xml2array',['xml2array',['../include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff',1,'network.php']]], ['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']]] ]; diff --git a/doc/html/search/variables_24.js b/doc/html/search/variables_24.js index cca20bbe5..0947880f2 100644 --- a/doc/html/search/variables_24.js +++ b/doc/html/search/variables_24.js @@ -15,17 +15,19 @@ var searchData= ['_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']]], ['_24cached_5fprofile_5fimage',['$cached_profile_image',['../classApp.html#abe0e4fa91097f7a6588e1213a834121c',1,'App']]], ['_24cached_5fprofile_5fpicdate',['$cached_profile_picdate',['../classApp.html#aab4a685d15a363bb1d7edbbc20bfb94e',1,'App']]], ['_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()']]], + ['_24channel',['$channel',['../classApp.html#a050b0696118da47e8b30859ad1a2c149',1,'App\$channel()'],['../classItem.html#acc32426c0f465391be8a99ad810c7b8e',1,'Item\$channel()'],['../theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864',1,'$channel(): theme_init.php']]], ['_24channel_5fid',['$channel_id',['../classRedDirectory.html#ae624dcaa4d73a517f4b1616d33df690d',1,'RedDirectory']]], ['_24children',['$children',['../classItem.html#a80dcd0fb7673776c0967839d429c2a0f',1,'Item']]], ['_24cid',['$cid',['../classApp.html#ad1c8eb91a6fd470b94f34b7fdad3a2d0',1,'App']]], ['_24cipher',['$cipher',['../classConversation.html#aa95c1a62af38bdfba7add9549bec083b',1,'Conversation']]], ['_24cmd',['$cmd',['../classApp.html#a495ec082c2719314e536070ca1ce073d',1,'App']]], ['_24comment_5fbox_5ftemplate',['$comment_box_template',['../classItem.html#a90743c8348b13213275c223bb9333aa0',1,'Item']]], + ['_24comment_5findent',['$comment_indent',['../redbasic_2php_2style_8php.html#a5bff5012c56e34da6b3b2ed475726b27',1,'style.php']]], ['_24commentable',['$commentable',['../classConversation.html#afd4965d22a6e4bfea2f35e931b3273c6',1,'Conversation\$commentable()'],['../classItem.html#aa2c221231ad0fc3720ccc1f00f0c6304',1,'Item\$commentable()']]], ['_24config',['$config',['../classApp.html#ac73dc90e4764497e2f1b7e6612c8fb88',1,'App']]], ['_24connected',['$connected',['../classdba__driver.html#a205f6535e399700b6fca2492f96f2229',1,'dba_driver']]], @@ -97,7 +99,11 @@ var searchData= ['_24perms',['$perms',['../classApp.html#ab47de68fa39806d1fb0976407e188b77',1,'App']]], ['_24phpath',['$phpath',['../typo_8php.html#a3ecd17ac846be1b35f3662f5c12ab6bd',1,'typo.php']]], ['_24phpfile',['$phpfile',['../php2po_8php.html#abbb0e5fd8fbc1f13a9bf68f86eb3d2a4',1,'php2po.php']]], + ['_24plugin',['$plugin',['../post__to__red_8php.html#ada8a7130088351710bb02ed622d6bf65',1,'post_to_red.php']]], + ['_24plugin_5fdir',['$plugin_dir',['../post__to__red_8php.html#a99811555b30bde504a863e44015f2f19',1,'post_to_red.php']]], ['_24plugins',['$plugins',['../classApp.html#ae9f96338f32187d308b67b980eea0008',1,'App']]], + ['_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']]], ['_24prepared_5fitem',['$prepared_item',['../classConversation.html#a5b6adbb2fe24f0f53d6c22660dff91b2',1,'Conversation']]], ['_24preview',['$preview',['../classConversation.html#ae9937f9e0f3d927acc2bed46cc72e9ae',1,'Conversation']]], @@ -111,6 +117,7 @@ var searchData= ['_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']]], ['_24s',['$s',['../extract_8php.html#a50b05cf2e02ef0b67fcad97106dd7634',1,'extract.php']]], ['_24schema',['$schema',['../redbasic_2php_2style_8php.html#a83022b1d70799d2bde3d64dca9cb40ee',1,'style.php']]], @@ -137,6 +144,7 @@ var searchData= ['_24timezone',['$timezone',['../classApp.html#ab35b01a366a2ea95725e97af278f87ab',1,'App']]], ['_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']]], @@ -151,5 +159,6 @@ var searchData= ['_24widgets',['$widgets',['../classApp.html#aa5a87c46ab3fee21362c466bf78042ef',1,'App']]], ['_24width',['$width',['../classphoto__driver.html#a3e4215890f4a4894bf3799a7d2e0c0b1',1,'photo_driver\$width()'],['../minimalisticdarkness_8php.html#a5795120b4b324bc4ca83f1e6fdce7d57',1,'$width(): minimalisticdarkness.php']]], ['_24writable',['$writable',['../classConversation.html#ae81221251307e315f566a11f921ce0a9',1,'Conversation']]], + ['_24wwtop',['$wwtop',['../redbasic_2php_2style_8php.html#a61891d0d3e6894f52410d507b04e565d',1,'style.php']]], ['_24zones',['$zones',['../extract_8php.html#a0cbe524ffc9a496114fd7ba9f423ef44',1,'extract.php']]] ]; diff --git a/doc/html/search/variables_70.js b/doc/html/search/variables_70.js index 13097a52d..333736820 100644 --- a/doc/html/search/variables_70.js +++ b/doc/html/search/variables_70.js @@ -41,5 +41,8 @@ var searchData= ['poll_5fmultiple_5fchoice',['POLL_MULTIPLE_CHOICE',['../boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86',1,'boot.php']]], ['poll_5foverwrite',['POLL_OVERWRITE',['../boot_8php.html#a2b525996e4426bdddbcec277778bde08',1,'boot.php']]], ['poll_5fsimple_5frating',['POLL_SIMPLE_RATING',['../boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5',1,'boot.php']]], - ['poll_5ftenscale',['POLL_TENSCALE',['../boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc',1,'boot.php']]] + ['poll_5ftenscale',['POLL_TENSCALE',['../boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc',1,'boot.php']]], + ['post_5fto_5fred_5facct_5fname',['post_to_red_acct_name',['../post__to__red_8php.html#a588cea66afe0b32f27f2713d44940119',1,'post_to_red.php']]], + ['post_5fto_5fred_5fpath',['post_to_red_path',['../post__to__red_8php.html#a6210f39392a5f0fa0255cc7d3760493a',1,'post_to_red.php']]], + ['post_5fto_5fred_5fversion',['post_to_red_version',['../post__to__red_8php.html#af3e7ebd361d4ed7cb6d43209970cd94a',1,'post_to_red.php']]] ]; diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index 264044b48..052071915 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -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(), 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(), dfrn_deliver(), directory_content(), directory_run(), email_send(), encode_item(), expire_run(), feed_init(), fetch_lrdd_template(), fetch_xrd_links(), 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_xchan(), 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(), lrdd(), magic_init(), mail_store(), menu_edit(), message_post(), mini_group_select(), mood_init(), network_content(), 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_fetch(), zot_finger(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().

    +

    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(), 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(), dfrn_deliver(), directory_content(), directory_run(), email_send(), encode_item(), expire_run(), feed_init(), fetch_lrdd_template(), fetch_xrd_links(), 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_xchan(), 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(), lrdd(), 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().

    @@ -1565,7 +1565,7 @@ Variables
    -

    Referenced by conversation(), email_send(), Item\get_template_data(), and page_content().

    +

    Referenced by conversation(), email_send(), and Item\get_template_data().

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

    diff --git a/doc/html/theme__init_8php.html b/doc/html/theme__init_8php.html index dc0daa242..262bf0941 100644 --- a/doc/html/theme__init_8php.html +++ b/doc/html/theme__init_8php.html @@ -103,10 +103,34 @@ $(document).ready(function(){initNavTree('theme__init_8php.html','');});
    +
    +Variables
    theme_init.php File Reference
    + + + + +

    +Variables

     $channel = get_app()->get_channel()
     
    +

    Variable Documentation

    + +
    +
    + + + + +
    $channel = get_app()->get_channel()
    +
    +

    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_create_item(), photos_list_photos(), ping_init(), poke_init(), post_activity_item(), probe_content(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), profile_init(), profile_photo_init(), profile_photo_post(), profile_tabs(), 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/theme__init_8php.js b/doc/html/theme__init_8php.js new file mode 100644 index 000000000..5500e5a4f --- /dev/null +++ b/doc/html/theme__init_8php.js @@ -0,0 +1,4 @@ +var theme__init_8php = +[ + [ "$channel", "theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864", null ] +]; \ No newline at end of file -- cgit v1.2.3 From 34f8b215114f1041094784c9f931d185b78b0ec2 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 22 Nov 2013 11:52:38 -0800 Subject: init_groups_visitor() was still using old array of id output (not the newer array of hash which we need for permission queries) --- include/security.php | 4 +- util/messages.po | 796 ++++++++++++++++++++++++------------------------ version.inc | 2 +- view/php/theme_init.php | 3 + 4 files changed, 402 insertions(+), 403 deletions(-) diff --git a/include/security.php b/include/security.php index 1181e6bf2..296fa450f 100644 --- a/include/security.php +++ b/include/security.php @@ -386,12 +386,12 @@ function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'f if(! function_exists('init_groups_visitor')) { function init_groups_visitor($contact_id) { $groups = array(); - $r = q("SELECT gid FROM group_member WHERE xchan = '%s' ", + $r = q("SELECT hash FROM `group` left join group_member on group.id = group_member.gid WHERE xchan = '%s' ", dbesc($contact_id) ); if(count($r)) { foreach($r as $rr) - $groups[] = $rr['gid']; + $groups[] = $rr['hash']; } return $groups; }} diff --git a/util/messages.po b/util/messages.po index d53d35f3a..958d9e046 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2013-11-15.498\n" +"Project-Id-Version: 2013-11-22.505\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-15 00:03-0800\n" +"POT-Creation-Date: 2013-11-22 00:02-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -61,6 +61,10 @@ msgstr "" msgid "Red Matrix Notification" msgstr "" +#: ../../include/enotify.php:37 +msgid "redmatrix" +msgstr "" + #: ../../include/enotify.php:39 msgid "Thank You," msgstr "" @@ -82,7 +86,7 @@ msgstr "" #: ../../include/enotify.php:82 #, php-format -msgid "%1$s sent you a new private message at %2$s." +msgid "%1$s, %2$s sent you a new private message at %3$s." msgstr "" #: ../../include/enotify.php:83 @@ -153,7 +157,7 @@ msgstr "" #: ../../include/enotify.php:201 #, php-format -msgid "%1$s tagged you at %2$s" +msgid "%1$s, %2$s tagged you at %3$s" msgstr "" #: ../../include/enotify.php:202 @@ -168,7 +172,7 @@ msgstr "" #: ../../include/enotify.php:215 #, php-format -msgid "%1$s poked you at %2$s" +msgid "%1$s, %2$s poked you at %3$s" msgstr "" #: ../../include/enotify.php:216 @@ -247,7 +251,7 @@ msgid "Private Message" msgstr "" #: ../../include/ItemObject.php:95 ../../include/page_widgets.php:8 -#: ../../mod/webpages.php:101 ../../mod/settings.php:712 ../../mod/menu.php:55 +#: ../../mod/webpages.php:101 ../../mod/settings.php:713 ../../mod/menu.php:55 #: ../../mod/layouts.php:102 ../../mod/editlayout.php:100 #: ../../mod/editwebpage.php:119 ../../mod/blocks.php:93 #: ../../mod/editpost.php:97 ../../mod/editblock.php:114 @@ -255,8 +259,8 @@ msgid "Edit" msgstr "" #: ../../include/ItemObject.php:107 ../../include/conversation.php:628 -#: ../../mod/settings.php:713 ../../mod/admin.php:677 ../../mod/group.php:182 -#: ../../mod/photos.php:1130 ../../mod/connections.php:354 +#: ../../mod/settings.php:714 ../../mod/admin.php:686 ../../mod/group.php:182 +#: ../../mod/photos.php:1130 ../../mod/connections.php:374 #: ../../mod/filestorage.php:82 msgid "Delete" msgstr "" @@ -380,20 +384,20 @@ msgstr "" #: ../../include/ItemObject.php:530 ../../mod/events.php:458 #: ../../mod/thing.php:190 ../../mod/invite.php:154 ../../mod/setup.php:302 -#: ../../mod/setup.php:345 ../../mod/settings.php:650 -#: ../../mod/settings.php:762 ../../mod/settings.php:790 -#: ../../mod/settings.php:814 ../../mod/settings.php:885 -#: ../../mod/settings.php:1053 ../../mod/connect.php:96 +#: ../../mod/setup.php:345 ../../mod/settings.php:651 +#: ../../mod/settings.php:763 ../../mod/settings.php:791 +#: ../../mod/settings.php:815 ../../mod/settings.php:886 +#: ../../mod/settings.php:1054 ../../mod/connect.php:96 #: ../../mod/sources.php:83 ../../mod/sources.php:110 ../../mod/admin.php:418 -#: ../../mod/admin.php:670 ../../mod/admin.php:810 ../../mod/admin.php:1009 -#: ../../mod/admin.php:1096 ../../mod/group.php:87 ../../mod/photos.php:685 +#: ../../mod/admin.php:679 ../../mod/admin.php:819 ../../mod/admin.php:1018 +#: ../../mod/admin.php:1105 ../../mod/group.php:87 ../../mod/photos.php:685 #: ../../mod/photos.php:779 ../../mod/photos.php:1040 #: ../../mod/photos.php:1080 ../../mod/photos.php:1167 #: ../../mod/message.php:333 ../../mod/message.php:515 -#: ../../mod/connections.php:432 ../../mod/profiles.php:529 +#: ../../mod/connections.php:452 ../../mod/profiles.php:529 #: ../../mod/import.php:385 ../../mod/crepair.php:166 ../../mod/poke.php:166 #: ../../mod/fsuggest.php:108 ../../mod/mood.php:137 -#: ../../view/theme/redbasic/php/config.php:79 +#: ../../view/theme/redbasic/php/config.php:85 #: ../../view/theme/apw/php/config.php:231 msgid "Submit" msgstr "" @@ -445,7 +449,7 @@ msgstr "" #: ../../include/Contact.php:87 ../../include/contact_widgets.php:23 #: ../../mod/match.php:58 ../../mod/suggest.php:56 ../../mod/directory.php:198 -#: ../../boot.php:1745 +#: ../../boot.php:1741 msgid "Connect" msgstr "" @@ -466,8 +470,8 @@ msgid "View Status" msgstr "" #: ../../include/Contact.php:526 ../../include/nav.php:76 -#: ../../include/conversation.php:925 ../../mod/connections.php:307 -#: ../../mod/connections.php:421 +#: ../../include/conversation.php:925 ../../mod/connections.php:327 +#: ../../mod/connections.php:441 msgid "View Profile" msgstr "" @@ -547,8 +551,8 @@ msgstr "" msgid "RSS/Atom" msgstr "" -#: ../../include/contact_selectors.php:77 ../../mod/admin.php:673 -#: ../../mod/admin.php:682 ../../boot.php:1465 +#: ../../include/contact_selectors.php:77 ../../mod/admin.php:682 +#: ../../mod/admin.php:691 ../../boot.php:1461 msgid "Email" msgstr "" @@ -667,7 +671,7 @@ msgid "Finishes:" msgstr "" #: ../../include/event.php:40 ../../include/bb2diaspora.php:455 -#: ../../mod/events.php:450 ../../mod/directory.php:173 ../../boot.php:1795 +#: ../../mod/events.php:450 ../../mod/directory.php:173 ../../boot.php:1791 msgid "Location:" msgstr "" @@ -827,14 +831,6 @@ msgstr "" msgid "Post/Comment Tools" msgstr "" -#: ../../include/features.php:56 -msgid "Multiple Deletion" -msgstr "" - -#: ../../include/features.php:56 -msgid "Select and delete multiple posts/comments at once" -msgstr "" - #: ../../include/features.php:57 msgid "Edit Sent Posts" msgstr "" @@ -1059,12 +1055,12 @@ msgstr "" msgid "Profile" msgstr "" -#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1061 +#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1062 msgid "Full Name:" msgstr "" #: ../../include/profile_advanced.php:17 ../../mod/directory.php:175 -#: ../../boot.php:1797 +#: ../../boot.php:1793 msgid "Gender:" msgstr "" @@ -1085,7 +1081,7 @@ msgid "Age:" msgstr "" #: ../../include/profile_advanced.php:37 ../../mod/directory.php:177 -#: ../../boot.php:1798 +#: ../../boot.php:1794 msgid "Status:" msgstr "" @@ -1099,7 +1095,7 @@ msgid "Sexual Preference:" msgstr "" #: ../../include/profile_advanced.php:48 ../../mod/directory.php:179 -#: ../../boot.php:1799 +#: ../../boot.php:1795 msgid "Homepage:" msgstr "" @@ -1503,7 +1499,7 @@ msgstr "" msgid "Pages" msgstr "" -#: ../../include/identity.php:14 ../../mod/item.php:1131 +#: ../../include/identity.php:14 ../../mod/item.php:1123 msgid "Unable to obtain identity information from database" msgstr "" @@ -1537,7 +1533,7 @@ msgid "Default Profile" msgstr "" #: ../../include/identity.php:245 ../../include/profile_selectors.php:42 -#: ../../mod/network.php:387 ../../mod/connections.php:387 +#: ../../mod/network.php:387 ../../mod/connections.php:407 msgid "Friends" msgstr "" @@ -1585,17 +1581,17 @@ 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:3572 ../../mod/common.php:43 +#: ../../include/items.php:3582 ../../mod/common.php:43 #: ../../mod/events.php:134 ../../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:627 +#: ../../mod/page.php:80 ../../mod/setup.php:200 ../../mod/settings.php:628 #: ../../mod/viewconnections.php:33 ../../mod/viewconnections.php:38 #: ../../mod/delegate.php:6 ../../mod/sources.php:48 ../../mod/mitem.php:92 #: ../../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:7 -#: ../../mod/intro.php:50 ../../mod/connections.php:177 +#: ../../mod/intro.php:50 ../../mod/connections.php:197 #: ../../mod/profiles.php:163 ../../mod/profiles.php:476 #: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97 #: ../../mod/filestorage.php:26 ../../mod/manage.php:6 @@ -1606,7 +1602,7 @@ msgstr "" #: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/editpost.php:13 #: ../../mod/poke.php:128 ../../mod/channel.php:123 ../../mod/fsuggest.php:78 #: ../../mod/editblock.php:48 ../../mod/item.php:173 ../../mod/item.php:181 -#: ../../mod/suggest.php:32 ../../mod/register.php:60 ../../mod/regmod.php:18 +#: ../../mod/suggest.php:32 ../../mod/register.php:68 ../../mod/regmod.php:18 #: ../../mod/mood.php:114 ../../index.php:178 ../../index.php:340 msgid "Permission denied." msgstr "" @@ -1628,7 +1624,7 @@ msgstr "" msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:288 ../../boot.php:2246 +#: ../../include/photos.php:288 ../../boot.php:2242 msgid "Photo Albums" msgstr "" @@ -1923,20 +1919,20 @@ msgstr "" msgid "database storage failed." msgstr "" -#: ../../include/zot.php:426 +#: ../../include/zot.php:438 msgid "Invalid data packet" msgstr "" -#: ../../include/zot.php:436 +#: ../../include/zot.php:448 msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:582 +#: ../../include/zot.php:594 #, php-format msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1462 +#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1458 msgid "Logout" msgstr "" @@ -1964,7 +1960,7 @@ msgstr "" msgid "Manage/Edit Profiles" msgstr "" -#: ../../include/nav.php:79 ../../mod/fbrowser.php:25 ../../boot.php:2243 +#: ../../include/nav.php:79 ../../mod/fbrowser.php:25 ../../boot.php:2239 msgid "Photos" msgstr "" @@ -1972,7 +1968,7 @@ msgstr "" msgid "Your photos" msgstr "" -#: ../../include/nav.php:85 ../../boot.php:1463 +#: ../../include/nav.php:85 ../../boot.php:1459 msgid "Login" msgstr "" @@ -1993,7 +1989,7 @@ msgstr "" msgid "Home Page" msgstr "" -#: ../../include/nav.php:125 ../../mod/register.php:187 ../../boot.php:1439 +#: ../../include/nav.php:125 ../../mod/register.php:195 ../../boot.php:1435 msgid "Register" msgstr "" @@ -2001,7 +1997,7 @@ msgstr "" msgid "Create an account" msgstr "" -#: ../../include/nav.php:130 ../../mod/help.php:34 +#: ../../include/nav.php:130 ../../mod/help.php:45 ../../mod/help.php:49 msgid "Help" msgstr "" @@ -2065,7 +2061,7 @@ msgstr "" msgid "Intros" msgstr "" -#: ../../include/nav.php:158 ../../mod/connections.php:565 +#: ../../include/nav.php:158 ../../mod/connections.php:585 msgid "New Connections" msgstr "" @@ -2117,7 +2113,7 @@ msgstr "" msgid "New Message" msgstr "" -#: ../../include/nav.php:174 ../../mod/events.php:348 ../../boot.php:2254 +#: ../../include/nav.php:174 ../../mod/events.php:348 ../../boot.php:2250 msgid "Events" msgstr "" @@ -2142,7 +2138,7 @@ msgid "Manage Your Channels" msgstr "" #: ../../include/nav.php:180 ../../mod/settings.php:131 -#: ../../mod/admin.php:769 ../../mod/admin.php:974 +#: ../../mod/admin.php:778 ../../mod/admin.php:983 msgid "Settings" msgstr "" @@ -2150,7 +2146,7 @@ msgstr "" msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:182 ../../mod/connections.php:671 +#: ../../include/nav.php:182 ../../mod/connections.php:691 msgid "Connections" msgstr "" @@ -2282,7 +2278,7 @@ msgstr "" msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/contact_widgets.php:48 ../../mod/connections.php:677 +#: ../../include/contact_widgets.php:48 ../../mod/connections.php:697 #: ../../mod/directory.php:221 ../../mod/directory.php:226 msgid "Find" msgstr "" @@ -2474,7 +2470,7 @@ msgstr "" msgid "This action is not available under your subscription plan." msgstr "" -#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:56 +#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:62 #: ../../view/theme/apw/php/config.php:176 msgid "Default" msgstr "" @@ -2763,25 +2759,25 @@ msgstr "" msgid "Permission denied" msgstr "" -#: ../../include/items.php:3521 ../../mod/admin.php:150 -#: ../../mod/admin.php:714 ../../mod/admin.php:917 ../../mod/viewsrc.php:18 +#: ../../include/items.php:3531 ../../mod/admin.php:150 +#: ../../mod/admin.php:723 ../../mod/admin.php:926 ../../mod/viewsrc.php:18 #: ../../mod/home.php:64 ../../mod/display.php:32 msgid "Item not found." msgstr "" -#: ../../include/items.php:3693 +#: ../../include/items.php:3703 msgid "Archives" msgstr "" -#: ../../include/items.php:3854 ../../mod/group.php:44 ../../mod/group.php:146 +#: ../../include/items.php:3869 ../../mod/group.php:44 ../../mod/group.php:146 msgid "Collection not found." msgstr "" -#: ../../include/items.php:3870 ../../mod/network.php:469 +#: ../../include/items.php:3885 ../../mod/network.php:469 msgid "Group is empty" msgstr "" -#: ../../include/items.php:3886 +#: ../../include/items.php:3901 msgid "Connection not found." msgstr "" @@ -3024,7 +3020,7 @@ msgstr "" #: ../../mod/webpages.php:8 ../../mod/connect.php:13 ../../mod/layouts.php:8 #: ../../mod/filestorage.php:8 ../../mod/blocks.php:10 ../../mod/profile.php:8 -#: ../../boot.php:1644 +#: ../../boot.php:1640 msgid "Requested profile is not available." msgstr "" @@ -3051,17 +3047,17 @@ msgid "" "and/or create new posts for you?" msgstr "" -#: ../../mod/api.php:105 ../../mod/settings.php:1008 -#: ../../mod/settings.php:1013 ../../mod/settings.php:1036 -#: ../../mod/settings.php:1038 ../../mod/settings.php:1039 -#: ../../mod/settings.php:1040 ../../mod/profiles.php:506 +#: ../../mod/api.php:105 ../../mod/settings.php:1009 +#: ../../mod/settings.php:1014 ../../mod/settings.php:1037 +#: ../../mod/settings.php:1039 ../../mod/settings.php:1040 +#: ../../mod/settings.php:1041 ../../mod/profiles.php:506 msgid "Yes" msgstr "" -#: ../../mod/api.php:106 ../../mod/settings.php:1008 -#: ../../mod/settings.php:1013 ../../mod/settings.php:1036 -#: ../../mod/settings.php:1038 ../../mod/settings.php:1039 -#: ../../mod/settings.php:1040 ../../mod/profiles.php:507 +#: ../../mod/api.php:106 ../../mod/settings.php:1009 +#: ../../mod/settings.php:1014 ../../mod/settings.php:1037 +#: ../../mod/settings.php:1039 ../../mod/settings.php:1040 +#: ../../mod/settings.php:1041 ../../mod/profiles.php:507 msgid "No" msgstr "" @@ -3082,11 +3078,11 @@ msgid "Invalid item." msgstr "" #: ../../mod/page.php:47 ../../mod/chanview.php:78 ../../mod/home.php:51 -#: ../../mod/magic.php:77 ../../mod/wall_upload.php:35 +#: ../../mod/magic.php:95 ../../mod/wall_upload.php:35 msgid "Channel not found." msgstr "" -#: ../../mod/page.php:83 ../../mod/help.php:41 ../../mod/display.php:92 +#: ../../mod/page.php:83 ../../mod/help.php:56 ../../mod/display.php:92 #: ../../index.php:229 msgid "Page not found." msgstr "" @@ -3429,7 +3425,7 @@ msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" -#: ../../mod/rpost.php:83 ../../mod/editpost.php:42 +#: ../../mod/rpost.php:84 ../../mod/editpost.php:42 msgid "Edit post" msgstr "" @@ -3497,7 +3493,7 @@ msgstr "" msgid "Key and Secret are required" msgstr "" -#: ../../mod/settings.php:179 ../../mod/settings.php:676 +#: ../../mod/settings.php:179 ../../mod/settings.php:677 msgid "Update" msgstr "" @@ -3529,380 +3525,380 @@ msgstr "" msgid "System failure storing new email. Please try again." msgstr "" -#: ../../mod/settings.php:578 +#: ../../mod/settings.php:579 msgid "Settings updated." msgstr "" -#: ../../mod/settings.php:649 ../../mod/settings.php:675 -#: ../../mod/settings.php:711 +#: ../../mod/settings.php:650 ../../mod/settings.php:676 +#: ../../mod/settings.php:712 msgid "Add application" msgstr "" -#: ../../mod/settings.php:651 ../../mod/settings.php:677 +#: ../../mod/settings.php:652 ../../mod/settings.php:678 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/fbrowser.php:82 #: ../../mod/fbrowser.php:117 msgid "Cancel" msgstr "" -#: ../../mod/settings.php:652 ../../mod/settings.php:678 -#: ../../mod/admin.php:673 ../../mod/crepair.php:148 +#: ../../mod/settings.php:653 ../../mod/settings.php:679 +#: ../../mod/admin.php:682 ../../mod/crepair.php:148 msgid "Name" msgstr "" -#: ../../mod/settings.php:652 +#: ../../mod/settings.php:653 msgid "Name of application" msgstr "" -#: ../../mod/settings.php:653 ../../mod/settings.php:679 +#: ../../mod/settings.php:654 ../../mod/settings.php:680 msgid "Consumer Key" msgstr "" -#: ../../mod/settings.php:653 ../../mod/settings.php:654 +#: ../../mod/settings.php:654 ../../mod/settings.php:655 msgid "Automatically generated - change if desired. Max length 20" msgstr "" -#: ../../mod/settings.php:654 ../../mod/settings.php:680 +#: ../../mod/settings.php:655 ../../mod/settings.php:681 msgid "Consumer Secret" msgstr "" -#: ../../mod/settings.php:655 ../../mod/settings.php:681 +#: ../../mod/settings.php:656 ../../mod/settings.php:682 msgid "Redirect" msgstr "" -#: ../../mod/settings.php:655 +#: ../../mod/settings.php:656 msgid "" "Redirect URI - leave blank unless your application specifically requires this" msgstr "" -#: ../../mod/settings.php:656 ../../mod/settings.php:682 +#: ../../mod/settings.php:657 ../../mod/settings.php:683 msgid "Icon url" msgstr "" -#: ../../mod/settings.php:656 +#: ../../mod/settings.php:657 msgid "Optional" msgstr "" -#: ../../mod/settings.php:667 +#: ../../mod/settings.php:668 msgid "You can't edit this application." msgstr "" -#: ../../mod/settings.php:710 +#: ../../mod/settings.php:711 msgid "Connected Apps" msgstr "" -#: ../../mod/settings.php:714 +#: ../../mod/settings.php:715 msgid "Client key starts with" msgstr "" -#: ../../mod/settings.php:715 +#: ../../mod/settings.php:716 msgid "No name" msgstr "" -#: ../../mod/settings.php:716 +#: ../../mod/settings.php:717 msgid "Remove authorization" msgstr "" -#: ../../mod/settings.php:727 +#: ../../mod/settings.php:728 msgid "No feature settings configured" msgstr "" -#: ../../mod/settings.php:735 +#: ../../mod/settings.php:736 msgid "Feature Settings" msgstr "" -#: ../../mod/settings.php:758 +#: ../../mod/settings.php:759 msgid "Account Settings" msgstr "" -#: ../../mod/settings.php:759 +#: ../../mod/settings.php:760 msgid "Password Settings" msgstr "" -#: ../../mod/settings.php:760 +#: ../../mod/settings.php:761 msgid "New Password:" msgstr "" -#: ../../mod/settings.php:761 +#: ../../mod/settings.php:762 msgid "Confirm:" msgstr "" -#: ../../mod/settings.php:761 +#: ../../mod/settings.php:762 msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/settings.php:763 ../../mod/settings.php:1062 +#: ../../mod/settings.php:764 ../../mod/settings.php:1063 msgid "Email Address:" msgstr "" -#: ../../mod/settings.php:764 +#: ../../mod/settings.php:765 msgid "Remove Account" msgstr "" -#: ../../mod/settings.php:765 +#: ../../mod/settings.php:766 msgid "Warning: This action is permanent and cannot be reversed." msgstr "" -#: ../../mod/settings.php:781 +#: ../../mod/settings.php:782 msgid "Off" msgstr "" -#: ../../mod/settings.php:781 +#: ../../mod/settings.php:782 msgid "On" msgstr "" -#: ../../mod/settings.php:788 +#: ../../mod/settings.php:789 msgid "Additional Features" msgstr "" -#: ../../mod/settings.php:813 +#: ../../mod/settings.php:814 msgid "Connector Settings" msgstr "" -#: ../../mod/settings.php:843 ../../mod/admin.php:369 +#: ../../mod/settings.php:844 ../../mod/admin.php:369 msgid "No special theme for mobile devices" msgstr "" -#: ../../mod/settings.php:883 +#: ../../mod/settings.php:884 msgid "Display Settings" msgstr "" -#: ../../mod/settings.php:889 +#: ../../mod/settings.php:890 msgid "Display Theme:" msgstr "" -#: ../../mod/settings.php:890 +#: ../../mod/settings.php:891 msgid "Mobile Theme:" msgstr "" -#: ../../mod/settings.php:891 +#: ../../mod/settings.php:892 msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/settings.php:891 +#: ../../mod/settings.php:892 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/settings.php:892 +#: ../../mod/settings.php:893 msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../mod/settings.php:892 +#: ../../mod/settings.php:893 msgid "Maximum of 100 items" msgstr "" -#: ../../mod/settings.php:893 +#: ../../mod/settings.php:894 msgid "Don't show emoticons" msgstr "" -#: ../../mod/settings.php:929 +#: ../../mod/settings.php:930 msgid "Nobody except yourself" msgstr "" -#: ../../mod/settings.php:930 +#: ../../mod/settings.php:931 msgid "Only those you specifically allow" msgstr "" -#: ../../mod/settings.php:931 +#: ../../mod/settings.php:932 msgid "Anybody in your address book" msgstr "" -#: ../../mod/settings.php:932 +#: ../../mod/settings.php:933 msgid "Anybody on this website" msgstr "" -#: ../../mod/settings.php:933 +#: ../../mod/settings.php:934 msgid "Anybody in this network" msgstr "" -#: ../../mod/settings.php:934 +#: ../../mod/settings.php:935 msgid "Anybody on the internet" msgstr "" -#: ../../mod/settings.php:1008 +#: ../../mod/settings.php:1009 msgid "Publish your default profile in the network directory" msgstr "" -#: ../../mod/settings.php:1013 +#: ../../mod/settings.php:1014 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/settings.php:1017 ../../mod/profile_photo.php:298 +#: ../../mod/settings.php:1018 ../../mod/profile_photo.php:298 msgid "or" msgstr "" -#: ../../mod/settings.php:1022 +#: ../../mod/settings.php:1023 msgid "Your channel address is" msgstr "" -#: ../../mod/settings.php:1033 +#: ../../mod/settings.php:1034 msgid "Automatically expire posts after this many days:" msgstr "" -#: ../../mod/settings.php:1033 +#: ../../mod/settings.php:1034 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: ../../mod/settings.php:1034 +#: ../../mod/settings.php:1035 msgid "Advanced expiration settings" msgstr "" -#: ../../mod/settings.php:1035 +#: ../../mod/settings.php:1036 msgid "Advanced Expiration" msgstr "" -#: ../../mod/settings.php:1036 +#: ../../mod/settings.php:1037 msgid "Expire posts:" msgstr "" -#: ../../mod/settings.php:1038 +#: ../../mod/settings.php:1039 msgid "Expire starred posts:" msgstr "" -#: ../../mod/settings.php:1039 +#: ../../mod/settings.php:1040 msgid "Expire photos:" msgstr "" -#: ../../mod/settings.php:1040 +#: ../../mod/settings.php:1041 msgid "Only expire posts by others:" msgstr "" -#: ../../mod/settings.php:1051 +#: ../../mod/settings.php:1052 msgid "Channel Settings" msgstr "" -#: ../../mod/settings.php:1060 +#: ../../mod/settings.php:1061 msgid "Basic Settings" msgstr "" -#: ../../mod/settings.php:1063 +#: ../../mod/settings.php:1064 msgid "Your Timezone:" msgstr "" -#: ../../mod/settings.php:1064 +#: ../../mod/settings.php:1065 msgid "Default Post Location:" msgstr "" -#: ../../mod/settings.php:1065 +#: ../../mod/settings.php:1066 msgid "Use Browser Location:" msgstr "" -#: ../../mod/settings.php:1067 +#: ../../mod/settings.php:1068 msgid "Adult Content" msgstr "" -#: ../../mod/settings.php:1067 +#: ../../mod/settings.php:1068 msgid "This channel publishes adult content." msgstr "" -#: ../../mod/settings.php:1069 +#: ../../mod/settings.php:1070 msgid "Security and Privacy Settings" msgstr "" -#: ../../mod/settings.php:1071 +#: ../../mod/settings.php:1072 msgid "Quick Privacy Settings:" msgstr "" -#: ../../mod/settings.php:1072 +#: ../../mod/settings.php:1073 msgid "Very Public - extremely permissive" msgstr "" -#: ../../mod/settings.php:1073 +#: ../../mod/settings.php:1074 msgid "Typical - default public, privacy when desired" msgstr "" -#: ../../mod/settings.php:1074 +#: ../../mod/settings.php:1075 msgid "Private - default private, rarely open or public" msgstr "" -#: ../../mod/settings.php:1075 +#: ../../mod/settings.php:1076 msgid "Blocked - default blocked to/from everybody" msgstr "" -#: ../../mod/settings.php:1078 +#: ../../mod/settings.php:1079 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/settings.php:1078 +#: ../../mod/settings.php:1079 msgid "May reduce spam activity" msgstr "" -#: ../../mod/settings.php:1079 +#: ../../mod/settings.php:1080 msgid "Default Post Permissions" msgstr "" -#: ../../mod/settings.php:1080 +#: ../../mod/settings.php:1081 msgid "(click to open/close)" msgstr "" -#: ../../mod/settings.php:1093 +#: ../../mod/settings.php:1094 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../mod/settings.php:1093 +#: ../../mod/settings.php:1094 msgid "Useful to reduce spamming" msgstr "" -#: ../../mod/settings.php:1096 +#: ../../mod/settings.php:1097 msgid "Notification Settings" msgstr "" -#: ../../mod/settings.php:1097 +#: ../../mod/settings.php:1098 msgid "By default post a status message when:" msgstr "" -#: ../../mod/settings.php:1098 +#: ../../mod/settings.php:1099 msgid "accepting a friend request" msgstr "" -#: ../../mod/settings.php:1099 +#: ../../mod/settings.php:1100 msgid "joining a forum/community" msgstr "" -#: ../../mod/settings.php:1100 +#: ../../mod/settings.php:1101 msgid "making an interesting profile change" msgstr "" -#: ../../mod/settings.php:1101 +#: ../../mod/settings.php:1102 msgid "Send a notification email when:" msgstr "" -#: ../../mod/settings.php:1102 +#: ../../mod/settings.php:1103 msgid "You receive an introduction" msgstr "" -#: ../../mod/settings.php:1103 +#: ../../mod/settings.php:1104 msgid "Your introductions are confirmed" msgstr "" -#: ../../mod/settings.php:1104 +#: ../../mod/settings.php:1105 msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/settings.php:1105 +#: ../../mod/settings.php:1106 msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/settings.php:1106 +#: ../../mod/settings.php:1107 msgid "You receive a private message" msgstr "" -#: ../../mod/settings.php:1107 +#: ../../mod/settings.php:1108 msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/settings.php:1108 +#: ../../mod/settings.php:1109 msgid "You are tagged in a post" msgstr "" -#: ../../mod/settings.php:1109 +#: ../../mod/settings.php:1110 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../mod/settings.php:1112 +#: ../../mod/settings.php:1113 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../mod/settings.php:1113 +#: ../../mod/settings.php:1114 msgid "Change the behaviour of this account for special situations" msgstr "" @@ -4082,15 +4078,15 @@ msgstr "" msgid "Site" msgstr "" -#: ../../mod/admin.php:88 ../../mod/admin.php:669 ../../mod/admin.php:681 +#: ../../mod/admin.php:88 ../../mod/admin.php:678 ../../mod/admin.php:690 msgid "Users" msgstr "" -#: ../../mod/admin.php:89 ../../mod/admin.php:767 ../../mod/admin.php:809 +#: ../../mod/admin.php:89 ../../mod/admin.php:776 ../../mod/admin.php:818 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:90 ../../mod/admin.php:972 ../../mod/admin.php:1008 +#: ../../mod/admin.php:90 ../../mod/admin.php:981 ../../mod/admin.php:1017 msgid "Themes" msgstr "" @@ -4102,7 +4098,7 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1095 +#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1104 msgid "Logs" msgstr "" @@ -4119,8 +4115,8 @@ msgid "Message queues" msgstr "" #: ../../mod/admin.php:193 ../../mod/admin.php:416 ../../mod/admin.php:474 -#: ../../mod/admin.php:668 ../../mod/admin.php:766 ../../mod/admin.php:808 -#: ../../mod/admin.php:971 ../../mod/admin.php:1007 ../../mod/admin.php:1094 +#: ../../mod/admin.php:677 ../../mod/admin.php:775 ../../mod/admin.php:817 +#: ../../mod/admin.php:980 ../../mod/admin.php:1016 ../../mod/admin.php:1103 msgid "Administration" msgstr "" @@ -4180,7 +4176,7 @@ msgstr "" msgid "Tiered Access" msgstr "" -#: ../../mod/admin.php:419 ../../mod/register.php:172 +#: ../../mod/admin.php:419 ../../mod/register.php:180 msgid "Registration" msgstr "" @@ -4458,149 +4454,137 @@ msgstr "" msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:650 -msgid "Normal Account" -msgstr "" - -#: ../../mod/admin.php:651 -msgid "Soapbox Account" -msgstr "" - -#: ../../mod/admin.php:652 -msgid "Community/Celebrity Account" -msgstr "" - -#: ../../mod/admin.php:653 -msgid "Automatic Friend Account" -msgstr "" - -#: ../../mod/admin.php:671 +#: ../../mod/admin.php:680 msgid "select all" msgstr "" -#: ../../mod/admin.php:672 +#: ../../mod/admin.php:681 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:673 +#: ../../mod/admin.php:682 msgid "Request date" msgstr "" -#: ../../mod/admin.php:674 +#: ../../mod/admin.php:683 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:675 ../../mod/intro.php:11 ../../mod/intro.php:98 +#: ../../mod/admin.php:684 ../../mod/intro.php:11 ../../mod/intro.php:98 #: ../../mod/notifications.php:159 ../../mod/notifications.php:206 msgid "Approve" msgstr "" -#: ../../mod/admin.php:676 +#: ../../mod/admin.php:685 msgid "Deny" msgstr "" -#: ../../mod/admin.php:678 ../../mod/intro.php:14 ../../mod/intro.php:99 -#: ../../mod/connections.php:328 ../../mod/connections.php:470 +#: ../../mod/admin.php:687 ../../mod/intro.php:14 ../../mod/intro.php:99 +#: ../../mod/connections.php:348 ../../mod/connections.php:490 msgid "Block" msgstr "" -#: ../../mod/admin.php:679 ../../mod/connections.php:328 -#: ../../mod/connections.php:470 +#: ../../mod/admin.php:688 ../../mod/connections.php:348 +#: ../../mod/connections.php:490 msgid "Unblock" msgstr "" -#: ../../mod/admin.php:682 +#: ../../mod/admin.php:691 msgid "Register date" msgstr "" -#: ../../mod/admin.php:682 +#: ../../mod/admin.php:691 msgid "Last login" msgstr "" -#: ../../mod/admin.php:682 +#: ../../mod/admin.php:691 +msgid "Expires" +msgstr "" + +#: ../../mod/admin.php:691 msgid "Service Class" msgstr "" -#: ../../mod/admin.php:684 +#: ../../mod/admin.php:693 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:685 +#: ../../mod/admin.php:694 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:726 +#: ../../mod/admin.php:735 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:730 +#: ../../mod/admin.php:739 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:740 ../../mod/admin.php:942 +#: ../../mod/admin.php:749 ../../mod/admin.php:951 msgid "Disable" msgstr "" -#: ../../mod/admin.php:742 ../../mod/admin.php:944 +#: ../../mod/admin.php:751 ../../mod/admin.php:953 msgid "Enable" msgstr "" -#: ../../mod/admin.php:768 ../../mod/admin.php:973 +#: ../../mod/admin.php:777 ../../mod/admin.php:982 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:776 ../../mod/admin.php:983 +#: ../../mod/admin.php:785 ../../mod/admin.php:992 msgid "Author: " msgstr "" -#: ../../mod/admin.php:777 ../../mod/admin.php:984 +#: ../../mod/admin.php:786 ../../mod/admin.php:993 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:906 +#: ../../mod/admin.php:915 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:965 +#: ../../mod/admin.php:974 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:1013 +#: ../../mod/admin.php:1022 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:1014 +#: ../../mod/admin.php:1023 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:1041 +#: ../../mod/admin.php:1050 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:1097 +#: ../../mod/admin.php:1106 msgid "Clear" msgstr "" -#: ../../mod/admin.php:1103 +#: ../../mod/admin.php:1112 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:1104 +#: ../../mod/admin.php:1113 msgid "Log file" msgstr "" -#: ../../mod/admin.php:1104 +#: ../../mod/admin.php:1113 msgid "" "Must be writable by web server. Relative to your Red top-level directory." msgstr "" -#: ../../mod/admin.php:1105 +#: ../../mod/admin.php:1114 msgid "Log level" msgstr "" @@ -4908,11 +4892,11 @@ msgstr "" msgid "added your channel" msgstr "" -#: ../../mod/ping.php:230 ../../boot.php:1862 ../../boot.php:1942 +#: ../../mod/ping.php:230 ../../boot.php:1858 ../../boot.php:1938 msgid "g A l F d" msgstr "" -#: ../../mod/ping.php:252 ../../boot.php:1908 ../../boot.php:1983 +#: ../../mod/ping.php:252 ../../boot.php:1904 ../../boot.php:1979 msgid "[today]" msgstr "" @@ -4949,7 +4933,7 @@ msgid "Drop" msgstr "" #: ../../mod/menu.php:57 ../../mod/network.php:321 -#: ../../mod/connections.php:532 +#: ../../mod/connections.php:552 msgid "New" msgstr "" @@ -5116,11 +5100,11 @@ msgstr "" msgid "Layout Name" msgstr "" -#: ../../mod/help.php:30 +#: ../../mod/help.php:41 msgid "Help:" msgstr "" -#: ../../mod/help.php:38 ../../index.php:226 +#: ../../mod/help.php:53 ../../index.php:226 msgid "Not Found" msgstr "" @@ -5188,11 +5172,11 @@ msgstr "" msgid "Refresh" msgstr "" -#: ../../mod/network.php:385 ../../mod/connections.php:384 +#: ../../mod/network.php:385 ../../mod/connections.php:404 msgid "Me" msgstr "" -#: ../../mod/network.php:386 ../../mod/connections.php:386 +#: ../../mod/network.php:386 ../../mod/connections.php:406 msgid "Best Friends" msgstr "" @@ -5200,11 +5184,11 @@ msgstr "" msgid "Co-workers" msgstr "" -#: ../../mod/network.php:389 ../../mod/connections.php:388 +#: ../../mod/network.php:389 ../../mod/connections.php:408 msgid "Former Friends" msgstr "" -#: ../../mod/network.php:390 ../../mod/connections.php:389 +#: ../../mod/network.php:390 ../../mod/connections.php:409 msgid "Acquaintances" msgstr "" @@ -5229,7 +5213,7 @@ msgid "Invalid connection." msgstr "" #: ../../mod/intro.php:17 ../../mod/intro.php:100 -#: ../../mod/connections.php:335 ../../mod/connections.php:471 +#: ../../mod/connections.php:355 ../../mod/connections.php:491 #: ../../mod/notifications.php:51 ../../mod/notifications.php:162 #: ../../mod/notifications.php:208 msgid "Ignore" @@ -5255,7 +5239,7 @@ msgstr "" msgid "System error. Please try again later." msgstr "" -#: ../../mod/intro.php:95 ../../mod/connections.php:476 +#: ../../mod/intro.php:95 ../../mod/connections.php:496 #: ../../mod/notifications.php:155 ../../mod/notifications.php:202 msgid "Hide this contact from others" msgstr "" @@ -5287,373 +5271,373 @@ msgstr "" msgid "Failed to update connection record." msgstr "" -#: ../../mod/connections.php:199 +#: ../../mod/connections.php:219 msgid "Could not access address book record." msgstr "" -#: ../../mod/connections.php:213 +#: ../../mod/connections.php:233 msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../mod/connections.php:220 +#: ../../mod/connections.php:240 msgid "Channel has been unblocked" msgstr "" -#: ../../mod/connections.php:221 +#: ../../mod/connections.php:241 msgid "Channel has been blocked" msgstr "" -#: ../../mod/connections.php:225 ../../mod/connections.php:237 -#: ../../mod/connections.php:249 ../../mod/connections.php:261 -#: ../../mod/connections.php:276 +#: ../../mod/connections.php:245 ../../mod/connections.php:257 +#: ../../mod/connections.php:269 ../../mod/connections.php:281 +#: ../../mod/connections.php:296 msgid "Unable to set address book parameters." msgstr "" -#: ../../mod/connections.php:232 +#: ../../mod/connections.php:252 msgid "Channel has been unignored" msgstr "" -#: ../../mod/connections.php:233 +#: ../../mod/connections.php:253 msgid "Channel has been ignored" msgstr "" -#: ../../mod/connections.php:244 +#: ../../mod/connections.php:264 msgid "Channel has been unarchived" msgstr "" -#: ../../mod/connections.php:245 +#: ../../mod/connections.php:265 msgid "Channel has been archived" msgstr "" -#: ../../mod/connections.php:256 +#: ../../mod/connections.php:276 msgid "Channel has been unhidden" msgstr "" -#: ../../mod/connections.php:257 +#: ../../mod/connections.php:277 msgid "Channel has been hidden" msgstr "" -#: ../../mod/connections.php:271 +#: ../../mod/connections.php:291 msgid "Channel has been approved" msgstr "" -#: ../../mod/connections.php:272 +#: ../../mod/connections.php:292 msgid "Channel has been unapproved" msgstr "" -#: ../../mod/connections.php:290 +#: ../../mod/connections.php:310 msgid "Contact has been removed." msgstr "" -#: ../../mod/connections.php:310 +#: ../../mod/connections.php:330 #, php-format msgid "View %s's profile" msgstr "" -#: ../../mod/connections.php:314 +#: ../../mod/connections.php:334 msgid "Refresh Permissions" msgstr "" -#: ../../mod/connections.php:317 +#: ../../mod/connections.php:337 msgid "Fetch updated permissions" msgstr "" -#: ../../mod/connections.php:321 +#: ../../mod/connections.php:341 msgid "Recent Activity" msgstr "" -#: ../../mod/connections.php:324 +#: ../../mod/connections.php:344 msgid "View recent posts and comments" msgstr "" -#: ../../mod/connections.php:331 +#: ../../mod/connections.php:351 msgid "Block or Unblock this connection" msgstr "" -#: ../../mod/connections.php:335 ../../mod/connections.php:471 +#: ../../mod/connections.php:355 ../../mod/connections.php:491 msgid "Unignore" msgstr "" -#: ../../mod/connections.php:338 +#: ../../mod/connections.php:358 msgid "Ignore or Unignore this connection" msgstr "" -#: ../../mod/connections.php:341 +#: ../../mod/connections.php:361 msgid "Unarchive" msgstr "" -#: ../../mod/connections.php:341 +#: ../../mod/connections.php:361 msgid "Archive" msgstr "" -#: ../../mod/connections.php:344 +#: ../../mod/connections.php:364 msgid "Archive or Unarchive this connection" msgstr "" -#: ../../mod/connections.php:347 +#: ../../mod/connections.php:367 msgid "Unhide" msgstr "" -#: ../../mod/connections.php:347 +#: ../../mod/connections.php:367 msgid "Hide" msgstr "" -#: ../../mod/connections.php:350 +#: ../../mod/connections.php:370 msgid "Hide or Unhide this connection" msgstr "" -#: ../../mod/connections.php:357 +#: ../../mod/connections.php:377 msgid "Delete this connection" msgstr "" -#: ../../mod/connections.php:390 +#: ../../mod/connections.php:410 msgid "Unknown" msgstr "" -#: ../../mod/connections.php:400 ../../mod/connections.php:429 +#: ../../mod/connections.php:420 ../../mod/connections.php:449 msgid "Approve this connection" msgstr "" -#: ../../mod/connections.php:400 +#: ../../mod/connections.php:420 msgid "Accept connection to allow communication" msgstr "" -#: ../../mod/connections.php:416 +#: ../../mod/connections.php:436 msgid "Automatic Permissions Settings" msgstr "" -#: ../../mod/connections.php:416 +#: ../../mod/connections.php:436 #, php-format msgid "Connections: settings for %s" msgstr "" -#: ../../mod/connections.php:420 +#: ../../mod/connections.php:440 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:422 +#: ../../mod/connections.php:442 msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../mod/connections.php:428 +#: ../../mod/connections.php:448 msgid "inherited" msgstr "" -#: ../../mod/connections.php:430 +#: ../../mod/connections.php:450 msgid "Connection has no individual permissions!" msgstr "" -#: ../../mod/connections.php:431 +#: ../../mod/connections.php:451 msgid "" "This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"." msgstr "" -#: ../../mod/connections.php:433 +#: ../../mod/connections.php:453 msgid "Profile Visibility" msgstr "" -#: ../../mod/connections.php:434 +#: ../../mod/connections.php:454 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../mod/connections.php:435 +#: ../../mod/connections.php:455 msgid "Contact Information / Notes" msgstr "" -#: ../../mod/connections.php:436 +#: ../../mod/connections.php:456 msgid "Edit contact notes" msgstr "" -#: ../../mod/connections.php:438 +#: ../../mod/connections.php:458 msgid "Their Settings" msgstr "" -#: ../../mod/connections.php:439 +#: ../../mod/connections.php:459 msgid "My Settings" msgstr "" -#: ../../mod/connections.php:441 +#: ../../mod/connections.php:461 msgid "Forum Members" msgstr "" -#: ../../mod/connections.php:442 +#: ../../mod/connections.php:462 msgid "Soapbox" msgstr "" -#: ../../mod/connections.php:443 +#: ../../mod/connections.php:463 msgid "Full Sharing" msgstr "" -#: ../../mod/connections.php:444 +#: ../../mod/connections.php:464 msgid "Cautious Sharing" msgstr "" -#: ../../mod/connections.php:445 +#: ../../mod/connections.php:465 msgid "Follow Only" msgstr "" -#: ../../mod/connections.php:446 +#: ../../mod/connections.php:466 msgid "Individual Permissions" msgstr "" -#: ../../mod/connections.php:447 +#: ../../mod/connections.php:467 msgid "" "Some permissions may be inherited from your privacy " "settings, which have higher priority. Changing those on this page will " "have no effect." msgstr "" -#: ../../mod/connections.php:448 +#: ../../mod/connections.php:468 msgid "Advanced Permissions" msgstr "" -#: ../../mod/connections.php:449 +#: ../../mod/connections.php:469 msgid "Quick Links" msgstr "" -#: ../../mod/connections.php:453 +#: ../../mod/connections.php:473 #, php-format msgid "Visit %s's profile - %s" msgstr "" -#: ../../mod/connections.php:454 +#: ../../mod/connections.php:474 msgid "Block/Unblock contact" msgstr "" -#: ../../mod/connections.php:455 +#: ../../mod/connections.php:475 msgid "Ignore contact" msgstr "" -#: ../../mod/connections.php:456 +#: ../../mod/connections.php:476 msgid "Repair URL settings" msgstr "" -#: ../../mod/connections.php:457 +#: ../../mod/connections.php:477 msgid "View conversations" msgstr "" -#: ../../mod/connections.php:459 +#: ../../mod/connections.php:479 msgid "Delete contact" msgstr "" -#: ../../mod/connections.php:462 +#: ../../mod/connections.php:482 msgid "Last update:" msgstr "" -#: ../../mod/connections.php:464 +#: ../../mod/connections.php:484 msgid "Update public posts" msgstr "" -#: ../../mod/connections.php:466 +#: ../../mod/connections.php:486 msgid "Update now" msgstr "" -#: ../../mod/connections.php:472 +#: ../../mod/connections.php:492 msgid "Currently blocked" msgstr "" -#: ../../mod/connections.php:473 +#: ../../mod/connections.php:493 msgid "Currently ignored" msgstr "" -#: ../../mod/connections.php:474 +#: ../../mod/connections.php:494 msgid "Currently archived" msgstr "" -#: ../../mod/connections.php:475 +#: ../../mod/connections.php:495 msgid "Currently pending" msgstr "" -#: ../../mod/connections.php:476 +#: ../../mod/connections.php:496 msgid "" "Replies/likes to your public posts may still be visible" msgstr "" -#: ../../mod/connections.php:512 ../../mod/connections.php:584 +#: ../../mod/connections.php:532 ../../mod/connections.php:604 msgid "Blocked" msgstr "" -#: ../../mod/connections.php:517 ../../mod/connections.php:591 +#: ../../mod/connections.php:537 ../../mod/connections.php:611 msgid "Ignored" msgstr "" -#: ../../mod/connections.php:522 ../../mod/connections.php:605 +#: ../../mod/connections.php:542 ../../mod/connections.php:625 msgid "Hidden" msgstr "" -#: ../../mod/connections.php:527 ../../mod/connections.php:598 +#: ../../mod/connections.php:547 ../../mod/connections.php:618 msgid "Archived" msgstr "" -#: ../../mod/connections.php:538 +#: ../../mod/connections.php:558 msgid "All" msgstr "" -#: ../../mod/connections.php:559 +#: ../../mod/connections.php:579 msgid "Suggestions" msgstr "" -#: ../../mod/connections.php:562 +#: ../../mod/connections.php:582 msgid "Suggest new connections" msgstr "" -#: ../../mod/connections.php:568 +#: ../../mod/connections.php:588 msgid "Show pending (new) connections" msgstr "" -#: ../../mod/connections.php:571 +#: ../../mod/connections.php:591 msgid "All Connections" msgstr "" -#: ../../mod/connections.php:574 +#: ../../mod/connections.php:594 msgid "Show all connections" msgstr "" -#: ../../mod/connections.php:577 +#: ../../mod/connections.php:597 msgid "Unblocked" msgstr "" -#: ../../mod/connections.php:580 +#: ../../mod/connections.php:600 msgid "Only show unblocked connections" msgstr "" -#: ../../mod/connections.php:587 +#: ../../mod/connections.php:607 msgid "Only show blocked connections" msgstr "" -#: ../../mod/connections.php:594 +#: ../../mod/connections.php:614 msgid "Only show ignored connections" msgstr "" -#: ../../mod/connections.php:601 +#: ../../mod/connections.php:621 msgid "Only show archived connections" msgstr "" -#: ../../mod/connections.php:608 +#: ../../mod/connections.php:628 msgid "Only show hidden connections" msgstr "" -#: ../../mod/connections.php:650 +#: ../../mod/connections.php:670 #, php-format msgid "%1$s [%2$s]" msgstr "" -#: ../../mod/connections.php:651 ../../mod/nogroup.php:41 +#: ../../mod/connections.php:671 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "" -#: ../../mod/connections.php:675 +#: ../../mod/connections.php:695 msgid "Search your connections" msgstr "" -#: ../../mod/connections.php:676 +#: ../../mod/connections.php:696 msgid "Finding: " msgstr "" @@ -5913,23 +5897,23 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:624 ../../boot.php:1759 +#: ../../mod/profiles.php:624 ../../boot.php:1755 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:625 ../../boot.php:1766 +#: ../../mod/profiles.php:625 ../../boot.php:1762 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:636 ../../boot.php:1780 +#: ../../mod/profiles.php:636 ../../boot.php:1776 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:639 ../../boot.php:1783 +#: ../../mod/profiles.php:639 ../../boot.php:1779 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:640 ../../boot.php:1784 +#: ../../mod/profiles.php:640 ../../boot.php:1780 msgid "Edit visibility" msgstr "" @@ -6010,7 +5994,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1473 +#: ../../mod/lostpass.php:85 ../../boot.php:1469 msgid "Password Reset" msgstr "" @@ -6552,7 +6536,7 @@ msgstr "" msgid "Make this post private" msgstr "" -#: ../../mod/wall_upload.php:41 ../../mod/item.php:1057 +#: ../../mod/wall_upload.php:41 ../../mod/item.php:1049 msgid "Wall Photos" msgstr "" @@ -6633,12 +6617,12 @@ msgstr "" msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:1136 +#: ../../mod/item.php:1128 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../mod/item.php:1142 +#: ../../mod/item.php:1134 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" @@ -6721,69 +6705,69 @@ msgstr "" msgid "Registration Policy" msgstr "" -#: ../../mod/register.php:35 +#: ../../mod/register.php:43 msgid "Maximum daily site registrations exceeded. Please try again tomorrow." msgstr "" -#: ../../mod/register.php:41 +#: ../../mod/register.php:49 msgid "" "Please indicate acceptance of the Terms of Service. Registration failed." msgstr "" -#: ../../mod/register.php:69 +#: ../../mod/register.php:77 msgid "Passwords do not match." msgstr "" -#: ../../mod/register.php:97 +#: ../../mod/register.php:105 msgid "" "Registration successful. Please check your email for validation instructions." msgstr "" -#: ../../mod/register.php:103 +#: ../../mod/register.php:111 msgid "Your registration is pending approval by the site owner." msgstr "" -#: ../../mod/register.php:106 +#: ../../mod/register.php:114 msgid "Your registration can not be processed." msgstr "" -#: ../../mod/register.php:141 +#: ../../mod/register.php:149 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." msgstr "" -#: ../../mod/register.php:152 +#: ../../mod/register.php:160 msgid "Terms of Service" msgstr "" -#: ../../mod/register.php:158 +#: ../../mod/register.php:166 #, php-format msgid "I accept the %s for this website" msgstr "" -#: ../../mod/register.php:160 +#: ../../mod/register.php:168 #, php-format msgid "I am over 13 years of age and accept the %s for this website" msgstr "" -#: ../../mod/register.php:175 +#: ../../mod/register.php:183 msgid "Membership on this site is by invitation only." msgstr "" -#: ../../mod/register.php:176 +#: ../../mod/register.php:184 msgid "Please enter your invitation code" msgstr "" -#: ../../mod/register.php:179 +#: ../../mod/register.php:187 msgid "Your email address" msgstr "" -#: ../../mod/register.php:180 +#: ../../mod/register.php:188 msgid "Choose a password" msgstr "" -#: ../../mod/register.php:181 +#: ../../mod/register.php:189 msgid "Please re-enter your password" msgstr "" @@ -6791,13 +6775,13 @@ msgstr "" msgid "Please login." msgstr "" -#: ../../mod/post.php:114 +#: ../../mod/post.php:119 msgid "" "Remote authentication blocked. You are logged into this site locally. Please " "logout and retry." msgstr "" -#: ../../mod/post.php:127 +#: ../../mod/post.php:132 #, php-format msgid "Welcome %s. Remote authentication successful." msgstr "" @@ -6858,94 +6842,106 @@ msgstr "" msgid "Set your current mood and tell your friends" msgstr "" -#: ../../view/theme/redbasic/php/config.php:68 +#: ../../view/theme/redbasic/php/config.php:74 msgid "Scheme Default" msgstr "" -#: ../../view/theme/redbasic/php/config.php:69 +#: ../../view/theme/redbasic/php/config.php:75 msgid "red" msgstr "" -#: ../../view/theme/redbasic/php/config.php:70 +#: ../../view/theme/redbasic/php/config.php:76 msgid "black" msgstr "" -#: ../../view/theme/redbasic/php/config.php:71 +#: ../../view/theme/redbasic/php/config.php:77 msgid "silver" msgstr "" -#: ../../view/theme/redbasic/php/config.php:82 +#: ../../view/theme/redbasic/php/config.php:88 #: ../../view/theme/apw/php/config.php:234 msgid "Theme settings" msgstr "" -#: ../../view/theme/redbasic/php/config.php:83 +#: ../../view/theme/redbasic/php/config.php:89 #: ../../view/theme/apw/php/config.php:235 msgid "Set scheme" msgstr "" -#: ../../view/theme/redbasic/php/config.php:84 +#: ../../view/theme/redbasic/php/config.php:90 msgid "Navigation bar colour" msgstr "" -#: ../../view/theme/redbasic/php/config.php:85 +#: ../../view/theme/redbasic/php/config.php:91 msgid "Set font-colour for banner" msgstr "" -#: ../../view/theme/redbasic/php/config.php:86 +#: ../../view/theme/redbasic/php/config.php:92 msgid "Set the background colour" msgstr "" -#: ../../view/theme/redbasic/php/config.php:87 +#: ../../view/theme/redbasic/php/config.php:93 msgid "Set the background image" msgstr "" -#: ../../view/theme/redbasic/php/config.php:88 +#: ../../view/theme/redbasic/php/config.php:94 msgid "Set the background colour of items" msgstr "" -#: ../../view/theme/redbasic/php/config.php:89 +#: ../../view/theme/redbasic/php/config.php:95 msgid "Set the opacity of items" msgstr "" -#: ../../view/theme/redbasic/php/config.php:90 +#: ../../view/theme/redbasic/php/config.php:96 msgid "Set the basic colour for item icons" msgstr "" -#: ../../view/theme/redbasic/php/config.php:91 +#: ../../view/theme/redbasic/php/config.php:97 msgid "Set the hover colour for item icons" msgstr "" -#: ../../view/theme/redbasic/php/config.php:92 +#: ../../view/theme/redbasic/php/config.php:98 +msgid "Set font-size for the entire application" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:99 #: ../../view/theme/apw/php/config.php:236 msgid "Set font-size for posts and comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:93 +#: ../../view/theme/redbasic/php/config.php:100 msgid "Set font-colour for posts and comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:94 +#: ../../view/theme/redbasic/php/config.php:101 msgid "Set radius of corners" msgstr "" -#: ../../view/theme/redbasic/php/config.php:95 +#: ../../view/theme/redbasic/php/config.php:102 msgid "Set shadow depth of photos" msgstr "" -#: ../../view/theme/redbasic/php/config.php:96 +#: ../../view/theme/redbasic/php/config.php:103 msgid "Set maximum width of conversation regions" msgstr "" -#: ../../view/theme/redbasic/php/config.php:97 +#: ../../view/theme/redbasic/php/config.php:104 msgid "Set minimum opacity of nav bar - to hide it" msgstr "" -#: ../../view/theme/redbasic/php/config.php:98 +#: ../../view/theme/redbasic/php/config.php:105 +msgid "Set size of conversation author photo" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:106 +msgid "Set size of followup author photos" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:107 msgid "Sloppy photo albums" msgstr "" -#: ../../view/theme/redbasic/php/config.php:98 +#: ../../view/theme/redbasic/php/config.php:107 msgid "Are you a clean desk or a messy desk person?" msgstr "" @@ -7074,113 +7070,113 @@ msgstr "" msgid "Right offset of the aside element" msgstr "" -#: ../../boot.php:1278 +#: ../../boot.php:1274 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1281 +#: ../../boot.php:1277 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1438 +#: ../../boot.php:1434 msgid "" "Create an account to access services and applications within the Red Matrix" msgstr "" -#: ../../boot.php:1466 +#: ../../boot.php:1462 msgid "Password" msgstr "" -#: ../../boot.php:1467 +#: ../../boot.php:1463 msgid "Remember me" msgstr "" -#: ../../boot.php:1472 +#: ../../boot.php:1468 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1537 +#: ../../boot.php:1533 msgid "permission denied" msgstr "" -#: ../../boot.php:1538 +#: ../../boot.php:1534 msgid "Got Zot?" msgstr "" -#: ../../boot.php:1597 +#: ../../boot.php:1593 msgid "Requested channel is not available." msgstr "" -#: ../../boot.php:1609 +#: ../../boot.php:1605 msgid " Sorry, you don't have the permission to view this profile. " msgstr "" -#: ../../boot.php:1765 +#: ../../boot.php:1761 msgid "Profiles" msgstr "" -#: ../../boot.php:1765 +#: ../../boot.php:1761 msgid "Manage/edit profiles" msgstr "" -#: ../../boot.php:1769 +#: ../../boot.php:1765 msgid "Edit Profile" msgstr "" -#: ../../boot.php:1863 ../../boot.php:1943 +#: ../../boot.php:1859 ../../boot.php:1939 msgid "F d" msgstr "" -#: ../../boot.php:1920 +#: ../../boot.php:1916 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1921 +#: ../../boot.php:1917 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1976 +#: ../../boot.php:1972 msgid "[No description]" msgstr "" -#: ../../boot.php:1994 +#: ../../boot.php:1990 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1995 +#: ../../boot.php:1991 msgid "Events this week:" msgstr "" -#: ../../boot.php:2229 +#: ../../boot.php:2225 msgid "Channel" msgstr "" -#: ../../boot.php:2232 +#: ../../boot.php:2228 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:2236 +#: ../../boot.php:2232 msgid "About" msgstr "" -#: ../../boot.php:2239 +#: ../../boot.php:2235 msgid "Profile Details" msgstr "" -#: ../../boot.php:2257 +#: ../../boot.php:2253 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:2262 +#: ../../boot.php:2258 msgid "Webpages" msgstr "" -#: ../../boot.php:2265 +#: ../../boot.php:2261 msgid "Manage Webpages" msgstr "" -#: ../../boot.php:2547 +#: ../../boot.php:2545 msgid "toggle mobile" msgstr "" diff --git a/version.inc b/version.inc index 3e026cef2..9c9570aa4 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-11-21.504 +2013-11-22.505 diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 1fefa110e..69d99893a 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -42,6 +42,9 @@ head_add_js('library/colorbox/jquery.colorbox-min.js'); /** * 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. */ $channel = get_app()->get_channel(); -- cgit v1.2.3 From 72e0bd6b28fbb2e13a02573a053430493f97c14b Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 22 Nov 2013 21:19:41 +0100 Subject: missing input type and use same font for password and text input --- view/theme/redbasic/css/style.css | 7 ++++--- view/tpl/field_input.tpl | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f5e99bdf7..72413f283 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -51,7 +51,8 @@ a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; } } -input[type=text] { +input[type=text], +input[type=password] { font-family: arial,freesans,sans-serif; } @@ -458,9 +459,9 @@ footer { clear: both; } -#register-link, #lost-password-link { +#register-link, +#lost-password-link { float: left; - font-size: 90%; margin-left: 100px; } diff --git a/view/tpl/field_input.tpl b/view/tpl/field_input.tpl index d5b3d6b4e..a584f95e7 100755 --- a/view/tpl/field_input.tpl +++ b/view/tpl/field_input.tpl @@ -1,6 +1,6 @@
    - {{if $field.4}} {{$field.4}} {{/if}} + {{if $field.4}} {{$field.4}} {{/if}} {{$field.3}}
    -- cgit v1.2.3 From 45c10d6d0a4a971446390137676fe8c00712372b Mon Sep 17 00:00:00 2001 From: marijus Date: Fri, 22 Nov 2013 22:23:25 +0100 Subject: use same font for textarea aswell and some simplification --- view/theme/redbasic/css/style.css | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 72413f283..bdf1fb5fd 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -51,9 +51,12 @@ a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; } } -input[type=text], -input[type=password] { +input[type="text"], +input[type="password"], +input[type="submit"], +textarea { font-family: arial,freesans,sans-serif; + font-size: $body_font_size; } input { @@ -61,14 +64,13 @@ input { -moz-border-radius: $radiuspx; border-radius: $radiuspx; padding: 3px; - font-size: $body_font_size; } input[type="submit"] { background-color: #F0F0F0; font-weight: bold; color: #0080FF; - text-decoration: none; + text-decoration: none; } code { @@ -1456,10 +1458,11 @@ tr.mceLast { border: 1px solid #cccccc; padding: 8px; margin-right: 0px; - width: 90%; + width: 90%; -moz-border-radius: $radiuspx; border-radius: $radiuspx; } + #profile-jot-text:hover { color: #000000; } -- cgit v1.2.3 From 8619fc368d24fa903c543561428709452b08c5a7 Mon Sep 17 00:00:00 2001 From: tuscanhobbit Date: Fri, 22 Nov 2013 22:45:16 +0100 Subject: updated logo in readme and r# shorthand --- images/rm-16.png | Bin 0 -> 949 bytes images/rm300.png | Bin 7389 -> 6426 bytes include/text.php | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 images/rm-16.png diff --git a/images/rm-16.png b/images/rm-16.png new file mode 100644 index 000000000..62e45c2dd Binary files /dev/null and b/images/rm-16.png differ diff --git a/images/rm300.png b/images/rm300.png index 52c234dc2..bc2600348 100644 Binary files a/images/rm300.png and b/images/rm300.png differ diff --git a/include/text.php b/include/text.php index 780992f4a..54626a772 100755 --- a/include/text.php +++ b/include/text.php @@ -916,8 +916,8 @@ function smilies($s, $sample = false) { ':facepalm', ':like', ':dislike', - 'red# the Red Matrix', - 'r# the Red Matrix', + 'redred#matrix', + 'redr#matrix', '~friendica ~friendica' ); -- cgit v1.2.3 From 35e8536c7ccb773152edbfaffef0ed5fb1410cf1 Mon Sep 17 00:00:00 2001 From: tuscanhobbit Date: Fri, 22 Nov 2013 23:08:29 +0100 Subject: Italian translation updated --- view/it/messages.po | 6 +++--- view/it/strings.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/view/it/messages.po b/view/it/messages.po index 7a77586bc..0143952d4 100644 --- a/view/it/messages.po +++ b/view/it/messages.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: Red Matrix\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-11-15 00:03-0800\n" -"PO-Revision-Date: 2013-11-15 11:55+0000\n" +"PO-Revision-Date: 2013-11-22 22:02+0000\n" "Last-Translator: tuscanhobbit Pa \n" "Language-Team: Italian (http://www.transifex.com/projects/p/red-matrix/language/it/)\n" "MIME-Version: 1.0\n" @@ -6951,11 +6951,11 @@ msgstr "Imposta l'opacità minima della barra di navigazione per nasconderla" #: ../../view/theme/redbasic/php/config.php:98 msgid "Sloppy photo albums" -msgstr "Photo album semplificati" +msgstr "Album fotografici semplificati" #: ../../view/theme/redbasic/php/config.php:98 msgid "Are you a clean desk or a messy desk person?" -msgstr "Hai una scrivania ordinata o sei una persona che lascia confusione?" +msgstr "La tua scrivania è sempre a posto? Sei una persona disordinata?" #: ../../view/theme/apw/php/config.php:193 #: ../../view/theme/apw/php/config.php:211 diff --git a/view/it/strings.php b/view/it/strings.php index 62936964f..5c71824db 100644 --- a/view/it/strings.php +++ b/view/it/strings.php @@ -1635,8 +1635,8 @@ $a->strings["Set radius of corners"] = "Raggio degli angoli stondati"; $a->strings["Set shadow depth of photos"] = "Profondità dell'ombra delle foto"; $a->strings["Set maximum width of conversation regions"] = "Larghezza massima delle aree delle conversazioni"; $a->strings["Set minimum opacity of nav bar - to hide it"] = "Imposta l'opacità minima della barra di navigazione per nasconderla"; -$a->strings["Sloppy photo albums"] = "Photo album semplificati"; -$a->strings["Are you a clean desk or a messy desk person?"] = "Hai una scrivania ordinata o sei una persona che lascia confusione?"; +$a->strings["Sloppy photo albums"] = "Album fotografici semplificati"; +$a->strings["Are you a clean desk or a messy desk person?"] = "La tua scrivania è sempre a posto? Sei una persona disordinata?"; $a->strings["Schema Default"] = "Schema predefinito"; $a->strings["Sans-Serif"] = "Sans-Serif"; $a->strings["Monospace"] = "Monospace"; -- cgit v1.2.3 From adad1b75cd1fb6ef96e06d32ee5c2d89cd9e759b Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 23 Nov 2013 01:10:54 +0100 Subject: use placeholder for profile-jot-text and some minor alignment --- view/theme/redbasic/css/style.css | 7 ++++--- view/tpl/jot.tpl | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index bdf1fb5fd..97f24c8df 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -54,6 +54,7 @@ a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; } input[type="text"], input[type="password"], input[type="submit"], +select, textarea { font-family: arial,freesans,sans-serif; font-size: $body_font_size; @@ -1464,7 +1465,7 @@ tr.mceLast { } #profile-jot-text:hover { - color: #000000; + color: #000000; } #profile-jot-text-loading { @@ -2545,7 +2546,7 @@ brain is weird like that */ .field label { float: left; - width: 200px; + width: 350px; } .field input, @@ -2555,7 +2556,7 @@ brain is weird like that */ .field textarea { height: 100px; } .field_help { display: block; - margin-left: 200px; + margin-left: 350px; color: #666666; } diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index ef91f45be..b9238f0c0 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -24,7 +24,7 @@
    {{/if}}
    - +
    -- cgit v1.2.3 From 7f6f4d2e9e5ff0486382c41c76f6eac87af37ef2 Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 23 Nov 2013 01:12:30 +0100 Subject: typo --- 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 97f24c8df..8c9266f62 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1465,7 +1465,7 @@ tr.mceLast { } #profile-jot-text:hover { - color: #000000; + color: #000000; } #profile-jot-text-loading { -- cgit v1.2.3 From ccba7d8d07a3d78693f764f0d5997782ac52bbda Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 23 Nov 2013 09:19:37 +0100 Subject: make profile-jot-text placeholder more prominent --- view/theme/redbasic/css/style.css | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 8c9266f62..e7ac112f6 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1464,8 +1464,20 @@ tr.mceLast { border-radius: $radiuspx; } -#profile-jot-text:hover { - color: #000000; +#profile-jot-text::-moz-placeholder { + font-size:1.5em; +} + +#profile-jot-text:focus::-moz-placeholder { + color: transparent; +} + +#profile-jot-text::-webkit-input-placeholder { + font-size:1.5em; +} + +#profile-jot-text:focus::-webkit-input-placeholder { + color: transparent; } #profile-jot-text-loading { -- cgit v1.2.3 From a98685df760d40439fbcd61022dec7d2b9b58b5f Mon Sep 17 00:00:00 2001 From: marijus Date: Sat, 23 Nov 2013 09:49:12 +0100 Subject: make profile-jot-text and -title height scalable --- view/theme/redbasic/css/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e7ac112f6..660651a7f 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -358,7 +358,7 @@ footer { border: 0px; margin: 0px; padding: 8px; - height: 20px; + height: 1.8em; width: 530px; margin-bottom: 5px; font-weight: bold; @@ -1454,7 +1454,7 @@ tr.mceLast { /* Not MCE */ #profile-jot-text { - height: 20px; + height: 1.8em; color:#000; border: 1px solid #cccccc; padding: 8px; -- cgit v1.2.3 From d27ed7f6e5b595aaf20154a30995601fd6b11644 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 23 Nov 2013 01:01:23 -0800 Subject: rev update --- version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.inc b/version.inc index 9c9570aa4..ec2cb12cd 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-11-22.505 +2013-11-23.506 -- cgit v1.2.3 From 2e4177796364ca4edb3a29e7646545649d57c56a Mon Sep 17 00:00:00 2001 From: tuscanhobbit Date: Sat, 23 Nov 2013 19:46:07 +0100 Subject: a reference to account_id was missing in user admin table --- mod/admin.php | 5 +++-- view/tpl/admin_users.tpl | 14 ++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 1615412b5..5a3ec48f7 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -649,7 +649,8 @@ function admin_page_users(&$a){ if($_REQUEST['order'] === 'expires') $order = " order by account_expires desc "; - $users =q("SELECT `account_id` , `account_email`, `account_lastlog`, `account_created`, `account_expires`, `account_service_class` FROM `account` where true $serviceclass $order limit %d , %d ", + $users =q("SELECT `account_id` , `account_email`, `account_lastlog`, `account_created`, `account_expires`, `account_service_class`, ( account_flags & %d ) > 0 as `blocked` FROM `account` where true $serviceclass $order limit %d , %d ", + intval(ACCOUNT_BLOCKED), intval($a->pager['start']), intval($a->pager['itemspage']) ); @@ -686,7 +687,7 @@ function admin_page_users(&$a){ '$delete' => t('Delete'), '$block' => t('Block'), '$unblock' => t('Unblock'), - + '$h_users' => t('Users'), '$th_users' => array( t('Email'), t('Register date'), t('Last login'), t('Expires'), t('Service Class')), diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index cedd55216..609289013 100755 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -55,7 +55,6 @@ - {{foreach $th_users as $th}}{{/foreach}} @@ -64,16 +63,19 @@ {{foreach $users as $u}} - - + - + {{/foreach}} -- cgit v1.2.3 From 2c6e1b7aee2928c077bc090b1c4fe65c599d5d12 Mon Sep 17 00:00:00 2001 From: tuscanhobbit Date: Sat, 23 Nov 2013 20:01:11 +0100 Subject: replaced rhash icon --- boot.php | 2 +- images/rm-32.png | Bin 0 -> 2451 bytes images/rm-64.png | Bin 0 -> 5236 bytes include/api.php | 4 ++-- util/Doxyfile | 2 +- view/tpl/email_notify_html.tpl | 2 +- view/tpl/opensearch.tpl | 6 +++--- 7 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 images/rm-32.png create mode 100644 images/rm-64.png diff --git a/boot.php b/boot.php index 3fabff55a..53d756e93 100755 --- a/boot.php +++ b/boot.php @@ -773,7 +773,7 @@ class App { $this->is_mobile = $mobile_detect->isMobile(); $this->is_tablet = $mobile_detect->isTablet(); - $this->head_set_icon('/images/rhash-32.png'); + $this->head_set_icon('/images/rm-32.png'); BaseObject::set_app($this); diff --git a/images/rm-32.png b/images/rm-32.png new file mode 100644 index 000000000..c9c942dee Binary files /dev/null and b/images/rm-32.png differ diff --git a/images/rm-64.png b/images/rm-64.png new file mode 100644 index 000000000..30341bfa4 Binary files /dev/null and b/images/rm-64.png differ diff --git a/include/api.php b/include/api.php index 1dd970cbc..8f7be37c7 100644 --- a/include/api.php +++ b/include/api.php @@ -233,7 +233,7 @@ require_once('include/photos.php'); 'updated' => api_date(null), 'atom_updated' => datetime_convert('UTC','UTC','now',ATOM_TIME), 'language' => $user_info['language'], - 'logo' => $a->get_baseurl()."/images/rhash-64.png", + 'logo' => $a->get_baseurl()."/images/rm-64.png", ); return $arr; @@ -1581,7 +1581,7 @@ require_once('include/photos.php'); $name = get_config('system','sitename'); $server = $a->get_hostname(); - $logo = $a->get_baseurl() . '/images/rhash-64.png'; + $logo = $a->get_baseurl() . '/images/rm-64.png'; $email = get_config('system','admin_email'); $closed = ((get_config('system','register_policy') == REGISTER_CLOSED) ? 'true' : 'false'); $private = ((get_config('system','block_public')) ? 'true' : 'false'); diff --git a/util/Doxyfile b/util/Doxyfile index edb8a8464..fce6c1359 100644 --- a/util/Doxyfile +++ b/util/Doxyfile @@ -1,7 +1,7 @@ INPUT = boot.php mod include setup util view RECURSIVE = YES PROJECT_NAME = "The Red Matrix" -PROJECT_LOGO = images/rhash-64.png +PROJECT_LOGO = images/rm-64.png EXCLUDE = .htconfig.php library doc .git EXCLUDE_PATTERNS = *smarty3* *strings.php *.out *test* OUTPUT_DIRECTORY = doc diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl index 85939ac22..41bbe16a9 100755 --- a/view/tpl/email_notify_html.tpl +++ b/view/tpl/email_notify_html.tpl @@ -7,7 +7,7 @@
    {{$th}}
    {{$u.nickname}} {{$u.account_created}} {{$u.account_service_class}} - - + +
    - + diff --git a/view/tpl/opensearch.tpl b/view/tpl/opensearch.tpl index 26fb5a799..ea260c6ae 100755 --- a/view/tpl/opensearch.tpl +++ b/view/tpl/opensearch.tpl @@ -3,11 +3,11 @@ Red Matrix@{{$nodename}}Search in The Red Matrix@{{$nodename}}http://github.com/friendica/red/ - {{$baseurl}}/images/rhash-16.png - {{$baseurl}}/images/rhash-64.png + {{$baseurl}}/images/rm-16.png + {{$baseurl}}/images/rm-64.png - \ No newline at end of file + -- cgit v1.2.3 From d126c2bcaae4c25eda03b99b4422398ad781c582 Mon Sep 17 00:00:00 2001 From: tuscanhobbit Date: Sat, 23 Nov 2013 20:04:09 +0100 Subject: redbasic nav bar gradient is now similar to the red shade in the logo --- view/theme/redbasic/php/style.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 1eb5abfbb..9956ccd31 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -114,22 +114,20 @@ // Nav colours have nested values, so we have to define the actual variables // used in the CSS from the higher level "red", "black", etc here if ($nav_colour == "red") { - $nav_bg_1 = "#f88"; - $nav_bg_2 = "#b00"; - $nav_bg_3 = "#f00"; - $nav_bg_4 = "#b00"; - $search_background = '#FFDDDD'; + $nav_bg_1 = $nav_bg_3 = "#ba002f"; + $nav_bg_2 = $nav_bg_4 = "#ad002c"; + $search_background = "#EEEEEE"; $active_colour = '#444444'; } if ($nav_colour == "black") { - $nav_bg_1 = $nav_bg_3 = "#000"; - $nav_bg_2 = $nav_bg_4 = "#222"; + $nav_bg_1 = $nav_bg_3 = "#000"; + $nav_bg_2 = $nav_bg_4 = "#222"; $search_background = '#EEEEEE'; $active_colour = '#AAAAAA'; } if ($nav_colour == "silver") { - $nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver"; + $nav_bg_1 = $nav_bg_2 = $nav_bg_3 = $nav_bg_4 = "silver"; $search_background = '#EEEEEE'; } -- cgit v1.2.3 From 421cacfc8d968f981e6c3420017910c3a8d047ab Mon Sep 17 00:00:00 2001 From: tuscanhobbit Date: Sun, 24 Nov 2013 23:06:03 +0100 Subject: admin user table now shows the channel list, minor changes to summary --- mod/admin.php | 9 ++++++--- view/tpl/admin_summary.tpl | 20 ++++++++------------ view/tpl/admin_users.tpl | 2 ++ 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 5a3ec48f7..031fe7852 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -474,7 +474,7 @@ function admin_page_hubloc(&$a) { '$title' => t('Administration'), '$page' => t('Server'), '$queues' => $queues, - '$accounts' => $accounts, + //'$accounts' => $accounts, /*$accounts is empty here*/ '$pending' => Array( t('Pending registrations'), $pending), '$plugins' => Array( t('Active plugins'), $a->plugins ) )); @@ -649,7 +649,10 @@ function admin_page_users(&$a){ if($_REQUEST['order'] === 'expires') $order = " order by account_expires desc "; - $users =q("SELECT `account_id` , `account_email`, `account_lastlog`, `account_created`, `account_expires`, `account_service_class`, ( account_flags & %d ) > 0 as `blocked` FROM `account` where true $serviceclass $order limit %d , %d ", + $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` " . + "FROM account as ac where true $serviceclass $order limit %d , %d ", intval(ACCOUNT_BLOCKED), intval($a->pager['start']), intval($a->pager['itemspage']) @@ -689,7 +692,7 @@ function admin_page_users(&$a){ '$unblock' => t('Unblock'), '$h_users' => t('Users'), - '$th_users' => array( t('Email'), t('Register date'), t('Last login'), t('Expires'), t('Service Class')), + '$th_users' => array( t('ID'), t('Email'), t('All Channels'), t('Register date'), t('Last login'), t('Expires'), t('Service Class')), '$confirm_delete_multi' => t('Selected users will be deleted!\n\nEverything these users had posted on this site will be permanently deleted!\n\nAre you sure?'), '$confirm_delete' => t('The user {0} will be deleted!\n\nEverything this user has posted on this site will be permanently deleted!\n\nAre you sure?'), diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl index d3665626f..24cdd57cc 100755 --- a/view/tpl/admin_summary.tpl +++ b/view/tpl/admin_summary.tpl @@ -14,27 +14,23 @@
    {{$users.0}}
    {{$users.1}}
    - {{foreach $accounts as $p}} +
    {{$plugins.0}}
    - - {{foreach $plugins.1 as $p}} -
    {{$p}}
    - {{/foreach}} - +
    + {{foreach $plugins.1 as $p}} {{$p}} {{/foreach}} +   +
    -
    {{$version.0}}
    -
    {{$version.1}} - {{$build}} +
    {{$version.1}} - {{$build}}
    - diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index 609289013..3549dc5c2 100755 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -63,11 +63,13 @@     {{foreach $users as $u}} + + -- cgit v1.2.3 From a82a1d7c0548eccc10ce9ad71c2514cd70e03b3d Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 24 Nov 2013 14:39:29 -0800 Subject: add recipient name to the rest of the notification emails --- include/enotify.php | 84 ++++++++++++++++++++++++++++++----------------------- version.inc | 2 +- 2 files changed, 48 insertions(+), 38 deletions(-) diff --git a/include/enotify.php b/include/enotify.php index cfa8c25ae..808efef51 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -132,25 +132,28 @@ function notification($params) { //$possess_desc = str_replace('',$possess_desc); // "a post" - $dest_str = sprintf(t('%1$s commented on [zrl=%2$s]a %3$s[/zrl]'), - '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', - $itemlink, - $item_post_type); + $dest_str = sprintf(t('%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]'), + $recip['channel_name'], + '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', + $itemlink, + $item_post_type); // "George Bull's post" if($p) - $dest_str = sprintf(t('%1$s commented on [zrl=%2$s]%3$s\'s %4$s[/zrl]'), - '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', - $itemlink, - $p[0]['author']['xchan_name'], - $item_post_type); + $dest_str = sprintf(t('%1$s, %2$s commented on [zrl=%3$s]%4$s\'s %5$s[/zrl]'), + $recip['channel_name'], + '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', + $itemlink, + $p[0]['author']['xchan_name'], + $item_post_type); // "your post" if($p[0]['owner']['xchan_name'] == $p[0]['author']['xchan_name'] && ($p[0]['item_flags'] & ITEM_WALL)) - $dest_str = sprintf(t('%1$s commented on [zrl=%2$s]your %3$s[/zrl]'), - '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', - $itemlink, - $item_post_type); + $dest_str = sprintf(t('%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]'), + $recip['channel_name'], + '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', + $itemlink, + $item_post_type); // Some mail softwares relies on subject field for threading. // So, we cannot have different subjects for notifications of the same thread. @@ -158,7 +161,7 @@ function notification($params) { // differents subjects for messages on the same thread. $subject = sprintf( t('[Red:Notify] Comment to conversation #%1$d by %2$s'), $parent_id, $sender['xchan_name']); - $preamble = sprintf( t('%s commented on an item/conversation you have been following.'), $sender['xchan_name']); + $preamble = sprintf( t('%1$s, %2$s commented on an item/conversation you have been following.'), $recip['channel_name'], $sender['xchan_name']); $epreamble = $dest_str; $sitelink = t('Please visit %s to view and/or reply to the conversation.'); @@ -170,11 +173,13 @@ function notification($params) { if($params['type'] == NOTIFY_WALL) { $subject = sprintf( t('[Red:Notify] %s posted to your profile wall') , $sender['xchan_name']); - $preamble = sprintf( t('%1$s posted to your profile wall at %2$s') , $sender['xchan_name'], $sitename); + $preamble = sprintf( t('%1$s, %2$s posted to your profile wall at %3$s') , $recip['channel_name'], $sender['xchan_name'], $sitename); - $epreamble = sprintf( t('%1$s posted to [zrl=%2$s]your wall[/zrl]') , - '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', - $params['link']); + $epreamble = sprintf( t('%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]') , + $recip['channel_name'], + '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', + $params['link']); + // FIXME - check the item privacy $private = false; @@ -199,9 +204,10 @@ function notification($params) { $subject = sprintf( t('[Red:Notify] %s tagged you') , $sender['xchan_name']); $preamble = sprintf( t('%1$s, %2$s tagged you at %3$s') , $recip['channel_name'], $sender['xchan_name'], $sitename); - $epreamble = sprintf( t('%1$s [zrl=%2$s]tagged you[/zrl].') , - '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', - $params['link']); + $epreamble = sprintf( t('%1$s, %2$s [zrl=%3$s]tagged you[/zrl].') , + $recip['channel_name'], + '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', + $params['link']); $sitelink = t('Please visit %s to view and/or reply to the conversation.'); $tsitelink = sprintf( $sitelink, $siteurl ); @@ -213,9 +219,10 @@ function notification($params) { $subject = sprintf( t('[Red:Notify] %1$s poked you') , $sender['xchan_name']); $preamble = sprintf( t('%1$s, %2$s poked you at %3$s') , $recip['channel_name'], $sender['xchan_name'], $sitename); - $epreamble = sprintf( t('%1$s [zrl=%2$s]poked you[/zrl].') , - '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', - $params['link']); + $epreamble = sprintf( t('%1$s, %2$s [zrl=%2$s]poked you[/zrl].') , + $recip['channel_name'], + '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', + $params['link']); $subject = str_replace('poked', t($params['activity']), $subject); $preamble = str_replace('poked', t($params['activity']), $preamble); @@ -229,10 +236,11 @@ function notification($params) { if($params['type'] == NOTIFY_TAGSHARE) { $subject = sprintf( t('[Red:Notify] %s tagged your post') , $sender['xchan_name']); - $preamble = sprintf( t('%1$s tagged your post at %2$s') , $sender['xchan_name'], $sitename); - $epreamble = sprintf( t('%1$s tagged [zrl=%2$s]your post[/zrl]') , - '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', - $itemlink); + $preamble = sprintf( t('%1$s, %2$s tagged your post at %3$s') , $recip['channel_name'],$sender['xchan_name'], $sitename); + $epreamble = sprintf( t('%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]') , + $recip['channel_name'], + '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]', + $itemlink); $sitelink = t('Please visit %s to view and/or reply to the conversation.'); $tsitelink = sprintf( $sitelink, $siteurl ); @@ -242,10 +250,11 @@ function notification($params) { if($params['type'] == NOTIFY_INTRO) { $subject = sprintf( t('[Red:Notify] Introduction received')); - $preamble = sprintf( t('You\'ve received an introduction from \'%1$s\' at %2$s'), $sender['xchan_name'], $sitename); - $epreamble = sprintf( t('You\'ve received [zrl=%1$s]an introduction[/zrl] from %2$s.'), - $itemlink, - '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]'); + $preamble = sprintf( t('%1$s, you\'ve received an introduction from \'%2$s\' at %3$s'), $recip['channel_name'], $sender['xchan_name'], $sitename); + $epreamble = sprintf( t('%1$s, you\'ve received [zrl=%2$s]an introduction[/zrl] from %3$s.'), + $recip['channel_name'], + $itemlink, + '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]'); $body = sprintf( t('You may visit their profile at %s'),$sender['xchan_url']); $sitelink = t('Please visit %s to approve or reject the introduction.'); @@ -256,11 +265,12 @@ function notification($params) { if($params['type'] == NOTIFY_SUGGEST) { $subject = sprintf( t('[Red:Notify] Friend suggestion received')); - $preamble = sprintf( t('You\'ve received a friend suggestion from \'%1$s\' at %2$s'), $sender['xchan_name'], $sitename); - $epreamble = sprintf( t('You\'ve received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s.'), - $itemlink, - '[zrl=' . $params['item']['url'] . ']' . $params['item']['name'] . '[/zrl]', - '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]'); + $preamble = sprintf( t('%1$s, you\'ve received a friend suggestion from \'%2$s\' at %3$s'), $recip['channel_name'], $sender['xchan_name'], $sitename); + $epreamble = sprintf( t('%1$s, you\'ve received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s.'), + $recip['channel_name'], + $itemlink, + '[zrl=' . $params['item']['url'] . ']' . $params['item']['name'] . '[/zrl]', + '[zrl=' . $sender['xchan_url'] . ']' . $sender['xchan_name'] . '[/zrl]'); $body = t('Name:') . ' ' . $params['item']['name'] . "\n"; $body .= t('Photo:') . ' ' . $params['item']['photo'] . "\n"; diff --git a/version.inc b/version.inc index ec2cb12cd..2e1d6ddf2 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-11-23.506 +2013-11-24.507 -- cgit v1.2.3 From ac3ae83a1646404bcd096891bf5da7b47314cfb3 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 24 Nov 2013 18:03:12 -0800 Subject: wordpress-to-red cross-posting tool ported from Friendica --- util/wp/post_to_red/post_to_red.php | 286 ++++++++++++++++++++++++++++++++++++ util/wp/post_to_red/readme.txt | 39 +++++ 2 files changed, 325 insertions(+) create mode 100644 util/wp/post_to_red/post_to_red.php create mode 100644 util/wp/post_to_red/readme.txt diff --git a/util/wp/post_to_red/post_to_red.php b/util/wp/post_to_red/post_to_red.php new file mode 100644 index 000000000..8e62a1a56 --- /dev/null +++ b/util/wp/post_to_red/post_to_red.php @@ -0,0 +1,286 @@ +/Uis', '', $post->post_content); + + // get any tags and make them hashtags + $post_tags = get_the_tags($post_id); + if ($post_tags) { + foreach($post_tags as $tag) { + $tag_string .= "#" . $tag->name . " "; + } + } + + $message = $post->post_title . "

    " . $message; + + $message .= "

    permalink: " . $post->guid; + + if (isset($tag_string)) { + $message .= "
    $tag_string"; + } + + $bbcode = xpost_to_html2bbcode($message); + + $url = $seed_location . '/api/statuses/update'; + + + + $headers = array('Authorization' => 'Basic '.base64_encode("$user_name:$password")); + $body = array('status' => $bbcode,'source' => 'WordPress'); + if($channel) + $body['channel'] = $channel; + + // post: + $request = new WP_Http; + $result = $request->request($url , array( 'method' => 'POST', 'body' => $body, 'headers' => $headers)); + + } + + } +} + +function post_to_red_displayAdminContent() { + + $seed_url = post_to_red_get_seed_location(); + $password = post_to_red_get_password(); + $user_acct = post_to_red_get_acct_name(); + $channel = post_to_red_get_channel_name(); + + // debug... + // echo "seed location: $seed_url
    "; + // echo "password: $password
    "; + // echo "user_acct: $user_acct
    "; + + echo << +

    CrossPost to Red Matrix

    +

    This plugin allows you to cross post to your Red Matrix channel.

    + + +
    +

    Configuration

    +
    + Enter the login details of your Red Matrix account

    +   + Password:   + Red Matrix URL:   + Optional channel nickname:   + + +

    +
    +EOF; + + if(isset($_POST['submit'])) { + echo "
    Settings Saved!
    "; + } +} + +function post_to_red_post_checkbox() { + add_meta_box( + 'post_to_red_meta_box_id', + 'Cross Post to Red Matrix', + 'post_to_red_post_meta_content', + 'post', + 'normal', + 'default' + ); +} + +function post_to_red_post_meta_content($post_id) { + wp_nonce_field(plugin_basename( __FILE__ ), 'post_to_red_nonce'); + echo ' Cross post?'; +} + +function post_to_red_post_field_data($post_id) { + + // check if this isn't an auto save + if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) + return; + + // security check +// if (!wp_verify_nonce( $_POST['post_to_red_nonce'], plugin_basename( __FILE__ ))) +// return; + + // now store data in custom fields based on checkboxes selected + if (isset($_POST['post_to_red'])) { + update_post_meta($post_id, 'post_to_red', 1); + } else { + update_post_meta($post_id, 'post_to_red', 0); + } +} + +function post_to_red_display_admin_page() { + + if ((isset($_REQUEST["post_to_red_acct_name"])) && (isset($_REQUEST["post_to_red_password"]))) { + + $password = $_REQUEST["post_to_red_password"]; + $red_url = $_REQUEST["post_to_red_url"]; + + update_option('post_to_red_acct_name', $_REQUEST["post_to_red_acct_name"]); + update_option('post_to_red_channel_name', $channelname); + update_option('post_to_red_seed_location', $red_url); + update_option('post_to_red_password', $password); + + } + + post_to_red_displayAdminContent(); +} + +function post_to_red_settings_link($links) { + $settings_link = 'Settings'; + array_unshift($links, $settings_link); + return $links; +} + +function post_to_red_admin() { + add_options_page("Crosspost to redmatrix", "Crosspost to redmatrix", "manage_options", "xpost-to-redmatrix", "post_to_red_display_admin_page"); +} + +register_deactivation_hook( __FILE__, 'post_to_red_deactivate' ); + +add_filter("plugin_action_links_$plugin", "post_to_red_settings_link"); + +add_action("admin_menu", "post_to_red_admin"); +add_action('publish_post', 'post_to_red_post'); +add_action('add_meta_boxes', 'post_to_red_post_checkbox'); +add_action('save_post', 'post_to_red_post_field_data'); + +// from: +// http://www.docgate.com/tutorial/php/how-to-convert-html-to-bbcode-with-php-script.html +function xpost_to_html2bbcode($text) { + $htmltags = array( + '/\(.*?)\<\/b\>/is', + '/\(.*?)\<\/i\>/is', + '/\(.*?)\<\/u\>/is', + '/\(.*?)\<\/ul\>/is', + '/\(.*?)\<\/li\>/is', + '/\/is', // some smiley + '/\/is', + '/\/is', // some smiley + '/\
    (.*?)\<\/div\>/is', + '/\
    (.*?)\<\/div\>/is', + '/\
    (.*?)\<\/div\>/is', + '/\
    (.*?)\<\/div\>/is', + '/\(.*?)\<\/cite\>/is', + '/\(.*?)\<\/blockquote\>/is', + '/\(.*?)\<\/div\>/is', + '/\(.*?)\<\/code\>/is', + '/\/is', + '/\(.*?)\<\/strong\>/is', + '/\(.*?)\<\/em\>/is', + '/\(.*?)\<\/a\>/is', + '/\http:\/\/(.*?)\<\/a\>/is', + '/\(.*?)\<\/a\>/is' + ); + + $bbtags = array( + '[b]$1[/b]', + '[i]$1[/i]', + '[u]$1[/u]', + '[list]$1[/list]', + '[*]$1', + '$3', + '[img]http://$2[/img]' . "\n", + ':$3', + '\[quote\]$1\[/quote\]', + '\[code\]$1\[/code\]', + '', + '', + '', + '\[quote\]$1\[/quote\]', + '$1', + '\[code\]$1\[/code\]', + "\n", + '[b]$1[/b]', + '[i]$1[/i]', + '[email=$1]$3[/email]', + '[url]$1[/url]', + '[url=$1]$3[/url]' + ); + + $text = str_replace ("\n", ' ', $text); + $ntext = preg_replace ($htmltags, $bbtags, $text); + $ntext = preg_replace ($htmltags, $bbtags, $ntext); + + // for too large text and cannot handle by str_replace + if (!$ntext) { + $ntext = str_replace(array('
    ', '
    '), "\n", $text); + $ntext = str_replace(array('', ''), array('[b]', '[/b]'), $ntext); + $ntext = str_replace(array('', ''), array('[i]', '[/i]'), $ntext); + } + + $ntext = strip_tags($ntext); + + $ntext = trim(html_entity_decode($ntext,ENT_QUOTES,'UTF-8')); + return $ntext; +} + + diff --git a/util/wp/post_to_red/readme.txt b/util/wp/post_to_red/readme.txt new file mode 100644 index 000000000..e27c46236 --- /dev/null +++ b/util/wp/post_to_red/readme.txt @@ -0,0 +1,39 @@ +=== CrossPost to redmatrix === +Contributors: duthied, macgirvin +Donate link: TBD +Tags: redmatrix, crosspost +Requires at least: 3.2 +Tested up to: 3.2 +Stable tag: 1.2 + +CrossPost to Red Matrix for WordPress + +== Description == +This plugin allows you to cross post to your Red Matrix account. + +**Note, this plugin converts the html from wordpress into bbcode. +The bbcode conversion doesn't handle height and width of an image, so be warned that if you post a very large +image that is resized via height and with attributes, those attributes won't be honored in the resulatant post. + +== Changelog == += 1.2 = +* ensured no function name collision + += 1.1 = +* Added feedback to settings form post. + += 1.0 = +* Initial release. + +== Installation == + +1. Install the plugin from your Wordpress admin panel. + +OR + +1. Upload the plugin folder to the `/wp-content/plugins/` directory. +2. Activate the plugin through the 'Plugins' menu in WordPress. +3. On the settings page enter your account name and password and the nickname of the channel to post to - then click the submit button +4. To cross-post ensure the check box in the 'Cross Post To redmatrix' is checked before publishing. + +== Frequently Asked Questions == -- cgit v1.2.3 From c63a18a2506778fff37c3e82881e90e24ce545a8 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 24 Nov 2013 20:28:51 -0800 Subject: Add some message_id meta information for wordpress posts so we'll know where to send comments --- mod/item.php | 10 ++++++++++ util/wp/post_to_red/post_to_red.php | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/mod/item.php b/mod/item.php index 7eebbe287..dba9f01b6 100644 --- a/mod/item.php +++ b/mod/item.php @@ -58,6 +58,12 @@ function item_post(&$a) { // If you are unsure, it is prudent (and important) to leave it unset. $origin = (($api_source && array_key_exists('origin',$_REQUEST)) ? intval($_REQUEST['origin']) : 1); + + // To represent message-ids on other networks - this will create an item_id record + + $namespace = (($api_source && array_key_exists('namespace',$_REQUEST)) ? strip_tags($_REQUEST['namespace']) : ''); + $remote_id = (($api_source && array_key_exists('remote_id',$_REQUEST)) ? strip_tags($_REQUEST['remote_id']) : ''); + $owner_hash = null; $message_id = ((x($_REQUEST,'message_id') && $api_source) ? strip_tags($_REQUEST['message_id']) : ''); @@ -782,6 +788,10 @@ function item_post(&$a) { $page_type = 'BUILDBLOCK'; elseif($webpage & ITEM_PDL) $page_type = 'PDL'; + elseif($namespace && $remote_id) { + $page_type = $namespace; + $pagetitle = $remote_id; + } if($page_type) { diff --git a/util/wp/post_to_red/post_to_red.php b/util/wp/post_to_red/post_to_red.php index 8e62a1a56..095884007 100644 --- a/util/wp/post_to_red/post_to_red.php +++ b/util/wp/post_to_red/post_to_red.php @@ -78,6 +78,10 @@ function post_to_red_post($post_id) { } } + $message_namespace = 'wordpress'; + + $message_id = $site_url() . '/' . $post_id; + $message = $post->post_title . "

    " . $message; $message .= "

    permalink: " . $post->guid; @@ -93,7 +97,7 @@ function post_to_red_post($post_id) { $headers = array('Authorization' => 'Basic '.base64_encode("$user_name:$password")); - $body = array('status' => $bbcode,'source' => 'WordPress'); + $body = array('status' => $bbcode,'source' => 'WordPress', 'namespace' => $message_namespace, 'remote_id' => $message_id); if($channel) $body['channel'] = $channel; -- cgit v1.2.3 From 2b47d36a11cd7203c26c50c6cd504726c2cd9b39 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 24 Nov 2013 23:15:07 -0800 Subject: wordpress publish hook was called before the meta storage hook so the plugin would only work on edited posts. This may be a wordpress version issue because you'd think somebody would've noticed it before. --- util/wp/post_to_red/post_to_red.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/util/wp/post_to_red/post_to_red.php b/util/wp/post_to_red/post_to_red.php index 095884007..47af7789b 100644 --- a/util/wp/post_to_red/post_to_red.php +++ b/util/wp/post_to_red/post_to_red.php @@ -55,12 +55,19 @@ function post_to_red_get_password() { } function post_to_red_post($post_id) { - + $post = get_post($post_id); + if (isset($_POST['post_to_red'])) { + update_post_meta($post_id, 'post_to_red', 1); + } else { + update_post_meta($post_id, 'post_to_red', 0); + } + + // if meta has been set if (get_post_meta($post_id, "post_to_red", true) == 1) { - + $user_name = post_to_red_get_acct_name(); $password = post_to_red_get_password(); $seed_location = post_to_red_get_seed_location(); @@ -80,7 +87,7 @@ function post_to_red_post($post_id) { $message_namespace = 'wordpress'; - $message_id = $site_url() . '/' . $post_id; + $message_id = site_url() . '/' . $post_id; $message = $post->post_title . "

    " . $message; @@ -148,6 +155,7 @@ EOF; } function post_to_red_post_checkbox() { + add_meta_box( 'post_to_red_meta_box_id', 'Cross Post to Red Matrix', @@ -170,8 +178,9 @@ function post_to_red_post_field_data($post_id) { return; // security check -// if (!wp_verify_nonce( $_POST['post_to_red_nonce'], plugin_basename( __FILE__ ))) -// return; + if((! array_key_exists('post_to_red_nonce', $_POST)) + || (!wp_verify_nonce( $_POST['post_to_red_nonce'], plugin_basename( __FILE__ )))) + return; // now store data in custom fields based on checkboxes selected if (isset($_POST['post_to_red'])) { -- cgit v1.2.3 From c0f2bc436c3fc53b48a588edbe766312fbcdc278 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 25 Nov 2013 00:07:00 -0800 Subject: force HTML notification mails to use predefined colours. --- version.inc | 2 +- view/tpl/email_notify_html.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/version.inc b/version.inc index 2e1d6ddf2..65cc36208 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-11-24.507 +2013-11-25.508 diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl index 41bbe16a9..cf149341e 100755 --- a/view/tpl/email_notify_html.tpl +++ b/view/tpl/email_notify_html.tpl @@ -5,7 +5,7 @@ -
    {{$product}}
    {{$product}}
    {{$preamble}}
    {{$u.channels}} {{$u.account_created}}
    +
    -- cgit v1.2.3 From 24acf29009149968a43dba8399346806fba25bea Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 25 Nov 2013 13:51:35 +0100 Subject: polish up share button a little --- view/theme/redbasic/css/style.css | 54 +++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 30 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 660651a7f..3c3851a65 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1195,21 +1195,11 @@ footer { #profile-jot-perms { float: right; - margin-left: 100px; - font-weight: bold; - font-size: 1.2em; - height: auto; - width: auto; - background-color: #0080FF; - border-radius: $radiuspx; - border: 2px outset; - box-shadow: 5px 5px 5px #666; - margin-right: 8px; - padding: 4px; -} - -#profile-jot-perms:active { - box-shadow: 0 0 0 0; + background-color: $toolicon_colour; + border: 1px solid #666; + border-right: none; + border-radius: $radiuspx 0px 0px $radiuspx; + padding: 6px; } #profile-jot-perms-end { @@ -1537,23 +1527,27 @@ tr.mceLast { } #profile-jot-submit { - height: auto; - background-color: #0080FF; - color: #eeeeec; - font-weight: bold; - -webkit-border-radius: $radiuspx; - -moz-border-radius: $radiuspx; - border-radius: $radiuspx; - border: 2px outset #222420 !important; - margin: 0; - float: right; - text-shadow: 1px 1px #111; - width: auto; - box-shadow: 5px 5px 5px #444; + height: 30px; + width: 70px; + background: linear-gradient(top, #0080ff 0%, #0080aa); + background: -webkit-linear-gradient(top, #0080ff 0%, #0080aa); + background: -moz-linear-gradient(top, #0080ff 0%, #0080aa); + background: -o-linear-gradient(top, #0080ff 0%, #0080aa); + background: -ms-linear-gradient(top, #0080ff 0%, #0080aa); + color: #fff; + font-weight: bold; + border-radius: 0px $radiuspx $radiuspx 0px; + float: right; + text-shadow: 1px 1px #111; + cursor: pointer; } -#profile-jot-submit:active { - box-shadow: 0 0 0 0; +#profile-jot-submit:hover { + background: linear-gradient(top, #0080aa 0%, #0080ff); + background: -webkit-linear-gradient(top, #0080aa 0%, #0080ff); + background: -moz-linear-gradient(top, #0080aa 0%, #0080ff); + background: -o-linear-gradient(top, #0080aa 0%, #0080ff); + background: -ms-linear-gradient(top, #0080aa 0%, #0080ff); } #sidebar-page-list .label { -- cgit v1.2.3 From ba6d6876d62759156e9da12e5e1aede14c5c66e1 Mon Sep 17 00:00:00 2001 From: 23n Date: Mon, 25 Nov 2013 22:18:34 +0100 Subject: no underlined drop icon --- 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 3c3851a65..ae3758c2e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3528,6 +3528,7 @@ margin-right: 50px; a .drop-icons { color: #777; font-size: 1.2em; + text-decoration: none; } .drop-icons:hover { -- cgit v1.2.3 From cbe096dd90292613e21725c8468eaf77f934d079 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 25 Nov 2013 14:20:57 -0800 Subject: wp-to-red: now supports editing, titles, and native permalinks --- mod/item.php | 13 +++++++++++++ util/wp/post_to_red/post_to_red.php | 11 ++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/mod/item.php b/mod/item.php index dba9f01b6..1893bb684 100644 --- a/mod/item.php +++ b/mod/item.php @@ -77,6 +77,8 @@ function item_post(&$a) { $webpage = ((x($_REQUEST,'webpage')) ? intval($_REQUEST['webpage']) : 0); $pagetitle = ((x($_REQUEST,'pagetitle')) ? escape_tags($_REQUEST['pagetitle']) : ''); $layout_mid = ((x($_REQUEST,'layout_mid')) ? escape_tags($_REQUEST['layout_mid']): ''); + $plink = ((x($_REQUEST,'permalink')) ? escape_tags($_REQUEST['permalink']) : ''); + /* Check service class limits */ @@ -196,6 +198,16 @@ function item_post(&$a) { $orig_post = null; + if($namespace && $remote_id) { + // It wasn't an internally generated post - see if we've got an item matching this remote service id + $i = q("select iid from item_id where service = '%s' and sid = '%s' limit 1", + dbesc($namespace), + dbesc($remote_id) + ); + if($i) + $post_id = $i[0]['iid']; + } + if($post_id) { $i = q("SELECT * FROM `item` WHERE `uid` = %d AND `id` = %d LIMIT 1", intval($profile_uid), @@ -616,6 +628,7 @@ function item_post(&$a) { $datarray['layout_mid'] = $layout_mid; $datarray['comment_policy'] = map_scope($channel['channel_w_comment']); $datarray['term'] = $post_tags; + $datarray['plink'] = $plink; // preview mode - prepare the body for display and send it via json diff --git a/util/wp/post_to_red/post_to_red.php b/util/wp/post_to_red/post_to_red.php index 47af7789b..00c9b6b73 100644 --- a/util/wp/post_to_red/post_to_red.php +++ b/util/wp/post_to_red/post_to_red.php @@ -91,8 +91,6 @@ function post_to_red_post($post_id) { $message = $post->post_title . "

    " . $message; - $message .= "

    permalink: " . $post->guid; - if (isset($tag_string)) { $message .= "
    $tag_string"; } @@ -104,7 +102,14 @@ function post_to_red_post($post_id) { $headers = array('Authorization' => 'Basic '.base64_encode("$user_name:$password")); - $body = array('status' => $bbcode,'source' => 'WordPress', 'namespace' => $message_namespace, 'remote_id' => $message_id); + $body = array( + 'title' => xpost_to_html2bbcode($post->post_title), + 'status' => $bbcode, + 'source' => 'WordPress', + 'namespace' => 'wordpress', + 'remote_id' => $message_id, + 'permalink' => $post->guid; + ); if($channel) $body['channel'] = $channel; -- cgit v1.2.3 From fe9162395ae703adf91f7ac32833211ca60ac216 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 25 Nov 2013 14:54:14 -0800 Subject: sort out the preview icons --- mod/item.php | 2 +- view/theme/redbasic/css/style.css | 8 ++++++-- view/tpl/comment_item.tpl | 2 +- view/tpl/jot.tpl | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/mod/item.php b/mod/item.php index 1893bb684..f5df854ee 100644 --- a/mod/item.php +++ b/mod/item.php @@ -823,7 +823,7 @@ function item_post(&$a) { } $datarray['id'] = $post_id; - $datarray['plink'] = $a->get_baseurl() . '/display/' . $channel['channel_address'] . '/' . $post_id; + $datarray['llink'] = $a->get_baseurl() . '/display/' . $channel['channel_address'] . '/' . $post_id; call_hooks('post_local_end', $datarray); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 3c3851a65..6b670126a 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1133,8 +1133,8 @@ footer { #profile-jot-plugin-wrapper, #profile-jot-submit-wrapper { - margin-top: 15px; - width:90%; + margin-top: 10px; + width:92%; } #profile-upload-wrapper { @@ -3515,6 +3515,10 @@ margin-right: 50px; color: $toolicon_colour; } +.comment-preview-icon { + margin-left: 15px; +} + .comment-icon:hover, .jot-icons:hover { color: $toolicon_activecolour; diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index b8e2b4730..1ea619774 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -61,7 +61,7 @@ diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index b9238f0c0..666fae9cd 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -71,7 +71,7 @@ {{/if}} - {{if $preview}}{{$preview}}{{/if}} + {{if $preview}}{{/if}}
    -- cgit v1.2.3 From 95824642a643ccee269f7bf1a5ac570bc966a2e2 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 25 Nov 2013 19:07:58 -0800 Subject: make font-asewome optional. Also include jquery.browser in js/main.js so we can turn off the migration toolkit. --- js/main.js | 39 ++++++++++++++++++++++++++++++++++ view/php/theme_init.php | 7 ++---- view/theme/redbasic/php/theme_init.php | 5 +++++ 3 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 view/theme/redbasic/php/theme_init.php diff --git a/js/main.js b/js/main.js index f9dc95daa..e1769f77a 100644 --- a/js/main.js +++ b/js/main.js @@ -1203,3 +1203,42 @@ function zid(s) { s = s + achar + 'f=&zid=' + zid; return s; } + +// provide jquery.browser so we can get rid of the migration toolkit + +jQuery.uaMatch = function( ua ) { + ua = ua.toLowerCase(); + + var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) || + /(webkit)[ \/]([\w.]+)/.exec( ua ) || + /(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) || + /(msie) ([\w.]+)/.exec( ua ) || + ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) || + []; + + return { + browser: match[ 1 ] || "", + version: match[ 2 ] || "0" + }; +}; + + +// Don't clobber any existing jQuery.browser in case it's different +if ( !jQuery.browser ) { + matched = jQuery.uaMatch( navigator.userAgent ); + browser = {}; + + if ( matched.browser ) { + browser[ matched.browser ] = true; + browser.version = matched.version; + } + + // Chrome is Webkit, but Webkit is also Safari. + if ( browser.chrome ) { + browser.webkit = true; + } else if ( browser.webkit ) { + browser.safari = true; + } + + jQuery.browser = browser; +} diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 69d99893a..c33187797 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -1,20 +1,17 @@ Date: Tue, 26 Nov 2013 00:06:56 -0800 Subject: will be doing some stuff for which handcrafting xmlrpc requests is too bloody painful. xmlrpc is long dead, but it's the language of wordpress - which is far from dead. --- library/IXR_Library.php | 1371 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1371 insertions(+) create mode 100644 library/IXR_Library.php diff --git a/library/IXR_Library.php b/library/IXR_Library.php new file mode 100644 index 000000000..9e2537701 --- /dev/null +++ b/library/IXR_Library.php @@ -0,0 +1,1371 @@ +data = $data; + if (!$type) { + $type = $this->calculateType(); + } + $this->type = $type; + if ($type == 'struct') { + // Turn all the values in the array in to new IXR_Value objects + foreach ($this->data as $key => $value) { + $this->data[$key] = new IXR_Value($value); + } + } + if ($type == 'array') { + for ($i = 0, $j = count($this->data); $i < $j; $i++) { + $this->data[$i] = new IXR_Value($this->data[$i]); + } + } + } + + function calculateType() + { + if ($this->data === true || $this->data === false) { + return 'boolean'; + } + if (is_integer($this->data)) { + return 'int'; + } + if (is_double($this->data)) { + return 'double'; + } + + // Deal with IXR object types base64 and date + if (is_object($this->data) && is_a($this->data, 'IXR_Date')) { + return 'date'; + } + if (is_object($this->data) && is_a($this->data, 'IXR_Base64')) { + return 'base64'; + } + + // If it is a normal PHP object convert it in to a struct + if (is_object($this->data)) { + $this->data = get_object_vars($this->data); + return 'struct'; + } + if (!is_array($this->data)) { + return 'string'; + } + + // We have an array - is it an array or a struct? + if ($this->isStruct($this->data)) { + return 'struct'; + } else { + return 'array'; + } + } + + function getXml() + { + // Return XML for this value + switch ($this->type) { + case 'boolean': + return ''.(($this->data) ? '1' : '0').''; + break; + case 'int': + return ''.$this->data.''; + break; + case 'double': + return ''.$this->data.''; + break; + case 'string': + return ''.htmlspecialchars($this->data).''; + break; + case 'array': + $return = ''."\n"; + foreach ($this->data as $item) { + $return .= ' '.$item->getXml()."\n"; + } + $return .= ''; + return $return; + break; + case 'struct': + $return = ''."\n"; + foreach ($this->data as $name => $value) { + $return .= " $name"; + $return .= $value->getXml()."\n"; + } + $return .= ''; + return $return; + break; + case 'date': + case 'base64': + return $this->data->getXml(); + break; + } + return false; + } + + /** + * Checks whether or not the supplied array is a struct or not + * + * @param unknown_type $array + * @return boolean + */ + function isStruct($array) + { + $expected = 0; + foreach ($array as $key => $value) { + if ((string)$key != (string)$expected) { + return true; + } + $expected++; + } + return false; + } +} + +/** + * IXR_MESSAGE + * + * @package IXR + * @since 1.5 + * + */ +class IXR_Message +{ + var $message; + var $messageType; // methodCall / methodResponse / fault + var $faultCode; + var $faultString; + var $methodName; + var $params; + + // Current variable stacks + var $_arraystructs = array(); // The stack used to keep track of the current array/struct + var $_arraystructstypes = array(); // Stack keeping track of if things are structs or array + var $_currentStructName = array(); // A stack as well + var $_param; + var $_value; + var $_currentTag; + var $_currentTagContents; + // The XML parser + var $_parser; + + function IXR_Message($message) + { + $this->message =& $message; + } + + function parse() + { + // first remove the XML declaration + // merged from WP #10698 - this method avoids the RAM usage of preg_replace on very large messages + $header = preg_replace( '/<\?xml.*?\?'.'>/', '', substr($this->message, 0, 100), 1); + $this->message = substr_replace($this->message, $header, 0, 100); + if (trim($this->message) == '') { + return false; + } + $this->_parser = xml_parser_create(); + // Set XML parser to take the case of tags in to account + xml_parser_set_option($this->_parser, XML_OPTION_CASE_FOLDING, false); + // Set XML parser callback functions + xml_set_object($this->_parser, $this); + xml_set_element_handler($this->_parser, 'tag_open', 'tag_close'); + xml_set_character_data_handler($this->_parser, 'cdata'); + $chunk_size = 262144; // 256Kb, parse in chunks to avoid the RAM usage on very large messages + do { + if (strlen($this->message) <= $chunk_size) { + $final = true; + } + $part = substr($this->message, 0, $chunk_size); + $this->message = substr($this->message, $chunk_size); + if (!xml_parse($this->_parser, $part, $final)) { + return false; + } + if ($final) { + break; + } + } while (true); + xml_parser_free($this->_parser); + + // Grab the error messages, if any + if ($this->messageType == 'fault') { + $this->faultCode = $this->params[0]['faultCode']; + $this->faultString = $this->params[0]['faultString']; + } + return true; + } + + function tag_open($parser, $tag, $attr) + { + $this->_currentTagContents = ''; + $this->currentTag = $tag; + switch($tag) { + case 'methodCall': + case 'methodResponse': + case 'fault': + $this->messageType = $tag; + break; + /* Deal with stacks of arrays and structs */ + case 'data': // data is to all intents and puposes more interesting than array + $this->_arraystructstypes[] = 'array'; + $this->_arraystructs[] = array(); + break; + case 'struct': + $this->_arraystructstypes[] = 'struct'; + $this->_arraystructs[] = array(); + break; + } + } + + function cdata($parser, $cdata) + { + $this->_currentTagContents .= $cdata; + } + + function tag_close($parser, $tag) + { + $valueFlag = false; + switch($tag) { + case 'int': + case 'i4': + $value = (int)trim($this->_currentTagContents); + $valueFlag = true; + break; + case 'double': + $value = (double)trim($this->_currentTagContents); + $valueFlag = true; + break; + case 'string': + $value = (string)trim($this->_currentTagContents); + $valueFlag = true; + break; + case 'dateTime.iso8601': + $value = new IXR_Date(trim($this->_currentTagContents)); + $valueFlag = true; + break; + case 'value': + // "If no type is indicated, the type is string." + if (trim($this->_currentTagContents) != '') { + $value = (string)$this->_currentTagContents; + $valueFlag = true; + } + break; + case 'boolean': + $value = (boolean)trim($this->_currentTagContents); + $valueFlag = true; + break; + case 'base64': + $value = base64_decode($this->_currentTagContents); + $valueFlag = true; + break; + /* Deal with stacks of arrays and structs */ + case 'data': + case 'struct': + $value = array_pop($this->_arraystructs); + array_pop($this->_arraystructstypes); + $valueFlag = true; + break; + case 'member': + array_pop($this->_currentStructName); + break; + case 'name': + $this->_currentStructName[] = trim($this->_currentTagContents); + break; + case 'methodName': + $this->methodName = trim($this->_currentTagContents); + break; + } + + if ($valueFlag) { + if (count($this->_arraystructs) > 0) { + // Add value to struct or array + if ($this->_arraystructstypes[count($this->_arraystructstypes)-1] == 'struct') { + // Add to struct + $this->_arraystructs[count($this->_arraystructs)-1][$this->_currentStructName[count($this->_currentStructName)-1]] = $value; + } else { + // Add to array + $this->_arraystructs[count($this->_arraystructs)-1][] = $value; + } + } else { + // Just add as a paramater + $this->params[] = $value; + } + } + $this->_currentTagContents = ''; + } +} + +/** + * IXR_Server + * + * @package IXR + * @since 1.5 + */ +class IXR_Server +{ + var $data; + var $callbacks = array(); + var $message; + var $capabilities; + + function IXR_Server($callbacks = false, $data = false, $wait = false) + { + $this->setCapabilities(); + if ($callbacks) { + $this->callbacks = $callbacks; + } + $this->setCallbacks(); + if (!$wait) { + $this->serve($data); + } + } + + function serve($data = false) + { + if (!$data) { + if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] !== 'POST') { + header('Content-Type: text/plain'); // merged from WP #9093 + die('XML-RPC server accepts POST requests only.'); + } + + global $HTTP_RAW_POST_DATA; + if (empty($HTTP_RAW_POST_DATA)) { + // workaround for a bug in PHP 5.2.2 - http://bugs.php.net/bug.php?id=41293 + $data = file_get_contents('php://input'); + } else { + $data =& $HTTP_RAW_POST_DATA; + } + } + $this->message = new IXR_Message($data); + if (!$this->message->parse()) { + $this->error(-32700, 'parse error. not well formed'); + } + if ($this->message->messageType != 'methodCall') { + $this->error(-32600, 'server error. invalid xml-rpc. not conforming to spec. Request must be a methodCall'); + } + $result = $this->call($this->message->methodName, $this->message->params); + + // Is the result an error? + if (is_a($result, 'IXR_Error')) { + $this->error($result); + } + + // Encode the result + $r = new IXR_Value($result); + $resultxml = $r->getXml(); + + // Create the XML + $xml = << + + + + $resultxml + + + + + +EOD; + // Send it + $this->output($xml); + } + + function call($methodname, $args) + { + if (!$this->hasMethod($methodname)) { + return new IXR_Error(-32601, 'server error. requested method '.$methodname.' does not exist.'); + } + $method = $this->callbacks[$methodname]; + + // Perform the callback and send the response + if (count($args) == 1) { + // If only one paramater just send that instead of the whole array + $args = $args[0]; + } + + // Are we dealing with a function or a method? + if (is_string($method) && substr($method, 0, 5) == 'this:') { + // It's a class method - check it exists + $method = substr($method, 5); + if (!method_exists($this, $method)) { + return new IXR_Error(-32601, 'server error. requested class method "'.$method.'" does not exist.'); + } + + //Call the method + $result = $this->$method($args); + } else { + // It's a function - does it exist? + if (is_array($method)) { + if (!method_exists($method[0], $method[1])) { + return new IXR_Error(-32601, 'server error. requested object method "'.$method[1].'" does not exist.'); + } + } else if (!function_exists($method)) { + return new IXR_Error(-32601, 'server error. requested function "'.$method.'" does not exist.'); + } + + // Call the function + $result = call_user_func($method, $args); + } + return $result; + } + + function error($error, $message = false) + { + // Accepts either an error object or an error code and message + if ($message && !is_object($error)) { + $error = new IXR_Error($error, $message); + } + $this->output($error->getXml()); + } + + function output($xml) + { + $xml = ''."\n".$xml; + $length = strlen($xml); + header('Connection: close'); + header('Content-Length: '.$length); + header('Content-Type: text/xml'); + header('Date: '.date('r')); + echo $xml; + exit; + } + + function hasMethod($method) + { + return in_array($method, array_keys($this->callbacks)); + } + + function setCapabilities() + { + // Initialises capabilities array + $this->capabilities = array( + 'xmlrpc' => array( + 'specUrl' => 'http://www.xmlrpc.com/spec', + 'specVersion' => 1 + ), + 'faults_interop' => array( + 'specUrl' => 'http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php', + 'specVersion' => 20010516 + ), + 'system.multicall' => array( + 'specUrl' => 'http://www.xmlrpc.com/discuss/msgReader$1208', + 'specVersion' => 1 + ), + ); + } + + function getCapabilities($args) + { + return $this->capabilities; + } + + function setCallbacks() + { + $this->callbacks['system.getCapabilities'] = 'this:getCapabilities'; + $this->callbacks['system.listMethods'] = 'this:listMethods'; + $this->callbacks['system.multicall'] = 'this:multiCall'; + } + + function listMethods($args) + { + // Returns a list of methods - uses array_reverse to ensure user defined + // methods are listed before server defined methods + return array_reverse(array_keys($this->callbacks)); + } + + function multiCall($methodcalls) + { + // See http://www.xmlrpc.com/discuss/msgReader$1208 + $return = array(); + foreach ($methodcalls as $call) { + $method = $call['methodName']; + $params = $call['params']; + if ($method == 'system.multicall') { + $result = new IXR_Error(-32600, 'Recursive calls to system.multicall are forbidden'); + } else { + $result = $this->call($method, $params); + } + if (is_a($result, 'IXR_Error')) { + $return[] = array( + 'faultCode' => $result->code, + 'faultString' => $result->message + ); + } else { + $return[] = array($result); + } + } + return $return; + } +} + +/** + * IXR_Request + * + * @package IXR + * @since 1.5 + */ +class IXR_Request +{ + var $method; + var $args; + var $xml; + + function IXR_Request($method, $args) + { + $this->method = $method; + $this->args = $args; + $this->xml = << + +{$this->method} + + +EOD; + foreach ($this->args as $arg) { + $this->xml .= ''; + $v = new IXR_Value($arg); + $this->xml .= $v->getXml(); + $this->xml .= "\n"; + } + $this->xml .= ''; + } + + function getLength() + { + return strlen($this->xml); + } + + function getXml() + { + return $this->xml; + } +} + +/** + * IXR_Client + * + * @package IXR + * @since 1.5 + * + */ +class IXR_Client +{ + var $server; + var $port; + var $path; + var $useragent; + var $response; + var $message = false; + var $debug = false; + var $timeout; + + // Storage place for an error message + var $error = false; + + function IXR_Client($server, $path = false, $port = 80, $timeout = 15) + { + if (!$path) { + // Assume we have been given a URL instead + $bits = parse_url($server); + $this->server = $bits['host']; + $this->port = isset($bits['port']) ? $bits['port'] : 80; + $this->path = isset($bits['path']) ? $bits['path'] : '/'; + + // Make absolutely sure we have a path + if (!$this->path) { + $this->path = '/'; + } + } else { + $this->server = $server; + $this->path = $path; + $this->port = $port; + } + $this->useragent = 'The Incutio XML-RPC PHP Library'; + $this->timeout = $timeout; + } + + function query() + { + $args = func_get_args(); + $method = array_shift($args); + $request = new IXR_Request($method, $args); + $length = $request->getLength(); + $xml = $request->getXml(); + $r = "\r\n"; + $request = "POST {$this->path} HTTP/1.0$r"; + + // Merged from WP #8145 - allow custom headers + $this->headers['Host'] = $this->server; + $this->headers['Content-Type'] = 'text/xml'; + $this->headers['User-Agent'] = $this->useragent; + $this->headers['Content-Length']= $length; + + foreach( $this->headers as $header => $value ) { + $request .= "{$header}: {$value}{$r}"; + } + $request .= $r; + + $request .= $xml; + + // Now send the request + if ($this->debug) { + echo '
    '.htmlspecialchars($request)."\n
    \n\n"; + } + + if ($this->timeout) { + $fp = @fsockopen($this->server, $this->port, $errno, $errstr, $this->timeout); + } else { + $fp = @fsockopen($this->server, $this->port, $errno, $errstr); + } + if (!$fp) { + $this->error = new IXR_Error(-32300, 'transport error - could not open socket'); + return false; + } + fputs($fp, $request); + $contents = ''; + $debugContents = ''; + $gotFirstLine = false; + $gettingHeaders = true; + while (!feof($fp)) { + $line = fgets($fp, 4096); + if (!$gotFirstLine) { + // Check line for '200' + if (strstr($line, '200') === false) { + $this->error = new IXR_Error(-32300, 'transport error - HTTP status code was not 200'); + return false; + } + $gotFirstLine = true; + } + if (trim($line) == '') { + $gettingHeaders = false; + } + if (!$gettingHeaders) { + // merged from WP #12559 - remove trim + $contents .= $line; + } + if ($this->debug) { + $debugContents .= $line; + } + } + if ($this->debug) { + echo '
    '.htmlspecialchars($debugContents)."\n
    \n\n"; + } + + // Now parse what we've got back + $this->message = new IXR_Message($contents); + if (!$this->message->parse()) { + // XML error + $this->error = new IXR_Error(-32700, 'parse error. not well formed'); + return false; + } + + // Is the message a fault? + if ($this->message->messageType == 'fault') { + $this->error = new IXR_Error($this->message->faultCode, $this->message->faultString); + return false; + } + + // Message must be OK + return true; + } + + function getResponse() + { + // methodResponses can only have one param - return that + return $this->message->params[0]; + } + + function isError() + { + return (is_object($this->error)); + } + + function getErrorCode() + { + return $this->error->code; + } + + function getErrorMessage() + { + return $this->error->message; + } +} + + +/** + * IXR_Error + * + * @package IXR + * @since 1.5 + */ +class IXR_Error +{ + var $code; + var $message; + + function IXR_Error($code, $message) + { + $this->code = $code; + $this->message = htmlspecialchars($message); + } + + function getXml() + { + $xml = << + + + + + faultCode + {$this->code} + + + faultString + {$this->message} + + + + + + +EOD; + return $xml; + } +} + +/** + * IXR_Date + * + * @package IXR + * @since 1.5 + */ +class IXR_Date { + var $year; + var $month; + var $day; + var $hour; + var $minute; + var $second; + var $timezone; + + function IXR_Date($time) + { + // $time can be a PHP timestamp or an ISO one + if (is_numeric($time)) { + $this->parseTimestamp($time); + } else { + $this->parseIso($time); + } + } + + function parseTimestamp($timestamp) + { + $this->year = date('Y', $timestamp); + $this->month = date('m', $timestamp); + $this->day = date('d', $timestamp); + $this->hour = date('H', $timestamp); + $this->minute = date('i', $timestamp); + $this->second = date('s', $timestamp); + $this->timezone = ''; + } + + function parseIso($iso) + { + $this->year = substr($iso, 0, 4); + $this->month = substr($iso, 4, 2); + $this->day = substr($iso, 6, 2); + $this->hour = substr($iso, 9, 2); + $this->minute = substr($iso, 12, 2); + $this->second = substr($iso, 15, 2); + $this->timezone = substr($iso, 17); + } + + function getIso() + { + return $this->year.$this->month.$this->day.'T'.$this->hour.':'.$this->minute.':'.$this->second.$this->timezone; + } + + function getXml() + { + return ''.$this->getIso().''; + } + + function getTimestamp() + { + return mktime($this->hour, $this->minute, $this->second, $this->month, $this->day, $this->year); + } +} + +/** + * IXR_Base64 + * + * @package IXR + * @since 1.5 + */ +class IXR_Base64 +{ + var $data; + + function IXR_Base64($data) + { + $this->data = $data; + } + + function getXml() + { + return ''.base64_encode($this->data).''; + } +} + +/** + * IXR_IntrospectionServer + * + * @package IXR + * @since 1.5 + */ +class IXR_IntrospectionServer extends IXR_Server +{ + var $signatures; + var $help; + + function IXR_IntrospectionServer() + { + $this->setCallbacks(); + $this->setCapabilities(); + $this->capabilities['introspection'] = array( + 'specUrl' => 'http://xmlrpc.usefulinc.com/doc/reserved.html', + 'specVersion' => 1 + ); + $this->addCallback( + 'system.methodSignature', + 'this:methodSignature', + array('array', 'string'), + 'Returns an array describing the return type and required parameters of a method' + ); + $this->addCallback( + 'system.getCapabilities', + 'this:getCapabilities', + array('struct'), + 'Returns a struct describing the XML-RPC specifications supported by this server' + ); + $this->addCallback( + 'system.listMethods', + 'this:listMethods', + array('array'), + 'Returns an array of available methods on this server' + ); + $this->addCallback( + 'system.methodHelp', + 'this:methodHelp', + array('string', 'string'), + 'Returns a documentation string for the specified method' + ); + } + + function addCallback($method, $callback, $args, $help) + { + $this->callbacks[$method] = $callback; + $this->signatures[$method] = $args; + $this->help[$method] = $help; + } + + function call($methodname, $args) + { + // Make sure it's in an array + if ($args && !is_array($args)) { + $args = array($args); + } + + // Over-rides default call method, adds signature check + if (!$this->hasMethod($methodname)) { + return new IXR_Error(-32601, 'server error. requested method "'.$this->message->methodName.'" not specified.'); + } + $method = $this->callbacks[$methodname]; + $signature = $this->signatures[$methodname]; + $returnType = array_shift($signature); + + // Check the number of arguments + if (count($args) != count($signature)) { + return new IXR_Error(-32602, 'server error. wrong number of method parameters'); + } + + // Check the argument types + $ok = true; + $argsbackup = $args; + for ($i = 0, $j = count($args); $i < $j; $i++) { + $arg = array_shift($args); + $type = array_shift($signature); + switch ($type) { + case 'int': + case 'i4': + if (is_array($arg) || !is_int($arg)) { + $ok = false; + } + break; + case 'base64': + case 'string': + if (!is_string($arg)) { + $ok = false; + } + break; + case 'boolean': + if ($arg !== false && $arg !== true) { + $ok = false; + } + break; + case 'float': + case 'double': + if (!is_float($arg)) { + $ok = false; + } + break; + case 'date': + case 'dateTime.iso8601': + if (!is_a($arg, 'IXR_Date')) { + $ok = false; + } + break; + } + if (!$ok) { + return new IXR_Error(-32602, 'server error. invalid method parameters'); + } + } + // It passed the test - run the "real" method call + return parent::call($methodname, $argsbackup); + } + + function methodSignature($method) + { + if (!$this->hasMethod($method)) { + return new IXR_Error(-32601, 'server error. requested method "'.$method.'" not specified.'); + } + // We should be returning an array of types + $types = $this->signatures[$method]; + $return = array(); + foreach ($types as $type) { + switch ($type) { + case 'string': + $return[] = 'string'; + break; + case 'int': + case 'i4': + $return[] = 42; + break; + case 'double': + $return[] = 3.1415; + break; + case 'dateTime.iso8601': + $return[] = new IXR_Date(time()); + break; + case 'boolean': + $return[] = true; + break; + case 'base64': + $return[] = new IXR_Base64('base64'); + break; + case 'array': + $return[] = array('array'); + break; + case 'struct': + $return[] = array('struct' => 'struct'); + break; + } + } + return $return; + } + + function methodHelp($method) + { + return $this->help[$method]; + } +} + +/** + * IXR_ClientMulticall + * + * @package IXR + * @since 1.5 + */ +class IXR_ClientMulticall extends IXR_Client +{ + var $calls = array(); + + function IXR_ClientMulticall($server, $path = false, $port = 80) + { + parent::IXR_Client($server, $path, $port); + $this->useragent = 'The Incutio XML-RPC PHP Library (multicall client)'; + } + + function addCall() + { + $args = func_get_args(); + $methodName = array_shift($args); + $struct = array( + 'methodName' => $methodName, + 'params' => $args + ); + $this->calls[] = $struct; + } + + function query() + { + // Prepare multicall, then call the parent::query() method + return parent::query('system.multicall', $this->calls); + } +} + +/** + * Client for communicating with a XML-RPC Server over HTTPS. + * + * @author Jason Stirk (@link http://blog.griffin.homelinux.org/projects/xmlrpc/) + * @version 0.2.0 26May2005 08:34 +0800 + * @copyright (c) 2004-2005 Jason Stirk + * @package IXR + */ +class IXR_ClientSSL extends IXR_Client +{ + /** + * Filename of the SSL Client Certificate + * @access private + * @since 0.1.0 + * @var string + */ + var $_certFile; + + /** + * Filename of the SSL CA Certificate + * @access private + * @since 0.1.0 + * @var string + */ + var $_caFile; + + /** + * Filename of the SSL Client Private Key + * @access private + * @since 0.1.0 + * @var string + */ + var $_keyFile; + + /** + * Passphrase to unlock the private key + * @access private + * @since 0.1.0 + * @var string + */ + var $_passphrase; + + /** + * Constructor + * @param string $server URL of the Server to connect to + * @since 0.1.0 + */ + function IXR_ClientSSL($server, $path = false, $port = 443, $timeout = false) + { + parent::IXR_Client($server, $path, $port, $timeout); + $this->useragent = 'The Incutio XML-RPC PHP Library for SSL'; + + // Set class fields + $this->_certFile=false; + $this->_caFile=false; + $this->_keyFile=false; + $this->_passphrase=''; + } + + /** + * Set the client side certificates to communicate with the server. + * + * @since 0.1.0 + * @param string $certificateFile Filename of the client side certificate to use + * @param string $keyFile Filename of the client side certificate's private key + * @param string $keyPhrase Passphrase to unlock the private key + */ + function setCertificate($certificateFile, $keyFile, $keyPhrase='') + { + // Check the files all exist + if (is_file($certificateFile)) { + $this->_certFile = $certificateFile; + } else { + die('Could not open certificate: ' . $certificateFile); + } + + if (is_file($keyFile)) { + $this->_keyFile = $keyFile; + } else { + die('Could not open private key: ' . $keyFile); + } + + $this->_passphrase=(string)$keyPhrase; + } + + function setCACertificate($caFile) + { + if (is_file($caFile)) { + $this->_caFile = $caFile; + } else { + die('Could not open CA certificate: ' . $caFile); + } + } + + /** + * Sets the connection timeout (in seconds) + * @param int $newTimeOut Timeout in seconds + * @returns void + * @since 0.1.2 + */ + function setTimeOut($newTimeOut) + { + $this->timeout = (int)$newTimeOut; + } + + /** + * Returns the connection timeout (in seconds) + * @returns int + * @since 0.1.2 + */ + function getTimeOut() + { + return $this->timeout; + } + + /** + * Set the query to send to the XML-RPC Server + * @since 0.1.0 + */ + function query() + { + $args = func_get_args(); + $method = array_shift($args); + $request = new IXR_Request($method, $args); + $length = $request->getLength(); + $xml = $request->getXml(); + + if ($this->debug) { + echo '
    '.htmlspecialchars($xml)."\n
    \n\n"; + } + + //This is where we deviate from the normal query() + //Rather than open a normal sock, we will actually use the cURL + //extensions to make the calls, and handle the SSL stuff. + + //Since 04Aug2004 (0.1.3) - Need to include the port (duh...) + //Since 06Oct2004 (0.1.4) - Need to include the colon!!! + // (I swear I've fixed this before... ESP in live... But anyhu...) + $curl=curl_init('https://' . $this->server . ':' . $this->port . $this->path); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + + //Since 23Jun2004 (0.1.2) - Made timeout a class field + curl_setopt($curl, CURLOPT_TIMEOUT, $this->timeout); + + if ($this->debug) { + curl_setopt($curl, CURLOPT_VERBOSE, 1); + } + + curl_setopt($curl, CURLOPT_HEADER, 1); + curl_setopt($curl, CURLOPT_POST, 1); + curl_setopt($curl, CURLOPT_POSTFIELDS, $xml); + curl_setopt($curl, CURLOPT_PORT, $this->port); + curl_setopt($curl, CURLOPT_HTTPHEADER, array( + "Content-Type: text/xml", + "Content-length: {$length}")); + + // Process the SSL certificates, etc. to use + if (!($this->_certFile === false)) { + // We have a certificate file set, so add these to the cURL handler + curl_setopt($curl, CURLOPT_SSLCERT, $this->_certFile); + curl_setopt($curl, CURLOPT_SSLKEY, $this->_keyFile); + + if ($this->debug) { + echo "SSL Cert at : " . $this->_certFile . "\n"; + echo "SSL Key at : " . $this->_keyFile . "\n"; + } + + // See if we need to give a passphrase + if (!($this->_passphrase === '')) { + curl_setopt($curl, CURLOPT_SSLCERTPASSWD, $this->_passphrase); + } + + if ($this->_caFile === false) { + // Don't verify their certificate, as we don't have a CA to verify against + curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 0); + } else { + // Verify against a CA + curl_setopt($curl, CURLOPT_CAINFO, $this->_caFile); + } + } + + // Call cURL to do it's stuff and return us the content + $contents = curl_exec($curl); + curl_close($curl); + + // Check for 200 Code in $contents + if (!strstr($contents, '200 OK')) { + //There was no "200 OK" returned - we failed + $this->error = new IXR_Error(-32300, 'transport error - HTTP status code was not 200'); + return false; + } + + if ($this->debug) { + echo '
    '.htmlspecialchars($contents)."\n
    \n\n"; + } + // Now parse what we've got back + // Since 20Jun2004 (0.1.1) - We need to remove the headers first + // Why I have only just found this, I will never know... + // So, remove everything before the first < + $contents = substr($contents,strpos($contents, '<')); + + $this->message = new IXR_Message($contents); + if (!$this->message->parse()) { + // XML error + $this->error = new IXR_Error(-32700, 'parse error. not well formed'); + return false; + } + // Is the message a fault? + if ($this->message->messageType == 'fault') { + $this->error = new IXR_Error($this->message->faultCode, $this->message->faultString); + return false; + } + + // Message must be OK + return true; + } +} + +/** + * Extension of the {@link IXR_Server} class to easily wrap objects. + * + * Class is designed to extend the existing XML-RPC server to allow the + * presentation of methods from a variety of different objects via an + * XML-RPC server. + * It is intended to assist in organization of your XML-RPC methods by allowing + * you to "write once" in your existing model classes and present them. + * + * @author Jason Stirk + * @version 1.0.1 19Apr2005 17:40 +0800 + * @copyright Copyright (c) 2005 Jason Stirk + * @package IXR + */ +class IXR_ClassServer extends IXR_Server +{ + var $_objects; + var $_delim; + + function IXR_ClassServer($delim = '.', $wait = false) + { + $this->IXR_Server(array(), false, $wait); + $this->_delimiter = $delim; + $this->_objects = array(); + } + + function addMethod($rpcName, $functionName) + { + $this->callbacks[$rpcName] = $functionName; + } + + function registerObject($object, $methods, $prefix=null) + { + if (is_null($prefix)) + { + $prefix = get_class($object); + } + $this->_objects[$prefix] = $object; + + // Add to our callbacks array + foreach($methods as $method) + { + if (is_array($method)) + { + $targetMethod = $method[0]; + $method = $method[1]; + } + else + { + $targetMethod = $method; + } + $this->callbacks[$prefix . $this->_delimiter . $method]=array($prefix, $targetMethod); + } + } + + function call($methodname, $args) + { + if (!$this->hasMethod($methodname)) { + return new IXR_Error(-32601, 'server error. requested method '.$methodname.' does not exist.'); + } + $method = $this->callbacks[$methodname]; + + // Perform the callback and send the response + if (count($args) == 1) { + // If only one paramater just send that instead of the whole array + $args = $args[0]; + } + + // See if this method comes from one of our objects or maybe self + if (is_array($method) || (substr($method, 0, 5) == 'this:')) { + if (is_array($method)) { + $object=$this->_objects[$method[0]]; + $method=$method[1]; + } else { + $object=$this; + $method = substr($method, 5); + } + + // It's a class method - check it exists + if (!method_exists($object, $method)) { + return new IXR_Error(-32601, 'server error. requested class method "'.$method.'" does not exist.'); + } + + // Call the method + $result = $object->$method($args); + } else { + // It's a function - does it exist? + if (!function_exists($method)) { + return new IXR_Error(-32601, 'server error. requested function "'.$method.'" does not exist.'); + } + + // Call the function + $result = $method($args); + } + return $result; + } +} -- cgit v1.2.3 From ed71567e5ce3cc5c9dd30acc0c2bc527960fa3da Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 26 Nov 2013 13:24:36 -0800 Subject: create jquery-compat to hold deprecated jquery functions, load it before all the dependent js scripts --- js/jquery-compat.js | 71 +++++++++++++++++++++++++++++++++++++++ js/main.js | 39 --------------------- version.inc | 2 +- view/php/theme_init.php | 3 +- view/theme/redbasic/css/style.css | 6 ++-- 5 files changed, 77 insertions(+), 44 deletions(-) create mode 100644 js/jquery-compat.js diff --git a/js/jquery-compat.js b/js/jquery-compat.js new file mode 100644 index 000000000..7bf912542 --- /dev/null +++ b/js/jquery-compat.js @@ -0,0 +1,71 @@ + +// provide jquery.browser so we can get rid of the migration toolkit + +jQuery.uaMatch = function( ua ) { + ua = ua.toLowerCase(); + + var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) || + /(webkit)[ \/]([\w.]+)/.exec( ua ) || + /(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) || + /(msie) ([\w.]+)/.exec( ua ) || + ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) || + []; + + return { + browser: match[ 1 ] || "", + version: match[ 2 ] || "0" + }; +}; + + +// Don't clobber any existing jQuery.browser in case it's different +if ( !jQuery.browser ) { + matched = jQuery.uaMatch( navigator.userAgent ); + browser = {}; + + if ( matched.browser ) { + browser[ matched.browser ] = true; + browser.version = matched.version; + } + + // Chrome is Webkit, but Webkit is also Safari. + if ( browser.chrome ) { + browser.webkit = true; + } else if ( browser.webkit ) { + browser.safari = true; + } + + jQuery.browser = browser; +} + +jQuery.fn.toggle = function( fn, fn2 ) { + + // Don't mess with animation or css toggles + if ( !jQuery.isFunction( fn ) || !jQuery.isFunction( fn2 ) ) { + return oldToggle.apply( this, arguments ); + } + + // Save reference to arguments for access in closure + var args = arguments, + guid = fn.guid || jQuery.guid++, + i = 0, + toggler = function( event ) { + // Figure out which function to execute + var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i; + jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 ); + + // Make sure that clicks stop + event.preventDefault(); + + // and execute the function + return args[ lastToggle ].apply( this, arguments ) || false; + }; + + // link all the functions, so any of them can unbind this click handler + toggler.guid = guid; + while ( i < args.length ) { + args[ i++ ].guid = guid; + } + + return this.click( toggler ); +}; diff --git a/js/main.js b/js/main.js index e1769f77a..f9dc95daa 100644 --- a/js/main.js +++ b/js/main.js @@ -1203,42 +1203,3 @@ function zid(s) { s = s + achar + 'f=&zid=' + zid; return s; } - -// provide jquery.browser so we can get rid of the migration toolkit - -jQuery.uaMatch = function( ua ) { - ua = ua.toLowerCase(); - - var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) || - /(webkit)[ \/]([\w.]+)/.exec( ua ) || - /(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) || - /(msie) ([\w.]+)/.exec( ua ) || - ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) || - []; - - return { - browser: match[ 1 ] || "", - version: match[ 2 ] || "0" - }; -}; - - -// Don't clobber any existing jQuery.browser in case it's different -if ( !jQuery.browser ) { - matched = jQuery.uaMatch( navigator.userAgent ); - browser = {}; - - if ( matched.browser ) { - browser[ matched.browser ] = true; - browser.version = matched.version; - } - - // Chrome is Webkit, but Webkit is also Safari. - if ( browser.chrome ) { - browser.webkit = true; - } else if ( browser.webkit ) { - browser.safari = true; - } - - jQuery.browser = browser; -} diff --git a/version.inc b/version.inc index 65cc36208..761c49939 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-11-25.508 +2013-11-26.509 diff --git a/view/php/theme_init.php b/view/php/theme_init.php index c33187797..1ba8d18a4 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -11,7 +11,8 @@ head_add_css('library/colorbox/colorbox.css'); // head_add_css('library/font_awesome/css/font-awesome.min.css'); head_add_js('js/jquery.js'); -// head_add_js('js/jquery-migrate-1.1.1.js'); +//head_add_js('js/jquery-migrate-1.1.1.js'); +head_add_js('js/jquery-compat.js'); head_add_js('js/spin.js'); head_add_js('js/jquery.spin.js'); head_add_js('js/jquery.textinputs.js'); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index ce3bfaee9..4b7925ba9 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1978,7 +1978,7 @@ a.mail-list-link { display: block; color: #FFFFFF; margin-top: 15px; - background-color: #F80000; + background-color: $nav_bg_2; -webkit-border-radius: $radiuspx ; -moz-border-radius: $radiuspx; border-radius: $radiuspx; @@ -3002,7 +3002,7 @@ div.jGrowl div.info { width: 90%; } - +a.rconnect, nav a, nav a:active, nav a:visited, @@ -3012,7 +3012,7 @@ nav a:link { outline: none; } -nav a:hover { +a.rconnect:hover, nav a:hover { color: #0080FF; } nav .fakelink { -- cgit v1.2.3 From dde3e28ceb150b2ddc6f60ea6c0c25aa45176921 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 26 Nov 2013 15:26:11 -0800 Subject: add drop_item hook --- include/items.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/items.php b/include/items.php index 9fbd3fd8a..6968781f7 100755 --- a/include/items.php +++ b/include/items.php @@ -3551,6 +3551,9 @@ function drop_item($id,$interactive = true) { if($ok_to_delete) { + $arr = array('item' => $item); + call_hooks('drop_item', $arr ); + $notify_id = intval($item['id']); $items = q("select * from item where parent = %d and uid = %d", -- cgit v1.2.3 From 7aa7f0f4eb201627b89c0587185ad72efc7e6606 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 26 Nov 2013 15:50:30 -0800 Subject: allow editing posts on connectors that support edits --- mod/item.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mod/item.php b/mod/item.php index f5df854ee..6781eba2d 100644 --- a/mod/item.php +++ b/mod/item.php @@ -273,6 +273,7 @@ function item_post(&$a) { $private = $orig_post['item_private']; $item_flags = $orig_post['item_flags']; $item_restrict = $orig_post['item_restrict']; + $postopts = $orig_post['postopts']; } else { @@ -305,6 +306,7 @@ function item_post(&$a) { $verb = notags(trim($_REQUEST['verb'])); $title = escape_tags(trim($_REQUEST['title'])); $body = $_REQUEST['body']; + $postopts = ''; $private = ( ( strlen($str_group_allow) @@ -622,7 +624,7 @@ function item_post(&$a) { $datarray['item_private'] = $private; $datarray['attach'] = $attachments; $datarray['thr_parent'] = $thr_parent; - $datarray['postopts'] = ''; + $datarray['postopts'] = $postopts; $datarray['item_restrict'] = $item_restrict; $datarray['item_flags'] = $item_flags; $datarray['layout_mid'] = $layout_mid; -- cgit v1.2.3 From 6f6fcddfc3fc9bb2e63dd615f29116ced49838d5 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 26 Nov 2013 16:38:48 -0800 Subject: api fixes --- include/api.php | 16 ++++++++++++---- util/wp/post_to_red/post_to_red.php | 11 ++++++++++- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/include/api.php b/include/api.php index 8f7be37c7..717f1572a 100644 --- a/include/api.php +++ b/include/api.php @@ -739,7 +739,7 @@ require_once('include/photos.php'); 'created_at' => api_date($lastwall['created']), 'in_reply_to_status_id' => $in_reply_to_status_id, 'source' => (($lastwall['app']) ? $lastwall['app'] : 'web'), - 'id' => (($w) ? $w[0]['abook_id'] : $user_info['id']), + 'id' => ($lastwall['id']), 'in_reply_to_user_id' => $in_reply_to_user_id, 'in_reply_to_screen_name' => $in_reply_to_screen_name, 'geo' => '', @@ -1081,10 +1081,18 @@ require_once('include/photos.php'); // params $id = intval(argv(3)); - logger('API: api_statuses_destroy: '.$id); + // first prove that we own the item + + $r = q("select * from item where id = %d and uid = %d limit 1", + intval($id), + intval($user_info['uid']) + ); - require_once('include/items.php'); - drop_item($id, false); + if($r) { + logger('API: api_statuses_destroy: '.$id); + require_once('include/items.php'); + drop_item($id, false); + } if ($type == 'xml') $ok = "true"; diff --git a/util/wp/post_to_red/post_to_red.php b/util/wp/post_to_red/post_to_red.php index 00c9b6b73..4c353468c 100644 --- a/util/wp/post_to_red/post_to_red.php +++ b/util/wp/post_to_red/post_to_red.php @@ -108,7 +108,7 @@ function post_to_red_post($post_id) { 'source' => 'WordPress', 'namespace' => 'wordpress', 'remote_id' => $message_id, - 'permalink' => $post->guid; + 'permalink' => $post->guid ); if($channel) $body['channel'] = $channel; @@ -117,6 +117,15 @@ function post_to_red_post($post_id) { $request = new WP_Http; $result = $request->request($url , array( 'method' => 'POST', 'body' => $body, 'headers' => $headers)); +// if($result['response']['code'] == 200) { +// $j = json_decode($result['body'],true); +// if($j && $j['id']) { +// // store the red id in case we need to delete it in the future. +// +// } +// } +// logger('post_to_red returns: ' . print_r($result,true)); + } } -- cgit v1.2.3 From ef53c72a708ed2b1ba4cc1ffc6a926a33ba6a2f2 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 26 Nov 2013 17:02:49 -0800 Subject: delete from the wp side as well as from the red side --- include/api.php | 38 +++++++++++++++++++-------- util/wp/post_to_red/post_to_red.php | 52 +++++++++++++++++++++++++++---------- 2 files changed, 65 insertions(+), 25 deletions(-) diff --git a/include/api.php b/include/api.php index 717f1572a..ca5592d08 100644 --- a/include/api.php +++ b/include/api.php @@ -1080,19 +1080,35 @@ require_once('include/photos.php'); // params $id = intval(argv(3)); + if($id) { + // first prove that we own the item - // first prove that we own the item + $r = q("select * from item where id = %d and uid = %d limit 1", + intval($id), + intval($user_info['uid']) + ); + if(! $r) + return false; + } + else { + if($_REQUEST['namespace'] && $_REQUEST['remote_id']) { + $r = q("select * from item_id where service = '%s' and sid = '%s' and uid = %d limit 1", + dbesc($_REQUEST['namespace']), + dbesc($_REQUEST['remote_id']), + intval($user_info['uid']) + ); + if(! $r) + return false; + $id = $r[0]['iid']; + } + } + if(! $id) + return false; - $r = q("select * from item where id = %d and uid = %d limit 1", - intval($id), - intval($user_info['uid']) - ); + logger('API: api_statuses_destroy: '.$id); + require_once('include/items.php'); + drop_item($id, false); - if($r) { - logger('API: api_statuses_destroy: '.$id); - require_once('include/items.php'); - drop_item($id, false); - } if ($type == 'xml') $ok = "true"; @@ -1114,7 +1130,7 @@ require_once('include/photos.php'); if (api_user()===false) return false; $user_info = api_get_user($a); - // get last newtork messages + // get last network messages // params diff --git a/util/wp/post_to_red/post_to_red.php b/util/wp/post_to_red/post_to_red.php index 4c353468c..d89ab91be 100644 --- a/util/wp/post_to_red/post_to_red.php +++ b/util/wp/post_to_red/post_to_red.php @@ -85,12 +85,8 @@ function post_to_red_post($post_id) { } } - $message_namespace = 'wordpress'; - $message_id = site_url() . '/' . $post_id; - $message = $post->post_title . "

    " . $message; - if (isset($tag_string)) { $message .= "
    $tag_string"; } @@ -98,8 +94,6 @@ function post_to_red_post($post_id) { $bbcode = xpost_to_html2bbcode($message); $url = $seed_location . '/api/statuses/update'; - - $headers = array('Authorization' => 'Basic '.base64_encode("$user_name:$password")); $body = array( @@ -117,20 +111,49 @@ function post_to_red_post($post_id) { $request = new WP_Http; $result = $request->request($url , array( 'method' => 'POST', 'body' => $body, 'headers' => $headers)); -// if($result['response']['code'] == 200) { -// $j = json_decode($result['body'],true); -// if($j && $j['id']) { -// // store the red id in case we need to delete it in the future. -// -// } -// } -// logger('post_to_red returns: ' . print_r($result,true)); + } + + } +} + + +function post_to_red_delete_post($post_id) { + + $post = get_post($post_id); + + // if meta has been set + if (get_post_meta($post_id, "post_to_red", true) == 1) { + + $user_name = post_to_red_get_acct_name(); + $password = post_to_red_get_password(); + $seed_location = post_to_red_get_seed_location(); + $channel = post_to_red_get_channel_name(); + + if ((isset($user_name)) && (isset($password)) && (isset($seed_location))) { + + $message_id = site_url() . '/' . $post_id; + $url = $seed_location . '/api/statuses/destroy'; + + $headers = array('Authorization' => 'Basic '.base64_encode("$user_name:$password")); + $body = array( + 'namespace' => 'wordpress', + 'remote_id' => $message_id, + ); + if($channel) + $body['channel'] = $channel; + + // post: + $request = new WP_Http; + $result = $request->request($url , array( 'method' => 'POST', 'body' => $body, 'headers' => $headers)); } } } + + + function post_to_red_displayAdminContent() { $seed_url = post_to_red_get_seed_location(); @@ -239,6 +262,7 @@ add_action("admin_menu", "post_to_red_admin"); add_action('publish_post', 'post_to_red_post'); add_action('add_meta_boxes', 'post_to_red_post_checkbox'); add_action('save_post', 'post_to_red_post_field_data'); +add_action('before_delete_post', 'post_to_red_delete_post'); // from: // http://www.docgate.com/tutorial/php/how-to-convert-html-to-bbcode-with-php-script.html -- cgit v1.2.3 From 64b71a231b9f8e01490b78316205923c77c68c48 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 26 Nov 2013 18:33:49 -0800 Subject: link the plugins at both ends so that each can discover a post that was imported/exported to/from the other and keep track of updates accordingly --- util/wp/post_to_red/post_to_red.php | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/util/wp/post_to_red/post_to_red.php b/util/wp/post_to_red/post_to_red.php index d89ab91be..55177238d 100644 --- a/util/wp/post_to_red/post_to_red.php +++ b/util/wp/post_to_red/post_to_red.php @@ -59,14 +59,11 @@ function post_to_red_post($post_id) { $post = get_post($post_id); if (isset($_POST['post_to_red'])) { - update_post_meta($post_id, 'post_to_red', 1); - } else { - update_post_meta($post_id, 'post_to_red', 0); - } - + update_post_meta($post_id, 'post_to_red', '1'); + } // if meta has been set - if (get_post_meta($post_id, "post_to_red", true) == 1) { + if (get_post_meta($post_id, "post_to_red", true) === '1') { $user_name = post_to_red_get_acct_name(); $password = post_to_red_get_password(); @@ -122,7 +119,7 @@ function post_to_red_delete_post($post_id) { $post = get_post($post_id); // if meta has been set - if (get_post_meta($post_id, "post_to_red", true) == 1) { + if (get_post_meta($post_id, "post_to_red", true) == '1') { $user_name = post_to_red_get_acct_name(); $password = post_to_red_get_password(); @@ -221,10 +218,8 @@ function post_to_red_post_field_data($post_id) { // now store data in custom fields based on checkboxes selected if (isset($_POST['post_to_red'])) { - update_post_meta($post_id, 'post_to_red', 1); - } else { - update_post_meta($post_id, 'post_to_red', 0); - } + update_post_meta($post_id, 'post_to_red', '1'); + } } function post_to_red_display_admin_page() { -- cgit v1.2.3 From fd57b63c1d8e840db6902c7f8e04f69de2c58a3b Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 26 Nov 2013 21:21:40 -0800 Subject: add terms and categories, fix a delivery loop (stops at one cycle but we don't need a post coming back that we just sent out). --- util/wp/post_to_red/post_to_red.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/wp/post_to_red/post_to_red.php b/util/wp/post_to_red/post_to_red.php index 55177238d..427e0f5e2 100644 --- a/util/wp/post_to_red/post_to_red.php +++ b/util/wp/post_to_red/post_to_red.php @@ -119,7 +119,7 @@ function post_to_red_delete_post($post_id) { $post = get_post($post_id); // if meta has been set - if (get_post_meta($post_id, "post_to_red", true) == '1') { + if ((get_post_meta($post_id, "post_to_red", true) == '1') || (get_post_meta($post_id, "post_from_red", true) == '1')) { $user_name = post_to_red_get_acct_name(); $password = post_to_red_get_password(); -- cgit v1.2.3 From ff635f0133532b82efc1e1fb531a1e3943cfe337 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 26 Nov 2013 23:00:32 -0800 Subject: ensure that drop_item doesn't recurse --- include/items.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index 6968781f7..02f733d92 100755 --- a/include/items.php +++ b/include/items.php @@ -3525,7 +3525,7 @@ function drop_item($id,$interactive = true) { intval($id) ); - if(! $r) { + if((! $r) || ($r[0]['item_restrict'] & ITEM_DELETED)) { if(! $interactive) return 0; notice( t('Item not found.') . EOL); -- cgit v1.2.3 From da29ce6dac0667de2883101e34c9dd64258719ce Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 26 Nov 2013 23:10:10 -0800 Subject: more loop prevention --- include/items.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/items.php b/include/items.php index 02f733d92..45c5f5ac9 100755 --- a/include/items.php +++ b/include/items.php @@ -3551,6 +3551,14 @@ function drop_item($id,$interactive = true) { if($ok_to_delete) { + // set the deleted flag immediately on this item just in case the + // hook calls a remote process which loops. We'll delete it properly in a second. + + $r = q("UPDATE item SET item_restrict = ( item_restrict | %d ) WHERE id = %d LIMIT 1", + intval(ITEM_DELETED), + intval($item['id']) + ); + $arr = array('item' => $item); call_hooks('drop_item', $arr ); -- cgit v1.2.3 From e3f5c4458bc637ca304b807d2125f332965e4126 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 27 Nov 2013 00:48:17 -0800 Subject: re-enable jquery migration tool until we sort out all the issues --- version.inc | 2 +- view/php/theme_init.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/version.inc b/version.inc index 761c49939..099c10c8d 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-11-26.509 +2013-11-27.510 diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 1ba8d18a4..f49b9c043 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -11,8 +11,8 @@ head_add_css('library/colorbox/colorbox.css'); // head_add_css('library/font_awesome/css/font-awesome.min.css'); head_add_js('js/jquery.js'); -//head_add_js('js/jquery-migrate-1.1.1.js'); -head_add_js('js/jquery-compat.js'); +head_add_js('js/jquery-migrate-1.1.1.js'); +//head_add_js('js/jquery-compat.js'); head_add_js('js/spin.js'); head_add_js('js/jquery.spin.js'); head_add_js('js/jquery.textinputs.js'); -- cgit v1.2.3 From 64b467ea98fd4cf3cb6215be9ff8e5a9d13ba1a8 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 27 Nov 2013 02:51:16 -0800 Subject: reduce the likelihood that a given channel will have 30-40 valid hublocs with the same hubloc_url. --- include/zot.php | 31 +++++++++---------------------- mod/zfinger.php | 2 +- 2 files changed, 10 insertions(+), 23 deletions(-) diff --git a/include/zot.php b/include/zot.php index 65f3b606f..0e92b0bff 100644 --- a/include/zot.php +++ b/include/zot.php @@ -18,33 +18,20 @@ function zot_new_uid($channel_nick) { /** - * - * Given an array of zot hashes, return all distinct hubs - * If primary is true, return only primary hubs - * Result is ordered by url to assist in batching. - * Return only the first primary hub as there should only be one. + * @function zot_get_hublocs($hash) + * Given a zot hash, return all distinct hubs + * @param string $hash - xchan_hash + * @retuns array * */ -function zot_get_hubloc($arr,$primary = false) { - - $tmp = ''; - - if(is_array($arr)) { - foreach($arr as $e) { - if(strlen($tmp)) - $tmp .= ','; - $tmp .= "'" . dbesc($e) . "'" ; - } - } - - if(! strlen($tmp)) - return array(); +function zot_get_hublocs($hash) { - $sql_extra = (($primary) ? " and hubloc_flags & " . intval(HUBLOC_FLAGS_PRIMARY) : "" ); - $limit = (($primary) ? " limit 1 " : ""); - return q("select * from hubloc where hubloc_hash in ( $tmp ) $sql_extra order by hubloc_url $limit"); + $ret = q("select * from hubloc where hubloc_hash = '%s' group by hubloc_url ", + dbesc($hash) + ); + return $ret; } /* diff --git a/mod/zfinger.php b/mod/zfinger.php index 59cef5549..2eb6adc75 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -164,7 +164,7 @@ function zfinger_init(&$a) { $ret['locations'] = array(); - $x = zot_get_hubloc(array($e['channel_hash'])); + $x = zot_get_hublocs($e['channel_hash']); if($x && count($x)) { foreach($x as $hub) { if(! ($hub['hubloc_flags'] & HUBLOC_FLAGS_UNVERIFIED)) { -- cgit v1.2.3 From 11983c12429021565f2400f893d85b5d4c6f9779 Mon Sep 17 00:00:00 2001 From: Olivier Migeot Date: Wed, 27 Nov 2013 12:30:01 +0100 Subject: Quick hack to allow themes/modules to use different CSS classes for the ACL selector's icon (e.g. icon-lock/icon-unlock instead of lock/unlock). Unless a theme supports it, they'll stay at their former values. Dunno if it's the best way to achieve this, though. --- js/acl.js | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/js/acl.js b/js/acl.js index 591c9c467..906b28354 100644 --- a/js/acl.js +++ b/js/acl.js @@ -152,11 +152,23 @@ ACL.prototype.set_deny = function(itemid){ } 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('lock').addClass('unlock'); + $('#jot-perms-icon').removeClass(jotpermslock).addClass(jotpermsunlock); $('#jot-public').show(); $('.profile-jot-net input').attr('disabled', false); if(typeof editor != 'undefined' && editor != false) { @@ -166,7 +178,7 @@ ACL.prototype.update_view = function(){ } else { that.showall.removeClass("selected"); /* jot acl */ - $('#jot-perms-icon').removeClass('unlock').addClass('lock'); + $('#jot-perms-icon').removeClass(jotpermsunlock).addClass(jotpermslock); $('#jot-public').hide(); $('.profile-jot-net input').attr('disabled', 'disabled'); $('#profile-jot-desc').html(' '); -- cgit v1.2.3 From f8d49ef560945390d4c7de86756541f4b5d72ff8 Mon Sep 17 00:00:00 2001 From: "p.tacconi" Date: Wed, 27 Nov 2013 13:56:30 +0100 Subject: italian translation --- view/it/messages.po | 812 ++++++++++++++++++++++++++-------------------------- view/it/strings.php | 27 +- 2 files changed, 417 insertions(+), 422 deletions(-) diff --git a/view/it/messages.po b/view/it/messages.po index 0143952d4..901b19efc 100644 --- a/view/it/messages.po +++ b/view/it/messages.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: Red Matrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-15 00:03-0800\n" -"PO-Revision-Date: 2013-11-22 22:02+0000\n" +"POT-Creation-Date: 2013-11-22 00:02-0800\n" +"PO-Revision-Date: 2013-11-27 11:34+0000\n" "Last-Translator: tuscanhobbit Pa \n" "Language-Team: Italian (http://www.transifex.com/projects/p/red-matrix/language/it/)\n" "MIME-Version: 1.0\n" @@ -66,6 +66,10 @@ msgstr "Diario pubblico" msgid "Red Matrix Notification" msgstr "Notifica di Red Matrix" +#: ../../include/enotify.php:37 +msgid "redmatrix" +msgstr "redmatrix" + #: ../../include/enotify.php:39 msgid "Thank You," msgstr "Grazie," @@ -87,8 +91,8 @@ msgstr "[Red:Notifica] Nuovo messaggio ricevuto alle %s" #: ../../include/enotify.php:82 #, php-format -msgid "%1$s sent you a new private message at %2$s." -msgstr "%1$s ti ha mandato un messaggio privato alle %2$s." +msgid "%1$s, %2$s sent you a new private message at %3$s." +msgstr "%1$s, %2$s ti ha mandato un messaggio privato alle %3$s." #: ../../include/enotify.php:83 #, php-format @@ -158,8 +162,8 @@ msgstr "[Red:Notifica] %s ti ha taggato" #: ../../include/enotify.php:201 #, php-format -msgid "%1$s tagged you at %2$s" -msgstr "%1$s ti ha taggato alle %2$s" +msgid "%1$s, %2$s tagged you at %3$s" +msgstr "%1$s, %2$s ti ha taggato alle %3$s" #: ../../include/enotify.php:202 #, php-format @@ -173,8 +177,8 @@ msgstr "[Red:Notifica] %1$s ti ha mandato un poke" #: ../../include/enotify.php:215 #, php-format -msgid "%1$s poked you at %2$s" -msgstr "%1$s ti ha mandato un poke alle %2$s" +msgid "%1$s, %2$s poked you at %3$s" +msgstr "%1$s, %2$s ti ha mandato un poke alle %3$s" #: ../../include/enotify.php:216 #, php-format @@ -253,7 +257,7 @@ msgid "Private Message" msgstr "Messaggio privato" #: ../../include/ItemObject.php:95 ../../include/page_widgets.php:8 -#: ../../mod/webpages.php:101 ../../mod/settings.php:712 ../../mod/menu.php:55 +#: ../../mod/webpages.php:101 ../../mod/settings.php:713 ../../mod/menu.php:55 #: ../../mod/layouts.php:102 ../../mod/editlayout.php:100 #: ../../mod/editwebpage.php:119 ../../mod/blocks.php:93 #: ../../mod/editpost.php:97 ../../mod/editblock.php:114 @@ -261,8 +265,8 @@ msgid "Edit" msgstr "Modifica" #: ../../include/ItemObject.php:107 ../../include/conversation.php:628 -#: ../../mod/settings.php:713 ../../mod/admin.php:677 ../../mod/group.php:182 -#: ../../mod/photos.php:1130 ../../mod/connections.php:354 +#: ../../mod/settings.php:714 ../../mod/admin.php:686 ../../mod/group.php:182 +#: ../../mod/photos.php:1130 ../../mod/connections.php:374 #: ../../mod/filestorage.php:82 msgid "Delete" msgstr "Elimina" @@ -386,20 +390,20 @@ msgstr "Commento" #: ../../include/ItemObject.php:530 ../../mod/events.php:458 #: ../../mod/thing.php:190 ../../mod/invite.php:154 ../../mod/setup.php:302 -#: ../../mod/setup.php:345 ../../mod/settings.php:650 -#: ../../mod/settings.php:762 ../../mod/settings.php:790 -#: ../../mod/settings.php:814 ../../mod/settings.php:885 -#: ../../mod/settings.php:1053 ../../mod/connect.php:96 +#: ../../mod/setup.php:345 ../../mod/settings.php:651 +#: ../../mod/settings.php:763 ../../mod/settings.php:791 +#: ../../mod/settings.php:815 ../../mod/settings.php:886 +#: ../../mod/settings.php:1054 ../../mod/connect.php:96 #: ../../mod/sources.php:83 ../../mod/sources.php:110 ../../mod/admin.php:418 -#: ../../mod/admin.php:670 ../../mod/admin.php:810 ../../mod/admin.php:1009 -#: ../../mod/admin.php:1096 ../../mod/group.php:87 ../../mod/photos.php:685 +#: ../../mod/admin.php:679 ../../mod/admin.php:819 ../../mod/admin.php:1018 +#: ../../mod/admin.php:1105 ../../mod/group.php:87 ../../mod/photos.php:685 #: ../../mod/photos.php:779 ../../mod/photos.php:1040 #: ../../mod/photos.php:1080 ../../mod/photos.php:1167 #: ../../mod/message.php:333 ../../mod/message.php:515 -#: ../../mod/connections.php:432 ../../mod/profiles.php:529 +#: ../../mod/connections.php:452 ../../mod/profiles.php:529 #: ../../mod/import.php:385 ../../mod/crepair.php:166 ../../mod/poke.php:166 #: ../../mod/fsuggest.php:108 ../../mod/mood.php:137 -#: ../../view/theme/redbasic/php/config.php:79 +#: ../../view/theme/redbasic/php/config.php:85 #: ../../view/theme/apw/php/config.php:231 msgid "Submit" msgstr "Salva" @@ -451,7 +455,7 @@ msgstr "Crittografia del testo" #: ../../include/Contact.php:87 ../../include/contact_widgets.php:23 #: ../../mod/match.php:58 ../../mod/suggest.php:56 ../../mod/directory.php:198 -#: ../../boot.php:1745 +#: ../../boot.php:1741 msgid "Connect" msgstr "Connetti" @@ -472,8 +476,8 @@ msgid "View Status" msgstr "Guarda il messaggio di stato" #: ../../include/Contact.php:526 ../../include/nav.php:76 -#: ../../include/conversation.php:925 ../../mod/connections.php:307 -#: ../../mod/connections.php:421 +#: ../../include/conversation.php:925 ../../mod/connections.php:327 +#: ../../mod/connections.php:441 msgid "View Profile" msgstr "Profilo" @@ -553,8 +557,8 @@ msgstr "OStatus" msgid "RSS/Atom" msgstr "RSS/Atom" -#: ../../include/contact_selectors.php:77 ../../mod/admin.php:673 -#: ../../mod/admin.php:682 ../../boot.php:1465 +#: ../../include/contact_selectors.php:77 ../../mod/admin.php:682 +#: ../../mod/admin.php:691 ../../boot.php:1461 msgid "Email" msgstr "Email" @@ -673,7 +677,7 @@ msgid "Finishes:" msgstr "Fine:" #: ../../include/event.php:40 ../../include/bb2diaspora.php:455 -#: ../../mod/events.php:450 ../../mod/directory.php:173 ../../boot.php:1795 +#: ../../mod/events.php:450 ../../mod/directory.php:173 ../../boot.php:1791 msgid "Location:" msgstr "Luogo:" @@ -833,14 +837,6 @@ msgstr "Permette di selezionare i contenuti in base al livello di amicizia" msgid "Post/Comment Tools" msgstr "Gestione articoli e commenti" -#: ../../include/features.php:56 -msgid "Multiple Deletion" -msgstr "Eliminazione multipla" - -#: ../../include/features.php:56 -msgid "Select and delete multiple posts/comments at once" -msgstr "Rendi possibile l'eliminazione di molti articoli o commenti con un solo comando" - #: ../../include/features.php:57 msgid "Edit Sent Posts" msgstr "Modifica gli articoli già inviati" @@ -1065,12 +1061,12 @@ msgstr "Foto del profilo" msgid "Profile" msgstr "Profilo" -#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1061 +#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1062 msgid "Full Name:" msgstr "Nome completo:" #: ../../include/profile_advanced.php:17 ../../mod/directory.php:175 -#: ../../boot.php:1797 +#: ../../boot.php:1793 msgid "Gender:" msgstr "Sesso:" @@ -1091,7 +1087,7 @@ msgid "Age:" msgstr "Età:" #: ../../include/profile_advanced.php:37 ../../mod/directory.php:177 -#: ../../boot.php:1798 +#: ../../boot.php:1794 msgid "Status:" msgstr "Stato:" @@ -1105,7 +1101,7 @@ msgid "Sexual Preference:" msgstr "Preferenze sessuali:" #: ../../include/profile_advanced.php:48 ../../mod/directory.php:179 -#: ../../boot.php:1799 +#: ../../boot.php:1795 msgid "Homepage:" msgstr "Home page:" @@ -1509,7 +1505,7 @@ msgstr "Layout" msgid "Pages" msgstr "Pagine" -#: ../../include/identity.php:14 ../../mod/item.php:1131 +#: ../../include/identity.php:14 ../../mod/item.php:1123 msgid "Unable to obtain identity information from database" msgstr "Impossibile ottenere le informazioni di identificazione dal database" @@ -1543,7 +1539,7 @@ msgid "Default Profile" msgstr "Profilo predefinito" #: ../../include/identity.php:245 ../../include/profile_selectors.php:42 -#: ../../mod/network.php:387 ../../mod/connections.php:387 +#: ../../mod/network.php:387 ../../mod/connections.php:407 msgid "Friends" msgstr "Amici" @@ -1591,17 +1587,17 @@ msgstr "ha commentato l'articolo di %s" #: ../../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:3572 ../../mod/common.php:43 +#: ../../include/items.php:3582 ../../mod/common.php:43 #: ../../mod/events.php:134 ../../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:627 +#: ../../mod/page.php:80 ../../mod/setup.php:200 ../../mod/settings.php:628 #: ../../mod/viewconnections.php:33 ../../mod/viewconnections.php:38 #: ../../mod/delegate.php:6 ../../mod/sources.php:48 ../../mod/mitem.php:92 #: ../../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:7 -#: ../../mod/intro.php:50 ../../mod/connections.php:177 +#: ../../mod/intro.php:50 ../../mod/connections.php:197 #: ../../mod/profiles.php:163 ../../mod/profiles.php:476 #: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97 #: ../../mod/filestorage.php:26 ../../mod/manage.php:6 @@ -1612,7 +1608,7 @@ msgstr "ha commentato l'articolo di %s" #: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/editpost.php:13 #: ../../mod/poke.php:128 ../../mod/channel.php:123 ../../mod/fsuggest.php:78 #: ../../mod/editblock.php:48 ../../mod/item.php:173 ../../mod/item.php:181 -#: ../../mod/suggest.php:32 ../../mod/register.php:60 ../../mod/regmod.php:18 +#: ../../mod/suggest.php:32 ../../mod/register.php:68 ../../mod/regmod.php:18 #: ../../mod/mood.php:114 ../../index.php:178 ../../index.php:340 msgid "Permission denied." msgstr "Permesso negato." @@ -1634,7 +1630,7 @@ msgstr "Impossibile elaborare l'immagine" msgid "Photo storage failed." msgstr "Impossibile caricare la foto." -#: ../../include/photos.php:288 ../../boot.php:2246 +#: ../../include/photos.php:288 ../../boot.php:2242 msgid "Photo Albums" msgstr "Album foto" @@ -1929,20 +1925,20 @@ msgstr "mkdir fallito." msgid "database storage failed." msgstr "scrittura su database fallita." -#: ../../include/zot.php:426 +#: ../../include/zot.php:438 msgid "Invalid data packet" msgstr "Dati non validi" -#: ../../include/zot.php:436 +#: ../../include/zot.php:448 msgid "Unable to verify channel signature" msgstr "Impossibile verificare la firma elettronica del canale" -#: ../../include/zot.php:582 +#: ../../include/zot.php:594 #, php-format msgid "Unable to verify site signature for %s" msgstr "Impossibile verificare la firma elettronica del sito %s" -#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1462 +#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1458 msgid "Logout" msgstr "Esci" @@ -1970,7 +1966,7 @@ msgstr "Modifica i profili" msgid "Manage/Edit Profiles" msgstr "Gestisci e modifica i profili" -#: ../../include/nav.php:79 ../../mod/fbrowser.php:25 ../../boot.php:2243 +#: ../../include/nav.php:79 ../../mod/fbrowser.php:25 ../../boot.php:2239 msgid "Photos" msgstr "Foto" @@ -1978,7 +1974,7 @@ msgstr "Foto" msgid "Your photos" msgstr "Le tue foto" -#: ../../include/nav.php:85 ../../boot.php:1463 +#: ../../include/nav.php:85 ../../boot.php:1459 msgid "Login" msgstr "Accedi" @@ -1999,7 +1995,7 @@ msgstr "Clicca per autenticarti sul tuo server principale" msgid "Home Page" msgstr "Bacheca" -#: ../../include/nav.php:125 ../../mod/register.php:187 ../../boot.php:1439 +#: ../../include/nav.php:125 ../../mod/register.php:195 ../../boot.php:1435 msgid "Register" msgstr "Iscriviti" @@ -2007,7 +2003,7 @@ msgstr "Iscriviti" msgid "Create an account" msgstr "Crea un account" -#: ../../include/nav.php:130 ../../mod/help.php:34 +#: ../../include/nav.php:130 ../../mod/help.php:45 ../../mod/help.php:49 msgid "Help" msgstr "Guida" @@ -2071,7 +2067,7 @@ msgstr "Segna come lette le notifiche dei canali" msgid "Intros" msgstr "Richieste" -#: ../../include/nav.php:158 ../../mod/connections.php:565 +#: ../../include/nav.php:158 ../../mod/connections.php:585 msgid "New Connections" msgstr "Nuovi contatti" @@ -2123,7 +2119,7 @@ msgstr "Inviati" msgid "New Message" msgstr "Nuovo messaggio" -#: ../../include/nav.php:174 ../../mod/events.php:348 ../../boot.php:2254 +#: ../../include/nav.php:174 ../../mod/events.php:348 ../../boot.php:2250 msgid "Events" msgstr "Eventi" @@ -2148,7 +2144,7 @@ msgid "Manage Your Channels" msgstr "Gestisci i contatti dei tuoi canali" #: ../../include/nav.php:180 ../../mod/settings.php:131 -#: ../../mod/admin.php:769 ../../mod/admin.php:974 +#: ../../mod/admin.php:778 ../../mod/admin.php:983 msgid "Settings" msgstr "Impostazioni" @@ -2156,7 +2152,7 @@ msgstr "Impostazioni" msgid "Account/Channel Settings" msgstr "Impostazioni account e canali" -#: ../../include/nav.php:182 ../../mod/connections.php:671 +#: ../../include/nav.php:182 ../../mod/connections.php:691 msgid "Connections" msgstr "Contatti" @@ -2288,7 +2284,7 @@ msgstr "Segui" msgid "Examples: Robert Morgenstein, Fishing" msgstr "Per esempio: Mario Rossi, Pesca" -#: ../../include/contact_widgets.php:48 ../../mod/connections.php:677 +#: ../../include/contact_widgets.php:48 ../../mod/connections.php:697 #: ../../mod/directory.php:221 ../../mod/directory.php:226 msgid "Find" msgstr "Cerca" @@ -2481,7 +2477,7 @@ msgstr "Questa operazione esce dai termini del tuo abbonamento." msgid "This action is not available under your subscription plan." msgstr "Questa operazione non è prevista dal tuo abbonamento." -#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:56 +#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:62 #: ../../view/theme/apw/php/config.php:176 msgid "Default" msgstr "Predefinito" @@ -2770,25 +2766,25 @@ msgstr "L'identificativo di sicurezza del modulo che hai riempito non è corrett msgid "Permission denied" msgstr "Permesso negato" -#: ../../include/items.php:3521 ../../mod/admin.php:150 -#: ../../mod/admin.php:714 ../../mod/admin.php:917 ../../mod/viewsrc.php:18 +#: ../../include/items.php:3531 ../../mod/admin.php:150 +#: ../../mod/admin.php:723 ../../mod/admin.php:926 ../../mod/viewsrc.php:18 #: ../../mod/home.php:64 ../../mod/display.php:32 msgid "Item not found." msgstr "Elemento non trovato." -#: ../../include/items.php:3693 +#: ../../include/items.php:3703 msgid "Archives" msgstr "Archivi" -#: ../../include/items.php:3854 ../../mod/group.php:44 ../../mod/group.php:146 +#: ../../include/items.php:3869 ../../mod/group.php:44 ../../mod/group.php:146 msgid "Collection not found." msgstr "Insieme non trovato." -#: ../../include/items.php:3870 ../../mod/network.php:469 +#: ../../include/items.php:3885 ../../mod/network.php:469 msgid "Group is empty" msgstr "L'insieme è vuoto" -#: ../../include/items.php:3886 +#: ../../include/items.php:3901 msgid "Connection not found." msgstr "Gruppo non trovato." @@ -3031,7 +3027,7 @@ msgstr "Nessun amico da visualizzare." #: ../../mod/webpages.php:8 ../../mod/connect.php:13 ../../mod/layouts.php:8 #: ../../mod/filestorage.php:8 ../../mod/blocks.php:10 ../../mod/profile.php:8 -#: ../../boot.php:1644 +#: ../../boot.php:1640 msgid "Requested profile is not available." msgstr "Il profilo richiesto non è disponibile." @@ -3058,17 +3054,17 @@ msgid "" " and/or create new posts for you?" msgstr "Vuoi autorizzare questa app ad accedere ai messaggi e ai contatti o creare nuovi messaggi per te?" -#: ../../mod/api.php:105 ../../mod/settings.php:1008 -#: ../../mod/settings.php:1013 ../../mod/settings.php:1036 -#: ../../mod/settings.php:1038 ../../mod/settings.php:1039 -#: ../../mod/settings.php:1040 ../../mod/profiles.php:506 +#: ../../mod/api.php:105 ../../mod/settings.php:1009 +#: ../../mod/settings.php:1014 ../../mod/settings.php:1037 +#: ../../mod/settings.php:1039 ../../mod/settings.php:1040 +#: ../../mod/settings.php:1041 ../../mod/profiles.php:506 msgid "Yes" msgstr "Si" -#: ../../mod/api.php:106 ../../mod/settings.php:1008 -#: ../../mod/settings.php:1013 ../../mod/settings.php:1036 -#: ../../mod/settings.php:1038 ../../mod/settings.php:1039 -#: ../../mod/settings.php:1040 ../../mod/profiles.php:507 +#: ../../mod/api.php:106 ../../mod/settings.php:1009 +#: ../../mod/settings.php:1014 ../../mod/settings.php:1037 +#: ../../mod/settings.php:1039 ../../mod/settings.php:1040 +#: ../../mod/settings.php:1041 ../../mod/profiles.php:507 msgid "No" msgstr "No" @@ -3089,11 +3085,11 @@ msgid "Invalid item." msgstr "Elemento non valido." #: ../../mod/page.php:47 ../../mod/chanview.php:78 ../../mod/home.php:51 -#: ../../mod/magic.php:77 ../../mod/wall_upload.php:35 +#: ../../mod/magic.php:95 ../../mod/wall_upload.php:35 msgid "Channel not found." msgstr "Canale non trovato." -#: ../../mod/page.php:83 ../../mod/help.php:41 ../../mod/display.php:92 +#: ../../mod/page.php:83 ../../mod/help.php:56 ../../mod/display.php:92 #: ../../index.php:229 msgid "Page not found." msgstr "Pagina non trovata." @@ -3437,7 +3433,7 @@ msgid "" "poller." msgstr "IMPORTANTE: Devi creare [manualmente] la pianificazione del polling." -#: ../../mod/rpost.php:83 ../../mod/editpost.php:42 +#: ../../mod/rpost.php:84 ../../mod/editpost.php:42 msgid "Edit post" msgstr "Modifica articolo" @@ -3505,7 +3501,7 @@ msgstr "Il nome è obbligatorio" msgid "Key and Secret are required" msgstr "Chiave e Segreto sono richiesti" -#: ../../mod/settings.php:179 ../../mod/settings.php:676 +#: ../../mod/settings.php:179 ../../mod/settings.php:677 msgid "Update" msgstr "Aggiorna" @@ -3537,381 +3533,381 @@ msgstr "È un indirizzo email riservato. Non puoi sceglierlo." msgid "System failure storing new email. Please try again." msgstr "Errore di sistema. Non è stato possibile memorizzare il tuo messaggio, riprova per favore." -#: ../../mod/settings.php:578 +#: ../../mod/settings.php:579 msgid "Settings updated." msgstr "Impostazioni aggiornate." -#: ../../mod/settings.php:649 ../../mod/settings.php:675 -#: ../../mod/settings.php:711 +#: ../../mod/settings.php:650 ../../mod/settings.php:676 +#: ../../mod/settings.php:712 msgid "Add application" msgstr "Aggiungi una app" -#: ../../mod/settings.php:651 ../../mod/settings.php:677 +#: ../../mod/settings.php:652 ../../mod/settings.php:678 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/fbrowser.php:82 #: ../../mod/fbrowser.php:117 msgid "Cancel" msgstr "Annulla" -#: ../../mod/settings.php:652 ../../mod/settings.php:678 -#: ../../mod/admin.php:673 ../../mod/crepair.php:148 +#: ../../mod/settings.php:653 ../../mod/settings.php:679 +#: ../../mod/admin.php:682 ../../mod/crepair.php:148 msgid "Name" msgstr "Nome" -#: ../../mod/settings.php:652 +#: ../../mod/settings.php:653 msgid "Name of application" msgstr "Nome dell'applicazione" -#: ../../mod/settings.php:653 ../../mod/settings.php:679 +#: ../../mod/settings.php:654 ../../mod/settings.php:680 msgid "Consumer Key" msgstr "Consumer Key" -#: ../../mod/settings.php:653 ../../mod/settings.php:654 +#: ../../mod/settings.php:654 ../../mod/settings.php:655 msgid "Automatically generated - change if desired. Max length 20" msgstr "Generato automaticamente - è possibile cambiarlo. Lunghezza massima 20" -#: ../../mod/settings.php:654 ../../mod/settings.php:680 +#: ../../mod/settings.php:655 ../../mod/settings.php:681 msgid "Consumer Secret" msgstr "Consumer Secret" -#: ../../mod/settings.php:655 ../../mod/settings.php:681 +#: ../../mod/settings.php:656 ../../mod/settings.php:682 msgid "Redirect" msgstr "Redirect" -#: ../../mod/settings.php:655 +#: ../../mod/settings.php:656 msgid "" "Redirect URI - leave blank unless your application specifically requires " "this" msgstr "URI ridirezionato - lasciare bianco se non richiesto specificamente dall'applicazione." -#: ../../mod/settings.php:656 ../../mod/settings.php:682 +#: ../../mod/settings.php:657 ../../mod/settings.php:683 msgid "Icon url" msgstr "Url icona" -#: ../../mod/settings.php:656 +#: ../../mod/settings.php:657 msgid "Optional" msgstr "Opzionale" -#: ../../mod/settings.php:667 +#: ../../mod/settings.php:668 msgid "You can't edit this application." msgstr "Non puoi modificare questa applicazione." -#: ../../mod/settings.php:710 +#: ../../mod/settings.php:711 msgid "Connected Apps" msgstr "App connesse" -#: ../../mod/settings.php:714 +#: ../../mod/settings.php:715 msgid "Client key starts with" msgstr "La client key inizia con" -#: ../../mod/settings.php:715 +#: ../../mod/settings.php:716 msgid "No name" msgstr "Nessun nome" -#: ../../mod/settings.php:716 +#: ../../mod/settings.php:717 msgid "Remove authorization" msgstr "Revoca l'autorizzazione" -#: ../../mod/settings.php:727 +#: ../../mod/settings.php:728 msgid "No feature settings configured" msgstr "Non ci sono funzionalità aggiuntive personalizzabili" -#: ../../mod/settings.php:735 +#: ../../mod/settings.php:736 msgid "Feature Settings" msgstr "Impostazioni aggiuntive" -#: ../../mod/settings.php:758 +#: ../../mod/settings.php:759 msgid "Account Settings" msgstr "Impostazioni account" -#: ../../mod/settings.php:759 +#: ../../mod/settings.php:760 msgid "Password Settings" msgstr "Impostazioni password" -#: ../../mod/settings.php:760 +#: ../../mod/settings.php:761 msgid "New Password:" msgstr "Nuova password:" -#: ../../mod/settings.php:761 +#: ../../mod/settings.php:762 msgid "Confirm:" msgstr "Conferma:" -#: ../../mod/settings.php:761 +#: ../../mod/settings.php:762 msgid "Leave password fields blank unless changing" msgstr "Lascia questi campi in bianco per non cambiare la password" -#: ../../mod/settings.php:763 ../../mod/settings.php:1062 +#: ../../mod/settings.php:764 ../../mod/settings.php:1063 msgid "Email Address:" msgstr "Indirizzo email:" -#: ../../mod/settings.php:764 +#: ../../mod/settings.php:765 msgid "Remove Account" msgstr "Elimina l'account" -#: ../../mod/settings.php:765 +#: ../../mod/settings.php:766 msgid "Warning: This action is permanent and cannot be reversed." msgstr "Attenzione: questa azione è permanente e non potrà più essere annullata." -#: ../../mod/settings.php:781 +#: ../../mod/settings.php:782 msgid "Off" msgstr "Off" -#: ../../mod/settings.php:781 +#: ../../mod/settings.php:782 msgid "On" msgstr "On" -#: ../../mod/settings.php:788 +#: ../../mod/settings.php:789 msgid "Additional Features" msgstr "Funzionalità aggiuntive" -#: ../../mod/settings.php:813 +#: ../../mod/settings.php:814 msgid "Connector Settings" msgstr "Impostazioni del connettore" -#: ../../mod/settings.php:843 ../../mod/admin.php:369 +#: ../../mod/settings.php:844 ../../mod/admin.php:369 msgid "No special theme for mobile devices" msgstr "Nessun tema per dispositivi mobili" -#: ../../mod/settings.php:883 +#: ../../mod/settings.php:884 msgid "Display Settings" msgstr "Impostazioni grafiche" -#: ../../mod/settings.php:889 +#: ../../mod/settings.php:890 msgid "Display Theme:" msgstr "Tema per monitor:" -#: ../../mod/settings.php:890 +#: ../../mod/settings.php:891 msgid "Mobile Theme:" msgstr "Tema per dispositivi mobili:" -#: ../../mod/settings.php:891 +#: ../../mod/settings.php:892 msgid "Update browser every xx seconds" msgstr "Aggiorna il browser ogni x secondi" -#: ../../mod/settings.php:891 +#: ../../mod/settings.php:892 msgid "Minimum of 10 seconds, no maximum" msgstr "Minimo 10 secondi, nessun limite massimo" -#: ../../mod/settings.php:892 +#: ../../mod/settings.php:893 msgid "Maximum number of conversations to load at any time:" msgstr "Massimo numero di conversazioni da mostrare ogni volta:" -#: ../../mod/settings.php:892 +#: ../../mod/settings.php:893 msgid "Maximum of 100 items" msgstr "Massimo 100" -#: ../../mod/settings.php:893 +#: ../../mod/settings.php:894 msgid "Don't show emoticons" msgstr "Non mostrare le emoticons" -#: ../../mod/settings.php:929 +#: ../../mod/settings.php:930 msgid "Nobody except yourself" msgstr "Nessuno tranne te" -#: ../../mod/settings.php:930 +#: ../../mod/settings.php:931 msgid "Only those you specifically allow" msgstr "Solo chi riceve il mio permesso" -#: ../../mod/settings.php:931 +#: ../../mod/settings.php:932 msgid "Anybody in your address book" msgstr "Chiunque tra i miei contatti" -#: ../../mod/settings.php:932 +#: ../../mod/settings.php:933 msgid "Anybody on this website" msgstr "Chiunque su questo sito" -#: ../../mod/settings.php:933 +#: ../../mod/settings.php:934 msgid "Anybody in this network" msgstr "Chiunque su Red" -#: ../../mod/settings.php:934 +#: ../../mod/settings.php:935 msgid "Anybody on the internet" msgstr "Chiunque su internet" -#: ../../mod/settings.php:1008 +#: ../../mod/settings.php:1009 msgid "Publish your default profile in the network directory" msgstr "Pubblica il mio profilo predefinito sull'elenco pubblico dei canali" -#: ../../mod/settings.php:1013 +#: ../../mod/settings.php:1014 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "Vuoi essere suggerito come potenziale amico ai nuovi membri?" -#: ../../mod/settings.php:1017 ../../mod/profile_photo.php:298 +#: ../../mod/settings.php:1018 ../../mod/profile_photo.php:298 msgid "or" msgstr "o" -#: ../../mod/settings.php:1022 +#: ../../mod/settings.php:1023 msgid "Your channel address is" msgstr "L'indirizzo del tuo canale è" -#: ../../mod/settings.php:1033 +#: ../../mod/settings.php:1034 msgid "Automatically expire posts after this many days:" msgstr "Gli articoli scadono automaticamente dopo questo numero di giorni:" -#: ../../mod/settings.php:1033 +#: ../../mod/settings.php:1034 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "Se lasci vuoto, i messaggi non scadranno mai. I messaggi scaduti saranno eliminati." -#: ../../mod/settings.php:1034 +#: ../../mod/settings.php:1035 msgid "Advanced expiration settings" msgstr "Impostazioni avanzate di scandenza" -#: ../../mod/settings.php:1035 +#: ../../mod/settings.php:1036 msgid "Advanced Expiration" msgstr "Scadenza" -#: ../../mod/settings.php:1036 +#: ../../mod/settings.php:1037 msgid "Expire posts:" msgstr "Fai scadere gli articoli:" -#: ../../mod/settings.php:1038 +#: ../../mod/settings.php:1039 msgid "Expire starred posts:" msgstr "Fai scadere gli articoli preferiti:" -#: ../../mod/settings.php:1039 +#: ../../mod/settings.php:1040 msgid "Expire photos:" msgstr "Fai scadere le foto:" -#: ../../mod/settings.php:1040 +#: ../../mod/settings.php:1041 msgid "Only expire posts by others:" msgstr "Fai scadere solo gli articoli scritti da altri:" -#: ../../mod/settings.php:1051 +#: ../../mod/settings.php:1052 msgid "Channel Settings" msgstr "Impostazioni del canale" -#: ../../mod/settings.php:1060 +#: ../../mod/settings.php:1061 msgid "Basic Settings" msgstr "Impostazioni di base" -#: ../../mod/settings.php:1063 +#: ../../mod/settings.php:1064 msgid "Your Timezone:" msgstr "Il tuo fuso orario:" -#: ../../mod/settings.php:1064 +#: ../../mod/settings.php:1065 msgid "Default Post Location:" msgstr "Località predefinita:" -#: ../../mod/settings.php:1065 +#: ../../mod/settings.php:1066 msgid "Use Browser Location:" msgstr "Usa la località rilevata dal browser:" -#: ../../mod/settings.php:1067 +#: ../../mod/settings.php:1068 msgid "Adult Content" msgstr "Contenuto per adulti" -#: ../../mod/settings.php:1067 +#: ../../mod/settings.php:1068 msgid "This channel publishes adult content." msgstr "Questo canale pubblica contenuto per adulti." -#: ../../mod/settings.php:1069 +#: ../../mod/settings.php:1070 msgid "Security and Privacy Settings" msgstr "Impostazioni di sicurezza e privacy" -#: ../../mod/settings.php:1071 +#: ../../mod/settings.php:1072 msgid "Quick Privacy Settings:" msgstr "Impostazioni veloci della privacy:" -#: ../../mod/settings.php:1072 +#: ../../mod/settings.php:1073 msgid "Very Public - extremely permissive" msgstr "Tutto pubblico - molto permissivo" -#: ../../mod/settings.php:1073 +#: ../../mod/settings.php:1074 msgid "Typical - default public, privacy when desired" msgstr "Normale - tutto sarà pubblico tranne quel che vorrai tu" -#: ../../mod/settings.php:1074 +#: ../../mod/settings.php:1075 msgid "Private - default private, rarely open or public" msgstr "Privato - i contenuti saranno privati ma, se vorrai, alcuni potrai renderli pubblici" -#: ../../mod/settings.php:1075 +#: ../../mod/settings.php:1076 msgid "Blocked - default blocked to/from everybody" msgstr "Bloccato - non ci saranno interazioni con altri a meno che tu non voglia" -#: ../../mod/settings.php:1078 +#: ../../mod/settings.php:1079 msgid "Maximum Friend Requests/Day:" msgstr "Numero massimo giornaliero di richieste di amicizia:" -#: ../../mod/settings.php:1078 +#: ../../mod/settings.php:1079 msgid "May reduce spam activity" msgstr "Serve e ridurre lo spam" -#: ../../mod/settings.php:1079 +#: ../../mod/settings.php:1080 msgid "Default Post Permissions" msgstr "Permessi predefiniti per gli articoli" -#: ../../mod/settings.php:1080 +#: ../../mod/settings.php:1081 msgid "(click to open/close)" msgstr "(clicca per aprire/chiudere)" -#: ../../mod/settings.php:1093 +#: ../../mod/settings.php:1094 msgid "Maximum private messages per day from unknown people:" msgstr "Numero massimo giornaliero di messaggi privati da utenti sconosciuti:" -#: ../../mod/settings.php:1093 +#: ../../mod/settings.php:1094 msgid "Useful to reduce spamming" msgstr "Serve e ridurre lo spam" -#: ../../mod/settings.php:1096 +#: ../../mod/settings.php:1097 msgid "Notification Settings" msgstr "Impostazioni di notifica" -#: ../../mod/settings.php:1097 +#: ../../mod/settings.php:1098 msgid "By default post a status message when:" msgstr "Pubblica un messaggio di stato quando:" -#: ../../mod/settings.php:1098 +#: ../../mod/settings.php:1099 msgid "accepting a friend request" msgstr "accetto una nuova amicizia" -#: ../../mod/settings.php:1099 +#: ../../mod/settings.php:1100 msgid "joining a forum/community" msgstr "entro a far parte di un forum" -#: ../../mod/settings.php:1100 +#: ../../mod/settings.php:1101 msgid "making an interesting profile change" msgstr "faccio un cambiamento interessante al mio profilo" -#: ../../mod/settings.php:1101 +#: ../../mod/settings.php:1102 msgid "Send a notification email when:" msgstr "Invia una email di notifica quando:" -#: ../../mod/settings.php:1102 +#: ../../mod/settings.php:1103 msgid "You receive an introduction" msgstr "Ricevi una richiesta di amicizia" -#: ../../mod/settings.php:1103 +#: ../../mod/settings.php:1104 msgid "Your introductions are confirmed" msgstr "Le tue richieste di amicizia sono state accettate" -#: ../../mod/settings.php:1104 +#: ../../mod/settings.php:1105 msgid "Someone writes on your profile wall" msgstr "Qualcuno scrive sulla tua bacheca" -#: ../../mod/settings.php:1105 +#: ../../mod/settings.php:1106 msgid "Someone writes a followup comment" msgstr "Qualcuno scrive un commento a un tuo articolo" -#: ../../mod/settings.php:1106 +#: ../../mod/settings.php:1107 msgid "You receive a private message" msgstr "Ricevi un messaggio privato" -#: ../../mod/settings.php:1107 +#: ../../mod/settings.php:1108 msgid "You receive a friend suggestion" msgstr "Ti viene suggerito un amico" -#: ../../mod/settings.php:1108 +#: ../../mod/settings.php:1109 msgid "You are tagged in a post" msgstr "Sei taggato in un articolo" -#: ../../mod/settings.php:1109 +#: ../../mod/settings.php:1110 msgid "You are poked/prodded/etc. in a post" msgstr "Ricevi un poke in un articolo" -#: ../../mod/settings.php:1112 +#: ../../mod/settings.php:1113 msgid "Advanced Account/Page Type Settings" msgstr "Impostazioni avanzate" -#: ../../mod/settings.php:1113 +#: ../../mod/settings.php:1114 msgid "Change the behaviour of this account for special situations" msgstr "Cambia il funzionamento di questo account in situazioni particolari" @@ -4091,15 +4087,15 @@ msgstr "Le impostazioni del tema sono state aggiornate." msgid "Site" msgstr "Sito" -#: ../../mod/admin.php:88 ../../mod/admin.php:669 ../../mod/admin.php:681 +#: ../../mod/admin.php:88 ../../mod/admin.php:678 ../../mod/admin.php:690 msgid "Users" msgstr "Utenti" -#: ../../mod/admin.php:89 ../../mod/admin.php:767 ../../mod/admin.php:809 +#: ../../mod/admin.php:89 ../../mod/admin.php:776 ../../mod/admin.php:818 msgid "Plugins" msgstr "Plugin" -#: ../../mod/admin.php:90 ../../mod/admin.php:972 ../../mod/admin.php:1008 +#: ../../mod/admin.php:90 ../../mod/admin.php:981 ../../mod/admin.php:1017 msgid "Themes" msgstr "Temi" @@ -4111,7 +4107,7 @@ msgstr "Server" msgid "DB updates" msgstr "Aggiornamenti al DB" -#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1095 +#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1104 msgid "Logs" msgstr "Log" @@ -4121,15 +4117,15 @@ msgstr "Funzionalità dei componenti aggiuntivi" #: ../../mod/admin.php:114 msgid "User registrations waiting for confirmation" -msgstr "Utenti registrati in attesa di conferma" +msgstr "Registrazioni in attesa" #: ../../mod/admin.php:188 msgid "Message queues" -msgstr "Coda dei messaggi" +msgstr "Messaggi in attesa di recapito" #: ../../mod/admin.php:193 ../../mod/admin.php:416 ../../mod/admin.php:474 -#: ../../mod/admin.php:668 ../../mod/admin.php:766 ../../mod/admin.php:808 -#: ../../mod/admin.php:971 ../../mod/admin.php:1007 ../../mod/admin.php:1094 +#: ../../mod/admin.php:677 ../../mod/admin.php:775 ../../mod/admin.php:817 +#: ../../mod/admin.php:980 ../../mod/admin.php:1016 ../../mod/admin.php:1103 msgid "Administration" msgstr "Amministrazione" @@ -4143,7 +4139,7 @@ msgstr "Utenti registrati" #: ../../mod/admin.php:198 ../../mod/admin.php:478 msgid "Pending registrations" -msgstr "Registrazioni in attesa" +msgstr "Registrazioni da approvare" #: ../../mod/admin.php:199 msgid "Version" @@ -4189,7 +4185,7 @@ msgstr "Servizio gratuito" msgid "Tiered Access" msgstr "Accesso multilivello" -#: ../../mod/admin.php:419 ../../mod/register.php:172 +#: ../../mod/admin.php:419 ../../mod/register.php:180 msgid "Registration" msgstr "Registrazione" @@ -4279,7 +4275,7 @@ msgstr "Sarà mostrato ben visibile nella pagina di registrazione." #: ../../mod/admin.php:438 msgid "Accounts abandoned after x days" -msgstr "Account abbandonati dopo x giorni" +msgstr "Account abbandonati dopo X giorni" #: ../../mod/admin.php:438 msgid "" @@ -4467,149 +4463,137 @@ msgstr "Utente '%s' sbloccato" msgid "User '%s' blocked" msgstr "Utente '%s' bloccato" -#: ../../mod/admin.php:650 -msgid "Normal Account" -msgstr "Account normale" - -#: ../../mod/admin.php:651 -msgid "Soapbox Account" -msgstr "Account per comunicati e annunci" - -#: ../../mod/admin.php:652 -msgid "Community/Celebrity Account" -msgstr "Account per celebrità o per comunità" - -#: ../../mod/admin.php:653 -msgid "Automatic Friend Account" -msgstr "Account per amicizia automatizzato" - -#: ../../mod/admin.php:671 +#: ../../mod/admin.php:680 msgid "select all" msgstr "seleziona tutti" -#: ../../mod/admin.php:672 +#: ../../mod/admin.php:681 msgid "User registrations waiting for confirm" msgstr "Richieste di registrazione in attesa di conferma" -#: ../../mod/admin.php:673 +#: ../../mod/admin.php:682 msgid "Request date" msgstr "Data richiesta" -#: ../../mod/admin.php:674 +#: ../../mod/admin.php:683 msgid "No registrations." msgstr "Nessuna registrazione." -#: ../../mod/admin.php:675 ../../mod/intro.php:11 ../../mod/intro.php:98 +#: ../../mod/admin.php:684 ../../mod/intro.php:11 ../../mod/intro.php:98 #: ../../mod/notifications.php:159 ../../mod/notifications.php:206 msgid "Approve" msgstr "Approva" -#: ../../mod/admin.php:676 +#: ../../mod/admin.php:685 msgid "Deny" msgstr "Nega" -#: ../../mod/admin.php:678 ../../mod/intro.php:14 ../../mod/intro.php:99 -#: ../../mod/connections.php:328 ../../mod/connections.php:470 +#: ../../mod/admin.php:687 ../../mod/intro.php:14 ../../mod/intro.php:99 +#: ../../mod/connections.php:348 ../../mod/connections.php:490 msgid "Block" msgstr "Blocca" -#: ../../mod/admin.php:679 ../../mod/connections.php:328 -#: ../../mod/connections.php:470 +#: ../../mod/admin.php:688 ../../mod/connections.php:348 +#: ../../mod/connections.php:490 msgid "Unblock" msgstr "Sblocca" -#: ../../mod/admin.php:682 +#: ../../mod/admin.php:691 msgid "Register date" msgstr "Data registrazione" -#: ../../mod/admin.php:682 +#: ../../mod/admin.php:691 msgid "Last login" msgstr "Ultimo accesso" -#: ../../mod/admin.php:682 +#: ../../mod/admin.php:691 +msgid "Expires" +msgstr "Scadenza" + +#: ../../mod/admin.php:691 msgid "Service Class" msgstr "Service Class" -#: ../../mod/admin.php:684 +#: ../../mod/admin.php:693 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "Gli utenti selezionati saranno eliminati!\\n\\nTutto quello che gli utenti hanno pubblicato su questo sito sarà permanentemente eliminato!\\n\\nConfermi?" -#: ../../mod/admin.php:685 +#: ../../mod/admin.php:694 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'utente {0} sarà eliminato!\\n\\nTutto quello che ha pubblicato su questo sito sarà permanentemente eliminato!\\n\\nConfermi?" -#: ../../mod/admin.php:726 +#: ../../mod/admin.php:735 #, php-format msgid "Plugin %s disabled." msgstr "Plugin %s non attivo." -#: ../../mod/admin.php:730 +#: ../../mod/admin.php:739 #, php-format msgid "Plugin %s enabled." msgstr "Plugin %s attivo." -#: ../../mod/admin.php:740 ../../mod/admin.php:942 +#: ../../mod/admin.php:749 ../../mod/admin.php:951 msgid "Disable" msgstr "Disattiva" -#: ../../mod/admin.php:742 ../../mod/admin.php:944 +#: ../../mod/admin.php:751 ../../mod/admin.php:953 msgid "Enable" msgstr "Attiva" -#: ../../mod/admin.php:768 ../../mod/admin.php:973 +#: ../../mod/admin.php:777 ../../mod/admin.php:982 msgid "Toggle" msgstr "Attiva/disattiva" -#: ../../mod/admin.php:776 ../../mod/admin.php:983 +#: ../../mod/admin.php:785 ../../mod/admin.php:992 msgid "Author: " msgstr "Autore:" -#: ../../mod/admin.php:777 ../../mod/admin.php:984 +#: ../../mod/admin.php:786 ../../mod/admin.php:993 msgid "Maintainer: " msgstr "Gestore:" -#: ../../mod/admin.php:906 +#: ../../mod/admin.php:915 msgid "No themes found." msgstr "Nessun tema trovato." -#: ../../mod/admin.php:965 +#: ../../mod/admin.php:974 msgid "Screenshot" msgstr "Istantanea dello schermo" -#: ../../mod/admin.php:1013 +#: ../../mod/admin.php:1022 msgid "[Experimental]" msgstr "[Sperimentale]" -#: ../../mod/admin.php:1014 +#: ../../mod/admin.php:1023 msgid "[Unsupported]" msgstr "[Non supportato]" -#: ../../mod/admin.php:1041 +#: ../../mod/admin.php:1050 msgid "Log settings updated." msgstr "Impostazioni di log aggiornate." -#: ../../mod/admin.php:1097 +#: ../../mod/admin.php:1106 msgid "Clear" msgstr "Pulisci" -#: ../../mod/admin.php:1103 +#: ../../mod/admin.php:1112 msgid "Debugging" msgstr "Debugging" -#: ../../mod/admin.php:1104 +#: ../../mod/admin.php:1113 msgid "Log file" msgstr "File di log" -#: ../../mod/admin.php:1104 +#: ../../mod/admin.php:1113 msgid "" "Must be writable by web server. Relative to your Red top-level directory." msgstr "Deve essere scrivibile dal web server. È relativa alla cartella dove è installato Red." -#: ../../mod/admin.php:1105 +#: ../../mod/admin.php:1114 msgid "Log level" msgstr "Livello di log" @@ -4918,11 +4902,11 @@ msgstr "ti ha inviato un messaggio privato" msgid "added your channel" msgstr "ha aggiunto il tuo canale" -#: ../../mod/ping.php:230 ../../boot.php:1862 ../../boot.php:1942 +#: ../../mod/ping.php:230 ../../boot.php:1858 ../../boot.php:1938 msgid "g A l F d" msgstr "g A l d F" -#: ../../mod/ping.php:252 ../../boot.php:1908 ../../boot.php:1983 +#: ../../mod/ping.php:252 ../../boot.php:1904 ../../boot.php:1979 msgid "[today]" msgstr "[oggi]" @@ -4959,7 +4943,7 @@ msgid "Drop" msgstr "Elimina" #: ../../mod/menu.php:57 ../../mod/network.php:321 -#: ../../mod/connections.php:532 +#: ../../mod/connections.php:552 msgid "New" msgstr "Novità" @@ -5126,11 +5110,11 @@ msgstr "La guida per questa funzionalità" msgid "Layout Name" msgstr "Nome layout" -#: ../../mod/help.php:30 +#: ../../mod/help.php:41 msgid "Help:" msgstr "Guida:" -#: ../../mod/help.php:38 ../../index.php:226 +#: ../../mod/help.php:53 ../../index.php:226 msgid "Not Found" msgstr "Non disponibile" @@ -5198,11 +5182,11 @@ msgstr "Articoli marcati come spam" msgid "Refresh" msgstr "Aggiorna" -#: ../../mod/network.php:385 ../../mod/connections.php:384 +#: ../../mod/network.php:385 ../../mod/connections.php:404 msgid "Me" msgstr "Io" -#: ../../mod/network.php:386 ../../mod/connections.php:386 +#: ../../mod/network.php:386 ../../mod/connections.php:406 msgid "Best Friends" msgstr "Buoni amici" @@ -5210,11 +5194,11 @@ msgstr "Buoni amici" msgid "Co-workers" msgstr "Colleghi" -#: ../../mod/network.php:389 ../../mod/connections.php:388 +#: ../../mod/network.php:389 ../../mod/connections.php:408 msgid "Former Friends" msgstr "Ex amici" -#: ../../mod/network.php:390 ../../mod/connections.php:389 +#: ../../mod/network.php:390 ../../mod/connections.php:409 msgid "Acquaintances" msgstr "Conoscenti" @@ -5239,7 +5223,7 @@ msgid "Invalid connection." msgstr "Connessione non valida." #: ../../mod/intro.php:17 ../../mod/intro.php:100 -#: ../../mod/connections.php:335 ../../mod/connections.php:471 +#: ../../mod/connections.php:355 ../../mod/connections.php:491 #: ../../mod/notifications.php:51 ../../mod/notifications.php:162 #: ../../mod/notifications.php:208 msgid "Ignore" @@ -5265,7 +5249,7 @@ msgstr "Nessuna richiesta in attesa." msgid "System error. Please try again later." msgstr "Errore di sistema. Riprovare più tardi." -#: ../../mod/intro.php:95 ../../mod/connections.php:476 +#: ../../mod/intro.php:95 ../../mod/connections.php:496 #: ../../mod/notifications.php:155 ../../mod/notifications.php:202 msgid "Hide this contact from others" msgstr "Nascondi questo contatto agli altri" @@ -5297,373 +5281,373 @@ msgstr "Non riesco a trovare il profilo selezionato." msgid "Failed to update connection record." msgstr "Impossibile aggiornare le informazioni di contatto." -#: ../../mod/connections.php:199 +#: ../../mod/connections.php:219 msgid "Could not access address book record." msgstr "Impossibile accedere alle informazioni della rubrica." -#: ../../mod/connections.php:213 +#: ../../mod/connections.php:233 msgid "Refresh failed - channel is currently unavailable." msgstr "Il canale non è disponibile - impossibile aggiornare." -#: ../../mod/connections.php:220 +#: ../../mod/connections.php:240 msgid "Channel has been unblocked" msgstr "Il canale è stato sbloccato" -#: ../../mod/connections.php:221 +#: ../../mod/connections.php:241 msgid "Channel has been blocked" msgstr "Il canale è stato bloccato" -#: ../../mod/connections.php:225 ../../mod/connections.php:237 -#: ../../mod/connections.php:249 ../../mod/connections.php:261 -#: ../../mod/connections.php:276 +#: ../../mod/connections.php:245 ../../mod/connections.php:257 +#: ../../mod/connections.php:269 ../../mod/connections.php:281 +#: ../../mod/connections.php:296 msgid "Unable to set address book parameters." msgstr "Impossibile impostare i parametri della rubrica." -#: ../../mod/connections.php:232 +#: ../../mod/connections.php:252 msgid "Channel has been unignored" msgstr "Il canale non sarà più ignorato" -#: ../../mod/connections.php:233 +#: ../../mod/connections.php:253 msgid "Channel has been ignored" msgstr "Il canale sarà ignorato" -#: ../../mod/connections.php:244 +#: ../../mod/connections.php:264 msgid "Channel has been unarchived" msgstr "Il canale non è più archiviato" -#: ../../mod/connections.php:245 +#: ../../mod/connections.php:265 msgid "Channel has been archived" msgstr "Il canale è stato archiviato" -#: ../../mod/connections.php:256 +#: ../../mod/connections.php:276 msgid "Channel has been unhidden" msgstr "Il canale non è più nascosto" -#: ../../mod/connections.php:257 +#: ../../mod/connections.php:277 msgid "Channel has been hidden" msgstr "Il canale è stato nascosto" -#: ../../mod/connections.php:271 +#: ../../mod/connections.php:291 msgid "Channel has been approved" msgstr "Il canale è stato approvato" -#: ../../mod/connections.php:272 +#: ../../mod/connections.php:292 msgid "Channel has been unapproved" msgstr "Il canale non è più approvato" -#: ../../mod/connections.php:290 +#: ../../mod/connections.php:310 msgid "Contact has been removed." msgstr "Il contatto è stato rimosso." -#: ../../mod/connections.php:310 +#: ../../mod/connections.php:330 #, php-format msgid "View %s's profile" msgstr "Guarda il profilo di %s" -#: ../../mod/connections.php:314 +#: ../../mod/connections.php:334 msgid "Refresh Permissions" msgstr "Aggiorna i permessi" -#: ../../mod/connections.php:317 +#: ../../mod/connections.php:337 msgid "Fetch updated permissions" msgstr "Scarica i permessi aggiornati" -#: ../../mod/connections.php:321 +#: ../../mod/connections.php:341 msgid "Recent Activity" msgstr "Attività recenti" -#: ../../mod/connections.php:324 +#: ../../mod/connections.php:344 msgid "View recent posts and comments" msgstr "Leggi i post recenti e i commenti" -#: ../../mod/connections.php:331 +#: ../../mod/connections.php:351 msgid "Block or Unblock this connection" msgstr "Per bloccare o meno questo contatto" -#: ../../mod/connections.php:335 ../../mod/connections.php:471 +#: ../../mod/connections.php:355 ../../mod/connections.php:491 msgid "Unignore" msgstr "Non ignorare" -#: ../../mod/connections.php:338 +#: ../../mod/connections.php:358 msgid "Ignore or Unignore this connection" msgstr "Per ignorare o meno questo contatto" -#: ../../mod/connections.php:341 +#: ../../mod/connections.php:361 msgid "Unarchive" msgstr "Non archiviare" -#: ../../mod/connections.php:341 +#: ../../mod/connections.php:361 msgid "Archive" msgstr "Archivia" -#: ../../mod/connections.php:344 +#: ../../mod/connections.php:364 msgid "Archive or Unarchive this connection" msgstr "Per archiviare o meno questo contatto" -#: ../../mod/connections.php:347 +#: ../../mod/connections.php:367 msgid "Unhide" msgstr "Non nascondere" -#: ../../mod/connections.php:347 +#: ../../mod/connections.php:367 msgid "Hide" msgstr "Nascondi" -#: ../../mod/connections.php:350 +#: ../../mod/connections.php:370 msgid "Hide or Unhide this connection" msgstr "Per nascondere o meno questo contatto" -#: ../../mod/connections.php:357 +#: ../../mod/connections.php:377 msgid "Delete this connection" msgstr "Elimina questo contatto" -#: ../../mod/connections.php:390 +#: ../../mod/connections.php:410 msgid "Unknown" msgstr "Sconosciuto" -#: ../../mod/connections.php:400 ../../mod/connections.php:429 +#: ../../mod/connections.php:420 ../../mod/connections.php:449 msgid "Approve this connection" msgstr "Approva questo contatto" -#: ../../mod/connections.php:400 +#: ../../mod/connections.php:420 msgid "Accept connection to allow communication" msgstr "Accetta il contatto per poter comunicare" -#: ../../mod/connections.php:416 +#: ../../mod/connections.php:436 msgid "Automatic Permissions Settings" msgstr "Permessi predefiniti" -#: ../../mod/connections.php:416 +#: ../../mod/connections.php:436 #, php-format msgid "Connections: settings for %s" msgstr "Contatti: impostazioni per %s" -#: ../../mod/connections.php:420 +#: ../../mod/connections.php:440 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 "Quando ricevi una richiesta di amicizia da un canale, i permessi mostrati in questa pagina saranno applicati al nuovo contatto con l'approvazione della richiesta. Lascia questa pagina se non vuoi proseguire." -#: ../../mod/connections.php:422 +#: ../../mod/connections.php:442 msgid "Slide to adjust your degree of friendship" msgstr "Trascina per restringere il grado di amicizia da mostrare" -#: ../../mod/connections.php:428 +#: ../../mod/connections.php:448 msgid "inherited" msgstr "derivato" -#: ../../mod/connections.php:430 +#: ../../mod/connections.php:450 msgid "Connection has no individual permissions!" msgstr "Non hai assegnato permessi individuali a questo contatto!" -#: ../../mod/connections.php:431 +#: ../../mod/connections.php:451 msgid "" "This may be appropriate based on your     privacy " "settings, though you may wish to review the \"Advanced Permissions\"." msgstr "Questo corrisponde alle tue impostazioni di privacy, ma puoi anche dare un'occhiata ai 'Permessi avanzati' per opzioni più dettagliate." -#: ../../mod/connections.php:433 +#: ../../mod/connections.php:453 msgid "Profile Visibility" msgstr "Visibilità del profilo" -#: ../../mod/connections.php:434 +#: ../../mod/connections.php:454 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "Seleziona il profilo che vuoi mostrare a %s quando visita il tuo profilo in modo sicuro." -#: ../../mod/connections.php:435 +#: ../../mod/connections.php:455 msgid "Contact Information / Notes" msgstr "Informazioni e annotazioni sul contatto" -#: ../../mod/connections.php:436 +#: ../../mod/connections.php:456 msgid "Edit contact notes" msgstr "Modifica le informazioni sul contatto" -#: ../../mod/connections.php:438 +#: ../../mod/connections.php:458 msgid "Their Settings" msgstr "Permessi concessi a te" -#: ../../mod/connections.php:439 +#: ../../mod/connections.php:459 msgid "My Settings" msgstr "I permessi che concedo" -#: ../../mod/connections.php:441 +#: ../../mod/connections.php:461 msgid "Forum Members" msgstr "Membro di un forum" -#: ../../mod/connections.php:442 +#: ../../mod/connections.php:462 msgid "Soapbox" msgstr "Comunicati e annunci" -#: ../../mod/connections.php:443 +#: ../../mod/connections.php:463 msgid "Full Sharing" msgstr "Condivisione totale" -#: ../../mod/connections.php:444 +#: ../../mod/connections.php:464 msgid "Cautious Sharing" msgstr "Condivisione prudente" -#: ../../mod/connections.php:445 +#: ../../mod/connections.php:465 msgid "Follow Only" msgstr "Follower" -#: ../../mod/connections.php:446 +#: ../../mod/connections.php:466 msgid "Individual Permissions" msgstr "Permessi individuali" -#: ../../mod/connections.php:447 +#: ../../mod/connections.php:467 msgid "" "Some permissions may be inherited from your privacy " "settings, which have higher priority. Changing those on this page will " "have no effect." msgstr "Alcuni permessi possono derivano dalle impostazioni di privacy, che hanno una priorità maggiore. Cambiarli in questa pagina non avrà alcun effetto." -#: ../../mod/connections.php:448 +#: ../../mod/connections.php:468 msgid "Advanced Permissions" msgstr "Permessi avanzati" -#: ../../mod/connections.php:449 +#: ../../mod/connections.php:469 msgid "Quick Links" msgstr "Impostazioni veloci" -#: ../../mod/connections.php:453 +#: ../../mod/connections.php:473 #, php-format msgid "Visit %s's profile - %s" msgstr "Guarda il profilo di %s - %s" -#: ../../mod/connections.php:454 +#: ../../mod/connections.php:474 msgid "Block/Unblock contact" msgstr "Blocca/sblocca contatto" -#: ../../mod/connections.php:455 +#: ../../mod/connections.php:475 msgid "Ignore contact" msgstr "Ignora il contatto" -#: ../../mod/connections.php:456 +#: ../../mod/connections.php:476 msgid "Repair URL settings" msgstr "Ripara le impostazioni URL" -#: ../../mod/connections.php:457 +#: ../../mod/connections.php:477 msgid "View conversations" msgstr "Leggi le conversazioni" -#: ../../mod/connections.php:459 +#: ../../mod/connections.php:479 msgid "Delete contact" msgstr "Elimina contatto" -#: ../../mod/connections.php:462 +#: ../../mod/connections.php:482 msgid "Last update:" msgstr "Ultimo aggiornamento:" -#: ../../mod/connections.php:464 +#: ../../mod/connections.php:484 msgid "Update public posts" msgstr "Aggiorna gli articoli pubblici" -#: ../../mod/connections.php:466 +#: ../../mod/connections.php:486 msgid "Update now" msgstr "Aggiorna adesso" -#: ../../mod/connections.php:472 +#: ../../mod/connections.php:492 msgid "Currently blocked" msgstr "Attualmente bloccato" -#: ../../mod/connections.php:473 +#: ../../mod/connections.php:493 msgid "Currently ignored" msgstr "Attualmente ignorato" -#: ../../mod/connections.php:474 +#: ../../mod/connections.php:494 msgid "Currently archived" msgstr "Attualmente archiviato" -#: ../../mod/connections.php:475 +#: ../../mod/connections.php:495 msgid "Currently pending" msgstr "Attualmente da approvare" -#: ../../mod/connections.php:476 +#: ../../mod/connections.php:496 msgid "" "Replies/likes to your public posts may still be visible" msgstr "Le risposte ai tuoi articoli pubblici potrebbero restare comunque visibili" -#: ../../mod/connections.php:512 ../../mod/connections.php:584 +#: ../../mod/connections.php:532 ../../mod/connections.php:604 msgid "Blocked" msgstr "Bloccati" -#: ../../mod/connections.php:517 ../../mod/connections.php:591 +#: ../../mod/connections.php:537 ../../mod/connections.php:611 msgid "Ignored" msgstr "Ignorati" -#: ../../mod/connections.php:522 ../../mod/connections.php:605 +#: ../../mod/connections.php:542 ../../mod/connections.php:625 msgid "Hidden" msgstr "Nascosti" -#: ../../mod/connections.php:527 ../../mod/connections.php:598 +#: ../../mod/connections.php:547 ../../mod/connections.php:618 msgid "Archived" msgstr "Archiviati" -#: ../../mod/connections.php:538 +#: ../../mod/connections.php:558 msgid "All" msgstr "Tutti" -#: ../../mod/connections.php:559 +#: ../../mod/connections.php:579 msgid "Suggestions" msgstr "Suggerimenti" -#: ../../mod/connections.php:562 +#: ../../mod/connections.php:582 msgid "Suggest new connections" msgstr "Suggerisci nuovi contatti" -#: ../../mod/connections.php:568 +#: ../../mod/connections.php:588 msgid "Show pending (new) connections" msgstr "Richieste di amicizia in attesa" -#: ../../mod/connections.php:571 +#: ../../mod/connections.php:591 msgid "All Connections" msgstr "Tutti i contatti" -#: ../../mod/connections.php:574 +#: ../../mod/connections.php:594 msgid "Show all connections" msgstr "Mostra tutti i contatti" -#: ../../mod/connections.php:577 +#: ../../mod/connections.php:597 msgid "Unblocked" msgstr "Non bloccati" -#: ../../mod/connections.php:580 +#: ../../mod/connections.php:600 msgid "Only show unblocked connections" msgstr "Mostra solo i contatti non bloccati" -#: ../../mod/connections.php:587 +#: ../../mod/connections.php:607 msgid "Only show blocked connections" msgstr "Mostra solo i contatti bloccati" -#: ../../mod/connections.php:594 +#: ../../mod/connections.php:614 msgid "Only show ignored connections" msgstr "Mostra solo i contatti ignorati" -#: ../../mod/connections.php:601 +#: ../../mod/connections.php:621 msgid "Only show archived connections" msgstr "Mostra solo i contatti archiviati" -#: ../../mod/connections.php:608 +#: ../../mod/connections.php:628 msgid "Only show hidden connections" msgstr "Mostra solo i contatti nascosti" -#: ../../mod/connections.php:650 +#: ../../mod/connections.php:670 #, php-format msgid "%1$s [%2$s]" msgstr "%1$s [%2$s]" -#: ../../mod/connections.php:651 ../../mod/nogroup.php:41 +#: ../../mod/connections.php:671 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "Modifica il contatto" -#: ../../mod/connections.php:675 +#: ../../mod/connections.php:695 msgid "Search your connections" msgstr "Cerca tra i contatti" -#: ../../mod/connections.php:676 +#: ../../mod/connections.php:696 msgid "Finding: " msgstr "Ricerca: " @@ -5923,23 +5907,23 @@ msgstr "Età:" msgid "Edit/Manage Profiles" msgstr "Modifica/gestisci i profili" -#: ../../mod/profiles.php:624 ../../boot.php:1759 +#: ../../mod/profiles.php:624 ../../boot.php:1755 msgid "Change profile photo" msgstr "Cambia la foto del profilo" -#: ../../mod/profiles.php:625 ../../boot.php:1766 +#: ../../mod/profiles.php:625 ../../boot.php:1762 msgid "Create New Profile" msgstr "Crea un nuovo profilo" -#: ../../mod/profiles.php:636 ../../boot.php:1780 +#: ../../mod/profiles.php:636 ../../boot.php:1776 msgid "Profile Image" msgstr "Immagine del profilo" -#: ../../mod/profiles.php:639 ../../boot.php:1783 +#: ../../mod/profiles.php:639 ../../boot.php:1779 msgid "visible to everybody" msgstr "visibile a tutti" -#: ../../mod/profiles.php:640 ../../boot.php:1784 +#: ../../mod/profiles.php:640 ../../boot.php:1780 msgid "Edit visibility" msgstr "Cambia la visibilità" @@ -6017,7 +6001,7 @@ msgid "" "Password reset failed." msgstr "La richiesta non può essere verificata (potresti averla già usata precedentemente). La password non può essere reimpostata." -#: ../../mod/lostpass.php:85 ../../boot.php:1473 +#: ../../mod/lostpass.php:85 ../../boot.php:1469 msgid "Password Reset" msgstr "Reimposta la password" @@ -6559,7 +6543,7 @@ msgstr "Scegli cosa vuoi inviare al destinatario" msgid "Make this post private" msgstr "Rendi privato questo articolo" -#: ../../mod/wall_upload.php:41 ../../mod/item.php:1057 +#: ../../mod/wall_upload.php:41 ../../mod/item.php:1049 msgid "Wall Photos" msgstr "Foto della bacheca" @@ -6640,12 +6624,12 @@ msgstr "I contenuti eseguibili non sono permessi su questo canale." msgid "System error. Post not saved." msgstr "Errore di sistema. Articolo non salvato." -#: ../../mod/item.php:1136 +#: ../../mod/item.php:1128 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "Hai raggiunto il limite massimo di %1$.0f articoli sulla pagina principale." -#: ../../mod/item.php:1142 +#: ../../mod/item.php:1134 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "Hai raggiunto il limite massimo di %1$.0f pagine web." @@ -6728,70 +6712,70 @@ msgstr "Tipo di accesso" msgid "Registration Policy" msgstr "Politica di registrazione" -#: ../../mod/register.php:35 +#: ../../mod/register.php:43 msgid "Maximum daily site registrations exceeded. Please try again tomorrow." msgstr "È stato superato il numero massimo giornaliero di registrazioni a questo sito. Riprova domani!" -#: ../../mod/register.php:41 +#: ../../mod/register.php:49 msgid "" "Please indicate acceptance of the Terms of Service. Registration failed." msgstr "Impossibile proseguire. Devi prima accettare le Condizioni d'Uso del servizio." -#: ../../mod/register.php:69 +#: ../../mod/register.php:77 msgid "Passwords do not match." msgstr "Le password non corrispondono." -#: ../../mod/register.php:97 +#: ../../mod/register.php:105 msgid "" "Registration successful. Please check your email for validation " "instructions." msgstr "La registrazione è terminata correttamente. Per continuare controlla l'email che ti è stata inviata." -#: ../../mod/register.php:103 +#: ../../mod/register.php:111 msgid "Your registration is pending approval by the site owner." msgstr "La tua richiesta è in attesa di approvazione da parte dell'amministratore del sito." -#: ../../mod/register.php:106 +#: ../../mod/register.php:114 msgid "Your registration can not be processed." msgstr "La tua registrazione non puo' essere acquisita." -#: ../../mod/register.php:141 +#: ../../mod/register.php:149 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." msgstr "Questo sito ha superato il numero di registrazioni giornaliere consentite. Prova di nuovo domani." -#: ../../mod/register.php:152 +#: ../../mod/register.php:160 msgid "Terms of Service" msgstr "Condizioni d'Uso" -#: ../../mod/register.php:158 +#: ../../mod/register.php:166 #, php-format msgid "I accept the %s for this website" msgstr "Accetto le %s di questo sito" -#: ../../mod/register.php:160 +#: ../../mod/register.php:168 #, php-format msgid "I am over 13 years of age and accept the %s for this website" msgstr "Ho più di 13 anni e accetto le %s di questo sito" -#: ../../mod/register.php:175 +#: ../../mod/register.php:183 msgid "Membership on this site is by invitation only." msgstr "Per registrarsi su questo sito è necessario un invito." -#: ../../mod/register.php:176 +#: ../../mod/register.php:184 msgid "Please enter your invitation code" msgstr "Inserisci il codice dell'invito" -#: ../../mod/register.php:179 +#: ../../mod/register.php:187 msgid "Your email address" msgstr "Il tuo indirizzo email" -#: ../../mod/register.php:180 +#: ../../mod/register.php:188 msgid "Choose a password" msgstr "Scegli una password" -#: ../../mod/register.php:181 +#: ../../mod/register.php:189 msgid "Please re-enter your password" msgstr "Ripeti la password per verifica" @@ -6799,13 +6783,13 @@ msgstr "Ripeti la password per verifica" msgid "Please login." msgstr "Accedi." -#: ../../mod/post.php:114 +#: ../../mod/post.php:119 msgid "" "Remote authentication blocked. You are logged into this site locally. Please" " logout and retry." msgstr "L'autenticazione remota non è disponibile. Hai accesso solamente a questo sito. Puoi provare ad uscire per tentare di nuovo." -#: ../../mod/post.php:127 +#: ../../mod/post.php:132 #, php-format msgid "Welcome %s. Remote authentication successful." msgstr "Ciao %s. La tua autenticazione da remoto è avvenuta con successo." @@ -6866,94 +6850,106 @@ msgstr "Umore" msgid "Set your current mood and tell your friends" msgstr "Scegli il tuo umore attuale per mostrarlo agli amici" -#: ../../view/theme/redbasic/php/config.php:68 +#: ../../view/theme/redbasic/php/config.php:74 msgid "Scheme Default" msgstr "Schema predefinito" -#: ../../view/theme/redbasic/php/config.php:69 +#: ../../view/theme/redbasic/php/config.php:75 msgid "red" msgstr "rosso" -#: ../../view/theme/redbasic/php/config.php:70 +#: ../../view/theme/redbasic/php/config.php:76 msgid "black" msgstr "nero" -#: ../../view/theme/redbasic/php/config.php:71 +#: ../../view/theme/redbasic/php/config.php:77 msgid "silver" msgstr "argento" -#: ../../view/theme/redbasic/php/config.php:82 +#: ../../view/theme/redbasic/php/config.php:88 #: ../../view/theme/apw/php/config.php:234 msgid "Theme settings" msgstr "Impostazioni del tema" -#: ../../view/theme/redbasic/php/config.php:83 +#: ../../view/theme/redbasic/php/config.php:89 #: ../../view/theme/apw/php/config.php:235 msgid "Set scheme" msgstr "Schema" -#: ../../view/theme/redbasic/php/config.php:84 +#: ../../view/theme/redbasic/php/config.php:90 msgid "Navigation bar colour" msgstr "Colore della barra di navigazione" -#: ../../view/theme/redbasic/php/config.php:85 +#: ../../view/theme/redbasic/php/config.php:91 msgid "Set font-colour for banner" msgstr "Colore del font del banner" -#: ../../view/theme/redbasic/php/config.php:86 +#: ../../view/theme/redbasic/php/config.php:92 msgid "Set the background colour" msgstr "Colore di sfondo" -#: ../../view/theme/redbasic/php/config.php:87 +#: ../../view/theme/redbasic/php/config.php:93 msgid "Set the background image" msgstr "Immagine di sfondo" -#: ../../view/theme/redbasic/php/config.php:88 +#: ../../view/theme/redbasic/php/config.php:94 msgid "Set the background colour of items" msgstr "Colore di sfondo degli elementi della pagina" -#: ../../view/theme/redbasic/php/config.php:89 +#: ../../view/theme/redbasic/php/config.php:95 msgid "Set the opacity of items" msgstr "Opacità degli oggetti" -#: ../../view/theme/redbasic/php/config.php:90 +#: ../../view/theme/redbasic/php/config.php:96 msgid "Set the basic colour for item icons" msgstr "Colore di base per le icone" -#: ../../view/theme/redbasic/php/config.php:91 +#: ../../view/theme/redbasic/php/config.php:97 msgid "Set the hover colour for item icons" msgstr "Colore per le icone in evidenza" -#: ../../view/theme/redbasic/php/config.php:92 +#: ../../view/theme/redbasic/php/config.php:98 +msgid "Set font-size for the entire application" +msgstr "Dimensione font per tutto il sito" + +#: ../../view/theme/redbasic/php/config.php:99 #: ../../view/theme/apw/php/config.php:236 msgid "Set font-size for posts and comments" msgstr "Dimensioni del carattere per articoli e commenti" -#: ../../view/theme/redbasic/php/config.php:93 +#: ../../view/theme/redbasic/php/config.php:100 msgid "Set font-colour for posts and comments" msgstr "Colore del carattere per articoli e commenti" -#: ../../view/theme/redbasic/php/config.php:94 +#: ../../view/theme/redbasic/php/config.php:101 msgid "Set radius of corners" msgstr "Raggio degli angoli stondati" -#: ../../view/theme/redbasic/php/config.php:95 +#: ../../view/theme/redbasic/php/config.php:102 msgid "Set shadow depth of photos" msgstr "Profondità dell'ombra delle foto" -#: ../../view/theme/redbasic/php/config.php:96 +#: ../../view/theme/redbasic/php/config.php:103 msgid "Set maximum width of conversation regions" msgstr "Larghezza massima delle aree delle conversazioni" -#: ../../view/theme/redbasic/php/config.php:97 +#: ../../view/theme/redbasic/php/config.php:104 msgid "Set minimum opacity of nav bar - to hide it" msgstr "Imposta l'opacità minima della barra di navigazione per nasconderla" -#: ../../view/theme/redbasic/php/config.php:98 +#: ../../view/theme/redbasic/php/config.php:105 +msgid "Set size of conversation author photo" +msgstr "Dimensione foto dell'autore della conversazione" + +#: ../../view/theme/redbasic/php/config.php:106 +msgid "Set size of followup author photos" +msgstr "Dimensione foto dei partecipanti alla conversazione" + +#: ../../view/theme/redbasic/php/config.php:107 msgid "Sloppy photo albums" -msgstr "Album fotografici semplificati" +msgstr "Album con foto storte" -#: ../../view/theme/redbasic/php/config.php:98 +#: ../../view/theme/redbasic/php/config.php:107 msgid "Are you a clean desk or a messy desk person?" msgstr "La tua scrivania è sempre a posto? Sei una persona disordinata?" @@ -7082,113 +7078,113 @@ msgstr "Spazio a sinistra del aside" msgid "Right offset of the aside element" msgstr "Spazio a destra del aside" -#: ../../boot.php:1278 +#: ../../boot.php:1274 #, php-format msgid "Update %s failed. See error logs." msgstr "%s: aggiornamento fallito. Controlla i log di errore." -#: ../../boot.php:1281 +#: ../../boot.php:1277 #, php-format msgid "Update Error at %s" msgstr "Errore di aggiornamento su %s" -#: ../../boot.php:1438 +#: ../../boot.php:1434 msgid "" "Create an account to access services and applications within the Red Matrix" msgstr "Registrati per accedere ai servizi e alle applicazioni di Red Matrix" -#: ../../boot.php:1466 +#: ../../boot.php:1462 msgid "Password" msgstr "Password" -#: ../../boot.php:1467 +#: ../../boot.php:1463 msgid "Remember me" msgstr "Resta connesso" -#: ../../boot.php:1472 +#: ../../boot.php:1468 msgid "Forgot your password?" msgstr "Hai dimenticato la password?" -#: ../../boot.php:1537 +#: ../../boot.php:1533 msgid "permission denied" msgstr "permesso negato" -#: ../../boot.php:1538 +#: ../../boot.php:1534 msgid "Got Zot?" msgstr "Hai Zot?" -#: ../../boot.php:1597 +#: ../../boot.php:1593 msgid "Requested channel is not available." msgstr "Il canale che cerchi non è disponibile." -#: ../../boot.php:1609 +#: ../../boot.php:1605 msgid " Sorry, you don't have the permission to view this profile. " msgstr "Purtroppo non hai il permesso di vedere questo profilo." -#: ../../boot.php:1765 +#: ../../boot.php:1761 msgid "Profiles" msgstr "Profili" -#: ../../boot.php:1765 +#: ../../boot.php:1761 msgid "Manage/edit profiles" msgstr "Gestisci/modifica i profili" -#: ../../boot.php:1769 +#: ../../boot.php:1765 msgid "Edit Profile" msgstr "Modifica il profilo" -#: ../../boot.php:1863 ../../boot.php:1943 +#: ../../boot.php:1859 ../../boot.php:1939 msgid "F d" msgstr "d F" -#: ../../boot.php:1920 +#: ../../boot.php:1916 msgid "Birthday Reminders" msgstr "Promemoria compleanni" -#: ../../boot.php:1921 +#: ../../boot.php:1917 msgid "Birthdays this week:" msgstr "Compleanni questa settimana:" -#: ../../boot.php:1976 +#: ../../boot.php:1972 msgid "[No description]" msgstr "[Nessuna descrizione]" -#: ../../boot.php:1994 +#: ../../boot.php:1990 msgid "Event Reminders" msgstr "Promemoria" -#: ../../boot.php:1995 +#: ../../boot.php:1991 msgid "Events this week:" msgstr "Eventi di questa settimana:" -#: ../../boot.php:2229 +#: ../../boot.php:2225 msgid "Channel" msgstr "Canale" -#: ../../boot.php:2232 +#: ../../boot.php:2228 msgid "Status Messages and Posts" msgstr "Articoli e messaggi di stato" -#: ../../boot.php:2236 +#: ../../boot.php:2232 msgid "About" msgstr "Informazioni" -#: ../../boot.php:2239 +#: ../../boot.php:2235 msgid "Profile Details" msgstr "Dettagli del profilo" -#: ../../boot.php:2257 +#: ../../boot.php:2253 msgid "Events and Calendar" msgstr "Calendario eventi" -#: ../../boot.php:2262 +#: ../../boot.php:2258 msgid "Webpages" msgstr "Pagine web" -#: ../../boot.php:2265 +#: ../../boot.php:2261 msgid "Manage Webpages" msgstr "Gestisci le pagine web" -#: ../../boot.php:2547 +#: ../../boot.php:2545 msgid "toggle mobile" msgstr "attiva/disattiva versione mobile" diff --git a/view/it/strings.php b/view/it/strings.php index 5c71824db..58778798a 100644 --- a/view/it/strings.php +++ b/view/it/strings.php @@ -14,11 +14,12 @@ $a->strings["Visit %1\$s's %2\$s"] = "Guarda %2\$s di %1\$s "; $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s ha aggiornato %2\$s cambiando %3\$s."; $a->strings["Public Timeline"] = "Diario pubblico"; $a->strings["Red Matrix Notification"] = "Notifica di Red Matrix"; +$a->strings["redmatrix"] = "redmatrix"; $a->strings["Thank You,"] = "Grazie,"; $a->strings["%s Administrator"] = "Amministratore %s"; $a->strings["%s "] = "%s "; $a->strings["[Red:Notify] New mail received at %s"] = "[Red:Notifica] Nuovo messaggio ricevuto alle %s"; -$a->strings["%1\$s sent you a new private message at %2\$s."] = "%1\$s ti ha mandato un messaggio privato alle %2\$s."; +$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, %2\$s ti ha mandato un messaggio privato alle %3\$s."; $a->strings["%1\$s sent you %2\$s."] = "%1\$s ti ha mandato %2\$s."; $a->strings["a private message"] = "un messaggio privato"; $a->strings["Please visit %s to view and/or reply to your private messages."] = "Visita %s per leggere i tuoi messaggi privati e rispondere."; @@ -32,10 +33,10 @@ $a->strings["[Red:Notify] %s posted to your profile wall"] = "[Red:Notifica] %s $a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s ha scritto sulla tua bacheca alle %2\$s"; $a->strings["%1\$s posted to [zrl=%2\$s]your wall[/zrl]"] = "%1\$s ha scritto sulla [zrl=%2\$s]tua bacheca[/zrl]"; $a->strings["[Red:Notify] %s tagged you"] = "[Red:Notifica] %s ti ha taggato"; -$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s ti ha taggato alle %2\$s"; +$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s ti ha taggato alle %3\$s"; $a->strings["%1\$s [zrl=%2\$s]tagged you[/zrl]."] = "%1\$s [zrl=%2\$s]ti ha taggato[/zrl]."; $a->strings["[Red:Notify] %1\$s poked you"] = "[Red:Notifica] %1\$s ti ha mandato un poke"; -$a->strings["%1\$s poked you at %2\$s"] = "%1\$s ti ha mandato un poke alle %2\$s"; +$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s ti ha mandato un poke alle %3\$s"; $a->strings["%1\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s [zrl=%2\$s]ti ha mandato un poke[/zrl]."; $a->strings["[Red:Notify] %s tagged your post"] = "[Red:Notifica] %s ha taggato il tuo articolo"; $a->strings["%1\$s tagged your post at %2\$s"] = "%1\$s ha taggato il tuo articolo alle %2\$s"; @@ -187,8 +188,6 @@ $a->strings["Enable tab to display all new Network activity"] = "Abilita il link $a->strings["Affinity Tool"] = "Filtro per affinità"; $a->strings["Filter stream activity by depth of relationships"] = "Permette di selezionare i contenuti in base al livello di amicizia"; $a->strings["Post/Comment Tools"] = "Gestione articoli e commenti"; -$a->strings["Multiple Deletion"] = "Eliminazione multipla"; -$a->strings["Select and delete multiple posts/comments at once"] = "Rendi possibile l'eliminazione di molti articoli o commenti con un solo comando"; $a->strings["Edit Sent Posts"] = "Modifica gli articoli già inviati"; $a->strings["Edit and correct posts and comments after sending"] = "Modifica e correggi gli articoli o i commenti anche dopo l'invio"; $a->strings["Tagging"] = "Tag"; @@ -963,12 +962,12 @@ $a->strings["Server"] = "Server"; $a->strings["DB updates"] = "Aggiornamenti al DB"; $a->strings["Logs"] = "Log"; $a->strings["Plugin Features"] = "Funzionalità dei componenti aggiuntivi"; -$a->strings["User registrations waiting for confirmation"] = "Utenti registrati in attesa di conferma"; -$a->strings["Message queues"] = "Coda dei messaggi"; +$a->strings["User registrations waiting for confirmation"] = "Registrazioni in attesa"; +$a->strings["Message queues"] = "Messaggi in attesa di recapito"; $a->strings["Administration"] = "Amministrazione"; $a->strings["Summary"] = "Riepilogo"; $a->strings["Registered users"] = "Utenti registrati"; -$a->strings["Pending registrations"] = "Registrazioni in attesa"; +$a->strings["Pending registrations"] = "Registrazioni da approvare"; $a->strings["Version"] = "Versione"; $a->strings["Active plugins"] = "Plugin attivi"; $a->strings["Site settings updated."] = "Impostazioni del sito aggiornate."; @@ -1001,7 +1000,7 @@ $a->strings["Register policy"] = "Politica di registrazione"; $a->strings["Access policy"] = "Tipo di accesso"; $a->strings["Register text"] = "Testo diregistrazione"; $a->strings["Will be displayed prominently on the registration page."] = "Sarà mostrato ben visibile nella pagina di registrazione."; -$a->strings["Accounts abandoned after x days"] = "Account abbandonati dopo x giorni"; +$a->strings["Accounts abandoned after x days"] = "Account abbandonati dopo X giorni"; $a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Eviterà di sprecare risorse di sistema controllando se i siti esterni hanno account abbandonati. Immettere 0 per non imporre nessun limite di tempo."; $a->strings["Allowed friend domains"] = "Domini fidati e consentiti"; $a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Elenco separato da virglola dei domini che possono stabilire amicizie con questo sito. Sono accettati caratteri jolly. Lascia vuoto per accettare connessioni da qualsiasi dominio."; @@ -1047,10 +1046,6 @@ $a->strings["Account not found"] = "Account non trovato"; $a->strings["User '%s' deleted"] = "Utente '%s' eliminato"; $a->strings["User '%s' unblocked"] = "Utente '%s' sbloccato"; $a->strings["User '%s' blocked"] = "Utente '%s' bloccato"; -$a->strings["Normal Account"] = "Account normale"; -$a->strings["Soapbox Account"] = "Account per comunicati e annunci"; -$a->strings["Community/Celebrity Account"] = "Account per celebrità o per comunità"; -$a->strings["Automatic Friend Account"] = "Account per amicizia automatizzato"; $a->strings["select all"] = "seleziona tutti"; $a->strings["User registrations waiting for confirm"] = "Richieste di registrazione in attesa di conferma"; $a->strings["Request date"] = "Data richiesta"; @@ -1061,6 +1056,7 @@ $a->strings["Block"] = "Blocca"; $a->strings["Unblock"] = "Sblocca"; $a->strings["Register date"] = "Data registrazione"; $a->strings["Last login"] = "Ultimo accesso"; +$a->strings["Expires"] = "Scadenza"; $a->strings["Service Class"] = "Service Class"; $a->strings["Selected users will be deleted!\\n\\nEverything these users had posted on this site will be permanently deleted!\\n\\nAre you sure?"] = "Gli utenti selezionati saranno eliminati!\\n\\nTutto quello che gli utenti hanno pubblicato su questo sito sarà permanentemente eliminato!\\n\\nConfermi?"; $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'utente {0} sarà eliminato!\\n\\nTutto quello che ha pubblicato su questo sito sarà permanentemente eliminato!\\n\\nConfermi?"; @@ -1629,13 +1625,16 @@ $a->strings["Set the background colour of items"] = "Colore di sfondo degli elem $a->strings["Set the opacity of items"] = "Opacità degli oggetti"; $a->strings["Set the basic colour for item icons"] = "Colore di base per le icone"; $a->strings["Set the hover colour for item icons"] = "Colore per le icone in evidenza"; +$a->strings["Set font-size for the entire application"] = "Dimensione font per tutto il sito"; $a->strings["Set font-size for posts and comments"] = "Dimensioni del carattere per articoli e commenti"; $a->strings["Set font-colour for posts and comments"] = "Colore del carattere per articoli e commenti"; $a->strings["Set radius of corners"] = "Raggio degli angoli stondati"; $a->strings["Set shadow depth of photos"] = "Profondità dell'ombra delle foto"; $a->strings["Set maximum width of conversation regions"] = "Larghezza massima delle aree delle conversazioni"; $a->strings["Set minimum opacity of nav bar - to hide it"] = "Imposta l'opacità minima della barra di navigazione per nasconderla"; -$a->strings["Sloppy photo albums"] = "Album fotografici semplificati"; +$a->strings["Set size of conversation author photo"] = "Dimensione foto dell'autore della conversazione"; +$a->strings["Set size of followup author photos"] = "Dimensione foto dei partecipanti alla conversazione"; +$a->strings["Sloppy photo albums"] = "Album con foto storte"; $a->strings["Are you a clean desk or a messy desk person?"] = "La tua scrivania è sempre a posto? Sei una persona disordinata?"; $a->strings["Schema Default"] = "Schema predefinito"; $a->strings["Sans-Serif"] = "Sans-Serif"; -- cgit v1.2.3 From b67347d9a03f92738eaa6b6de3f2b526f35d99d0 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 27 Nov 2013 16:32:17 -0800 Subject: add xmlrpc method for importing red comments --- util/wp/post_to_red/post_to_red.php | 81 +++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/util/wp/post_to_red/post_to_red.php b/util/wp/post_to_red/post_to_red.php index 427e0f5e2..7fbf1eb76 100644 --- a/util/wp/post_to_red/post_to_red.php +++ b/util/wp/post_to_red/post_to_red.php @@ -259,6 +259,87 @@ add_action('add_meta_boxes', 'post_to_red_post_checkbox'); add_action('save_post', 'post_to_red_post_field_data'); add_action('before_delete_post', 'post_to_red_delete_post'); +add_filter('xmlrpc_methods', 'red_xmlrpc_methods'); + + +function red_xmlrpc_methods($methods) { + $methods['red.Comment'] = 'red_comment'; + return $methods; +} + +function red_comment($args) { + global $wp_xmlrpc_server; + $wp_xmlrpc_server->escape( $args ); + + $blog_id = $args[0]; + $username = $args[1]; + $password = $args[2]; + $post = $args[3]; + $content_struct = $args[4]; + + if ( ! $user = $wp_xmlrpc_server->login( $username, $password ) ) + return $wp_xmlrpc_server->error; + + if ( is_numeric($post) ) + $post_id = absint($post); + else + $post_id = url_to_postid($post); + + if ( ! $post_id ) + return new IXR_Error( 404, __( 'Invalid post ID.' ) ); + if ( ! get_post($post_id) ) + return new IXR_Error( 404, __( 'Invalid post ID.' ) ); + + $comment['comment_post_ID'] = $post_id; + + $comment['comment_author'] = ''; + if ( isset($content_struct['author']) ) + $comment['comment_author'] = $content_struct['author']; + + $comment['comment_author_email'] = ''; + if ( isset($content_struct['author_email']) ) + $comment['comment_author_email'] = $content_struct['author_email']; + + $comment['comment_author_url'] = ''; + if ( isset($content_struct['author_url']) ) + $comment['comment_author_url'] = $content_struct['author_url']; + + $comment['user_ID'] = 0; + + if ( get_option('require_name_email') ) { + if ( 6 > strlen($comment['comment_author_email']) || '' == $comment['comment_author'] ) + return new IXR_Error( 403, __( 'Comment author name and email are required' ) ); + elseif ( !is_email($comment['comment_author_email']) ) + return new IXR_Error( 403, __( 'A valid email address is required' ) ); + } + + if(isset($content_struct['comment_id'])) { + $comment['comment_ID'] = intval($content_struct['comment_id']); + $edit = true; + } + $comment['comment_post_ID'] = $post_id; + $comment['comment_parent'] = isset($content_struct['comment_parent']) ? absint($content_struct['comment_parent']) : 0; + $comment['comment_content'] = isset($content_struct['content']) ? $content_struct['content'] : null; + + do_action('xmlrpc_call', 'red.Comment'); + + if($edit) { + $result = wp_update_comment($comment); + $comment_ID = $comment['comment_ID']; + } + else { + $comment_ID = wp_new_comment( $comment ); + if($comment_ID) + wp_set_comment_status($comment_ID,'approve'); + } + + do_action( 'xmlrpc_call_success_red_Comment', $comment_ID, $args ); + + return $comment_ID; +} + + + // from: // http://www.docgate.com/tutorial/php/how-to-convert-html-to-bbcode-with-php-script.html function xpost_to_html2bbcode($text) { -- cgit v1.2.3 From 21e465e48ae918b75d011d0fc5de1864bb474edc Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 27 Nov 2013 20:56:08 -0800 Subject: add photos to red-to-wordpress comments --- util/wp/post_to_red/post_to_red.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/util/wp/post_to_red/post_to_red.php b/util/wp/post_to_red/post_to_red.php index 7fbf1eb76..71ae88aa8 100644 --- a/util/wp/post_to_red/post_to_red.php +++ b/util/wp/post_to_red/post_to_red.php @@ -261,6 +261,8 @@ add_action('before_delete_post', 'post_to_red_delete_post'); add_filter('xmlrpc_methods', 'red_xmlrpc_methods'); +add_filter('get_avatar', 'post_to_red_get_avatar',10,5); + function red_xmlrpc_methods($methods) { $methods['red.Comment'] = 'red_comment'; @@ -333,11 +335,29 @@ function red_comment($args) { wp_set_comment_status($comment_ID,'approve'); } + if(isset($content_struct['red_avatar'])) + add_comment_meta($comment_ID,'red_avatar',$content_struct['red_avatar'],true); + do_action( 'xmlrpc_call_success_red_Comment', $comment_ID, $args ); return $comment_ID; } +function post_to_red_get_avatar($avatar,$id_or_email,$size,$default,$alt) { + + if(! is_object($id_or_email)) + return $avatar; + if((! array_key_exists('comment_author_email',$id_or_email)) || (empty($id_or_email->comment_author_email))) + return $avatar; + if((! array_key_exists('comment_ID', $id_or_email)) || (! intval($id_or_email->comment_ID))) + return $avatar; + $l = get_comment_meta($id_or_email->comment_ID,'red_avatar',true); + if($l) { + $safe_alt = esc_attr($alt); + $avatar = "{$safe_alt}"; + } + return $avatar; +} // from: -- cgit v1.2.3 From aab9b30d03e2cad7be2207fa22dcd6ddad224369 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 28 Nov 2013 00:16:13 -0800 Subject: synchronise deletion of comments between red and wp --- include/api.php | 10 ++++++++++ util/wp/post_to_red/post_to_red.php | 33 +++++++++++++++++++++++++++++++++ version.inc | 2 +- 3 files changed, 44 insertions(+), 1 deletion(-) diff --git a/include/api.php b/include/api.php index ca5592d08..093839875 100644 --- a/include/api.php +++ b/include/api.php @@ -1101,6 +1101,16 @@ require_once('include/photos.php'); return false; $id = $r[0]['iid']; } + if($_REQUEST['namespace'] && $_REQUEST['comment_id']) { + $r = q("select * from item_id left join item on item.id = item_id.iid where service = '%s' and sid = '%s' and uid = %d and item.id != item.parent limit 1", + dbesc($_REQUEST['namespace']), + dbesc($_REQUEST['comment_id']), + intval($user_info['uid']) + ); + if(! $r) + return false; + $id = $r[0]['iid']; + } } if(! $id) return false; diff --git a/util/wp/post_to_red/post_to_red.php b/util/wp/post_to_red/post_to_red.php index 71ae88aa8..7eb8697ad 100644 --- a/util/wp/post_to_red/post_to_red.php +++ b/util/wp/post_to_red/post_to_red.php @@ -148,6 +148,37 @@ function post_to_red_delete_post($post_id) { } } +function post_to_red_delete_comment($post_id) { + + // The comment may already be destroyed so we can't query it or the parent post. That means + // we have to make a network call for any deleted comment to see if it's registered on Red. + // We really need a "before_delete_comment" action in WP to make + // this more efficient. + + $user_name = post_to_red_get_acct_name(); + $password = post_to_red_get_password(); + $seed_location = post_to_red_get_seed_location(); + $channel = post_to_red_get_channel_name(); + + if ((isset($user_name)) && (isset($password)) && (isset($seed_location))) { + + $message_id = site_url() . '/' . $post_id; + $url = $seed_location . '/api/statuses/destroy'; + + $headers = array('Authorization' => 'Basic '.base64_encode("$user_name:$password")); + $body = array( + 'namespace' => 'wordpress', + 'comment_id' => $message_id, + ); + if($channel) + $body['channel'] = $channel; + + // post: + $request = new WP_Http; + $result = $request->request($url , array( 'method' => 'POST', 'body' => $body, 'headers' => $headers)); + } +} + @@ -259,6 +290,8 @@ add_action('add_meta_boxes', 'post_to_red_post_checkbox'); add_action('save_post', 'post_to_red_post_field_data'); add_action('before_delete_post', 'post_to_red_delete_post'); +add_action('delete_comment', 'post_to_red_delete_comment'); + add_filter('xmlrpc_methods', 'red_xmlrpc_methods'); add_filter('get_avatar', 'post_to_red_get_avatar',10,5); diff --git a/version.inc b/version.inc index 099c10c8d..5a612c8d2 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-11-27.510 +2013-11-28.511 -- cgit v1.2.3 From 2239d472e56c49c314af57af2090c1206500446c Mon Sep 17 00:00:00 2001 From: Olivier Migeot Date: Thu, 28 Nov 2013 12:24:37 +0100 Subject: Plurals for conversation.php --- include/conversation.php | 6 +- util/messages.po | 7035 +++++++++++++++++++++++----------------------- 2 files changed, 3517 insertions(+), 3524 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index a2eeda25b..e20fef9f6 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -993,9 +993,9 @@ function format_like($cnt,$arr,$type,$id) { else { $spanatts = 'class="fakelink" onclick="openClose(\'' . $type . 'list-' . $id . '\');"'; $o .= (($type === 'like') ? - sprintf( t('%2$d people like this.'), $spanatts, $cnt) + sprintf( tt('%2$d people like this.','%2$d people like this.',$cnt), $spanatts, $cnt) : - sprintf( t('%2$d people don\'t like this.'), $spanatts, $cnt) ); + sprintf( tt('%2$d people don\'t like this.','%2$d people don\'t like this.',$cnt), $spanatts, $cnt) ); $o .= EOL ; $total = count($arr); if($total >= MAX_LIKERS) @@ -1004,7 +1004,7 @@ function format_like($cnt,$arr,$type,$id) { $arr[count($arr)-1] = t('and') . ' ' . $arr[count($arr)-1]; $str = implode(', ', $arr); if($total >= MAX_LIKERS) - $str .= sprintf( t(', and %d other people'), $total - MAX_LIKERS ); + $str .= sprintf( tt(', and %d other people',', and %d other people',$total - MAX_LIKERS), $total - MAX_LIKERS ); $str = (($type === 'like') ? sprintf( t('%s like this.'), $str) : sprintf( t('%s don\'t like this.'), $str)); $o .= "\t" . ''; } diff --git a/util/messages.po b/util/messages.po index 958d9e046..2156e2ef9 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2013-11-22.505\n" +"Project-Id-Version: 2013-11-27.510\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-22 00:02-0800\n" +"POT-Creation-Date: 2013-11-28 09:40+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,566 +18,665 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: ../../include/acl_selectors.php:235 -msgid "Visible to everybody" +#: ../../view/theme/red-theme-bootstrap/php/config.php:90 +#: ../../view/theme/redstrap/php/config.php:131 +#: ../../view/theme/redstrap3/php/config.php:51 +#: ../../view/theme/redbasic/php/config.php:85 +#: ../../view/theme/redstrap-multiengine/php/config.php:131 +#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:91 +#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:111 +#: ../../view/theme/redmatrixthemes/newsportal/php/config.php:63 +#: ../../view/theme/redmatrixthemes/newsportal/php/config.php:74 +#: ../../view/theme/redmatrixthemes/bookbasic/php/config.php:63 +#: ../../view/theme/redmatrixthemes/bookbasic/php/config.php:74 +#: ../../include/ItemObject.php:530 ../../mod/message.php:333 +#: ../../mod/message.php:515 ../../mod/poke.php:166 ../../mod/fsuggest.php:108 +#: ../../mod/mood.php:137 ../../mod/crepair.php:166 ../../mod/connect.php:96 +#: ../../mod/admin.php:418 ../../mod/admin.php:683 ../../mod/admin.php:823 +#: ../../mod/admin.php:1022 ../../mod/admin.php:1109 +#: ../../mod/connections.php:452 ../../mod/import.php:385 +#: ../../mod/invite.php:154 ../../mod/group.php:87 ../../mod/photos.php:685 +#: ../../mod/photos.php:779 ../../mod/photos.php:1040 +#: ../../mod/photos.php:1080 ../../mod/photos.php:1167 ../../mod/thing.php:190 +#: ../../mod/setup.php:302 ../../mod/setup.php:345 ../../mod/sources.php:83 +#: ../../mod/sources.php:110 ../../mod/settings.php:651 +#: ../../mod/settings.php:763 ../../mod/settings.php:791 +#: ../../mod/settings.php:815 ../../mod/settings.php:886 +#: ../../mod/settings.php:1054 ../../mod/profiles.php:529 +#: ../../mod/events.php:458 +msgid "Submit" msgstr "" -#: ../../include/acl_selectors.php:236 -msgid "show" +#: ../../view/theme/red-theme-bootstrap/php/config.php:92 +#: ../../view/theme/redstrap/php/config.php:133 +#: ../../view/theme/redstrap3/php/config.php:54 +#: ../../view/theme/redbasic/php/config.php:88 +#: ../../view/theme/redstrap-multiengine/php/config.php:133 +#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:93 +#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:113 +#: ../../view/theme/redmatrixthemes/newsportal/php/config.php:65 +#: ../../view/theme/redmatrixthemes/newsportal/php/config.php:76 +#: ../../view/theme/redmatrixthemes/bookbasic/php/config.php:65 +#: ../../view/theme/redmatrixthemes/bookbasic/php/config.php:76 +msgid "Theme settings" msgstr "" -#: ../../include/acl_selectors.php:237 -msgid "don't show" +#: ../../view/theme/red-theme-bootstrap/php/config.php:93 +#: ../../view/theme/redstrap/php/config.php:134 +#: ../../view/theme/redbasic/php/config.php:99 +#: ../../view/theme/redstrap-multiengine/php/config.php:134 +#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:94 +#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:114 +#: ../../view/theme/redmatrixthemes/newsportal/php/config.php:66 +#: ../../view/theme/redmatrixthemes/newsportal/php/config.php:77 +#: ../../view/theme/redmatrixthemes/bookbasic/php/config.php:66 +#: ../../view/theme/redmatrixthemes/bookbasic/php/config.php:77 +msgid "Set font-size for posts and comments" msgstr "" -#: ../../include/activities.php:37 -msgid " and " +#: ../../view/theme/red-theme-bootstrap/php/config.php:94 +#: ../../view/theme/redstrap/php/config.php:135 +#: ../../view/theme/redstrap-multiengine/php/config.php:135 +#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:96 +#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:116 +#: ../../view/theme/redmatrixthemes/newsportal/php/config.php:67 +#: ../../view/theme/redmatrixthemes/newsportal/php/config.php:79 +#: ../../view/theme/redmatrixthemes/bookbasic/php/config.php:67 +#: ../../view/theme/redmatrixthemes/bookbasic/php/config.php:79 +msgid "Set line-height for posts and comments" msgstr "" -#: ../../include/activities.php:45 -msgid "public profile" +#: ../../view/theme/red-theme-bootstrap/php/config.php:95 +#: ../../view/theme/redstrap/php/config.php:140 +#: ../../view/theme/redstrap-multiengine/php/config.php:140 +#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:98 +msgid "Display colour of links - hex value, do not include the #" msgstr "" -#: ../../include/activities.php:50 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" +#: ../../view/theme/redstrap/php/config.php:136 +#: ../../view/theme/redstrap-multiengine/php/config.php:136 +msgid "Set colour scheme" msgstr "" -#: ../../include/activities.php:51 -#, php-format -msgid "Visit %1$s's %2$s" +#: ../../view/theme/redstrap/php/config.php:137 +#: ../../view/theme/redstrap-multiengine/php/config.php:137 +#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:104 +#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:120 +msgid "Draw shadows" msgstr "" -#: ../../include/activities.php:54 -#, php-format -msgid "%1$s has an updated %2$s, changing %3$s." +#: ../../view/theme/redstrap/php/config.php:138 +#: ../../view/theme/redstrap3/php/config.php:56 +#: ../../view/theme/redbasic/php/config.php:90 +#: ../../view/theme/redstrap-multiengine/php/config.php:138 +#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:97 +#: ../../view/theme/redmatrixthemes/newsportal/php/config.php:68 +#: ../../view/theme/redmatrixthemes/bookbasic/php/config.php:68 +msgid "Navigation bar colour" msgstr "" -#: ../../include/api.php:972 -msgid "Public Timeline" +#: ../../view/theme/redstrap/php/config.php:139 +#: ../../view/theme/redstrap-multiengine/php/config.php:139 +msgid "Display style" msgstr "" -#: ../../include/enotify.php:36 -msgid "Red Matrix Notification" +#: ../../view/theme/redstrap/php/config.php:141 +#: ../../view/theme/redstrap-multiengine/php/config.php:141 +#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:99 +msgid "Icons" msgstr "" -#: ../../include/enotify.php:37 -msgid "redmatrix" +#: ../../view/theme/redstrap/php/config.php:142 +#: ../../view/theme/redstrap-multiengine/php/config.php:142 +msgid "Shiny style" msgstr "" -#: ../../include/enotify.php:39 -msgid "Thank You," +#: ../../view/theme/redstrap3/php/config.php:28 +#: ../../view/theme/redbasic/php/config.php:62 ../../include/comanche.php:35 +msgid "Default" msgstr "" -#: ../../include/enotify.php:41 -#, php-format -msgid "%s Administrator" +#: ../../view/theme/redstrap3/php/config.php:40 +#: ../../view/theme/redbasic/php/config.php:74 +msgid "Scheme Default" msgstr "" -#: ../../include/enotify.php:76 -#, php-format -msgid "%s " +#: ../../view/theme/redstrap3/php/config.php:41 +#: ../../view/theme/redbasic/php/config.php:75 +msgid "red" msgstr "" -#: ../../include/enotify.php:80 -#, php-format -msgid "[Red:Notify] New mail received at %s" +#: ../../view/theme/redstrap3/php/config.php:42 +#: ../../view/theme/redbasic/php/config.php:76 +msgid "black" msgstr "" -#: ../../include/enotify.php:82 -#, php-format -msgid "%1$s, %2$s sent you a new private message at %3$s." +#: ../../view/theme/redstrap3/php/config.php:43 +#: ../../view/theme/redbasic/php/config.php:77 +msgid "silver" msgstr "" -#: ../../include/enotify.php:83 -#, php-format -msgid "%1$s sent you %2$s." +#: ../../view/theme/redstrap3/php/config.php:55 +#: ../../view/theme/redbasic/php/config.php:89 +msgid "Set scheme" msgstr "" -#: ../../include/enotify.php:83 -msgid "a private message" +#: ../../view/theme/redbasic/php/config.php:91 +msgid "Set font-colour for banner" msgstr "" -#: ../../include/enotify.php:84 -#, php-format -msgid "Please visit %s to view and/or reply to your private messages." +#: ../../view/theme/redbasic/php/config.php:92 +msgid "Set the background colour" msgstr "" -#: ../../include/enotify.php:135 -#, php-format -msgid "%1$s commented on [zrl=%2$s]a %3$s[/zrl]" +#: ../../view/theme/redbasic/php/config.php:93 +msgid "Set the background image" msgstr "" -#: ../../include/enotify.php:142 -#, php-format -msgid "%1$s commented on [zrl=%2$s]%3$s's %4$s[/zrl]" +#: ../../view/theme/redbasic/php/config.php:94 +msgid "Set the background colour of items" msgstr "" -#: ../../include/enotify.php:150 -#, php-format -msgid "%1$s commented on [zrl=%2$s]your %3$s[/zrl]" +#: ../../view/theme/redbasic/php/config.php:95 +msgid "Set the opacity of items" msgstr "" -#: ../../include/enotify.php:160 -#, php-format -msgid "[Red:Notify] Comment to conversation #%1$d by %2$s" +#: ../../view/theme/redbasic/php/config.php:96 +msgid "Set the basic colour for item icons" msgstr "" -#: ../../include/enotify.php:161 -#, php-format -msgid "%s commented on an item/conversation you have been following." +#: ../../view/theme/redbasic/php/config.php:97 +msgid "Set the hover colour for item icons" msgstr "" -#: ../../include/enotify.php:164 ../../include/enotify.php:181 -#: ../../include/enotify.php:206 ../../include/enotify.php:224 -#: ../../include/enotify.php:237 -#, php-format -msgid "Please visit %s to view and/or reply to the conversation." +#: ../../view/theme/redbasic/php/config.php:98 +msgid "Set font-size for the entire application" msgstr "" -#: ../../include/enotify.php:171 -#, php-format -msgid "[Red:Notify] %s posted to your profile wall" +#: ../../view/theme/redbasic/php/config.php:100 +msgid "Set font-colour for posts and comments" msgstr "" -#: ../../include/enotify.php:173 -#, php-format -msgid "%1$s posted to your profile wall at %2$s" +#: ../../view/theme/redbasic/php/config.php:101 +msgid "Set radius of corners" msgstr "" -#: ../../include/enotify.php:175 -#, php-format -msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]" +#: ../../view/theme/redbasic/php/config.php:102 +msgid "Set shadow depth of photos" msgstr "" -#: ../../include/enotify.php:200 -#, php-format -msgid "[Red:Notify] %s tagged you" +#: ../../view/theme/redbasic/php/config.php:103 +msgid "Set maximum width of conversation regions" msgstr "" -#: ../../include/enotify.php:201 -#, php-format -msgid "%1$s, %2$s tagged you at %3$s" +#: ../../view/theme/redbasic/php/config.php:104 +msgid "Set minimum opacity of nav bar - to hide it" msgstr "" -#: ../../include/enotify.php:202 -#, php-format -msgid "%1$s [zrl=%2$s]tagged you[/zrl]." +#: ../../view/theme/redbasic/php/config.php:105 +msgid "Set size of conversation author photo" msgstr "" -#: ../../include/enotify.php:214 -#, php-format -msgid "[Red:Notify] %1$s poked you" +#: ../../view/theme/redbasic/php/config.php:106 +msgid "Set size of followup author photos" msgstr "" -#: ../../include/enotify.php:215 -#, php-format -msgid "%1$s, %2$s poked you at %3$s" +#: ../../view/theme/redbasic/php/config.php:107 +msgid "Sloppy photo albums" msgstr "" -#: ../../include/enotify.php:216 -#, php-format -msgid "%1$s [zrl=%2$s]poked you[/zrl]." +#: ../../view/theme/redbasic/php/config.php:107 +msgid "Are you a clean desk or a messy desk person?" msgstr "" -#: ../../include/enotify.php:231 -#, php-format -msgid "[Red:Notify] %s tagged your post" +#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:95 +#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:115 +msgid "Set background image" msgstr "" -#: ../../include/enotify.php:232 -#, php-format -msgid "%1$s tagged your post at %2$s" +#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:100 +msgid "Corner radius" msgstr "" -#: ../../include/enotify.php:233 -#, php-format -msgid "%1$s tagged [zrl=%2$s]your post[/zrl]" +#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:100 +msgid "0-99 default: 5" msgstr "" -#: ../../include/enotify.php:244 -msgid "[Red:Notify] Introduction received" +#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:101 +msgid "Section and Aside BG color (hex without #)" msgstr "" -#: ../../include/enotify.php:245 -#, php-format -msgid "You've received an introduction from '%1$s' at %2$s" +#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:102 +#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:118 +msgid "Section and Aside BG opacity (float: 0.80 - 1.00)" msgstr "" -#: ../../include/enotify.php:246 -#, php-format -msgid "You've received [zrl=%1$s]an introduction[/zrl] from %2$s." +#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:103 +#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:119 +msgid "Text color in Aside and Section (hex without #)" msgstr "" -#: ../../include/enotify.php:249 ../../include/enotify.php:267 +#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:117 +#: ../../view/theme/redmatrixthemes/newsportal/php/config.php:78 +#: ../../view/theme/redmatrixthemes/bookbasic/php/config.php:78 +msgid "Colour of the navigation bar" +msgstr "" + +#: ../../boot.php:1274 #, php-format -msgid "You may visit their profile at %s" +msgid "Update %s failed. See error logs." msgstr "" -#: ../../include/enotify.php:251 +#: ../../boot.php:1277 #, php-format -msgid "Please visit %s to approve or reject the introduction." +msgid "Update Error at %s" msgstr "" -#: ../../include/enotify.php:258 -msgid "[Red:Notify] Friend suggestion received" +#: ../../boot.php:1434 +msgid "" +"Create an account to access services and applications within the Red Matrix" msgstr "" -#: ../../include/enotify.php:259 -#, php-format -msgid "You've received a friend suggestion from '%1$s' at %2$s" +#: ../../boot.php:1435 ../../include/nav.php:125 ../../mod/register.php:195 +msgid "Register" msgstr "" -#: ../../include/enotify.php:260 -#, php-format -msgid "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s." +#: ../../boot.php:1458 ../../include/nav.php:72 ../../include/nav.php:87 +msgid "Logout" msgstr "" -#: ../../include/enotify.php:265 -msgid "Name:" +#: ../../boot.php:1459 ../../include/nav.php:85 +msgid "Login" msgstr "" -#: ../../include/enotify.php:266 -msgid "Photo:" +#: ../../boot.php:1461 ../../include/contact_selectors.php:77 +#: ../../mod/admin.php:686 ../../mod/admin.php:695 +msgid "Email" msgstr "" -#: ../../include/enotify.php:269 -#, php-format -msgid "Please visit %s to approve or reject the suggestion." +#: ../../boot.php:1462 +msgid "Password" msgstr "" -#: ../../include/ItemObject.php:88 ../../mod/photos.php:952 -msgid "Private Message" +#: ../../boot.php:1463 +msgid "Remember me" msgstr "" -#: ../../include/ItemObject.php:95 ../../include/page_widgets.php:8 -#: ../../mod/webpages.php:101 ../../mod/settings.php:713 ../../mod/menu.php:55 -#: ../../mod/layouts.php:102 ../../mod/editlayout.php:100 -#: ../../mod/editwebpage.php:119 ../../mod/blocks.php:93 -#: ../../mod/editpost.php:97 ../../mod/editblock.php:114 -msgid "Edit" +#: ../../boot.php:1468 +msgid "Forgot your password?" msgstr "" -#: ../../include/ItemObject.php:107 ../../include/conversation.php:628 -#: ../../mod/settings.php:714 ../../mod/admin.php:686 ../../mod/group.php:182 -#: ../../mod/photos.php:1130 ../../mod/connections.php:374 -#: ../../mod/filestorage.php:82 -msgid "Delete" +#: ../../boot.php:1469 ../../mod/lostpass.php:85 +msgid "Password Reset" msgstr "" -#: ../../include/ItemObject.php:113 ../../include/conversation.php:627 -msgid "Select" +#: ../../boot.php:1533 +msgid "permission denied" msgstr "" -#: ../../include/ItemObject.php:117 -msgid "save to folder" +#: ../../boot.php:1534 +msgid "Got Zot?" msgstr "" -#: ../../include/ItemObject.php:145 -msgid "add star" +#: ../../boot.php:1593 +msgid "Requested channel is not available." msgstr "" -#: ../../include/ItemObject.php:146 -msgid "remove star" +#: ../../boot.php:1605 +msgid " Sorry, you don't have the permission to view this profile. " msgstr "" -#: ../../include/ItemObject.php:147 -msgid "toggle star status" +#: ../../boot.php:1640 ../../mod/connect.php:13 ../../mod/blocks.php:10 +#: ../../mod/profile.php:8 ../../mod/webpages.php:8 +#: ../../mod/filestorage.php:8 ../../mod/layouts.php:8 +msgid "Requested profile is not available." msgstr "" -#: ../../include/ItemObject.php:151 -msgid "starred" +#: ../../boot.php:1741 ../../include/contact_widgets.php:23 +#: ../../include/Contact.php:87 ../../mod/directory.php:198 +#: ../../mod/suggest.php:56 ../../mod/match.php:58 +msgid "Connect" msgstr "" -#: ../../include/ItemObject.php:160 ../../include/conversation.php:638 -msgid "Message is verified" +#: ../../boot.php:1755 ../../mod/profiles.php:624 +msgid "Change profile photo" msgstr "" -#: ../../include/ItemObject.php:168 -msgid "add tag" +#: ../../boot.php:1761 +msgid "Profiles" msgstr "" -#: ../../include/ItemObject.php:174 ../../mod/photos.php:1058 -msgid "I like this (toggle)" +#: ../../boot.php:1761 +msgid "Manage/edit profiles" msgstr "" -#: ../../include/ItemObject.php:174 ../../include/taxonomy.php:251 -msgid "like" +#: ../../boot.php:1762 ../../mod/profiles.php:625 +msgid "Create New Profile" msgstr "" -#: ../../include/ItemObject.php:175 ../../mod/photos.php:1059 -msgid "I don't like this (toggle)" +#: ../../boot.php:1765 +msgid "Edit Profile" msgstr "" -#: ../../include/ItemObject.php:175 ../../include/taxonomy.php:252 -msgid "dislike" +#: ../../boot.php:1776 ../../mod/profiles.php:636 +msgid "Profile Image" msgstr "" -#: ../../include/ItemObject.php:177 -msgid "Share this" +#: ../../boot.php:1779 ../../mod/profiles.php:639 +msgid "visible to everybody" msgstr "" -#: ../../include/ItemObject.php:177 -msgid "share" +#: ../../boot.php:1780 ../../mod/profiles.php:640 +msgid "Edit visibility" msgstr "" -#: ../../include/ItemObject.php:201 ../../include/ItemObject.php:202 -#, php-format -msgid "View %s's profile - %s" +#: ../../boot.php:1791 ../../include/event.php:40 +#: ../../include/bb2diaspora.php:455 ../../mod/directory.php:173 +#: ../../mod/events.php:450 +msgid "Location:" msgstr "" -#: ../../include/ItemObject.php:203 -msgid "to" +#: ../../boot.php:1793 ../../include/profile_advanced.php:17 +#: ../../mod/directory.php:175 +msgid "Gender:" msgstr "" -#: ../../include/ItemObject.php:204 -msgid "via" +#: ../../boot.php:1794 ../../include/profile_advanced.php:37 +#: ../../mod/directory.php:177 +msgid "Status:" msgstr "" -#: ../../include/ItemObject.php:205 -msgid "Wall-to-Wall" +#: ../../boot.php:1795 ../../include/profile_advanced.php:48 +#: ../../mod/directory.php:179 +msgid "Homepage:" msgstr "" -#: ../../include/ItemObject.php:206 -msgid "via Wall-To-Wall:" +#: ../../boot.php:1858 ../../boot.php:1938 ../../mod/ping.php:230 +msgid "g A l F d" msgstr "" -#: ../../include/ItemObject.php:216 ../../include/conversation.php:682 -#, php-format -msgid " from %s" +#: ../../boot.php:1859 ../../boot.php:1939 +msgid "F d" msgstr "" -#: ../../include/ItemObject.php:219 ../../include/conversation.php:685 -#, php-format -msgid "last edited: %s" +#: ../../boot.php:1904 ../../boot.php:1979 ../../mod/ping.php:252 +msgid "[today]" msgstr "" -#: ../../include/ItemObject.php:246 ../../include/conversation.php:702 -#: ../../include/conversation.php:1112 ../../mod/photos.php:1061 -#: ../../mod/message.php:332 ../../mod/message.php:516 -#: ../../mod/editlayout.php:109 ../../mod/editwebpage.php:128 -#: ../../mod/editpost.php:106 ../../mod/editblock.php:123 -msgid "Please wait" +#: ../../boot.php:1916 +msgid "Birthday Reminders" msgstr "" -#: ../../include/ItemObject.php:267 -#, php-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "" -msgstr[1] "" +#: ../../boot.php:1917 +msgid "Birthdays this week:" +msgstr "" -#: ../../include/ItemObject.php:268 ../../include/js_strings.php:7 -#: ../../include/contact_widgets.php:148 -msgid "show more" +#: ../../boot.php:1972 +msgid "[No description]" msgstr "" -#: ../../include/ItemObject.php:527 ../../mod/photos.php:1077 -#: ../../mod/photos.php:1164 -msgid "This is you" +#: ../../boot.php:1990 +msgid "Event Reminders" msgstr "" -#: ../../include/ItemObject.php:529 ../../include/js_strings.php:6 -#: ../../mod/photos.php:1079 ../../mod/photos.php:1166 -msgid "Comment" +#: ../../boot.php:1991 +msgid "Events this week:" msgstr "" -#: ../../include/ItemObject.php:530 ../../mod/events.php:458 -#: ../../mod/thing.php:190 ../../mod/invite.php:154 ../../mod/setup.php:302 -#: ../../mod/setup.php:345 ../../mod/settings.php:651 -#: ../../mod/settings.php:763 ../../mod/settings.php:791 -#: ../../mod/settings.php:815 ../../mod/settings.php:886 -#: ../../mod/settings.php:1054 ../../mod/connect.php:96 -#: ../../mod/sources.php:83 ../../mod/sources.php:110 ../../mod/admin.php:418 -#: ../../mod/admin.php:679 ../../mod/admin.php:819 ../../mod/admin.php:1018 -#: ../../mod/admin.php:1105 ../../mod/group.php:87 ../../mod/photos.php:685 -#: ../../mod/photos.php:779 ../../mod/photos.php:1040 -#: ../../mod/photos.php:1080 ../../mod/photos.php:1167 -#: ../../mod/message.php:333 ../../mod/message.php:515 -#: ../../mod/connections.php:452 ../../mod/profiles.php:529 -#: ../../mod/import.php:385 ../../mod/crepair.php:166 ../../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 -msgid "Submit" +#: ../../boot.php:2225 +msgid "Channel" msgstr "" -#: ../../include/ItemObject.php:531 -msgid "Bold" +#: ../../boot.php:2228 +msgid "Status Messages and Posts" msgstr "" -#: ../../include/ItemObject.php:532 -msgid "Italic" +#: ../../boot.php:2232 +msgid "About" msgstr "" -#: ../../include/ItemObject.php:533 -msgid "Underline" +#: ../../boot.php:2235 +msgid "Profile Details" msgstr "" -#: ../../include/ItemObject.php:534 -msgid "Quote" +#: ../../boot.php:2239 ../../include/nav.php:79 ../../mod/fbrowser.php:25 +msgid "Photos" msgstr "" -#: ../../include/ItemObject.php:535 -msgid "Code" +#: ../../boot.php:2242 ../../include/photos.php:288 +msgid "Photo Albums" msgstr "" -#: ../../include/ItemObject.php:536 -msgid "Image" +#: ../../boot.php:2250 ../../include/nav.php:174 ../../mod/events.php:348 +msgid "Events" msgstr "" -#: ../../include/ItemObject.php:537 -msgid "Link" +#: ../../boot.php:2253 +msgid "Events and Calendar" msgstr "" -#: ../../include/ItemObject.php:538 -msgid "Video" +#: ../../boot.php:2258 +msgid "Webpages" msgstr "" -#: ../../include/ItemObject.php:539 ../../include/conversation.php:1075 -#: ../../mod/webpages.php:105 ../../mod/photos.php:1081 -#: ../../mod/editlayout.php:129 ../../mod/editwebpage.php:150 -#: ../../mod/editpost.php:126 ../../mod/editblock.php:144 -msgid "Preview" +#: ../../boot.php:2261 +msgid "Manage Webpages" msgstr "" -#: ../../include/ItemObject.php:542 ../../include/conversation.php:1139 -#: ../../mod/message.php:338 ../../mod/message.php:521 -#: ../../mod/editpost.php:134 -msgid "Encrypt text" +#: ../../boot.php:2545 +msgid "toggle mobile" msgstr "" -#: ../../include/Contact.php:87 ../../include/contact_widgets.php:23 -#: ../../mod/match.php:58 ../../mod/suggest.php:56 ../../mod/directory.php:198 -#: ../../boot.php:1741 -msgid "Connect" +#: ../../index.php:178 ../../index.php:340 ../../include/items.php:3593 +#: ../../include/photos.php:15 ../../include/attach.php:102 +#: ../../include/attach.php:133 ../../include/attach.php:189 +#: ../../include/attach.php:204 ../../include/attach.php:237 +#: ../../include/attach.php:251 ../../include/attach.php:272 +#: ../../include/attach.php:464 ../../include/attach.php:539 +#: ../../mod/message.php:208 ../../mod/poke.php:128 ../../mod/viewsrc.php:12 +#: ../../mod/fsuggest.php:78 ../../mod/mood.php:114 +#: ../../mod/profile_photo.php:197 ../../mod/profile_photo.php:210 +#: ../../mod/crepair.php:115 ../../mod/blocks.php:29 ../../mod/blocks.php:44 +#: ../../mod/intro.php:50 ../../mod/new_channel.php:66 +#: ../../mod/new_channel.php:97 ../../mod/mitem.php:92 +#: ../../mod/editwebpage.php:42 ../../mod/editwebpage.php:64 +#: ../../mod/connections.php:197 ../../mod/network.php:7 +#: ../../mod/webpages.php:40 ../../mod/filestorage.php:26 +#: ../../mod/page.php:30 ../../mod/page.php:80 ../../mod/api.php:26 +#: ../../mod/api.php:31 ../../mod/delegate.php:6 ../../mod/register.php:68 +#: ../../mod/editpost.php:13 ../../mod/invite.php:13 ../../mod/invite.php:102 +#: ../../mod/group.php:15 ../../mod/regmod.php:18 ../../mod/photos.php:74 +#: ../../mod/photos.php:654 ../../mod/editlayout.php:48 +#: ../../mod/common.php:43 ../../mod/layouts.php:27 ../../mod/layouts.php:42 +#: ../../mod/viewconnections.php:33 ../../mod/viewconnections.php:38 +#: ../../mod/suggest.php:32 ../../mod/menu.php:40 +#: ../../mod/notifications.php:66 ../../mod/editblock.php:48 +#: ../../mod/setup.php:200 ../../mod/sources.php:48 ../../mod/settings.php:628 +#: ../../mod/item.php:181 ../../mod/item.php:189 ../../mod/manage.php:6 +#: ../../mod/allfriends.php:10 ../../mod/nogroup.php:25 +#: ../../mod/channel.php:123 ../../mod/profiles.php:163 +#: ../../mod/profiles.php:476 ../../mod/events.php:134 +msgid "Permission denied." msgstr "" -#: ../../include/Contact.php:103 -msgid "New window" +#: ../../index.php:226 ../../mod/help.php:53 +msgid "Not Found" msgstr "" -#: ../../include/Contact.php:104 -msgid "Open the selected location in a different window or browser tab" +#: ../../index.php:229 ../../mod/display.php:92 ../../mod/page.php:83 +#: ../../mod/help.php:56 +msgid "Page not found." msgstr "" -#: ../../include/Contact.php:524 ../../include/conversation.php:930 -msgid "Poke" +#: ../../index.php:339 ../../include/items.php:201 ../../mod/profperm.php:28 +#: ../../mod/group.php:74 ../../mod/like.php:55 +msgid "Permission denied" msgstr "" -#: ../../include/Contact.php:525 ../../include/conversation.php:924 -msgid "View Status" +#: ../../include/message.php:18 +msgid "No recipient provided." msgstr "" -#: ../../include/Contact.php:526 ../../include/nav.php:76 -#: ../../include/conversation.php:925 ../../mod/connections.php:327 -#: ../../mod/connections.php:441 -msgid "View Profile" +#: ../../include/message.php:23 +msgid "[no subject]" msgstr "" -#: ../../include/Contact.php:527 ../../include/conversation.php:926 -msgid "View Photos" +#: ../../include/message.php:42 +msgid "Unable to determine sender." msgstr "" -#: ../../include/Contact.php:528 -msgid "Network Posts" +#: ../../include/message.php:143 +msgid "Stored post could not be verified." msgstr "" -#: ../../include/Contact.php:529 ../../include/conversation.php:928 -msgid "Edit Contact" +#: ../../include/bbcode.php:94 ../../include/bbcode.php:494 +#: ../../include/bbcode.php:497 +msgid "Image/photo" msgstr "" -#: ../../include/Contact.php:530 ../../include/conversation.php:929 -msgid "Send PM" +#: ../../include/bbcode.php:126 ../../include/bbcode.php:502 +msgid "Encrypted content" msgstr "" -#: ../../include/contact_selectors.php:30 -msgid "Unknown | Not categorised" +#: ../../include/bbcode.php:173 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: ../../include/contact_selectors.php:31 -msgid "Block immediately" +#: ../../include/bbcode.php:175 +msgid "post" msgstr "" -#: ../../include/contact_selectors.php:32 -msgid "Shady, spammer, self-marketer" +#: ../../include/bbcode.php:454 ../../include/bbcode.php:474 +msgid "$1 wrote:" msgstr "" -#: ../../include/contact_selectors.php:33 -msgid "Known to me, but no opinion" +#: ../../include/dir_fns.php:15 +msgid "Sort Options" msgstr "" -#: ../../include/contact_selectors.php:34 -msgid "OK, probably harmless" +#: ../../include/dir_fns.php:16 +msgid "Alphabetic" msgstr "" -#: ../../include/contact_selectors.php:35 -msgid "Reputable, has my trust" +#: ../../include/dir_fns.php:17 +msgid "Reverse Alphabetic" msgstr "" -#: ../../include/contact_selectors.php:54 -msgid "Frequently" +#: ../../include/dir_fns.php:18 +msgid "Newest to Oldest" msgstr "" -#: ../../include/contact_selectors.php:55 -msgid "Hourly" +#: ../../include/dir_fns.php:29 +msgid "Enable Safe Search" msgstr "" -#: ../../include/contact_selectors.php:56 -msgid "Twice daily" +#: ../../include/dir_fns.php:31 +msgid "Disable Safe Search" msgstr "" -#: ../../include/contact_selectors.php:57 -msgid "Daily" +#: ../../include/dir_fns.php:33 +msgid "Safe Mode" msgstr "" -#: ../../include/contact_selectors.php:58 -msgid "Weekly" +#: ../../include/widgets.php:26 ../../include/contact_widgets.php:110 +msgid "Categories" msgstr "" -#: ../../include/contact_selectors.php:59 -msgid "Monthly" +#: ../../include/account.php:23 +msgid "Not a valid email address" msgstr "" -#: ../../include/contact_selectors.php:74 -msgid "Friendica" +#: ../../include/account.php:25 +msgid "Your email domain is not among those allowed on this site" msgstr "" -#: ../../include/contact_selectors.php:75 -msgid "OStatus" +#: ../../include/account.php:31 +msgid "Your email address is already registered at this site." msgstr "" -#: ../../include/contact_selectors.php:76 -msgid "RSS/Atom" +#: ../../include/account.php:64 +msgid "An invitation is required." msgstr "" -#: ../../include/contact_selectors.php:77 ../../mod/admin.php:682 -#: ../../mod/admin.php:691 ../../boot.php:1461 -msgid "Email" +#: ../../include/account.php:68 +msgid "Invitation could not be verified." msgstr "" -#: ../../include/contact_selectors.php:78 -msgid "Diaspora" +#: ../../include/account.php:118 +msgid "Please enter the required information." msgstr "" -#: ../../include/contact_selectors.php:79 -msgid "Facebook" +#: ../../include/account.php:186 +msgid "Failed to store account information." msgstr "" -#: ../../include/contact_selectors.php:80 -msgid "Zot!" +#: ../../include/account.php:272 +#, php-format +msgid "Registration request at %s" msgstr "" -#: ../../include/contact_selectors.php:81 -msgid "LinkedIn" +#: ../../include/account.php:274 ../../include/account.php:301 +#: ../../include/account.php:358 +msgid "Administrator" msgstr "" -#: ../../include/contact_selectors.php:82 -msgid "XMPP/IM" +#: ../../include/account.php:296 +msgid "your registration password" msgstr "" -#: ../../include/contact_selectors.php:83 -msgid "MySpace" +#: ../../include/account.php:299 ../../include/account.php:356 +#, php-format +msgid "Registration details for %s" +msgstr "" + +#: ../../include/account.php:365 +msgid "Account approved." +msgstr "" + +#: ../../include/account.php:399 +#, php-format +msgid "Registration revoked for %s" +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 ../../include/ItemObject.php:174 +msgid "like" +msgstr "" + +#: ../../include/taxonomy.php:251 +msgid "likes" +msgstr "" + +#: ../../include/taxonomy.php:252 ../../include/ItemObject.php:175 +msgid "dislike" +msgstr "" + +#: ../../include/taxonomy.php:252 +msgid "dislikes" msgstr "" #: ../../include/datetime.php:43 ../../include/datetime.php:45 @@ -653,281 +752,406 @@ msgstr "" msgid "%1$d %2$s ago" msgstr "" -#: ../../include/dba/dba_driver.php:50 -#, php-format -msgid "Cannot locate DNS info for database server '%s'" +#: ../../include/text.php:309 +msgid "prev" msgstr "" -#: ../../include/event.php:11 ../../include/bb2diaspora.php:433 -msgid "l F d, Y \\@ g:i A" +#: ../../include/text.php:311 +msgid "first" msgstr "" -#: ../../include/event.php:20 ../../include/bb2diaspora.php:439 -msgid "Starts:" +#: ../../include/text.php:340 +msgid "last" msgstr "" -#: ../../include/event.php:30 ../../include/bb2diaspora.php:447 -msgid "Finishes:" +#: ../../include/text.php:343 +msgid "next" msgstr "" -#: ../../include/event.php:40 ../../include/bb2diaspora.php:455 -#: ../../mod/events.php:450 ../../mod/directory.php:173 ../../boot.php:1791 -msgid "Location:" +#: ../../include/text.php:355 +msgid "older" msgstr "" -#: ../../include/features.php:21 -msgid "General Features" +#: ../../include/text.php:357 +msgid "newer" msgstr "" -#: ../../include/features.php:23 -msgid "Content Expiration" +#: ../../include/text.php:648 +msgid "No connections" msgstr "" -#: ../../include/features.php:23 -msgid "Remove posts/comments and/or private messages at a future time" +#: ../../include/text.php:659 +#, php-format +msgid "%d Connection" +msgid_plural "%d Connections" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/text.php:671 +msgid "View Connections" msgstr "" -#: ../../include/features.php:24 -msgid "Multiple Profiles" +#: ../../include/text.php:730 ../../include/nav.php:135 +#: ../../mod/search.php:96 +msgid "Search" msgstr "" -#: ../../include/features.php:24 -msgid "Ability to create multiple profiles" +#: ../../include/text.php:732 ../../mod/filer.php:36 +msgid "Save" msgstr "" -#: ../../include/features.php:25 -msgid "Web Pages" +#: ../../include/text.php:770 +msgid "poke" msgstr "" -#: ../../include/features.php:25 -msgid "Provide managed web pages on your channel" +#: ../../include/text.php:770 ../../include/conversation.php:236 +msgid "poked" msgstr "" -#: ../../include/features.php:26 -msgid "Enhanced Photo Albums" +#: ../../include/text.php:771 +msgid "ping" msgstr "" -#: ../../include/features.php:26 -msgid "Enable photo album with enhanced features" +#: ../../include/text.php:771 +msgid "pinged" msgstr "" -#: ../../include/features.php:28 -msgid "Extended Identity Sharing" +#: ../../include/text.php:772 +msgid "prod" msgstr "" -#: ../../include/features.php:28 ../../include/js_strings.php:30 -msgid " " +#: ../../include/text.php:772 +msgid "prodded" msgstr "" -#: ../../include/features.php:29 -msgid "Expert Mode" +#: ../../include/text.php:773 +msgid "slap" msgstr "" -#: ../../include/features.php:29 -msgid "Enable Expert Mode to provide advanced configuration options" +#: ../../include/text.php:773 +msgid "slapped" msgstr "" -#: ../../include/features.php:30 -msgid "Premium Channel" +#: ../../include/text.php:774 +msgid "finger" msgstr "" -#: ../../include/features.php:30 -msgid "" -"Allows you to set restrictions and terms on those that connect with your " -"channel" +#: ../../include/text.php:774 +msgid "fingered" msgstr "" -#: ../../include/features.php:35 -msgid "Post Composition Features" +#: ../../include/text.php:775 +msgid "rebuff" msgstr "" -#: ../../include/features.php:36 -msgid "Richtext Editor" +#: ../../include/text.php:775 +msgid "rebuffed" msgstr "" -#: ../../include/features.php:36 -msgid "Enable richtext editor" +#: ../../include/text.php:787 +msgid "happy" msgstr "" -#: ../../include/features.php:37 -msgid "Post Preview" +#: ../../include/text.php:788 +msgid "sad" msgstr "" -#: ../../include/features.php:37 -msgid "Allow previewing posts and comments before publishing them" +#: ../../include/text.php:789 +msgid "mellow" msgstr "" -#: ../../include/features.php:38 ../../mod/settings.php:120 -#: ../../mod/sources.php:67 -msgid "Channel Sources" +#: ../../include/text.php:790 +msgid "tired" msgstr "" -#: ../../include/features.php:38 -msgid "Automatically import channel content from other channels or feeds" +#: ../../include/text.php:791 +msgid "perky" msgstr "" -#: ../../include/features.php:39 -msgid "Even More Encryption" +#: ../../include/text.php:792 +msgid "angry" msgstr "" -#: ../../include/features.php:39 -msgid "Allow encryption of content end-to-end with a shared secret key" +#: ../../include/text.php:793 +msgid "stupified" msgstr "" -#: ../../include/features.php:44 -msgid "Network and Stream Filtering" +#: ../../include/text.php:794 +msgid "puzzled" msgstr "" -#: ../../include/features.php:45 -msgid "Search by Date" +#: ../../include/text.php:795 +msgid "interested" msgstr "" -#: ../../include/features.php:45 -msgid "Ability to select posts by date ranges" +#: ../../include/text.php:796 +msgid "bitter" msgstr "" -#: ../../include/features.php:46 -msgid "Collections Filter" +#: ../../include/text.php:797 +msgid "cheerful" msgstr "" -#: ../../include/features.php:46 -msgid "Enable widget to display Network posts only from selected collections" +#: ../../include/text.php:798 +msgid "alive" msgstr "" -#: ../../include/features.php:47 ../../mod/network.php:173 -#: ../../mod/search.php:17 -msgid "Saved Searches" +#: ../../include/text.php:799 +msgid "annoyed" msgstr "" -#: ../../include/features.php:47 -msgid "Save search terms for re-use" +#: ../../include/text.php:800 +msgid "anxious" msgstr "" -#: ../../include/features.php:48 -msgid "Network Personal Tab" +#: ../../include/text.php:801 +msgid "cranky" msgstr "" -#: ../../include/features.php:48 -msgid "Enable tab to display only Network posts that you've interacted on" +#: ../../include/text.php:802 +msgid "disturbed" msgstr "" -#: ../../include/features.php:49 -msgid "Network New Tab" +#: ../../include/text.php:803 +msgid "frustrated" msgstr "" -#: ../../include/features.php:49 -msgid "Enable tab to display all new Network activity" +#: ../../include/text.php:804 +msgid "motivated" msgstr "" -#: ../../include/features.php:50 -msgid "Affinity Tool" +#: ../../include/text.php:805 +msgid "relaxed" msgstr "" -#: ../../include/features.php:50 -msgid "Filter stream activity by depth of relationships" +#: ../../include/text.php:806 +msgid "surprised" msgstr "" -#: ../../include/features.php:55 -msgid "Post/Comment Tools" +#: ../../include/text.php:970 +msgid "Monday" msgstr "" -#: ../../include/features.php:57 -msgid "Edit Sent Posts" +#: ../../include/text.php:970 +msgid "Tuesday" msgstr "" -#: ../../include/features.php:57 -msgid "Edit and correct posts and comments after sending" +#: ../../include/text.php:970 +msgid "Wednesday" msgstr "" -#: ../../include/features.php:58 -msgid "Tagging" +#: ../../include/text.php:970 +msgid "Thursday" msgstr "" -#: ../../include/features.php:58 -msgid "Ability to tag existing posts" +#: ../../include/text.php:970 +msgid "Friday" msgstr "" -#: ../../include/features.php:59 -msgid "Post Categories" +#: ../../include/text.php:970 +msgid "Saturday" msgstr "" -#: ../../include/features.php:59 -msgid "Add categories to your posts" +#: ../../include/text.php:970 +msgid "Sunday" msgstr "" -#: ../../include/features.php:60 ../../include/contact_widgets.php:76 -msgid "Saved Folders" +#: ../../include/text.php:974 +msgid "January" msgstr "" -#: ../../include/features.php:60 -msgid "Ability to file posts under folders" +#: ../../include/text.php:974 +msgid "February" msgstr "" -#: ../../include/features.php:61 -msgid "Dislike Posts" +#: ../../include/text.php:974 +msgid "March" msgstr "" -#: ../../include/features.php:61 -msgid "Ability to dislike posts/comments" +#: ../../include/text.php:974 +msgid "April" msgstr "" -#: ../../include/features.php:62 -msgid "Star Posts" +#: ../../include/text.php:974 +msgid "May" msgstr "" -#: ../../include/features.php:62 -msgid "Ability to mark special posts with a star indicator" +#: ../../include/text.php:974 +msgid "June" msgstr "" -#: ../../include/features.php:63 -msgid "Tag Cloud" +#: ../../include/text.php:974 +msgid "July" msgstr "" -#: ../../include/features.php:63 -msgid "Provide a personal tag cloud on your channel page" +#: ../../include/text.php:974 +msgid "August" 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/text.php:974 +msgid "September" msgstr "" -#: ../../include/group.php:223 -msgid "Default privacy group for new contacts" +#: ../../include/text.php:974 +msgid "October" msgstr "" -#: ../../include/group.php:242 -msgid "All Channels" +#: ../../include/text.php:974 +msgid "November" msgstr "" -#: ../../include/group.php:264 -msgid "edit" +#: ../../include/text.php:974 +msgid "December" msgstr "" -#: ../../include/group.php:285 -msgid "Collections" +#: ../../include/text.php:1052 ../../mod/message.php:453 +msgid "unknown.???" msgstr "" -#: ../../include/group.php:286 -msgid "Edit collection" +#: ../../include/text.php:1053 ../../mod/message.php:454 +msgid "bytes" msgstr "" -#: ../../include/group.php:287 -msgid "Create a new collection" +#: ../../include/text.php:1088 +msgid "remove category" msgstr "" -#: ../../include/group.php:288 -msgid "Channels not in any collection" +#: ../../include/text.php:1110 +msgid "remove from file" msgstr "" -#: ../../include/group.php:290 ../../mod/network.php:174 -msgid "add" +#: ../../include/text.php:1164 ../../include/text.php:1176 +msgid "Click to open/close" msgstr "" -#: ../../include/js_strings.php:5 -msgid "Delete this item?" +#: ../../include/text.php:1352 ../../mod/events.php:326 +msgid "link to source" +msgstr "" + +#: ../../include/text.php:1371 +msgid "Select a page layout: " +msgstr "" + +#: ../../include/text.php:1374 ../../include/text.php:1439 +msgid "default" +msgstr "" + +#: ../../include/text.php:1410 +msgid "Page content type: " +msgstr "" + +#: ../../include/text.php:1451 +msgid "Select an alternate language" +msgstr "" + +#: ../../include/text.php:1603 ../../include/conversation.php:117 +#: ../../mod/subthread.php:89 ../../mod/tagger.php:45 ../../mod/like.php:103 +msgid "photo" +msgstr "" + +#: ../../include/text.php:1606 ../../include/conversation.php:120 +#: ../../mod/tagger.php:49 +msgid "event" +msgstr "" + +#: ../../include/text.php:1609 ../../include/conversation.php:145 +#: ../../mod/subthread.php:89 ../../mod/tagger.php:53 ../../mod/like.php:103 +msgid "status" +msgstr "" + +#: ../../include/text.php:1611 ../../include/conversation.php:147 +#: ../../mod/tagger.php:55 +msgid "comment" +msgstr "" + +#: ../../include/text.php:1616 +msgid "activity" +msgstr "" + +#: ../../include/text.php:1878 +msgid "Design" +msgstr "" + +#: ../../include/text.php:1880 +msgid "Blocks" +msgstr "" + +#: ../../include/text.php:1881 +msgid "Menus" +msgstr "" + +#: ../../include/text.php:1882 +msgid "Layouts" +msgstr "" + +#: ../../include/text.php:1883 +msgid "Pages" +msgstr "" + +#: ../../include/dba/dba_driver.php:50 +#, php-format +msgid "Cannot locate DNS info for database server '%s'" +msgstr "" + +#: ../../include/activities.php:37 +msgid " and " +msgstr "" + +#: ../../include/activities.php:45 +msgid "public profile" +msgstr "" + +#: ../../include/activities.php:50 +#, php-format +msgid "%1$s changed %2$s to “%3$s”" +msgstr "" + +#: ../../include/activities.php:51 +#, php-format +msgid "Visit %1$s's %2$s" +msgstr "" + +#: ../../include/activities.php:54 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." +msgstr "" + +#: ../../include/event.php:11 ../../include/bb2diaspora.php:433 +msgid "l F d, Y \\@ g:i A" +msgstr "" + +#: ../../include/event.php:20 ../../include/bb2diaspora.php:439 +msgid "Starts:" +msgstr "" + +#: ../../include/event.php:30 ../../include/bb2diaspora.php:447 +msgid "Finishes:" +msgstr "" + +#: ../../include/acl_selectors.php:235 +msgid "Visible to everybody" +msgstr "" + +#: ../../include/acl_selectors.php:236 +msgid "show" +msgstr "" + +#: ../../include/acl_selectors.php:237 +msgid "don't show" +msgstr "" + +#: ../../include/js_strings.php:5 +msgid "Delete this item?" +msgstr "" + +#: ../../include/js_strings.php:6 ../../include/ItemObject.php:529 +#: ../../mod/photos.php:1079 ../../mod/photos.php:1166 +msgid "Comment" +msgstr "" + +#: ../../include/js_strings.php:7 ../../include/ItemObject.php:268 +#: ../../include/contact_widgets.php:148 +msgid "show more" msgstr "" #: ../../include/js_strings.php:8 @@ -1019,921 +1243,840 @@ msgstr "" msgid "%d years" msgstr "" +#: ../../include/js_strings.php:30 ../../include/features.php:28 +msgid " " +msgstr "" + #: ../../include/js_strings.php:31 msgid "timeago.numbers" msgstr "" -#: ../../include/message.php:18 -msgid "No recipient provided." +#: ../../include/permissions.php:13 +msgid "Can view my \"public\" stream and posts" msgstr "" -#: ../../include/message.php:23 -msgid "[no subject]" +#: ../../include/permissions.php:14 +msgid "Can view my \"public\" channel profile" msgstr "" -#: ../../include/message.php:42 -msgid "Unable to determine sender." +#: ../../include/permissions.php:15 +msgid "Can view my \"public\" photo albums" msgstr "" -#: ../../include/message.php:143 -msgid "Stored post could not be verified." +#: ../../include/permissions.php:16 +msgid "Can view my \"public\" address book" msgstr "" -#: ../../include/network.php:1113 -msgid "view full size" +#: ../../include/permissions.php:17 +msgid "Can view my \"public\" file storage" msgstr "" -#: ../../include/photo/photo_driver.php:609 ../../include/photos.php:51 -#: ../../mod/photos.php:97 ../../mod/photos.php:764 ../../mod/photos.php:786 -#: ../../mod/profile_photo.php:88 ../../mod/profile_photo.php:235 -#: ../../mod/profile_photo.php:346 -msgid "Profile Photos" +#: ../../include/permissions.php:18 +msgid "Can view my \"public\" pages" msgstr "" -#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:118 -#: ../../mod/profperm.php:112 -msgid "Profile" +#: ../../include/permissions.php:21 +msgid "Can send me their channel stream and posts" msgstr "" -#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1062 -msgid "Full Name:" +#: ../../include/permissions.php:22 +msgid "Can post on my channel page (\"wall\")" msgstr "" -#: ../../include/profile_advanced.php:17 ../../mod/directory.php:175 -#: ../../boot.php:1793 -msgid "Gender:" +#: ../../include/permissions.php:23 +msgid "Can comment on my posts" msgstr "" -#: ../../include/profile_advanced.php:22 -msgid "j F, Y" +#: ../../include/permissions.php:24 +msgid "Can send me private mail messages" msgstr "" -#: ../../include/profile_advanced.php:23 -msgid "j F" +#: ../../include/permissions.php:25 +msgid "Can post photos to my photo albums" msgstr "" -#: ../../include/profile_advanced.php:30 -msgid "Birthday:" +#: ../../include/permissions.php:26 +msgid "Can forward to all my channel contacts via post @mentions" msgstr "" -#: ../../include/profile_advanced.php:34 -msgid "Age:" +#: ../../include/permissions.php:26 +msgid "Advanced - useful for creating group forum channels" msgstr "" -#: ../../include/profile_advanced.php:37 ../../mod/directory.php:177 -#: ../../boot.php:1794 -msgid "Status:" +#: ../../include/permissions.php:27 +msgid "Can chat with me (when available)" msgstr "" -#: ../../include/profile_advanced.php:43 -#, php-format -msgid "for %1$d %2$s" +#: ../../include/permissions.php:27 +msgid "Requires compatible chat plugin" msgstr "" -#: ../../include/profile_advanced.php:46 ../../mod/profiles.php:549 -msgid "Sexual Preference:" +#: ../../include/permissions.php:28 +msgid "Can write to my \"public\" file storage" msgstr "" -#: ../../include/profile_advanced.php:48 ../../mod/directory.php:179 -#: ../../boot.php:1795 -msgid "Homepage:" +#: ../../include/permissions.php:29 +msgid "Can edit my \"public\" pages" msgstr "" -#: ../../include/profile_advanced.php:50 ../../mod/profiles.php:551 -msgid "Hometown:" +#: ../../include/permissions.php:31 +msgid "Can source my \"public\" posts in derived channels" msgstr "" -#: ../../include/profile_advanced.php:52 -msgid "Tags:" +#: ../../include/permissions.php:31 +msgid "Somewhat advanced - very useful in open communities" msgstr "" -#: ../../include/profile_advanced.php:54 ../../mod/profiles.php:552 -msgid "Political Views:" +#: ../../include/permissions.php:32 +msgid "Can administer my channel resources" msgstr "" -#: ../../include/profile_advanced.php:56 -msgid "Religion:" +#: ../../include/permissions.php:32 +msgid "Extremely advanced. Leave this alone unless you know what you are doing" msgstr "" -#: ../../include/profile_advanced.php:58 ../../mod/directory.php:181 -msgid "About:" +#: ../../include/items.php:3531 ../../mod/viewsrc.php:18 +#: ../../mod/display.php:32 ../../mod/admin.php:150 ../../mod/admin.php:727 +#: ../../mod/admin.php:930 ../../mod/home.php:64 +msgid "Item not found." msgstr "" -#: ../../include/profile_advanced.php:60 -msgid "Hobbies/Interests:" +#: ../../include/items.php:3714 +msgid "Archives" msgstr "" -#: ../../include/profile_advanced.php:62 ../../mod/profiles.php:555 -msgid "Likes:" +#: ../../include/items.php:3880 ../../mod/group.php:44 ../../mod/group.php:146 +msgid "Collection not found." msgstr "" -#: ../../include/profile_advanced.php:64 ../../mod/profiles.php:556 -msgid "Dislikes:" +#: ../../include/items.php:3896 ../../mod/network.php:469 +msgid "Group is empty" msgstr "" -#: ../../include/profile_advanced.php:67 -msgid "Contact information and Social Networks:" +#: ../../include/items.php:3912 +msgid "Connection not found." msgstr "" -#: ../../include/profile_advanced.php:69 -msgid "Musical interests:" +#: ../../include/oembed.php:149 +msgid "Embedded content" msgstr "" -#: ../../include/profile_advanced.php:71 -msgid "Books, literature:" +#: ../../include/oembed.php:158 +msgid "Embedding disabled" msgstr "" -#: ../../include/profile_advanced.php:73 -msgid "Television:" +#: ../../include/follow.php:21 +msgid "Channel is blocked on this site." msgstr "" -#: ../../include/profile_advanced.php:75 -msgid "Film/dance/culture/entertainment:" +#: ../../include/follow.php:26 +msgid "Channel location missing." msgstr "" -#: ../../include/profile_advanced.php:77 -msgid "Love/Romance:" +#: ../../include/follow.php:43 +msgid "Channel discovery failed. Website may be down or misconfigured." msgstr "" -#: ../../include/profile_advanced.php:79 -msgid "Work/employment:" +#: ../../include/follow.php:51 +msgid "Response from remote channel was not understood." msgstr "" -#: ../../include/profile_advanced.php:81 -msgid "School/education:" +#: ../../include/follow.php:58 +msgid "Response from remote channel was incomplete." msgstr "" -#: ../../include/text.php:309 -msgid "prev" +#: ../../include/follow.php:129 +msgid "local account not found." msgstr "" -#: ../../include/text.php:311 -msgid "first" -msgstr "" - -#: ../../include/text.php:340 -msgid "last" -msgstr "" - -#: ../../include/text.php:343 -msgid "next" -msgstr "" - -#: ../../include/text.php:355 -msgid "older" -msgstr "" - -#: ../../include/text.php:357 -msgid "newer" -msgstr "" - -#: ../../include/text.php:648 -msgid "No connections" -msgstr "" - -#: ../../include/text.php:659 -#, php-format -msgid "%d Connection" -msgid_plural "%d Connections" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/text.php:671 -msgid "View Connections" -msgstr "" - -#: ../../include/text.php:730 ../../include/nav.php:135 -#: ../../mod/search.php:96 -msgid "Search" -msgstr "" - -#: ../../include/text.php:732 ../../mod/filer.php:36 -msgid "Save" -msgstr "" - -#: ../../include/text.php:770 -msgid "poke" -msgstr "" - -#: ../../include/text.php:770 ../../include/conversation.php:236 -msgid "poked" -msgstr "" - -#: ../../include/text.php:771 -msgid "ping" -msgstr "" - -#: ../../include/text.php:771 -msgid "pinged" -msgstr "" - -#: ../../include/text.php:772 -msgid "prod" -msgstr "" - -#: ../../include/text.php:772 -msgid "prodded" -msgstr "" - -#: ../../include/text.php:773 -msgid "slap" -msgstr "" - -#: ../../include/text.php:773 -msgid "slapped" -msgstr "" - -#: ../../include/text.php:774 -msgid "finger" -msgstr "" - -#: ../../include/text.php:774 -msgid "fingered" -msgstr "" - -#: ../../include/text.php:775 -msgid "rebuff" -msgstr "" - -#: ../../include/text.php:775 -msgid "rebuffed" -msgstr "" - -#: ../../include/text.php:787 -msgid "happy" -msgstr "" - -#: ../../include/text.php:788 -msgid "sad" -msgstr "" - -#: ../../include/text.php:789 -msgid "mellow" -msgstr "" - -#: ../../include/text.php:790 -msgid "tired" -msgstr "" - -#: ../../include/text.php:791 -msgid "perky" -msgstr "" - -#: ../../include/text.php:792 -msgid "angry" -msgstr "" - -#: ../../include/text.php:793 -msgid "stupified" -msgstr "" - -#: ../../include/text.php:794 -msgid "puzzled" -msgstr "" - -#: ../../include/text.php:795 -msgid "interested" -msgstr "" - -#: ../../include/text.php:796 -msgid "bitter" -msgstr "" - -#: ../../include/text.php:797 -msgid "cheerful" -msgstr "" - -#: ../../include/text.php:798 -msgid "alive" -msgstr "" - -#: ../../include/text.php:799 -msgid "annoyed" +#: ../../include/follow.php:138 +msgid "Cannot connect to yourself." msgstr "" -#: ../../include/text.php:800 -msgid "anxious" +#: ../../include/network.php:1113 +msgid "view full size" msgstr "" -#: ../../include/text.php:801 -msgid "cranky" +#: ../../include/ItemObject.php:88 ../../mod/photos.php:952 +msgid "Private Message" msgstr "" -#: ../../include/text.php:802 -msgid "disturbed" +#: ../../include/ItemObject.php:95 ../../include/page_widgets.php:8 +#: ../../mod/blocks.php:93 ../../mod/editwebpage.php:119 +#: ../../mod/webpages.php:101 ../../mod/editpost.php:97 +#: ../../mod/editlayout.php:100 ../../mod/layouts.php:102 +#: ../../mod/menu.php:55 ../../mod/editblock.php:114 +#: ../../mod/settings.php:713 +msgid "Edit" msgstr "" -#: ../../include/text.php:803 -msgid "frustrated" +#: ../../include/ItemObject.php:107 ../../include/conversation.php:628 +#: ../../mod/admin.php:690 ../../mod/connections.php:374 +#: ../../mod/filestorage.php:82 ../../mod/group.php:182 +#: ../../mod/photos.php:1130 ../../mod/settings.php:714 +msgid "Delete" msgstr "" -#: ../../include/text.php:804 -msgid "motivated" +#: ../../include/ItemObject.php:113 ../../include/conversation.php:627 +msgid "Select" msgstr "" -#: ../../include/text.php:805 -msgid "relaxed" +#: ../../include/ItemObject.php:117 +msgid "save to folder" msgstr "" -#: ../../include/text.php:806 -msgid "surprised" +#: ../../include/ItemObject.php:145 +msgid "add star" msgstr "" -#: ../../include/text.php:970 -msgid "Monday" +#: ../../include/ItemObject.php:146 +msgid "remove star" msgstr "" -#: ../../include/text.php:970 -msgid "Tuesday" +#: ../../include/ItemObject.php:147 +msgid "toggle star status" msgstr "" -#: ../../include/text.php:970 -msgid "Wednesday" +#: ../../include/ItemObject.php:151 +msgid "starred" msgstr "" -#: ../../include/text.php:970 -msgid "Thursday" +#: ../../include/ItemObject.php:160 ../../include/conversation.php:638 +msgid "Message is verified" msgstr "" -#: ../../include/text.php:970 -msgid "Friday" +#: ../../include/ItemObject.php:168 +msgid "add tag" msgstr "" -#: ../../include/text.php:970 -msgid "Saturday" +#: ../../include/ItemObject.php:174 ../../mod/photos.php:1058 +msgid "I like this (toggle)" msgstr "" -#: ../../include/text.php:970 -msgid "Sunday" +#: ../../include/ItemObject.php:175 ../../mod/photos.php:1059 +msgid "I don't like this (toggle)" msgstr "" -#: ../../include/text.php:974 -msgid "January" +#: ../../include/ItemObject.php:177 +msgid "Share this" msgstr "" -#: ../../include/text.php:974 -msgid "February" +#: ../../include/ItemObject.php:177 +msgid "share" msgstr "" -#: ../../include/text.php:974 -msgid "March" +#: ../../include/ItemObject.php:201 ../../include/ItemObject.php:202 +#, php-format +msgid "View %s's profile - %s" msgstr "" -#: ../../include/text.php:974 -msgid "April" +#: ../../include/ItemObject.php:203 +msgid "to" msgstr "" -#: ../../include/text.php:974 -msgid "May" +#: ../../include/ItemObject.php:204 +msgid "via" msgstr "" -#: ../../include/text.php:974 -msgid "June" +#: ../../include/ItemObject.php:205 +msgid "Wall-to-Wall" msgstr "" -#: ../../include/text.php:974 -msgid "July" +#: ../../include/ItemObject.php:206 +msgid "via Wall-To-Wall:" msgstr "" -#: ../../include/text.php:974 -msgid "August" +#: ../../include/ItemObject.php:216 ../../include/conversation.php:682 +#, php-format +msgid " from %s" msgstr "" -#: ../../include/text.php:974 -msgid "September" +#: ../../include/ItemObject.php:219 ../../include/conversation.php:685 +#, php-format +msgid "last edited: %s" msgstr "" -#: ../../include/text.php:974 -msgid "October" +#: ../../include/ItemObject.php:246 ../../include/conversation.php:702 +#: ../../include/conversation.php:1112 ../../mod/message.php:332 +#: ../../mod/message.php:516 ../../mod/editwebpage.php:128 +#: ../../mod/editpost.php:106 ../../mod/photos.php:1061 +#: ../../mod/editlayout.php:109 ../../mod/editblock.php:123 +msgid "Please wait" msgstr "" -#: ../../include/text.php:974 -msgid "November" -msgstr "" +#: ../../include/ItemObject.php:267 +#, php-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "" +msgstr[1] "" -#: ../../include/text.php:974 -msgid "December" +#: ../../include/ItemObject.php:527 ../../mod/photos.php:1077 +#: ../../mod/photos.php:1164 +msgid "This is you" msgstr "" -#: ../../include/text.php:1052 ../../mod/message.php:453 -msgid "unknown.???" +#: ../../include/ItemObject.php:531 +msgid "Bold" msgstr "" -#: ../../include/text.php:1053 ../../mod/message.php:454 -msgid "bytes" +#: ../../include/ItemObject.php:532 +msgid "Italic" msgstr "" -#: ../../include/text.php:1088 -msgid "remove category" +#: ../../include/ItemObject.php:533 +msgid "Underline" msgstr "" -#: ../../include/text.php:1110 -msgid "remove from file" +#: ../../include/ItemObject.php:534 +msgid "Quote" msgstr "" -#: ../../include/text.php:1164 ../../include/text.php:1176 -msgid "Click to open/close" +#: ../../include/ItemObject.php:535 +msgid "Code" msgstr "" -#: ../../include/text.php:1352 ../../mod/events.php:326 -msgid "link to source" +#: ../../include/ItemObject.php:536 +msgid "Image" msgstr "" -#: ../../include/text.php:1371 -msgid "Select a page layout: " +#: ../../include/ItemObject.php:537 +msgid "Link" msgstr "" -#: ../../include/text.php:1374 ../../include/text.php:1439 -msgid "default" +#: ../../include/ItemObject.php:538 +msgid "Video" msgstr "" -#: ../../include/text.php:1410 -msgid "Page content type: " +#: ../../include/ItemObject.php:539 ../../include/conversation.php:1075 +#: ../../mod/editwebpage.php:150 ../../mod/webpages.php:105 +#: ../../mod/editpost.php:126 ../../mod/photos.php:1081 +#: ../../mod/editlayout.php:129 ../../mod/editblock.php:144 +msgid "Preview" msgstr "" -#: ../../include/text.php:1451 -msgid "Select an alternate language" +#: ../../include/ItemObject.php:542 ../../include/conversation.php:1139 +#: ../../mod/message.php:338 ../../mod/message.php:521 +#: ../../mod/editpost.php:134 +msgid "Encrypt text" msgstr "" -#: ../../include/text.php:1603 ../../include/conversation.php:117 -#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45 -msgid "photo" +#: ../../include/notify.php:23 +msgid "created a new post" msgstr "" -#: ../../include/text.php:1606 ../../include/conversation.php:120 -#: ../../mod/tagger.php:49 -msgid "event" +#: ../../include/notify.php:24 +#, php-format +msgid "commented on %s's post" msgstr "" -#: ../../include/text.php:1609 ../../include/conversation.php:145 -#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53 -msgid "status" +#: ../../include/contact_widgets.php:14 +#, php-format +msgid "You have %1$.0f of %2$.0f allowed connections." msgstr "" -#: ../../include/text.php:1611 ../../include/conversation.php:147 -#: ../../mod/tagger.php:55 -msgid "comment" +#: ../../include/contact_widgets.php:20 +msgid "Add New Connection" msgstr "" -#: ../../include/text.php:1616 -msgid "activity" +#: ../../include/contact_widgets.php:21 +msgid "Enter the channel address" msgstr "" -#: ../../include/text.php:1878 -msgid "Design" +#: ../../include/contact_widgets.php:22 +msgid "Example: bob@example.com, http://example.com/barbara" msgstr "" -#: ../../include/text.php:1880 -msgid "Blocks" -msgstr "" +#: ../../include/contact_widgets.php:38 +#, php-format +msgid "%d invitation available" +msgid_plural "%d invitations available" +msgstr[0] "" +msgstr[1] "" -#: ../../include/text.php:1881 -msgid "Menus" +#: ../../include/contact_widgets.php:44 +msgid "Find Channels" msgstr "" -#: ../../include/text.php:1882 -msgid "Layouts" +#: ../../include/contact_widgets.php:45 +msgid "Enter name or interest" msgstr "" -#: ../../include/text.php:1883 -msgid "Pages" +#: ../../include/contact_widgets.php:46 +msgid "Connect/Follow" msgstr "" -#: ../../include/identity.php:14 ../../mod/item.php:1123 -msgid "Unable to obtain identity information from database" +#: ../../include/contact_widgets.php:47 +msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/identity.php:36 -msgid "Empty name" +#: ../../include/contact_widgets.php:48 ../../mod/connections.php:697 +#: ../../mod/directory.php:221 ../../mod/directory.php:226 +msgid "Find" msgstr "" -#: ../../include/identity.php:38 -msgid "Name too long" +#: ../../include/contact_widgets.php:49 ../../mod/suggest.php:64 +msgid "Channel Suggestions" msgstr "" -#: ../../include/identity.php:80 -msgid "No account identifier" +#: ../../include/contact_widgets.php:51 +msgid "Random Profile" msgstr "" -#: ../../include/identity.php:90 -msgid "Nickname is required." +#: ../../include/contact_widgets.php:52 +msgid "Invite Friends" msgstr "" -#: ../../include/identity.php:104 -msgid "" -"Nickname has unsupported characters or is already being used on this site." +#: ../../include/contact_widgets.php:76 ../../include/features.php:60 +msgid "Saved Folders" msgstr "" -#: ../../include/identity.php:163 -msgid "Unable to retrieve created identity" +#: ../../include/contact_widgets.php:79 ../../include/contact_widgets.php:113 +msgid "Everything" msgstr "" -#: ../../include/identity.php:220 -msgid "Default Profile" -msgstr "" +#: ../../include/contact_widgets.php:143 +#, php-format +msgid "%d connection in common" +msgid_plural "%d connections in common" +msgstr[0] "" +msgstr[1] "" -#: ../../include/identity.php:245 ../../include/profile_selectors.php:42 -#: ../../mod/network.php:387 ../../mod/connections.php:407 -msgid "Friends" +#: ../../include/page_widgets.php:6 +msgid "New Page" msgstr "" -#: ../../include/bbcode.php:94 ../../include/bbcode.php:494 -#: ../../include/bbcode.php:497 -msgid "Image/photo" +#: ../../include/api.php:972 +msgid "Public Timeline" msgstr "" -#: ../../include/bbcode.php:126 ../../include/bbcode.php:502 -msgid "Encrypted content" +#: ../../include/conversation.php:123 +msgid "channel" msgstr "" -#: ../../include/bbcode.php:173 +#: ../../include/conversation.php:161 ../../mod/like.php:134 #, php-format -msgid "%1$s wrote the following %2$s %3$s" -msgstr "" - -#: ../../include/bbcode.php:175 -msgid "post" +msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../include/bbcode.php:454 ../../include/bbcode.php:474 -msgid "$1 wrote:" +#: ../../include/conversation.php:164 ../../mod/like.php:136 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" msgstr "" -#: ../../include/oembed.php:149 -msgid "Embedded content" +#: ../../include/conversation.php:201 +#, php-format +msgid "%1$s is now connected with %2$s" msgstr "" -#: ../../include/oembed.php:158 -msgid "Embedding disabled" +#: ../../include/conversation.php:232 +#, php-format +msgid "%1$s poked %2$s" msgstr "" -#: ../../include/notify.php:23 -msgid "created a new post" +#: ../../include/conversation.php:254 ../../mod/mood.php:63 +#, php-format +msgid "%1$s is currently %2$s" msgstr "" -#: ../../include/notify.php:24 +#: ../../include/conversation.php:658 #, php-format -msgid "commented on %s's post" +msgid "View %s's profile @ %s" msgstr "" -#: ../../include/photos.php:15 ../../include/attach.php:102 -#: ../../include/attach.php:133 ../../include/attach.php:189 -#: ../../include/attach.php:204 ../../include/attach.php:237 -#: ../../include/attach.php:251 ../../include/attach.php:272 -#: ../../include/attach.php:464 ../../include/attach.php:539 -#: ../../include/items.php:3582 ../../mod/common.php:43 -#: ../../mod/events.php:134 ../../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:628 -#: ../../mod/viewconnections.php:33 ../../mod/viewconnections.php:38 -#: ../../mod/delegate.php:6 ../../mod/sources.php:48 ../../mod/mitem.php:92 -#: ../../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:7 -#: ../../mod/intro.php:50 ../../mod/connections.php:197 -#: ../../mod/profiles.php:163 ../../mod/profiles.php:476 -#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97 -#: ../../mod/filestorage.php:26 ../../mod/manage.php:6 -#: ../../mod/crepair.php:115 ../../mod/editlayout.php:48 -#: ../../mod/nogroup.php:25 ../../mod/profile_photo.php:197 -#: ../../mod/profile_photo.php:210 ../../mod/editwebpage.php:42 -#: ../../mod/editwebpage.php:64 ../../mod/notifications.php:66 -#: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/editpost.php:13 -#: ../../mod/poke.php:128 ../../mod/channel.php:123 ../../mod/fsuggest.php:78 -#: ../../mod/editblock.php:48 ../../mod/item.php:173 ../../mod/item.php:181 -#: ../../mod/suggest.php:32 ../../mod/register.php:68 ../../mod/regmod.php:18 -#: ../../mod/mood.php:114 ../../index.php:178 ../../index.php:340 -msgid "Permission denied." +#: ../../include/conversation.php:672 +msgid "Categories:" msgstr "" -#: ../../include/photos.php:88 -#, php-format -msgid "Image exceeds website size limit of %lu bytes" +#: ../../include/conversation.php:673 +msgid "Filed under:" msgstr "" -#: ../../include/photos.php:95 -msgid "Image file is empty." +#: ../../include/conversation.php:700 +msgid "View in context" msgstr "" -#: ../../include/photos.php:124 ../../mod/profile_photo.php:157 -msgid "Unable to process image" +#: ../../include/conversation.php:826 +msgid "remove" msgstr "" -#: ../../include/photos.php:186 -msgid "Photo storage failed." +#: ../../include/conversation.php:830 +msgid "Loading..." msgstr "" -#: ../../include/photos.php:288 ../../boot.php:2242 -msgid "Photo Albums" +#: ../../include/conversation.php:831 +msgid "Delete Selected Items" msgstr "" -#: ../../include/photos.php:292 ../../mod/photos.php:802 -#: ../../mod/photos.php:1276 -msgid "Upload New Photos" +#: ../../include/conversation.php:922 +msgid "View Source" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Male" +#: ../../include/conversation.php:923 +msgid "Follow Thread" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Female" +#: ../../include/conversation.php:924 ../../include/Contact.php:525 +msgid "View Status" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Currently Male" +#: ../../include/conversation.php:925 ../../include/nav.php:76 +#: ../../include/Contact.php:526 ../../mod/connections.php:327 +#: ../../mod/connections.php:441 +msgid "View Profile" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Currently Female" +#: ../../include/conversation.php:926 ../../include/Contact.php:527 +msgid "View Photos" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Mostly Male" +#: ../../include/conversation.php:927 +msgid "Matrix Activity" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Mostly Female" +#: ../../include/conversation.php:928 ../../include/Contact.php:529 +msgid "Edit Contact" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Transgender" +#: ../../include/conversation.php:929 ../../include/Contact.php:530 +msgid "Send PM" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Intersex" +#: ../../include/conversation.php:930 ../../include/Contact.php:524 +msgid "Poke" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Transsexual" +#: ../../include/conversation.php:992 +#, php-format +msgid "%s likes this." msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Hermaphrodite" +#: ../../include/conversation.php:992 +#, php-format +msgid "%s doesn't like this." msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Neuter" +#: ../../include/conversation.php:996 +#, php-format +msgid "%2$d people like this." +msgid_plural "%2$d people like this." +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:998 +#, 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 +msgid "and" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Non-specific" +#: ../../include/conversation.php:1007 +#, php-format +msgid ", and %d other people" +msgid_plural ", and %d other people" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1008 +#, php-format +msgid "%s like this." msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Other" +#: ../../include/conversation.php:1008 +#, php-format +msgid "%s don't like this." msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Undecided" +#: ../../include/conversation.php:1058 +msgid "Visible to everybody" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Males" +#: ../../include/conversation.php:1059 ../../mod/message.php:281 +#: ../../mod/message.php:417 +msgid "Please enter a link URL:" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Females" +#: ../../include/conversation.php:1060 +msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Gay" +#: ../../include/conversation.php:1061 +msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Lesbian" +#: ../../include/conversation.php:1062 +msgid "Tag term:" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "No Preference" +#: ../../include/conversation.php:1063 ../../mod/filer.php:35 +msgid "Save to Folder:" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Bisexual" +#: ../../include/conversation.php:1064 +msgid "Where are you right now?" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Autosexual" +#: ../../include/conversation.php:1065 ../../mod/message.php:282 +#: ../../mod/message.php:418 ../../mod/editpost.php:52 +msgid "Expires YYYY-MM-DD HH:MM" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Abstinent" +#: ../../include/conversation.php:1089 ../../mod/photos.php:1060 +msgid "Share" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Virgin" +#: ../../include/conversation.php:1091 +msgid "Page link title" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Deviant" +#: ../../include/conversation.php:1093 ../../mod/message.php:329 +#: ../../mod/message.php:512 ../../mod/editwebpage.php:120 +#: ../../mod/editpost.php:98 ../../mod/editlayout.php:101 +#: ../../mod/editblock.php:115 +msgid "Upload photo" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Fetish" +#: ../../include/conversation.php:1094 +msgid "upload photo" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Oodles" +#: ../../include/conversation.php:1095 ../../mod/message.php:330 +#: ../../mod/message.php:513 ../../mod/editwebpage.php:121 +#: ../../mod/editpost.php:99 ../../mod/editlayout.php:102 +#: ../../mod/editblock.php:116 +msgid "Attach file" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Nonsexual" +#: ../../include/conversation.php:1096 +msgid "attach file" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Single" +#: ../../include/conversation.php:1097 ../../mod/message.php:331 +#: ../../mod/message.php:514 ../../mod/editwebpage.php:122 +#: ../../mod/editpost.php:100 ../../mod/editlayout.php:103 +#: ../../mod/editblock.php:117 +msgid "Insert web link" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Lonely" +#: ../../include/conversation.php:1098 +msgid "web link" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Available" +#: ../../include/conversation.php:1099 +msgid "Insert video link" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Unavailable" +#: ../../include/conversation.php:1100 +msgid "video link" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Has crush" +#: ../../include/conversation.php:1101 +msgid "Insert audio link" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Infatuated" +#: ../../include/conversation.php:1102 +msgid "audio link" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Dating" +#: ../../include/conversation.php:1103 ../../mod/editwebpage.php:126 +#: ../../mod/editpost.php:104 ../../mod/editlayout.php:107 +#: ../../mod/editblock.php:121 +msgid "Set your location" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Unfaithful" +#: ../../include/conversation.php:1104 +msgid "set location" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Sex Addict" +#: ../../include/conversation.php:1105 ../../mod/editwebpage.php:127 +#: ../../mod/editpost.php:105 ../../mod/editlayout.php:108 +#: ../../mod/editblock.php:122 +msgid "Clear browser location" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Friends/Benefits" +#: ../../include/conversation.php:1106 +msgid "clear location" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Casual" +#: ../../include/conversation.php:1108 ../../mod/editwebpage.php:142 +#: ../../mod/editpost.php:118 ../../mod/editlayout.php:121 +#: ../../mod/editblock.php:136 +msgid "Set title" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Engaged" +#: ../../include/conversation.php:1111 ../../mod/editwebpage.php:144 +#: ../../mod/editpost.php:120 ../../mod/editlayout.php:123 +#: ../../mod/editblock.php:138 +msgid "Categories (comma-separated list)" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Married" +#: ../../include/conversation.php:1113 ../../mod/editwebpage.php:129 +#: ../../mod/editpost.php:107 ../../mod/editlayout.php:110 +#: ../../mod/editblock.php:124 +msgid "Permission settings" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Imaginarily married" +#: ../../include/conversation.php:1114 +msgid "permissions" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Partners" +#: ../../include/conversation.php:1122 ../../mod/editwebpage.php:137 +#: ../../mod/editpost.php:115 ../../mod/editlayout.php:118 +#: ../../mod/editblock.php:133 +msgid "Public post" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Cohabiting" +#: ../../include/conversation.php:1124 ../../mod/editwebpage.php:145 +#: ../../mod/editpost.php:121 ../../mod/editlayout.php:124 +#: ../../mod/editblock.php:139 +msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Common law" +#: ../../include/conversation.php:1137 ../../mod/message.php:336 +#: ../../mod/message.php:519 ../../mod/editwebpage.php:155 +#: ../../mod/editpost.php:132 ../../mod/editlayout.php:134 +#: ../../mod/editblock.php:149 +msgid "Set expiration date" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Happy" +#: ../../include/photo/photo_driver.php:609 ../../include/photos.php:51 +#: ../../mod/profile_photo.php:88 ../../mod/profile_photo.php:235 +#: ../../mod/profile_photo.php:346 ../../mod/photos.php:97 +#: ../../mod/photos.php:764 ../../mod/photos.php:786 +msgid "Profile Photos" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Not looking" +#: ../../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 "Swinger" +#: ../../include/group.php:223 +msgid "Default privacy group for new contacts" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Betrayed" +#: ../../include/group.php:242 ../../mod/admin.php:695 +msgid "All Channels" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Separated" +#: ../../include/group.php:264 +msgid "edit" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Unstable" +#: ../../include/group.php:285 +msgid "Collections" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Divorced" +#: ../../include/group.php:286 +msgid "Edit collection" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Imaginarily divorced" +#: ../../include/group.php:287 +msgid "Create a new collection" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Widowed" +#: ../../include/group.php:288 +msgid "Channels not in any collection" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Uncertain" +#: ../../include/group.php:290 ../../mod/network.php:174 +msgid "add" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "It's complicated" +#: ../../include/identity.php:14 ../../mod/item.php:1148 +msgid "Unable to obtain identity information from database" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Don't care" +#: ../../include/identity.php:36 +msgid "Empty name" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Ask me" +#: ../../include/identity.php:38 +msgid "Name too long" msgstr "" -#: ../../include/attach.php:184 ../../include/attach.php:232 -msgid "Item was not found." +#: ../../include/identity.php:80 +msgid "No account identifier" msgstr "" -#: ../../include/attach.php:285 -msgid "No source file." +#: ../../include/identity.php:90 +msgid "Nickname is required." msgstr "" -#: ../../include/attach.php:302 -msgid "Cannot locate file to replace" +#: ../../include/identity.php:104 +msgid "" +"Nickname has unsupported characters or is already being used on this site." msgstr "" -#: ../../include/attach.php:320 -msgid "Cannot locate file to revise/update" +#: ../../include/identity.php:163 +msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/attach.php:331 -#, php-format -msgid "File exceeds size limit of %d" +#: ../../include/identity.php:220 +msgid "Default Profile" msgstr "" -#: ../../include/attach.php:342 -#, php-format -msgid "You have reached your limit of %1$.0f Mbytes attachment storage." +#: ../../include/identity.php:245 ../../include/profile_selectors.php:42 +#: ../../mod/connections.php:407 ../../mod/network.php:387 +msgid "Friends" msgstr "" -#: ../../include/attach.php:424 -msgid "File upload failed. Possible system limit or action terminated." +#: ../../include/photos.php:88 +#, php-format +msgid "Image exceeds website size limit of %lu bytes" msgstr "" -#: ../../include/attach.php:436 -msgid "Stored file could not be verified. Upload failed." +#: ../../include/photos.php:95 +msgid "Image file is empty." msgstr "" -#: ../../include/attach.php:480 ../../include/attach.php:497 -msgid "Path not available." +#: ../../include/photos.php:124 ../../mod/profile_photo.php:157 +msgid "Unable to process image" msgstr "" -#: ../../include/attach.php:544 -msgid "Empty pathname" +#: ../../include/photos.php:186 +msgid "Photo storage failed." msgstr "" -#: ../../include/attach.php:562 -msgid "duplicate filename or path" +#: ../../include/photos.php:292 ../../mod/photos.php:802 +#: ../../mod/photos.php:1276 +msgid "Upload New Photos" msgstr "" -#: ../../include/attach.php:584 -msgid "Path not found." +#: ../../include/security.php:49 +msgid "Welcome " msgstr "" -#: ../../include/attach.php:628 -msgid "mkdir failed." +#: ../../include/security.php:50 +msgid "Please upload a profile photo." msgstr "" -#: ../../include/attach.php:632 -msgid "database storage failed." +#: ../../include/security.php:53 +msgid "Welcome back " msgstr "" -#: ../../include/zot.php:438 -msgid "Invalid data packet" +#: ../../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 "" -#: ../../include/zot.php:448 -msgid "Unable to verify channel signature" +#: ../../include/plugin.php:440 ../../include/plugin.php:442 +msgid "Click here to upgrade." msgstr "" -#: ../../include/zot.php:594 -#, php-format -msgid "Unable to verify site signature for %s" +#: ../../include/plugin.php:448 +msgid "This action exceeds the limits set by your subscription plan." msgstr "" -#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1458 -msgid "Logout" +#: ../../include/plugin.php:453 +msgid "This action is not available under your subscription plan." msgstr "" #: ../../include/nav.php:72 ../../include/nav.php:87 @@ -1960,18 +2103,10 @@ msgstr "" msgid "Manage/Edit Profiles" msgstr "" -#: ../../include/nav.php:79 ../../mod/fbrowser.php:25 ../../boot.php:2239 -msgid "Photos" -msgstr "" - #: ../../include/nav.php:79 msgid "Your photos" msgstr "" -#: ../../include/nav.php:85 ../../boot.php:1459 -msgid "Login" -msgstr "" - #: ../../include/nav.php:85 msgid "Sign in" msgstr "" @@ -1989,10 +2124,6 @@ msgstr "" msgid "Home Page" msgstr "" -#: ../../include/nav.php:125 ../../mod/register.php:195 ../../boot.php:1435 -msgid "Register" -msgstr "" - #: ../../include/nav.php:125 msgid "Create an account" msgstr "" @@ -2113,10 +2244,6 @@ msgstr "" msgid "New Message" msgstr "" -#: ../../include/nav.php:174 ../../mod/events.php:348 ../../boot.php:2250 -msgid "Events" -msgstr "" - #: ../../include/nav.php:174 msgid "Event Calendar" msgstr "" @@ -2137,8 +2264,8 @@ msgstr "" msgid "Manage Your Channels" msgstr "" -#: ../../include/nav.php:180 ../../mod/settings.php:131 -#: ../../mod/admin.php:778 ../../mod/admin.php:983 +#: ../../include/nav.php:180 ../../mod/admin.php:782 ../../mod/admin.php:987 +#: ../../mod/settings.php:131 msgid "Settings" msgstr "" @@ -2170,1904 +2297,1737 @@ msgstr "" msgid "Please wait..." msgstr "" -#: ../../include/account.php:23 -msgid "Not a valid email address" -msgstr "" - -#: ../../include/account.php:25 -msgid "Your email domain is not among those allowed on this site" -msgstr "" - -#: ../../include/account.php:31 -msgid "Your email address is already registered at this site." -msgstr "" - -#: ../../include/account.php:64 -msgid "An invitation is required." -msgstr "" - -#: ../../include/account.php:68 -msgid "Invitation could not be verified." -msgstr "" - -#: ../../include/account.php:118 -msgid "Please enter the required information." -msgstr "" - -#: ../../include/account.php:186 -msgid "Failed to store account information." -msgstr "" - -#: ../../include/account.php:272 -#, php-format -msgid "Registration request at %s" -msgstr "" - -#: ../../include/account.php:274 ../../include/account.php:301 -#: ../../include/account.php:358 -msgid "Administrator" -msgstr "" - -#: ../../include/account.php:296 -msgid "your registration password" -msgstr "" - -#: ../../include/account.php:299 ../../include/account.php:356 -#, php-format -msgid "Registration details for %s" -msgstr "" - -#: ../../include/account.php:365 -msgid "Account approved." -msgstr "" - -#: ../../include/account.php:399 -#, php-format -msgid "Registration revoked for %s" -msgstr "" - -#: ../../include/auth.php:67 -msgid "Logged out." -msgstr "" - -#: ../../include/auth.php:179 -msgid "Failed authentication" -msgstr "" - -#: ../../include/auth.php:188 -msgid "Login failed." -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 -msgid "Find Channels" -msgstr "" - -#: ../../include/contact_widgets.php:45 -msgid "Enter name or interest" -msgstr "" - -#: ../../include/contact_widgets.php:46 -msgid "Connect/Follow" -msgstr "" - -#: ../../include/contact_widgets.php:47 -msgid "Examples: Robert Morgenstein, Fishing" -msgstr "" - -#: ../../include/contact_widgets.php:48 ../../mod/connections.php:697 -#: ../../mod/directory.php:221 ../../mod/directory.php:226 -msgid "Find" -msgstr "" - -#: ../../include/contact_widgets.php:49 ../../mod/suggest.php:64 -msgid "Channel Suggestions" -msgstr "" - -#: ../../include/contact_widgets.php:51 -msgid "Random Profile" -msgstr "" - -#: ../../include/contact_widgets.php:52 -msgid "Invite Friends" -msgstr "" - -#: ../../include/contact_widgets.php:79 ../../include/contact_widgets.php:113 -msgid "Everything" +#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:118 +#: ../../mod/profperm.php:112 +msgid "Profile" msgstr "" -#: ../../include/contact_widgets.php:110 ../../include/widgets.php:26 -msgid "Categories" +#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1062 +msgid "Full Name:" msgstr "" -#: ../../include/contact_widgets.php:143 -#, 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/profile_advanced.php:22 +msgid "j F, Y" msgstr "" -#: ../../include/follow.php:21 -msgid "Channel is blocked on this site." +#: ../../include/profile_advanced.php:23 +msgid "j F" msgstr "" -#: ../../include/follow.php:26 -msgid "Channel location missing." +#: ../../include/profile_advanced.php:30 +msgid "Birthday:" msgstr "" -#: ../../include/follow.php:43 -msgid "Channel discovery failed. Website may be down or misconfigured." +#: ../../include/profile_advanced.php:34 +msgid "Age:" msgstr "" -#: ../../include/follow.php:51 -msgid "Response from remote channel was not understood." +#: ../../include/profile_advanced.php:43 +#, php-format +msgid "for %1$d %2$s" msgstr "" -#: ../../include/follow.php:58 -msgid "Response from remote channel was incomplete." +#: ../../include/profile_advanced.php:46 ../../mod/profiles.php:549 +msgid "Sexual Preference:" msgstr "" -#: ../../include/follow.php:129 -msgid "local account not found." +#: ../../include/profile_advanced.php:50 ../../mod/profiles.php:551 +msgid "Hometown:" msgstr "" -#: ../../include/follow.php:138 -msgid "Cannot connect to yourself." +#: ../../include/profile_advanced.php:52 +msgid "Tags:" msgstr "" -#: ../../include/permissions.php:13 -msgid "Can view my \"public\" stream and posts" +#: ../../include/profile_advanced.php:54 ../../mod/profiles.php:552 +msgid "Political Views:" msgstr "" -#: ../../include/permissions.php:14 -msgid "Can view my \"public\" channel profile" +#: ../../include/profile_advanced.php:56 +msgid "Religion:" msgstr "" -#: ../../include/permissions.php:15 -msgid "Can view my \"public\" photo albums" +#: ../../include/profile_advanced.php:58 ../../mod/directory.php:181 +msgid "About:" msgstr "" -#: ../../include/permissions.php:16 -msgid "Can view my \"public\" address book" +#: ../../include/profile_advanced.php:60 +msgid "Hobbies/Interests:" msgstr "" -#: ../../include/permissions.php:17 -msgid "Can view my \"public\" file storage" +#: ../../include/profile_advanced.php:62 ../../mod/profiles.php:555 +msgid "Likes:" msgstr "" -#: ../../include/permissions.php:18 -msgid "Can view my \"public\" pages" +#: ../../include/profile_advanced.php:64 ../../mod/profiles.php:556 +msgid "Dislikes:" msgstr "" -#: ../../include/permissions.php:21 -msgid "Can send me their channel stream and posts" +#: ../../include/profile_advanced.php:67 +msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/permissions.php:22 -msgid "Can post on my channel page (\"wall\")" +#: ../../include/profile_advanced.php:69 +msgid "Musical interests:" msgstr "" -#: ../../include/permissions.php:23 -msgid "Can comment on my posts" +#: ../../include/profile_advanced.php:71 +msgid "Books, literature:" msgstr "" -#: ../../include/permissions.php:24 -msgid "Can send me private mail messages" +#: ../../include/profile_advanced.php:73 +msgid "Television:" msgstr "" -#: ../../include/permissions.php:25 -msgid "Can post photos to my photo albums" +#: ../../include/profile_advanced.php:75 +msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/permissions.php:26 -msgid "Can forward to all my channel contacts via post @mentions" +#: ../../include/profile_advanced.php:77 +msgid "Love/Romance:" msgstr "" -#: ../../include/permissions.php:26 -msgid "Advanced - useful for creating group forum channels" +#: ../../include/profile_advanced.php:79 +msgid "Work/employment:" msgstr "" -#: ../../include/permissions.php:27 -msgid "Can chat with me (when available)" +#: ../../include/profile_advanced.php:81 +msgid "School/education:" msgstr "" -#: ../../include/permissions.php:27 -msgid "Requires compatible chat plugin" +#: ../../include/zot.php:425 +msgid "Invalid data packet" msgstr "" -#: ../../include/permissions.php:28 -msgid "Can write to my \"public\" file storage" +#: ../../include/zot.php:435 +msgid "Unable to verify channel signature" msgstr "" -#: ../../include/permissions.php:29 -msgid "Can edit my \"public\" pages" +#: ../../include/zot.php:581 +#, php-format +msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/permissions.php:31 -msgid "Can source my \"public\" posts in derived channels" +#: ../../include/Contact.php:103 +msgid "New window" msgstr "" -#: ../../include/permissions.php:31 -msgid "Somewhat advanced - very useful in open communities" +#: ../../include/Contact.php:104 +msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/permissions.php:32 -msgid "Can administer my channel resources" +#: ../../include/Contact.php:528 +msgid "Network Posts" msgstr "" -#: ../../include/permissions.php:32 -msgid "Extremely advanced. Leave this alone unless you know what you are doing" +#: ../../include/profile_selectors.php:6 +msgid "Male" msgstr "" -#: ../../include/taxonomy.php:210 -msgid "Tags" +#: ../../include/profile_selectors.php:6 +msgid "Female" msgstr "" -#: ../../include/taxonomy.php:224 -msgid "Keywords" +#: ../../include/profile_selectors.php:6 +msgid "Currently Male" msgstr "" -#: ../../include/taxonomy.php:249 -msgid "have" +#: ../../include/profile_selectors.php:6 +msgid "Currently Female" msgstr "" -#: ../../include/taxonomy.php:249 -msgid "has" +#: ../../include/profile_selectors.php:6 +msgid "Mostly Male" msgstr "" -#: ../../include/taxonomy.php:250 -msgid "want" +#: ../../include/profile_selectors.php:6 +msgid "Mostly Female" msgstr "" -#: ../../include/taxonomy.php:250 -msgid "wants" +#: ../../include/profile_selectors.php:6 +msgid "Transgender" msgstr "" -#: ../../include/taxonomy.php:251 -msgid "likes" +#: ../../include/profile_selectors.php:6 +msgid "Intersex" msgstr "" -#: ../../include/taxonomy.php:252 -msgid "dislikes" +#: ../../include/profile_selectors.php:6 +msgid "Transsexual" msgstr "" -#: ../../include/plugin.php:440 ../../include/plugin.php:442 -msgid "Click here to upgrade." +#: ../../include/profile_selectors.php:6 +msgid "Hermaphrodite" msgstr "" -#: ../../include/plugin.php:448 -msgid "This action exceeds the limits set by your subscription plan." +#: ../../include/profile_selectors.php:6 +msgid "Neuter" msgstr "" -#: ../../include/plugin.php:453 -msgid "This action is not available under your subscription plan." +#: ../../include/profile_selectors.php:6 +msgid "Non-specific" msgstr "" -#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:62 -#: ../../view/theme/apw/php/config.php:176 -msgid "Default" +#: ../../include/profile_selectors.php:6 +msgid "Other" msgstr "" -#: ../../include/conversation.php:123 -msgid "channel" +#: ../../include/profile_selectors.php:6 +msgid "Undecided" msgstr "" -#: ../../include/conversation.php:161 ../../mod/like.php:134 -#, php-format -msgid "%1$s likes %2$s's %3$s" +#: ../../include/profile_selectors.php:23 +msgid "Males" msgstr "" -#: ../../include/conversation.php:164 ../../mod/like.php:136 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" +#: ../../include/profile_selectors.php:23 +msgid "Females" msgstr "" -#: ../../include/conversation.php:201 -#, php-format -msgid "%1$s is now connected with %2$s" +#: ../../include/profile_selectors.php:23 +msgid "Gay" msgstr "" -#: ../../include/conversation.php:232 -#, php-format -msgid "%1$s poked %2$s" +#: ../../include/profile_selectors.php:23 +msgid "Lesbian" msgstr "" -#: ../../include/conversation.php:254 ../../mod/mood.php:63 -#, php-format -msgid "%1$s is currently %2$s" +#: ../../include/profile_selectors.php:23 +msgid "No Preference" msgstr "" -#: ../../include/conversation.php:658 -#, php-format -msgid "View %s's profile @ %s" +#: ../../include/profile_selectors.php:23 +msgid "Bisexual" msgstr "" -#: ../../include/conversation.php:672 -msgid "Categories:" +#: ../../include/profile_selectors.php:23 +msgid "Autosexual" msgstr "" -#: ../../include/conversation.php:673 -msgid "Filed under:" +#: ../../include/profile_selectors.php:23 +msgid "Abstinent" msgstr "" -#: ../../include/conversation.php:700 -msgid "View in context" +#: ../../include/profile_selectors.php:23 +msgid "Virgin" msgstr "" -#: ../../include/conversation.php:826 -msgid "remove" +#: ../../include/profile_selectors.php:23 +msgid "Deviant" msgstr "" -#: ../../include/conversation.php:830 -msgid "Loading..." +#: ../../include/profile_selectors.php:23 +msgid "Fetish" msgstr "" -#: ../../include/conversation.php:831 -msgid "Delete Selected Items" +#: ../../include/profile_selectors.php:23 +msgid "Oodles" msgstr "" -#: ../../include/conversation.php:922 -msgid "View Source" +#: ../../include/profile_selectors.php:23 +msgid "Nonsexual" msgstr "" -#: ../../include/conversation.php:923 -msgid "Follow Thread" +#: ../../include/profile_selectors.php:42 +msgid "Single" msgstr "" -#: ../../include/conversation.php:927 -msgid "Matrix Activity" +#: ../../include/profile_selectors.php:42 +msgid "Lonely" msgstr "" -#: ../../include/conversation.php:992 -#, php-format -msgid "%s likes this." +#: ../../include/profile_selectors.php:42 +msgid "Available" msgstr "" -#: ../../include/conversation.php:992 -#, php-format -msgid "%s doesn't like this." +#: ../../include/profile_selectors.php:42 +msgid "Unavailable" msgstr "" -#: ../../include/conversation.php:996 -#, php-format -msgid "%2$d people like this." +#: ../../include/profile_selectors.php:42 +msgid "Has crush" msgstr "" -#: ../../include/conversation.php:998 -#, php-format -msgid "%2$d people don't like this." +#: ../../include/profile_selectors.php:42 +msgid "Infatuated" msgstr "" -#: ../../include/conversation.php:1004 -msgid "and" +#: ../../include/profile_selectors.php:42 +msgid "Dating" msgstr "" -#: ../../include/conversation.php:1007 -#, php-format -msgid ", and %d other people" +#: ../../include/profile_selectors.php:42 +msgid "Unfaithful" msgstr "" -#: ../../include/conversation.php:1008 -#, php-format -msgid "%s like this." +#: ../../include/profile_selectors.php:42 +msgid "Sex Addict" msgstr "" -#: ../../include/conversation.php:1008 -#, php-format -msgid "%s don't like this." +#: ../../include/profile_selectors.php:42 +msgid "Friends/Benefits" msgstr "" -#: ../../include/conversation.php:1058 -msgid "Visible to everybody" +#: ../../include/profile_selectors.php:42 +msgid "Casual" msgstr "" -#: ../../include/conversation.php:1059 ../../mod/message.php:281 -#: ../../mod/message.php:417 -msgid "Please enter a link URL:" +#: ../../include/profile_selectors.php:42 +msgid "Engaged" msgstr "" -#: ../../include/conversation.php:1060 -msgid "Please enter a video link/URL:" +#: ../../include/profile_selectors.php:42 +msgid "Married" msgstr "" -#: ../../include/conversation.php:1061 -msgid "Please enter an audio link/URL:" +#: ../../include/profile_selectors.php:42 +msgid "Imaginarily married" msgstr "" -#: ../../include/conversation.php:1062 -msgid "Tag term:" +#: ../../include/profile_selectors.php:42 +msgid "Partners" msgstr "" -#: ../../include/conversation.php:1063 ../../mod/filer.php:35 -msgid "Save to Folder:" +#: ../../include/profile_selectors.php:42 +msgid "Cohabiting" msgstr "" -#: ../../include/conversation.php:1064 -msgid "Where are you right now?" +#: ../../include/profile_selectors.php:42 +msgid "Common law" msgstr "" -#: ../../include/conversation.php:1065 ../../mod/message.php:282 -#: ../../mod/message.php:418 ../../mod/editpost.php:52 -msgid "Expires YYYY-MM-DD HH:MM" +#: ../../include/profile_selectors.php:42 +msgid "Happy" msgstr "" -#: ../../include/conversation.php:1089 ../../mod/photos.php:1060 -msgid "Share" +#: ../../include/profile_selectors.php:42 +msgid "Not looking" msgstr "" -#: ../../include/conversation.php:1091 -msgid "Page link title" +#: ../../include/profile_selectors.php:42 +msgid "Swinger" 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 -#: ../../mod/editblock.php:115 -msgid "Upload photo" +#: ../../include/profile_selectors.php:42 +msgid "Betrayed" msgstr "" -#: ../../include/conversation.php:1094 -msgid "upload photo" +#: ../../include/profile_selectors.php:42 +msgid "Separated" 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 -#: ../../mod/editblock.php:116 -msgid "Attach file" +#: ../../include/profile_selectors.php:42 +msgid "Unstable" msgstr "" -#: ../../include/conversation.php:1096 -msgid "attach file" +#: ../../include/profile_selectors.php:42 +msgid "Divorced" 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 -#: ../../mod/editblock.php:117 -msgid "Insert web link" +#: ../../include/profile_selectors.php:42 +msgid "Imaginarily divorced" msgstr "" -#: ../../include/conversation.php:1098 -msgid "web link" +#: ../../include/profile_selectors.php:42 +msgid "Widowed" msgstr "" -#: ../../include/conversation.php:1099 -msgid "Insert video link" +#: ../../include/profile_selectors.php:42 +msgid "Uncertain" msgstr "" -#: ../../include/conversation.php:1100 -msgid "video link" +#: ../../include/profile_selectors.php:42 +msgid "It's complicated" msgstr "" -#: ../../include/conversation.php:1101 -msgid "Insert audio link" +#: ../../include/profile_selectors.php:42 +msgid "Don't care" msgstr "" -#: ../../include/conversation.php:1102 -msgid "audio link" +#: ../../include/profile_selectors.php:42 +msgid "Ask me" msgstr "" -#: ../../include/conversation.php:1103 ../../mod/editlayout.php:107 -#: ../../mod/editwebpage.php:126 ../../mod/editpost.php:104 -#: ../../mod/editblock.php:121 -msgid "Set your location" +#: ../../include/features.php:21 +msgid "General Features" msgstr "" -#: ../../include/conversation.php:1104 -msgid "set location" +#: ../../include/features.php:23 +msgid "Content Expiration" msgstr "" -#: ../../include/conversation.php:1105 ../../mod/editlayout.php:108 -#: ../../mod/editwebpage.php:127 ../../mod/editpost.php:105 -#: ../../mod/editblock.php:122 -msgid "Clear browser location" +#: ../../include/features.php:23 +msgid "Remove posts/comments and/or private messages at a future time" msgstr "" -#: ../../include/conversation.php:1106 -msgid "clear location" +#: ../../include/features.php:24 +msgid "Multiple Profiles" msgstr "" -#: ../../include/conversation.php:1108 ../../mod/editlayout.php:121 -#: ../../mod/editwebpage.php:142 ../../mod/editpost.php:118 -#: ../../mod/editblock.php:136 -msgid "Set title" +#: ../../include/features.php:24 +msgid "Ability to create multiple profiles" msgstr "" -#: ../../include/conversation.php:1111 ../../mod/editlayout.php:123 -#: ../../mod/editwebpage.php:144 ../../mod/editpost.php:120 -#: ../../mod/editblock.php:138 -msgid "Categories (comma-separated list)" +#: ../../include/features.php:25 +msgid "Web Pages" msgstr "" -#: ../../include/conversation.php:1113 ../../mod/editlayout.php:110 -#: ../../mod/editwebpage.php:129 ../../mod/editpost.php:107 -#: ../../mod/editblock.php:124 -msgid "Permission settings" +#: ../../include/features.php:25 +msgid "Provide managed web pages on your channel" msgstr "" -#: ../../include/conversation.php:1114 -msgid "permissions" +#: ../../include/features.php:26 +msgid "Enhanced Photo Albums" msgstr "" -#: ../../include/conversation.php:1122 ../../mod/editlayout.php:118 -#: ../../mod/editwebpage.php:137 ../../mod/editpost.php:115 -#: ../../mod/editblock.php:133 -msgid "Public post" +#: ../../include/features.php:26 +msgid "Enable photo album with enhanced features" msgstr "" -#: ../../include/conversation.php:1124 ../../mod/editlayout.php:124 -#: ../../mod/editwebpage.php:145 ../../mod/editpost.php:121 -#: ../../mod/editblock.php:139 -msgid "Example: bob@example.com, mary@example.com" +#: ../../include/features.php:28 +msgid "Extended Identity Sharing" 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 -#: ../../mod/editblock.php:149 -msgid "Set expiration date" +#: ../../include/features.php:29 +msgid "Expert Mode" msgstr "" -#: ../../include/security.php:49 -msgid "Welcome " +#: ../../include/features.php:29 +msgid "Enable Expert Mode to provide advanced configuration options" msgstr "" -#: ../../include/security.php:50 -msgid "Please upload a profile photo." +#: ../../include/features.php:30 +msgid "Premium Channel" msgstr "" -#: ../../include/security.php:53 -msgid "Welcome back " +#: ../../include/features.php:30 +msgid "" +"Allows you to set restrictions and terms on those that connect with your " +"channel" msgstr "" -#: ../../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." +#: ../../include/features.php:35 +msgid "Post Composition Features" msgstr "" -#: ../../include/items.php:201 ../../mod/like.php:55 ../../mod/group.php:74 -#: ../../mod/profperm.php:28 ../../index.php:339 -msgid "Permission denied" +#: ../../include/features.php:36 +msgid "Richtext Editor" msgstr "" -#: ../../include/items.php:3531 ../../mod/admin.php:150 -#: ../../mod/admin.php:723 ../../mod/admin.php:926 ../../mod/viewsrc.php:18 -#: ../../mod/home.php:64 ../../mod/display.php:32 -msgid "Item not found." +#: ../../include/features.php:36 +msgid "Enable richtext editor" msgstr "" -#: ../../include/items.php:3703 -msgid "Archives" +#: ../../include/features.php:37 +msgid "Post Preview" msgstr "" -#: ../../include/items.php:3869 ../../mod/group.php:44 ../../mod/group.php:146 -msgid "Collection not found." +#: ../../include/features.php:37 +msgid "Allow previewing posts and comments before publishing them" msgstr "" -#: ../../include/items.php:3885 ../../mod/network.php:469 -msgid "Group is empty" +#: ../../include/features.php:38 ../../mod/sources.php:67 +#: ../../mod/settings.php:120 +msgid "Channel Sources" msgstr "" -#: ../../include/items.php:3901 -msgid "Connection not found." +#: ../../include/features.php:38 +msgid "Automatically import channel content from other channels or feeds" msgstr "" -#: ../../include/dir_fns.php:15 -msgid "Sort Options" +#: ../../include/features.php:39 +msgid "Even More Encryption" msgstr "" -#: ../../include/dir_fns.php:16 -msgid "Alphabetic" +#: ../../include/features.php:39 +msgid "Allow encryption of content end-to-end with a shared secret key" msgstr "" -#: ../../include/dir_fns.php:17 -msgid "Reverse Alphabetic" +#: ../../include/features.php:44 +msgid "Network and Stream Filtering" msgstr "" -#: ../../include/dir_fns.php:18 -msgid "Newest to Oldest" +#: ../../include/features.php:45 +msgid "Search by Date" msgstr "" -#: ../../include/dir_fns.php:29 -msgid "Enable Safe Search" +#: ../../include/features.php:45 +msgid "Ability to select posts by date ranges" msgstr "" -#: ../../include/dir_fns.php:31 -msgid "Disable Safe Search" +#: ../../include/features.php:46 +msgid "Collections Filter" msgstr "" -#: ../../include/dir_fns.php:33 -msgid "Safe Mode" +#: ../../include/features.php:46 +msgid "Enable widget to display Network posts only from selected collections" msgstr "" -#: ../../mod/common.php:10 -msgid "No channel." +#: ../../include/features.php:47 ../../mod/search.php:17 +#: ../../mod/network.php:173 +msgid "Saved Searches" msgstr "" -#: ../../mod/common.php:47 -msgid "Common connections" +#: ../../include/features.php:47 +msgid "Save search terms for re-use" msgstr "" -#: ../../mod/common.php:52 -msgid "No connections in common." +#: ../../include/features.php:48 +msgid "Network Personal Tab" msgstr "" -#: ../../mod/events.php:66 -msgid "Event title and start time are required." +#: ../../include/features.php:48 +msgid "Enable tab to display only Network posts that you've interacted on" msgstr "" -#: ../../mod/events.php:281 -msgid "l, F j" +#: ../../include/features.php:49 +msgid "Network New Tab" msgstr "" -#: ../../mod/events.php:303 -msgid "Edit event" +#: ../../include/features.php:49 +msgid "Enable tab to display all new Network activity" msgstr "" -#: ../../mod/events.php:349 -msgid "Create New Event" +#: ../../include/features.php:50 +msgid "Affinity Tool" msgstr "" -#: ../../mod/events.php:350 -msgid "Previous" +#: ../../include/features.php:50 +msgid "Filter stream activity by depth of relationships" msgstr "" -#: ../../mod/events.php:351 ../../mod/setup.php:256 -msgid "Next" +#: ../../include/features.php:55 +msgid "Post/Comment Tools" msgstr "" -#: ../../mod/events.php:425 -msgid "hour:minute" +#: ../../include/features.php:57 +msgid "Edit Sent Posts" msgstr "" -#: ../../mod/events.php:435 -msgid "Event details" +#: ../../include/features.php:57 +msgid "Edit and correct posts and comments after sending" msgstr "" -#: ../../mod/events.php:436 -#, php-format -msgid "Format is %s %s. Starting date and Title are required." +#: ../../include/features.php:58 +msgid "Tagging" msgstr "" -#: ../../mod/events.php:438 -msgid "Event Starts:" +#: ../../include/features.php:58 +msgid "Ability to tag existing posts" msgstr "" -#: ../../mod/events.php:438 ../../mod/events.php:452 -msgid "Required" +#: ../../include/features.php:59 +msgid "Post Categories" msgstr "" -#: ../../mod/events.php:441 -msgid "Finish date/time is not known or not relevant" +#: ../../include/features.php:59 +msgid "Add categories to your posts" msgstr "" -#: ../../mod/events.php:443 -msgid "Event Finishes:" +#: ../../include/features.php:60 +msgid "Ability to file posts under folders" msgstr "" -#: ../../mod/events.php:446 -msgid "Adjust for viewer timezone" +#: ../../include/features.php:61 +msgid "Dislike Posts" msgstr "" -#: ../../mod/events.php:448 -msgid "Description:" +#: ../../include/features.php:61 +msgid "Ability to dislike posts/comments" msgstr "" -#: ../../mod/events.php:452 -msgid "Title:" +#: ../../include/features.php:62 +msgid "Star Posts" msgstr "" -#: ../../mod/events.php:454 -msgid "Share this event" +#: ../../include/features.php:62 +msgid "Ability to mark special posts with a star indicator" msgstr "" -#: ../../mod/thing.php:109 -msgid "Object store: failed" +#: ../../include/features.php:63 +msgid "Tag Cloud" msgstr "" -#: ../../mod/thing.php:113 -msgid "thing/stuff added" +#: ../../include/features.php:63 +msgid "Provide a personal tag cloud on your channel page" msgstr "" -#: ../../mod/thing.php:129 -#, php-format -msgid "OBJ: %1$s %2$s %3$s" +#: ../../include/attach.php:184 ../../include/attach.php:232 +msgid "Item was not found." msgstr "" -#: ../../mod/thing.php:175 -msgid "not yet implemented." +#: ../../include/attach.php:285 +msgid "No source file." msgstr "" -#: ../../mod/thing.php:181 -msgid "Add Stuff to your Profile" +#: ../../include/attach.php:302 +msgid "Cannot locate file to replace" msgstr "" -#: ../../mod/thing.php:183 -msgid "Select a profile" +#: ../../include/attach.php:320 +msgid "Cannot locate file to revise/update" msgstr "" -#: ../../mod/thing.php:185 -msgid "Select a category of stuff. e.g. I ______ something" +#: ../../include/attach.php:331 +#, php-format +msgid "File exceeds size limit of %d" msgstr "" -#: ../../mod/thing.php:187 -msgid "Name of thing or stuff e.g. something" +#: ../../include/attach.php:342 +#, php-format +msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "" -#: ../../mod/thing.php:188 -msgid "URL of thing or stuff (optional)" +#: ../../include/attach.php:424 +msgid "File upload failed. Possible system limit or action terminated." msgstr "" -#: ../../mod/thing.php:189 -msgid "URL for photo of thing or stuff (optional)" +#: ../../include/attach.php:436 +msgid "Stored file could not be verified. Upload failed." msgstr "" -#: ../../mod/invite.php:25 -msgid "Total invitation limit exceeded." +#: ../../include/attach.php:480 ../../include/attach.php:497 +msgid "Path not available." msgstr "" -#: ../../mod/invite.php:47 -#, php-format -msgid "%s : Not a valid email address." +#: ../../include/attach.php:544 +msgid "Empty pathname" msgstr "" -#: ../../mod/invite.php:74 -msgid "Please join us on Red" +#: ../../include/attach.php:562 +msgid "duplicate filename or path" msgstr "" -#: ../../mod/invite.php:85 -msgid "Invitation limit exceeded. Please contact your site administrator." +#: ../../include/attach.php:584 +msgid "Path not found." msgstr "" -#: ../../mod/invite.php:90 -#, php-format -msgid "%s : Message delivery failed." +#: ../../include/attach.php:628 +msgid "mkdir failed." msgstr "" -#: ../../mod/invite.php:94 -#, php-format -msgid "%d message sent." -msgid_plural "%d messages sent." -msgstr[0] "" -msgstr[1] "" +#: ../../include/attach.php:632 +msgid "database storage failed." +msgstr "" -#: ../../mod/invite.php:113 -msgid "You have no more invitations available" +#: ../../include/auth.php:67 +msgid "Logged out." msgstr "" -#: ../../mod/invite.php:139 -msgid "Send invitations" +#: ../../include/auth.php:179 +msgid "Failed authentication" msgstr "" -#: ../../mod/invite.php:140 -msgid "Enter email addresses, one per line:" +#: ../../include/auth.php:188 +msgid "Login failed." msgstr "" -#: ../../mod/invite.php:141 ../../mod/message.php:326 -#: ../../mod/message.php:508 -msgid "Your message:" +#: ../../include/enotify.php:36 +msgid "Red Matrix Notification" msgstr "" -#: ../../mod/invite.php:142 -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." +#: ../../include/enotify.php:37 +msgid "redmatrix" msgstr "" -#: ../../mod/invite.php:144 -msgid "You will need to supply this invitation code: $invite_code" +#: ../../include/enotify.php:39 +msgid "Thank You," msgstr "" -#: ../../mod/invite.php:145 -msgid "Please visit my channel at" +#: ../../include/enotify.php:41 +#, php-format +msgid "%s Administrator" msgstr "" -#: ../../mod/invite.php:149 -msgid "" -"Once you have registered (on ANY Red Matrix site - they are all inter-" -"connected), please connect with my Red Matrix channel address:" +#: ../../include/enotify.php:76 +#, php-format +msgid "%s " msgstr "" -#: ../../mod/invite.php:151 -msgid "Click the [Register] link on the following page to join." +#: ../../include/enotify.php:80 +#, php-format +msgid "[Red:Notify] New mail received at %s" msgstr "" -#: ../../mod/invite.php:153 -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" +#: ../../include/enotify.php:82 +#, php-format +msgid "%1$s, %2$s sent you a new private message at %3$s." msgstr "" -#: ../../mod/allfriends.php:35 +#: ../../include/enotify.php:83 #, php-format -msgid "Friends of %s" +msgid "%1$s sent you %2$s." msgstr "" -#: ../../mod/allfriends.php:41 -msgid "No friends to display." +#: ../../include/enotify.php:83 +msgid "a private message" msgstr "" -#: ../../mod/webpages.php:8 ../../mod/connect.php:13 ../../mod/layouts.php:8 -#: ../../mod/filestorage.php:8 ../../mod/blocks.php:10 ../../mod/profile.php:8 -#: ../../boot.php:1640 -msgid "Requested profile is not available." +#: ../../include/enotify.php:84 +#, php-format +msgid "Please visit %s to view and/or reply to your private messages." msgstr "" -#: ../../mod/webpages.php:104 ../../mod/layouts.php:105 -#: ../../mod/blocks.php:96 -msgid "View" +#: ../../include/enotify.php:135 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]" msgstr "" -#: ../../mod/api.php:76 ../../mod/api.php:102 -msgid "Authorize application connection" +#: ../../include/enotify.php:143 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]" msgstr "" -#: ../../mod/api.php:77 -msgid "Return to your app and insert this Securty Code:" +#: ../../include/enotify.php:152 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]" msgstr "" -#: ../../mod/api.php:89 -msgid "Please login to continue." +#: ../../include/enotify.php:163 +#, php-format +msgid "[Red:Notify] Comment to conversation #%1$d by %2$s" 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?" +#: ../../include/enotify.php:164 +#, php-format +msgid "%1$s, %2$s commented on an item/conversation you have been following." msgstr "" -#: ../../mod/api.php:105 ../../mod/settings.php:1009 -#: ../../mod/settings.php:1014 ../../mod/settings.php:1037 -#: ../../mod/settings.php:1039 ../../mod/settings.php:1040 -#: ../../mod/settings.php:1041 ../../mod/profiles.php:506 -msgid "Yes" +#: ../../include/enotify.php:167 ../../include/enotify.php:186 +#: ../../include/enotify.php:212 ../../include/enotify.php:231 +#: ../../include/enotify.php:245 +#, php-format +msgid "Please visit %s to view and/or reply to the conversation." msgstr "" -#: ../../mod/api.php:106 ../../mod/settings.php:1009 -#: ../../mod/settings.php:1014 ../../mod/settings.php:1037 -#: ../../mod/settings.php:1039 ../../mod/settings.php:1040 -#: ../../mod/settings.php:1041 ../../mod/profiles.php:507 -msgid "No" +#: ../../include/enotify.php:174 +#, php-format +msgid "[Red:Notify] %s posted to your profile wall" msgstr "" -#: ../../mod/lastpost.php:16 ../../mod/channel.php:16 -msgid "You must be logged in to see this page." +#: ../../include/enotify.php:176 +#, php-format +msgid "%1$s, %2$s posted to your profile wall at %3$s" msgstr "" -#: ../../mod/apps.php:8 -msgid "No installed applications." +#: ../../include/enotify.php:178 +#, php-format +msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" msgstr "" -#: ../../mod/apps.php:13 -msgid "Applications" +#: ../../include/enotify.php:205 +#, php-format +msgid "[Red:Notify] %s tagged you" msgstr "" -#: ../../mod/page.php:35 -msgid "Invalid item." +#: ../../include/enotify.php:206 +#, php-format +msgid "%1$s, %2$s tagged you at %3$s" msgstr "" -#: ../../mod/page.php:47 ../../mod/chanview.php:78 ../../mod/home.php:51 -#: ../../mod/magic.php:95 ../../mod/wall_upload.php:35 -msgid "Channel not found." +#: ../../include/enotify.php:207 +#, php-format +msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." msgstr "" -#: ../../mod/page.php:83 ../../mod/help.php:56 ../../mod/display.php:92 -#: ../../index.php:229 -msgid "Page not found." +#: ../../include/enotify.php:220 +#, php-format +msgid "[Red:Notify] %1$s poked you" msgstr "" -#: ../../mod/attach.php:9 -msgid "Item not available." +#: ../../include/enotify.php:221 +#, php-format +msgid "%1$s, %2$s poked you at %3$s" msgstr "" -#: ../../mod/setup.php:161 -msgid "Red Matrix Server - Setup" +#: ../../include/enotify.php:222 +#, php-format +msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." msgstr "" -#: ../../mod/setup.php:167 -msgid "Could not connect to database." +#: ../../include/enotify.php:238 +#, php-format +msgid "[Red:Notify] %s tagged your post" msgstr "" -#: ../../mod/setup.php:171 -msgid "" -"Could not connect to specified site URL. Possible SSL certificate or DNS " -"issue." +#: ../../include/enotify.php:239 +#, php-format +msgid "%1$s, %2$s tagged your post at %3$s" msgstr "" -#: ../../mod/setup.php:176 -msgid "Could not create table." +#: ../../include/enotify.php:240 +#, php-format +msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" msgstr "" -#: ../../mod/setup.php:182 -msgid "Your site database has been installed." +#: ../../include/enotify.php:252 +msgid "[Red:Notify] Introduction received" msgstr "" -#: ../../mod/setup.php:187 -msgid "" -"You may need to import the file \"install/database.sql\" manually using " -"phpmyadmin or mysql." +#: ../../include/enotify.php:253 +#, php-format +msgid "%1$s, you've received an introduction from '%2$s' at %3$s" msgstr "" -#: ../../mod/setup.php:188 ../../mod/setup.php:255 ../../mod/setup.php:584 -msgid "Please see the file \"install/INSTALL.txt\"." +#: ../../include/enotify.php:254 +#, php-format +msgid "%1$s, you've received [zrl=%2$s]an introduction[/zrl] from %3$s." msgstr "" -#: ../../mod/setup.php:252 -msgid "System check" +#: ../../include/enotify.php:258 ../../include/enotify.php:277 +#, php-format +msgid "You may visit their profile at %s" msgstr "" -#: ../../mod/setup.php:257 -msgid "Check again" +#: ../../include/enotify.php:260 +#, php-format +msgid "Please visit %s to approve or reject the introduction." msgstr "" -#: ../../mod/setup.php:279 -msgid "Database connection" +#: ../../include/enotify.php:267 +msgid "[Red:Notify] Friend suggestion received" msgstr "" -#: ../../mod/setup.php:280 -msgid "" -"In order to install Red Matrix we need to know how to connect to your " -"database." +#: ../../include/enotify.php:268 +#, php-format +msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" msgstr "" -#: ../../mod/setup.php:281 +#: ../../include/enotify.php:269 +#, php-format msgid "" -"Please contact your hosting provider or site administrator if you have " -"questions about these settings." +"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s." msgstr "" -#: ../../mod/setup.php:282 -msgid "" -"The database you specify below should already exist. If it does not, please " -"create it before continuing." +#: ../../include/enotify.php:275 +msgid "Name:" msgstr "" -#: ../../mod/setup.php:286 -msgid "Database Server Name" +#: ../../include/enotify.php:276 +msgid "Photo:" msgstr "" -#: ../../mod/setup.php:286 -msgid "Default is localhost" +#: ../../include/enotify.php:279 +#, php-format +msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: ../../mod/setup.php:287 -msgid "Database Port" +#: ../../include/contact_selectors.php:30 +msgid "Unknown | Not categorised" msgstr "" -#: ../../mod/setup.php:287 -msgid "Communication port number - use 0 for default" +#: ../../include/contact_selectors.php:31 +msgid "Block immediately" msgstr "" -#: ../../mod/setup.php:288 -msgid "Database Login Name" +#: ../../include/contact_selectors.php:32 +msgid "Shady, spammer, self-marketer" msgstr "" -#: ../../mod/setup.php:289 -msgid "Database Login Password" +#: ../../include/contact_selectors.php:33 +msgid "Known to me, but no opinion" msgstr "" -#: ../../mod/setup.php:290 -msgid "Database Name" +#: ../../include/contact_selectors.php:34 +msgid "OK, probably harmless" msgstr "" -#: ../../mod/setup.php:292 ../../mod/setup.php:334 -msgid "Site administrator email address" +#: ../../include/contact_selectors.php:35 +msgid "Reputable, has my trust" 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." +#: ../../include/contact_selectors.php:54 +msgid "Frequently" msgstr "" -#: ../../mod/setup.php:293 ../../mod/setup.php:336 -msgid "Website URL" +#: ../../include/contact_selectors.php:55 +msgid "Hourly" msgstr "" -#: ../../mod/setup.php:293 ../../mod/setup.php:336 -msgid "Please use SSL (https) URL if available." +#: ../../include/contact_selectors.php:56 +msgid "Twice daily" msgstr "" -#: ../../mod/setup.php:296 ../../mod/setup.php:339 -msgid "Please select a default timezone for your website" +#: ../../include/contact_selectors.php:57 +msgid "Daily" msgstr "" -#: ../../mod/setup.php:323 -msgid "Site settings" +#: ../../include/contact_selectors.php:58 +msgid "Weekly" msgstr "" -#: ../../mod/setup.php:379 -msgid "Could not find a command line version of PHP in the web server PATH." +#: ../../include/contact_selectors.php:59 +msgid "Monthly" msgstr "" -#: ../../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." +#: ../../include/contact_selectors.php:74 +msgid "Friendica" msgstr "" -#: ../../mod/setup.php:384 -msgid "PHP executable path" +#: ../../include/contact_selectors.php:75 +msgid "OStatus" msgstr "" -#: ../../mod/setup.php:384 -msgid "" -"Enter full path to php executable. You can leave this blank to continue the " -"installation." +#: ../../include/contact_selectors.php:76 +msgid "RSS/Atom" msgstr "" -#: ../../mod/setup.php:389 -msgid "Command line PHP" +#: ../../include/contact_selectors.php:78 +msgid "Diaspora" msgstr "" -#: ../../mod/setup.php:398 -msgid "" -"The command line version of PHP on your system does not have " -"\"register_argc_argv\" enabled." +#: ../../include/contact_selectors.php:79 +msgid "Facebook" msgstr "" -#: ../../mod/setup.php:399 -msgid "This is required for message delivery to work." +#: ../../include/contact_selectors.php:80 +msgid "Zot!" msgstr "" -#: ../../mod/setup.php:401 -msgid "PHP register_argc_argv" +#: ../../include/contact_selectors.php:81 +msgid "LinkedIn" msgstr "" -#: ../../mod/setup.php:422 -msgid "" -"Error: the \"openssl_pkey_new\" function on this system is not able to " -"generate encryption keys" +#: ../../include/contact_selectors.php:82 +msgid "XMPP/IM" msgstr "" -#: ../../mod/setup.php:423 -msgid "" -"If running under Windows, please see \"http://www.php.net/manual/en/openssl." -"installation.php\"." +#: ../../include/contact_selectors.php:83 +msgid "MySpace" msgstr "" -#: ../../mod/setup.php:425 -msgid "Generate encryption keys" +#: ../../mod/ping.php:160 +msgid "sent you a private message" msgstr "" -#: ../../mod/setup.php:432 -msgid "libCurl PHP module" +#: ../../mod/ping.php:218 +msgid "added your channel" msgstr "" -#: ../../mod/setup.php:433 -msgid "GD graphics PHP module" +#: ../../mod/ping.php:262 +msgid "posted an event" msgstr "" -#: ../../mod/setup.php:434 -msgid "OpenSSL PHP module" +#: ../../mod/update_search.php:46 ../../mod/update_display.php:25 +#: ../../mod/update_community.php:18 ../../mod/update_network.php:23 +#: ../../mod/update_channel.php:43 +msgid "[Embedded content - reload page to view]" msgstr "" -#: ../../mod/setup.php:435 -msgid "mysqli PHP module" +#: ../../mod/message.php:19 +msgid "Check Mail" msgstr "" -#: ../../mod/setup.php:436 -msgid "mb_string PHP module" +#: ../../mod/message.php:56 +msgid "Unable to lookup recipient." msgstr "" -#: ../../mod/setup.php:437 -msgid "mcrypt PHP module" +#: ../../mod/message.php:64 +msgid "Unable to communicate with requested channel." msgstr "" -#: ../../mod/setup.php:442 ../../mod/setup.php:444 -msgid "Apache mod_rewrite module" +#: ../../mod/message.php:71 +msgid "Cannot verify requested channel." msgstr "" -#: ../../mod/setup.php:442 -msgid "" -"Error: Apache webserver mod-rewrite module is required but not installed." +#: ../../mod/message.php:97 +msgid "Selected channel has private message restrictions. Send failed." msgstr "" -#: ../../mod/setup.php:448 ../../mod/setup.php:451 -msgid "proc_open" +#: ../../mod/message.php:223 ../../mod/notifications.php:101 +msgid "Messages" msgstr "" -#: ../../mod/setup.php:448 -msgid "" -"Error: proc_open is required but is either not installed or has been " -"disabled in php.ini" +#: ../../mod/message.php:234 +msgid "Message deleted." msgstr "" -#: ../../mod/setup.php:456 -msgid "Error: libCURL PHP module required but not installed." +#: ../../mod/message.php:241 +msgid "Conversation removed." msgstr "" -#: ../../mod/setup.php:460 -msgid "" -"Error: GD graphics PHP module with JPEG support required but not installed." +#: ../../mod/message.php:258 +msgid "Message recalled." msgstr "" -#: ../../mod/setup.php:464 -msgid "Error: openssl PHP module required but not installed." +#: ../../mod/message.php:316 +msgid "Send Private Message" msgstr "" -#: ../../mod/setup.php:468 -msgid "Error: mysqli PHP module required but not installed." +#: ../../mod/message.php:317 ../../mod/message.php:503 +msgid "To:" msgstr "" -#: ../../mod/setup.php:472 -msgid "Error: mb_string PHP module required but not installed." +#: ../../mod/message.php:322 ../../mod/message.php:505 +msgid "Subject:" msgstr "" -#: ../../mod/setup.php:476 -msgid "Error: mcrypt PHP module required but not installed." +#: ../../mod/message.php:326 ../../mod/message.php:508 +#: ../../mod/invite.php:141 +msgid "Your message:" 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/message.php:359 +msgid "No messages." 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/message.php:375 ../../mod/message.php:472 +msgid "Delete message" 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/message.php:377 +msgid "D, d M Y - g:i A" 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/message.php:396 +msgid "Message not found." msgstr "" -#: ../../mod/setup.php:498 -msgid ".htconfig.php is writable" +#: ../../mod/message.php:473 +msgid "Recall message" 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/message.php:475 +msgid "Message has been recalled." 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/message.php:492 +msgid "Private Conversation" 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/message.php:496 +msgid "Delete conversation" msgstr "" -#: ../../mod/setup.php:511 +#: ../../mod/message.php:498 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." +"No secure communications available. You may be able to " +"respond from the sender's profile page." msgstr "" -#: ../../mod/setup.php:514 -msgid "view/tpl/smarty3 is writable" +#: ../../mod/message.php:502 +msgid "Send Reply" msgstr "" -#: ../../mod/setup.php:528 -msgid "SSL certificate validation" +#: ../../mod/chanview.php:78 ../../mod/wall_upload.php:35 +#: ../../mod/magic.php:95 ../../mod/page.php:47 ../../mod/home.php:51 +msgid "Channel not found." msgstr "" -#: ../../mod/setup.php:528 -msgid "" -"SSL certificate cannot be validated. Fix certificate or disable https access " -"to this site." +#: ../../mod/chanview.php:98 +msgid "toggle full screen mode" msgstr "" -#: ../../mod/setup.php:535 -msgid "" -"Url rewrite in .htaccess is not working. Check your server configuration." +#: ../../mod/xchan.php:25 ../../mod/mitem.php:97 ../../mod/menu.php:113 +msgid "Not found." msgstr "" -#: ../../mod/setup.php:537 -msgid "Url rewrite is working" +#: ../../mod/poke.php:159 +msgid "Poke/Prod" 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/poke.php:160 +msgid "poke, prod or do other things to somebody" msgstr "" -#: ../../mod/setup.php:571 -msgid "Errors encountered creating database tables." +#: ../../mod/poke.php:161 +msgid "Recipient" msgstr "" -#: ../../mod/setup.php:582 -msgid "

    What next

    " +#: ../../mod/poke.php:162 +msgid "Choose what you wish to do to recipient" msgstr "" -#: ../../mod/setup.php:583 -msgid "" -"IMPORTANT: You will need to [manually] setup a scheduled task for the poller." +#: ../../mod/poke.php:165 +msgid "Make this post private" 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" +#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92 +#: ../../mod/crepair.php:129 +msgid "Contact not found." 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/fsuggest.php:63 +msgid "Friend suggestion sent." msgstr "" -#: ../../mod/chanview.php:98 -msgid "toggle full screen mode" +#: ../../mod/fsuggest.php:97 +msgid "Suggest Friends" msgstr "" -#: ../../mod/tagger.php:98 +#: ../../mod/fsuggest.php:99 #, php-format -msgid "%1$s tagged %2$s's %3$s with %4$s" +msgid "Suggest a friend for %s" msgstr "" -#: ../../mod/settings.php:53 -msgid "Account settings" +#: ../../mod/pubsites.php:22 +msgid "Public Sites" msgstr "" -#: ../../mod/settings.php:59 -msgid "Channel settings" +#: ../../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 "" -#: ../../mod/settings.php:65 -msgid "Additional features" +#: ../../mod/pubsites.php:31 +msgid "Site URL" msgstr "" -#: ../../mod/settings.php:71 -msgid "Feature settings" +#: ../../mod/pubsites.php:31 +msgid "Access Type" msgstr "" -#: ../../mod/settings.php:77 -msgid "Display settings" +#: ../../mod/pubsites.php:31 +msgid "Registration Policy" msgstr "" -#: ../../mod/settings.php:83 -msgid "Connected apps" +#: ../../mod/pubsites.php:31 ../../mod/profiles.php:367 +msgid "Location" msgstr "" -#: ../../mod/settings.php:89 -msgid "Export channel" +#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 +#: ../../mod/tagrm.php:94 ../../mod/settings.php:652 +#: ../../mod/settings.php:678 +msgid "Cancel" msgstr "" -#: ../../mod/settings.php:101 -msgid "Automatic Permissions (Advanced)" +#: ../../mod/fbrowser.php:114 +msgid "Files" msgstr "" -#: ../../mod/settings.php:111 -msgid "Premium Channel Settings" +#: ../../mod/mood.php:133 +msgid "Mood" msgstr "" -#: ../../mod/settings.php:171 -msgid "Name is required" +#: ../../mod/mood.php:134 +msgid "Set your current mood and tell your friends" msgstr "" -#: ../../mod/settings.php:175 -msgid "Key and Secret are required" +#: ../../mod/profile_photo.php:54 +msgid "Image uploaded but image cropping failed." msgstr "" -#: ../../mod/settings.php:179 ../../mod/settings.php:677 -msgid "Update" +#: ../../mod/profile_photo.php:107 +msgid "Image resize failed." msgstr "" -#: ../../mod/settings.php:292 -msgid "Passwords do not match. Password unchanged." +#: ../../mod/profile_photo.php:151 +msgid "" +"Shift-reload the page or clear browser cache if the new photo does not " +"display immediately." msgstr "" -#: ../../mod/settings.php:296 -msgid "Empty passwords are not allowed. Password unchanged." +#: ../../mod/profile_photo.php:173 +#, php-format +msgid "Image exceeds size limit of %d" msgstr "" -#: ../../mod/settings.php:309 -msgid "Password changed." +#: ../../mod/profile_photo.php:182 +msgid "Unable to process image." msgstr "" -#: ../../mod/settings.php:311 -msgid "Password update failed. Please try again." +#: ../../mod/profile_photo.php:224 ../../mod/profile_photo.php:272 +msgid "Photo not available." msgstr "" -#: ../../mod/settings.php:325 -msgid "Not valid email." +#: ../../mod/profile_photo.php:291 +msgid "Upload File:" msgstr "" -#: ../../mod/settings.php:328 -msgid "Protected email address. Cannot change to that email." +#: ../../mod/profile_photo.php:292 +msgid "Select a profile:" msgstr "" -#: ../../mod/settings.php:337 -msgid "System failure storing new email. Please try again." +#: ../../mod/profile_photo.php:293 +msgid "Upload Profile Photo" msgstr "" -#: ../../mod/settings.php:579 -msgid "Settings updated." +#: ../../mod/profile_photo.php:294 +msgid "Upload" msgstr "" -#: ../../mod/settings.php:650 ../../mod/settings.php:676 -#: ../../mod/settings.php:712 -msgid "Add application" +#: ../../mod/profile_photo.php:298 ../../mod/settings.php:1018 +msgid "or" msgstr "" -#: ../../mod/settings.php:652 ../../mod/settings.php:678 -#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/fbrowser.php:82 -#: ../../mod/fbrowser.php:117 -msgid "Cancel" +#: ../../mod/profile_photo.php:298 +msgid "skip this step" msgstr "" -#: ../../mod/settings.php:653 ../../mod/settings.php:679 -#: ../../mod/admin.php:682 ../../mod/crepair.php:148 -msgid "Name" +#: ../../mod/profile_photo.php:298 +msgid "select a photo from your photo albums" msgstr "" -#: ../../mod/settings.php:653 -msgid "Name of application" +#: ../../mod/profile_photo.php:312 +msgid "Crop Image" msgstr "" -#: ../../mod/settings.php:654 ../../mod/settings.php:680 -msgid "Consumer Key" +#: ../../mod/profile_photo.php:313 +msgid "Please adjust the image cropping for optimum viewing." msgstr "" -#: ../../mod/settings.php:654 ../../mod/settings.php:655 -msgid "Automatically generated - change if desired. Max length 20" +#: ../../mod/profile_photo.php:315 +msgid "Done Editing" msgstr "" -#: ../../mod/settings.php:655 ../../mod/settings.php:681 -msgid "Consumer Secret" +#: ../../mod/profile_photo.php:350 +msgid "Image uploaded successfully." msgstr "" -#: ../../mod/settings.php:656 ../../mod/settings.php:682 -msgid "Redirect" +#: ../../mod/profile_photo.php:352 +msgid "Image upload failed." msgstr "" -#: ../../mod/settings.php:656 -msgid "" -"Redirect URI - leave blank unless your application specifically requires this" +#: ../../mod/profile_photo.php:361 +#, php-format +msgid "Image size reduction [%s] failed." msgstr "" -#: ../../mod/settings.php:657 ../../mod/settings.php:683 -msgid "Icon url" +#: ../../mod/wall_upload.php:41 ../../mod/item.php:1074 +msgid "Wall Photos" msgstr "" -#: ../../mod/settings.php:657 -msgid "Optional" +#: ../../mod/crepair.php:102 +msgid "Contact settings applied." msgstr "" -#: ../../mod/settings.php:668 -msgid "You can't edit this application." +#: ../../mod/crepair.php:104 +msgid "Contact update failed." msgstr "" -#: ../../mod/settings.php:711 -msgid "Connected Apps" +#: ../../mod/crepair.php:135 +msgid "Repair Contact Settings" msgstr "" -#: ../../mod/settings.php:715 -msgid "Client key starts with" +#: ../../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/settings.php:716 -msgid "No name" +#: ../../mod/crepair.php:138 +msgid "" +"Please use your browser 'Back' button now if you are " +"uncertain what to do on this page." msgstr "" -#: ../../mod/settings.php:717 -msgid "Remove authorization" +#: ../../mod/crepair.php:144 +msgid "Return to contact editor" msgstr "" -#: ../../mod/settings.php:728 -msgid "No feature settings configured" +#: ../../mod/crepair.php:148 ../../mod/admin.php:686 +#: ../../mod/settings.php:653 ../../mod/settings.php:679 +msgid "Name" msgstr "" -#: ../../mod/settings.php:736 -msgid "Feature Settings" +#: ../../mod/crepair.php:149 +msgid "Account Nickname" msgstr "" -#: ../../mod/settings.php:759 -msgid "Account Settings" +#: ../../mod/crepair.php:150 +msgid "@Tagname - overrides Name/Nickname" msgstr "" -#: ../../mod/settings.php:760 -msgid "Password Settings" +#: ../../mod/crepair.php:151 +msgid "Account URL" msgstr "" -#: ../../mod/settings.php:761 -msgid "New Password:" +#: ../../mod/crepair.php:152 +msgid "Friend Request URL" msgstr "" -#: ../../mod/settings.php:762 -msgid "Confirm:" +#: ../../mod/crepair.php:153 +msgid "Friend Confirm URL" msgstr "" -#: ../../mod/settings.php:762 -msgid "Leave password fields blank unless changing" +#: ../../mod/crepair.php:154 +msgid "Notification Endpoint URL" msgstr "" -#: ../../mod/settings.php:764 ../../mod/settings.php:1063 -msgid "Email Address:" +#: ../../mod/crepair.php:155 +msgid "Poll/Feed URL" msgstr "" -#: ../../mod/settings.php:765 -msgid "Remove Account" +#: ../../mod/crepair.php:156 +msgid "New photo from this URL" msgstr "" -#: ../../mod/settings.php:766 -msgid "Warning: This action is permanent and cannot be reversed." +#: ../../mod/connect.php:59 ../../mod/connect.php:107 +msgid "Continue" msgstr "" -#: ../../mod/settings.php:782 -msgid "Off" +#: ../../mod/connect.php:88 +msgid "Premium Channel Setup" msgstr "" -#: ../../mod/settings.php:782 -msgid "On" +#: ../../mod/connect.php:90 +msgid "Enable premium channel connection restrictions" msgstr "" -#: ../../mod/settings.php:789 -msgid "Additional Features" +#: ../../mod/connect.php:91 +msgid "" +"Please enter your restrictions or conditions, such as paypal receipt, usage " +"guidelines, etc." +msgstr "" + +#: ../../mod/connect.php:93 ../../mod/connect.php:113 +msgid "" +"This channel may require additional steps or acknowledgement of the " +"following conditions prior to connecting:" msgstr "" -#: ../../mod/settings.php:814 -msgid "Connector Settings" +#: ../../mod/connect.php:94 +msgid "" +"Potential connections will then see the following text before proceeding:" msgstr "" -#: ../../mod/settings.php:844 ../../mod/admin.php:369 -msgid "No special theme for mobile devices" +#: ../../mod/connect.php:95 ../../mod/connect.php:116 +msgid "" +"By continuing, I certify that I have complied with any instructions provided " +"on this page." msgstr "" -#: ../../mod/settings.php:884 -msgid "Display Settings" +#: ../../mod/connect.php:104 +msgid "(No specific instructions have been provided by the channel owner.)" msgstr "" -#: ../../mod/settings.php:890 -msgid "Display Theme:" +#: ../../mod/connect.php:112 +msgid "Restricted or Premium Channel" msgstr "" -#: ../../mod/settings.php:891 -msgid "Mobile Theme:" +#: ../../mod/lockview.php:34 +msgid "Remote privacy information not available." msgstr "" -#: ../../mod/settings.php:892 -msgid "Update browser every xx seconds" +#: ../../mod/lockview.php:43 +msgid "Visible to:" msgstr "" -#: ../../mod/settings.php:892 -msgid "Minimum of 10 seconds, no maximum" +#: ../../mod/blocks.php:65 +msgid "Block Name" msgstr "" -#: ../../mod/settings.php:893 -msgid "Maximum number of conversations to load at any time:" +#: ../../mod/blocks.php:96 ../../mod/webpages.php:104 +#: ../../mod/layouts.php:105 +msgid "View" msgstr "" -#: ../../mod/settings.php:893 -msgid "Maximum of 100 items" +#: ../../mod/intro.php:11 ../../mod/intro.php:98 ../../mod/admin.php:688 +#: ../../mod/notifications.php:159 ../../mod/notifications.php:206 +msgid "Approve" msgstr "" -#: ../../mod/settings.php:894 -msgid "Don't show emoticons" +#: ../../mod/intro.php:14 ../../mod/intro.php:99 ../../mod/admin.php:691 +#: ../../mod/connections.php:348 ../../mod/connections.php:490 +msgid "Block" msgstr "" -#: ../../mod/settings.php:930 -msgid "Nobody except yourself" +#: ../../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/settings.php:931 -msgid "Only those you specifically allow" +#: ../../mod/intro.php:29 ../../mod/connections.php:122 +msgid "Connection updated." msgstr "" -#: ../../mod/settings.php:932 -msgid "Anybody in your address book" +#: ../../mod/intro.php:31 +msgid "Connection update failed." msgstr "" -#: ../../mod/settings.php:933 -msgid "Anybody on this website" +#: ../../mod/intro.php:56 +msgid "Introductions and Connection Requests" msgstr "" -#: ../../mod/settings.php:934 -msgid "Anybody in this network" +#: ../../mod/intro.php:67 +msgid "No pending introductions." msgstr "" -#: ../../mod/settings.php:935 -msgid "Anybody on the internet" +#: ../../mod/intro.php:72 +msgid "System error. Please try again later." msgstr "" -#: ../../mod/settings.php:1009 -msgid "Publish your default profile in the network directory" +#: ../../mod/intro.php:95 ../../mod/connections.php:496 +#: ../../mod/notifications.php:155 ../../mod/notifications.php:202 +msgid "Hide this contact from others" msgstr "" -#: ../../mod/settings.php:1014 -msgid "Allow us to suggest you as a potential friend to new members?" +#: ../../mod/intro.php:96 ../../mod/notifications.php:156 +#: ../../mod/notifications.php:203 +msgid "Post a new friend activity" msgstr "" -#: ../../mod/settings.php:1018 ../../mod/profile_photo.php:298 -msgid "or" +#: ../../mod/intro.php:96 ../../mod/notifications.php:156 +#: ../../mod/notifications.php:203 +msgid "if applicable" msgstr "" -#: ../../mod/settings.php:1023 -msgid "Your channel address is" +#: ../../mod/intro.php:101 ../../mod/notifications.php:35 +#: ../../mod/notifications.php:163 ../../mod/notifications.php:209 +msgid "Discard" msgstr "" -#: ../../mod/settings.php:1034 -msgid "Automatically expire posts after this many days:" +#: ../../mod/community.php:18 ../../mod/search.php:80 ../../mod/display.php:9 +#: ../../mod/directory.php:32 ../../mod/photos.php:576 +#: ../../mod/viewconnections.php:28 +msgid "Public access denied." msgstr "" -#: ../../mod/settings.php:1034 -msgid "If empty, posts will not expire. Expired posts will be deleted" +#: ../../mod/community.php:23 +msgid "Not available." msgstr "" -#: ../../mod/settings.php:1035 -msgid "Advanced expiration settings" +#: ../../mod/community.php:32 +msgid "Community" msgstr "" -#: ../../mod/settings.php:1036 -msgid "Advanced Expiration" +#: ../../mod/community.php:63 ../../mod/community.php:88 +msgid "No results." msgstr "" -#: ../../mod/settings.php:1037 -msgid "Expire posts:" +#: ../../mod/oexchange.php:23 +msgid "Unable to find your hub." msgstr "" -#: ../../mod/settings.php:1039 -msgid "Expire starred posts:" +#: ../../mod/oexchange.php:37 +msgid "Post successful." msgstr "" -#: ../../mod/settings.php:1040 -msgid "Expire photos:" +#: ../../mod/search.php:20 ../../mod/network.php:164 +msgid "Remove term" msgstr "" -#: ../../mod/settings.php:1041 -msgid "Only expire posts by others:" +#: ../../mod/profperm.php:34 ../../mod/profperm.php:64 +msgid "Invalid profile identifier." msgstr "" -#: ../../mod/settings.php:1052 -msgid "Channel Settings" +#: ../../mod/profperm.php:110 +msgid "Profile Visibility Editor" msgstr "" -#: ../../mod/settings.php:1061 -msgid "Basic Settings" +#: ../../mod/profperm.php:114 +msgid "Click on a contact to add or remove." msgstr "" -#: ../../mod/settings.php:1064 -msgid "Your Timezone:" +#: ../../mod/profperm.php:123 +msgid "Visible To" msgstr "" -#: ../../mod/settings.php:1065 -msgid "Default Post Location:" +#: ../../mod/profperm.php:139 +msgid "All Contacts (with secure profile access)" msgstr "" -#: ../../mod/settings.php:1066 -msgid "Use Browser Location:" +#: ../../mod/new_channel.php:107 +msgid "Add a Channel" msgstr "" -#: ../../mod/settings.php:1068 -msgid "Adult Content" +#: ../../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:1068 -msgid "This channel publishes adult content." +#: ../../mod/new_channel.php:110 ../../mod/sources.php:82 +#: ../../mod/sources.php:109 +msgid "Channel Name" msgstr "" -#: ../../mod/settings.php:1070 -msgid "Security and Privacy Settings" +#: ../../mod/new_channel.php:111 +msgid "" +"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " +"Group\" " msgstr "" -#: ../../mod/settings.php:1072 -msgid "Quick Privacy Settings:" +#: ../../mod/new_channel.php:112 +msgid "Choose a short nickname" msgstr "" -#: ../../mod/settings.php:1073 -msgid "Very Public - extremely permissive" +#: ../../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:1074 -msgid "Typical - default public, privacy when desired" +#: ../../mod/new_channel.php:114 +msgid "" +"Or import an existing channel from another location" msgstr "" -#: ../../mod/settings.php:1075 -msgid "Private - default private, rarely open or public" +#: ../../mod/new_channel.php:117 ../../mod/mitem.php:149 ../../mod/menu.php:79 +msgid "Create" msgstr "" -#: ../../mod/settings.php:1076 -msgid "Blocked - default blocked to/from everybody" +#: ../../mod/mitem.php:13 ../../mod/menu.php:87 +msgid "Menu not found." msgstr "" -#: ../../mod/settings.php:1079 -msgid "Maximum Friend Requests/Day:" +#: ../../mod/mitem.php:66 +msgid "Menu element updated." msgstr "" -#: ../../mod/settings.php:1079 -msgid "May reduce spam activity" +#: ../../mod/mitem.php:70 +msgid "Unable to update menu element." msgstr "" -#: ../../mod/settings.php:1080 -msgid "Default Post Permissions" +#: ../../mod/mitem.php:76 +msgid "Menu element added." msgstr "" -#: ../../mod/settings.php:1081 -msgid "(click to open/close)" +#: ../../mod/mitem.php:80 +msgid "Unable to add menu element." msgstr "" -#: ../../mod/settings.php:1094 -msgid "Maximum private messages per day from unknown people:" +#: ../../mod/mitem.php:116 +msgid "Manage Menu Elements" msgstr "" -#: ../../mod/settings.php:1094 -msgid "Useful to reduce spamming" +#: ../../mod/mitem.php:119 +msgid "Edit menu" msgstr "" -#: ../../mod/settings.php:1097 -msgid "Notification Settings" +#: ../../mod/mitem.php:122 +msgid "Edit element" msgstr "" -#: ../../mod/settings.php:1098 -msgid "By default post a status message when:" +#: ../../mod/mitem.php:123 +msgid "Drop element" msgstr "" -#: ../../mod/settings.php:1099 -msgid "accepting a friend request" +#: ../../mod/mitem.php:124 +msgid "New element" msgstr "" -#: ../../mod/settings.php:1100 -msgid "joining a forum/community" +#: ../../mod/mitem.php:125 +msgid "Edit this menu container" msgstr "" -#: ../../mod/settings.php:1101 -msgid "making an interesting profile change" +#: ../../mod/mitem.php:126 +msgid "Add menu element" msgstr "" -#: ../../mod/settings.php:1102 -msgid "Send a notification email when:" +#: ../../mod/mitem.php:127 +msgid "Delete this menu item" msgstr "" -#: ../../mod/settings.php:1103 -msgid "You receive an introduction" +#: ../../mod/mitem.php:128 +msgid "Edit this menu item" msgstr "" -#: ../../mod/settings.php:1104 -msgid "Your introductions are confirmed" +#: ../../mod/mitem.php:141 +msgid "New Menu Element" msgstr "" -#: ../../mod/settings.php:1105 -msgid "Someone writes on your profile wall" +#: ../../mod/mitem.php:143 ../../mod/mitem.php:184 +msgid "Link text" msgstr "" -#: ../../mod/settings.php:1106 -msgid "Someone writes a followup comment" +#: ../../mod/mitem.php:144 ../../mod/mitem.php:185 +msgid "URL of link" msgstr "" -#: ../../mod/settings.php:1107 -msgid "You receive a private message" +#: ../../mod/mitem.php:145 ../../mod/mitem.php:186 +msgid "Use Red magic-auth if available" msgstr "" -#: ../../mod/settings.php:1108 -msgid "You receive a friend suggestion" +#: ../../mod/mitem.php:146 ../../mod/mitem.php:187 +msgid "Open link in new window" msgstr "" -#: ../../mod/settings.php:1109 -msgid "You are tagged in a post" +#: ../../mod/mitem.php:148 ../../mod/mitem.php:189 +msgid "Order in list" msgstr "" -#: ../../mod/settings.php:1110 -msgid "You are poked/prodded/etc. in a post" +#: ../../mod/mitem.php:148 ../../mod/mitem.php:189 +msgid "Higher numbers will sink to bottom of listing" msgstr "" -#: ../../mod/settings.php:1113 -msgid "Advanced Account/Page Type Settings" +#: ../../mod/mitem.php:161 +msgid "Menu item not found." msgstr "" -#: ../../mod/settings.php:1114 -msgid "Change the behaviour of this account for special situations" +#: ../../mod/mitem.php:170 +msgid "Menu item deleted." msgstr "" -#: ../../mod/viewconnections.php:28 ../../mod/photos.php:576 -#: ../../mod/display.php:9 ../../mod/search.php:80 ../../mod/community.php:18 -#: ../../mod/directory.php:32 -msgid "Public access denied." +#: ../../mod/mitem.php:172 +msgid "Menu item could not be deleted." msgstr "" -#: ../../mod/viewconnections.php:57 -msgid "No connections." +#: ../../mod/mitem.php:181 +msgid "Edit Menu Element" msgstr "" -#: ../../mod/viewconnections.php:69 ../../mod/nogroup.php:40 -#, php-format -msgid "Visit %s's profile [%s]" +#: ../../mod/mitem.php:190 ../../mod/menu.php:107 +msgid "Modify" msgstr "" -#: ../../mod/viewconnections.php:84 -msgid "View Connnections" +#: ../../mod/editwebpage.php:30 ../../mod/editpost.php:20 +#: ../../mod/editlayout.php:36 ../../mod/editblock.php:36 +msgid "Item not found" msgstr "" -#: ../../mod/tagrm.php:41 -msgid "Tag removed" +#: ../../mod/editwebpage.php:87 +msgid "Edit Webpage" msgstr "" -#: ../../mod/tagrm.php:79 -msgid "Remove Item Tag" +#: ../../mod/editwebpage.php:123 ../../mod/editpost.php:101 +#: ../../mod/editlayout.php:104 ../../mod/editblock.php:118 +msgid "Insert YouTube video" msgstr "" -#: ../../mod/tagrm.php:81 -msgid "Select a tag to remove: " +#: ../../mod/editwebpage.php:124 ../../mod/editpost.php:102 +#: ../../mod/editlayout.php:105 ../../mod/editblock.php:119 +msgid "Insert Vorbis [.ogg] video" msgstr "" -#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130 -msgid "Remove" +#: ../../mod/editwebpage.php:125 ../../mod/editpost.php:103 +#: ../../mod/editlayout.php:106 ../../mod/editblock.php:120 +msgid "Insert Vorbis [.ogg] audio" msgstr "" -#: ../../mod/connect.php:59 ../../mod/connect.php:107 -msgid "Continue" +#: ../../mod/editwebpage.php:162 +msgid "Delete Webpage" msgstr "" -#: ../../mod/connect.php:88 -msgid "Premium Channel Setup" +#: ../../mod/profile.php:111 +msgid "Access to this profile has been restricted." msgstr "" -#: ../../mod/connect.php:90 -msgid "Enable premium channel connection restrictions" +#: ../../mod/removeme.php:49 +msgid "Remove This Channel" msgstr "" -#: ../../mod/connect.php:91 +#: ../../mod/removeme.php:50 msgid "" -"Please enter your restrictions or conditions, such as paypal receipt, usage " -"guidelines, etc." +"This will completely remove this channel from the network. Once this has " +"been done it is not recoverable." msgstr "" -#: ../../mod/connect.php:93 ../../mod/connect.php:113 -msgid "" -"This channel may require additional steps or acknowledgement of the " -"following conditions prior to connecting:" +#: ../../mod/removeme.php:51 +msgid "Please enter your password for verification:" msgstr "" -#: ../../mod/connect.php:94 -msgid "" -"Potential connections will then see the following text before proceeding:" +#: ../../mod/removeme.php:52 +msgid "Remove this channel and all its clones from the network" msgstr "" -#: ../../mod/connect.php:95 ../../mod/connect.php:116 +#: ../../mod/removeme.php:52 msgid "" -"By continuing, I certify that I have complied with any instructions provided " -"on this page." +"By default only the instance of the channel located on this hub will be " +"removed from the network" msgstr "" -#: ../../mod/connect.php:104 -msgid "(No specific instructions have been provided by the channel owner.)" +#: ../../mod/removeme.php:53 +msgid "Remove My Account" msgstr "" -#: ../../mod/connect.php:112 -msgid "Restricted or Premium Channel" +#: ../../mod/tagrm.php:41 +msgid "Tag removed" msgstr "" -#: ../../mod/delegate.php:95 -msgid "No potential page delegates located." +#: ../../mod/tagrm.php:79 +msgid "Remove Item Tag" msgstr "" -#: ../../mod/delegate.php:121 -msgid "Delegate Page Management" +#: ../../mod/tagrm.php:81 +msgid "Select a tag to remove: " 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/tagrm.php:93 ../../mod/delegate.php:130 +msgid "Remove" msgstr "" -#: ../../mod/delegate.php:124 -msgid "Existing Page Managers" +#: ../../mod/rmagic.php:56 +msgid "Remote Authentication" msgstr "" -#: ../../mod/delegate.php:126 -msgid "Existing Page Delegates" +#: ../../mod/rmagic.php:57 +msgid "Enter your channel address (e.g. channel@example.com)" msgstr "" -#: ../../mod/delegate.php:128 -msgid "Potential Delegates" +#: ../../mod/rmagic.php:58 +msgid "Authenticate" msgstr "" -#: ../../mod/delegate.php:131 -msgid "Add" +#: ../../mod/lostpass.php:15 +msgid "No valid account found." msgstr "" -#: ../../mod/delegate.php:132 -msgid "No entries." +#: ../../mod/lostpass.php:29 +msgid "Password reset request issued. Check your email." msgstr "" -#: ../../mod/sources.php:27 -msgid "Source created." +#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102 +#, php-format +msgid "Site Member (%s)" msgstr "" -#: ../../mod/sources.php:39 -msgid "Source updated." +#: ../../mod/lostpass.php:40 +#, php-format +msgid "Password reset requested at %s" msgstr "" -#: ../../mod/sources.php:68 -msgid "Manage remote sources of content for your channel." +#: ../../mod/lostpass.php:63 +msgid "" +"Request could not be verified. (You may have previously submitted it.) " +"Password reset failed." msgstr "" -#: ../../mod/sources.php:69 ../../mod/sources.php:79 -msgid "New Source" +#: ../../mod/lostpass.php:86 +msgid "Your password has been reset as requested." msgstr "" -#: ../../mod/sources.php:80 ../../mod/sources.php:106 -msgid "" -"Import all or selected content from the following channel into this channel " -"and distribute it according to your channel settings." +#: ../../mod/lostpass.php:87 +msgid "Your new password is" msgstr "" -#: ../../mod/sources.php:81 ../../mod/sources.php:107 -msgid "Only import content with these words (one per line)" +#: ../../mod/lostpass.php:88 +msgid "Save or copy your new password - and then" msgstr "" -#: ../../mod/sources.php:81 ../../mod/sources.php:107 -msgid "Leave blank to import all public content" +#: ../../mod/lostpass.php:89 +msgid "click here to login" msgstr "" -#: ../../mod/sources.php:82 ../../mod/sources.php:109 -#: ../../mod/new_channel.php:110 -msgid "Channel Name" +#: ../../mod/lostpass.php:90 +msgid "" +"Your password may be changed from the Settings page after " +"successful login." msgstr "" -#: ../../mod/sources.php:96 ../../mod/sources.php:122 -msgid "Source not found." +#: ../../mod/lostpass.php:107 +#, php-format +msgid "Your password has changed at %s" msgstr "" -#: ../../mod/sources.php:103 -msgid "Edit Source" +#: ../../mod/lostpass.php:122 +msgid "Forgot your Password?" msgstr "" -#: ../../mod/sources.php:104 -msgid "Delete Source" +#: ../../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/sources.php:130 -msgid "Source removed" +#: ../../mod/lostpass.php:124 +msgid "Email Address" msgstr "" -#: ../../mod/sources.php:132 -msgid "Unable to remove source." +#: ../../mod/lostpass.php:125 +msgid "Reset" msgstr "" #: ../../mod/admin.php:48 @@ -4078,15 +4038,15 @@ msgstr "" msgid "Site" msgstr "" -#: ../../mod/admin.php:88 ../../mod/admin.php:678 ../../mod/admin.php:690 +#: ../../mod/admin.php:88 ../../mod/admin.php:682 ../../mod/admin.php:694 msgid "Users" msgstr "" -#: ../../mod/admin.php:89 ../../mod/admin.php:776 ../../mod/admin.php:818 +#: ../../mod/admin.php:89 ../../mod/admin.php:780 ../../mod/admin.php:822 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:90 ../../mod/admin.php:981 ../../mod/admin.php:1017 +#: ../../mod/admin.php:90 ../../mod/admin.php:985 ../../mod/admin.php:1021 msgid "Themes" msgstr "" @@ -4098,7 +4058,7 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1104 +#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1108 msgid "Logs" msgstr "" @@ -4115,8 +4075,8 @@ msgid "Message queues" msgstr "" #: ../../mod/admin.php:193 ../../mod/admin.php:416 ../../mod/admin.php:474 -#: ../../mod/admin.php:677 ../../mod/admin.php:775 ../../mod/admin.php:817 -#: ../../mod/admin.php:980 ../../mod/admin.php:1016 ../../mod/admin.php:1103 +#: ../../mod/admin.php:681 ../../mod/admin.php:779 ../../mod/admin.php:821 +#: ../../mod/admin.php:984 ../../mod/admin.php:1020 ../../mod/admin.php:1107 msgid "Administration" msgstr "" @@ -4144,6 +4104,10 @@ msgstr "" msgid "Site settings updated." msgstr "" +#: ../../mod/admin.php:369 ../../mod/settings.php:844 +msgid "No special theme for mobile devices" +msgstr "" + #: ../../mod/admin.php:371 msgid "No special theme for accessibility" msgstr "" @@ -4365,7 +4329,7 @@ msgstr "" msgid "No server found" msgstr "" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:473 ../../mod/admin.php:695 msgid "ID" msgstr "" @@ -4454,2729 +4418,2758 @@ msgstr "" msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:680 +#: ../../mod/admin.php:684 msgid "select all" msgstr "" -#: ../../mod/admin.php:681 +#: ../../mod/admin.php:685 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:682 +#: ../../mod/admin.php:686 msgid "Request date" msgstr "" -#: ../../mod/admin.php:683 +#: ../../mod/admin.php:687 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:684 ../../mod/intro.php:11 ../../mod/intro.php:98 -#: ../../mod/notifications.php:159 ../../mod/notifications.php:206 -msgid "Approve" -msgstr "" - -#: ../../mod/admin.php:685 +#: ../../mod/admin.php:689 msgid "Deny" msgstr "" -#: ../../mod/admin.php:687 ../../mod/intro.php:14 ../../mod/intro.php:99 -#: ../../mod/connections.php:348 ../../mod/connections.php:490 -msgid "Block" -msgstr "" - -#: ../../mod/admin.php:688 ../../mod/connections.php:348 +#: ../../mod/admin.php:692 ../../mod/connections.php:348 #: ../../mod/connections.php:490 msgid "Unblock" msgstr "" -#: ../../mod/admin.php:691 +#: ../../mod/admin.php:695 msgid "Register date" msgstr "" -#: ../../mod/admin.php:691 +#: ../../mod/admin.php:695 msgid "Last login" msgstr "" -#: ../../mod/admin.php:691 +#: ../../mod/admin.php:695 msgid "Expires" msgstr "" -#: ../../mod/admin.php:691 +#: ../../mod/admin.php:695 msgid "Service Class" msgstr "" -#: ../../mod/admin.php:693 +#: ../../mod/admin.php:697 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:694 +#: ../../mod/admin.php:698 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:735 +#: ../../mod/admin.php:739 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:739 +#: ../../mod/admin.php:743 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:749 ../../mod/admin.php:951 +#: ../../mod/admin.php:753 ../../mod/admin.php:955 msgid "Disable" msgstr "" -#: ../../mod/admin.php:751 ../../mod/admin.php:953 +#: ../../mod/admin.php:755 ../../mod/admin.php:957 msgid "Enable" msgstr "" -#: ../../mod/admin.php:777 ../../mod/admin.php:982 +#: ../../mod/admin.php:781 ../../mod/admin.php:986 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:785 ../../mod/admin.php:992 +#: ../../mod/admin.php:789 ../../mod/admin.php:996 msgid "Author: " msgstr "" -#: ../../mod/admin.php:786 ../../mod/admin.php:993 +#: ../../mod/admin.php:790 ../../mod/admin.php:997 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:915 +#: ../../mod/admin.php:919 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:974 +#: ../../mod/admin.php:978 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:1022 +#: ../../mod/admin.php:1026 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:1023 +#: ../../mod/admin.php:1027 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:1050 +#: ../../mod/admin.php:1054 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:1106 +#: ../../mod/admin.php:1110 msgid "Clear" msgstr "" -#: ../../mod/admin.php:1112 +#: ../../mod/admin.php:1116 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:1113 +#: ../../mod/admin.php:1117 msgid "Log file" msgstr "" -#: ../../mod/admin.php:1113 +#: ../../mod/admin.php:1117 msgid "" "Must be writable by web server. Relative to your Red top-level directory." msgstr "" -#: ../../mod/admin.php:1114 +#: ../../mod/admin.php:1118 msgid "Log level" msgstr "" -#: ../../mod/mitem.php:13 ../../mod/menu.php:87 -msgid "Menu not found." +#: ../../mod/follow.php:25 +msgid "Channel added." msgstr "" -#: ../../mod/mitem.php:66 -msgid "Menu element updated." +#: ../../mod/zfinger.php:23 +msgid "invalid target signature" msgstr "" -#: ../../mod/mitem.php:70 -msgid "Unable to update menu element." +#: ../../mod/connections.php:67 +msgid "Could not access contact record." msgstr "" -#: ../../mod/mitem.php:76 -msgid "Menu element added." +#: ../../mod/connections.php:81 +msgid "Could not locate selected profile." msgstr "" -#: ../../mod/mitem.php:80 -msgid "Unable to add menu element." +#: ../../mod/connections.php:124 +msgid "Failed to update connection record." msgstr "" -#: ../../mod/mitem.php:97 ../../mod/xchan.php:25 ../../mod/menu.php:113 -msgid "Not found." +#: ../../mod/connections.php:219 +msgid "Could not access address book record." msgstr "" -#: ../../mod/mitem.php:116 -msgid "Manage Menu Elements" +#: ../../mod/connections.php:233 +msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../mod/mitem.php:119 -msgid "Edit menu" +#: ../../mod/connections.php:240 +msgid "Channel has been unblocked" msgstr "" -#: ../../mod/mitem.php:122 -msgid "Edit element" +#: ../../mod/connections.php:241 +msgid "Channel has been blocked" msgstr "" -#: ../../mod/mitem.php:123 -msgid "Drop element" +#: ../../mod/connections.php:245 ../../mod/connections.php:257 +#: ../../mod/connections.php:269 ../../mod/connections.php:281 +#: ../../mod/connections.php:296 +msgid "Unable to set address book parameters." msgstr "" -#: ../../mod/mitem.php:124 -msgid "New element" +#: ../../mod/connections.php:252 +msgid "Channel has been unignored" msgstr "" -#: ../../mod/mitem.php:125 -msgid "Edit this menu container" +#: ../../mod/connections.php:253 +msgid "Channel has been ignored" msgstr "" -#: ../../mod/mitem.php:126 -msgid "Add menu element" +#: ../../mod/connections.php:264 +msgid "Channel has been unarchived" msgstr "" -#: ../../mod/mitem.php:127 -msgid "Delete this menu item" +#: ../../mod/connections.php:265 +msgid "Channel has been archived" +msgstr "" + +#: ../../mod/connections.php:276 +msgid "Channel has been unhidden" msgstr "" -#: ../../mod/mitem.php:128 -msgid "Edit this menu item" +#: ../../mod/connections.php:277 +msgid "Channel has been hidden" msgstr "" -#: ../../mod/mitem.php:141 -msgid "New Menu Element" +#: ../../mod/connections.php:291 +msgid "Channel has been approved" msgstr "" -#: ../../mod/mitem.php:143 ../../mod/mitem.php:184 -msgid "Link text" +#: ../../mod/connections.php:292 +msgid "Channel has been unapproved" msgstr "" -#: ../../mod/mitem.php:144 ../../mod/mitem.php:185 -msgid "URL of link" +#: ../../mod/connections.php:310 +msgid "Contact has been removed." msgstr "" -#: ../../mod/mitem.php:145 ../../mod/mitem.php:186 -msgid "Use Red magic-auth if available" +#: ../../mod/connections.php:330 +#, php-format +msgid "View %s's profile" msgstr "" -#: ../../mod/mitem.php:146 ../../mod/mitem.php:187 -msgid "Open link in new window" +#: ../../mod/connections.php:334 +msgid "Refresh Permissions" msgstr "" -#: ../../mod/mitem.php:148 ../../mod/mitem.php:189 -msgid "Order in list" +#: ../../mod/connections.php:337 +msgid "Fetch updated permissions" msgstr "" -#: ../../mod/mitem.php:148 ../../mod/mitem.php:189 -msgid "Higher numbers will sink to bottom of listing" +#: ../../mod/connections.php:341 +msgid "Recent Activity" msgstr "" -#: ../../mod/mitem.php:149 ../../mod/menu.php:79 ../../mod/new_channel.php:117 -msgid "Create" +#: ../../mod/connections.php:344 +msgid "View recent posts and comments" msgstr "" -#: ../../mod/mitem.php:161 -msgid "Menu item not found." +#: ../../mod/connections.php:351 +msgid "Block or Unblock this connection" msgstr "" -#: ../../mod/mitem.php:170 -msgid "Menu item deleted." +#: ../../mod/connections.php:355 ../../mod/connections.php:491 +msgid "Unignore" msgstr "" -#: ../../mod/mitem.php:172 -msgid "Menu item could not be deleted." +#: ../../mod/connections.php:358 +msgid "Ignore or Unignore this connection" msgstr "" -#: ../../mod/mitem.php:181 -msgid "Edit Menu Element" +#: ../../mod/connections.php:361 +msgid "Unarchive" msgstr "" -#: ../../mod/mitem.php:190 ../../mod/menu.php:107 -msgid "Modify" +#: ../../mod/connections.php:361 +msgid "Archive" msgstr "" -#: ../../mod/group.php:26 -msgid "Collection created." +#: ../../mod/connections.php:364 +msgid "Archive or Unarchive this connection" msgstr "" -#: ../../mod/group.php:32 -msgid "Could not create collection." +#: ../../mod/connections.php:367 +msgid "Unhide" msgstr "" -#: ../../mod/group.php:60 -msgid "Collection name changed." +#: ../../mod/connections.php:367 +msgid "Hide" msgstr "" -#: ../../mod/group.php:92 -msgid "Create a collection of channels." +#: ../../mod/connections.php:370 +msgid "Hide or Unhide this connection" msgstr "" -#: ../../mod/group.php:93 ../../mod/group.php:189 -msgid "Collection Name: " +#: ../../mod/connections.php:377 +msgid "Delete this connection" msgstr "" -#: ../../mod/group.php:95 ../../mod/group.php:192 -msgid "Members are visible to other channels" +#: ../../mod/connections.php:404 ../../mod/network.php:385 +msgid "Me" msgstr "" -#: ../../mod/group.php:113 -msgid "Collection removed." +#: ../../mod/connections.php:406 ../../mod/network.php:386 +msgid "Best Friends" msgstr "" -#: ../../mod/group.php:115 -msgid "Unable to remove collection." +#: ../../mod/connections.php:408 ../../mod/network.php:389 +msgid "Former Friends" msgstr "" -#: ../../mod/group.php:188 -msgid "Collection Editor" +#: ../../mod/connections.php:409 ../../mod/network.php:390 +msgid "Acquaintances" msgstr "" -#: ../../mod/group.php:202 -msgid "Members" +#: ../../mod/connections.php:410 +msgid "Unknown" msgstr "" -#: ../../mod/group.php:204 -msgid "All Connected Channels" +#: ../../mod/connections.php:420 ../../mod/connections.php:449 +msgid "Approve this connection" msgstr "" -#: ../../mod/group.php:237 -msgid "Click on a channel to add or remove." +#: ../../mod/connections.php:420 +msgid "Accept connection to allow communication" msgstr "" -#: ../../mod/photos.php:83 -msgid "Page owner information could not be retrieved." +#: ../../mod/connections.php:436 +msgid "Automatic Permissions Settings" msgstr "" -#: ../../mod/photos.php:103 -msgid "Album not found." +#: ../../mod/connections.php:436 +#, php-format +msgid "Connections: settings for %s" msgstr "" -#: ../../mod/photos.php:125 ../../mod/photos.php:780 -msgid "Delete Album" +#: ../../mod/connections.php:440 +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/photos.php:165 ../../mod/photos.php:1041 -msgid "Delete Photo" +#: ../../mod/connections.php:442 +msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../mod/photos.php:510 -#, php-format -msgid "%1$s was tagged in %2$s by %3$s" +#: ../../mod/connections.php:448 +msgid "inherited" msgstr "" -#: ../../mod/photos.php:510 -msgid "a photo" +#: ../../mod/connections.php:450 +msgid "Connection has no individual permissions!" msgstr "" -#: ../../mod/photos.php:586 -msgid "No photos selected" +#: ../../mod/connections.php:451 +msgid "" +"This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"." msgstr "" -#: ../../mod/photos.php:631 -msgid "Access to this item is restricted." +#: ../../mod/connections.php:453 +msgid "Profile Visibility" msgstr "" -#: ../../mod/photos.php:696 +#: ../../mod/connections.php:454 #, php-format -msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." msgstr "" -#: ../../mod/photos.php:699 -#, php-format -msgid "You have used %1$.2f Mbytes of photo storage." +#: ../../mod/connections.php:455 +msgid "Contact Information / Notes" msgstr "" -#: ../../mod/photos.php:707 -msgid "Upload Photos" +#: ../../mod/connections.php:456 +msgid "Edit contact notes" msgstr "" -#: ../../mod/photos.php:711 ../../mod/photos.php:775 -msgid "New album name: " +#: ../../mod/connections.php:458 +msgid "Their Settings" msgstr "" -#: ../../mod/photos.php:712 -msgid "or existing album name: " +#: ../../mod/connections.php:459 +msgid "My Settings" msgstr "" -#: ../../mod/photos.php:713 -msgid "Do not show a status post for this upload" +#: ../../mod/connections.php:461 +msgid "Forum Members" msgstr "" -#: ../../mod/photos.php:715 ../../mod/photos.php:1036 -msgid "Permissions" +#: ../../mod/connections.php:462 +msgid "Soapbox" msgstr "" -#: ../../mod/photos.php:764 ../../mod/photos.php:786 ../../mod/photos.php:1212 -#: ../../mod/photos.php:1227 -msgid "Contact Photos" +#: ../../mod/connections.php:463 +msgid "Full Sharing" msgstr "" -#: ../../mod/photos.php:790 -msgid "Edit Album" +#: ../../mod/connections.php:464 +msgid "Cautious Sharing" msgstr "" -#: ../../mod/photos.php:796 -msgid "Show Newest First" +#: ../../mod/connections.php:465 +msgid "Follow Only" msgstr "" -#: ../../mod/photos.php:798 -msgid "Show Oldest First" +#: ../../mod/connections.php:466 +msgid "Individual Permissions" msgstr "" -#: ../../mod/photos.php:842 ../../mod/photos.php:1259 -msgid "View Photo" +#: ../../mod/connections.php:467 +msgid "" +"Some permissions may be inherited from your privacy " +"settings, which have higher priority. Changing those on this page will " +"have no effect." msgstr "" -#: ../../mod/photos.php:886 -msgid "Permission denied. Access to this item may be restricted." +#: ../../mod/connections.php:468 +msgid "Advanced Permissions" msgstr "" -#: ../../mod/photos.php:888 -msgid "Photo not available" +#: ../../mod/connections.php:469 +msgid "Quick Links" msgstr "" -#: ../../mod/photos.php:946 -msgid "Use as profile photo" +#: ../../mod/connections.php:473 +#, php-format +msgid "Visit %s's profile - %s" msgstr "" -#: ../../mod/photos.php:970 -msgid "View Full Size" +#: ../../mod/connections.php:474 +msgid "Block/Unblock contact" msgstr "" -#: ../../mod/photos.php:1024 -msgid "Edit photo" +#: ../../mod/connections.php:475 +msgid "Ignore contact" msgstr "" -#: ../../mod/photos.php:1026 -msgid "Rotate CW (right)" +#: ../../mod/connections.php:476 +msgid "Repair URL settings" msgstr "" -#: ../../mod/photos.php:1027 -msgid "Rotate CCW (left)" +#: ../../mod/connections.php:477 +msgid "View conversations" msgstr "" -#: ../../mod/photos.php:1029 -msgid "New album name" +#: ../../mod/connections.php:479 +msgid "Delete contact" msgstr "" -#: ../../mod/photos.php:1032 -msgid "Caption" +#: ../../mod/connections.php:482 +msgid "Last update:" msgstr "" -#: ../../mod/photos.php:1034 -msgid "Add a Tag" +#: ../../mod/connections.php:484 +msgid "Update public posts" msgstr "" -#: ../../mod/photos.php:1038 -msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" +#: ../../mod/connections.php:486 +msgid "Update now" msgstr "" -#: ../../mod/photos.php:1265 -msgid "View Album" +#: ../../mod/connections.php:492 +msgid "Currently blocked" msgstr "" -#: ../../mod/photos.php:1274 -msgid "Recent Photos" +#: ../../mod/connections.php:493 +msgid "Currently ignored" msgstr "" -#: ../../mod/ping.php:160 -msgid "sent you a private message" +#: ../../mod/connections.php:494 +msgid "Currently archived" msgstr "" -#: ../../mod/ping.php:218 -msgid "added your channel" +#: ../../mod/connections.php:495 +msgid "Currently pending" msgstr "" -#: ../../mod/ping.php:230 ../../boot.php:1858 ../../boot.php:1938 -msgid "g A l F d" +#: ../../mod/connections.php:496 +msgid "" +"Replies/likes to your public posts may still be visible" msgstr "" -#: ../../mod/ping.php:252 ../../boot.php:1904 ../../boot.php:1979 -msgid "[today]" +#: ../../mod/connections.php:532 ../../mod/connections.php:604 +msgid "Blocked" msgstr "" -#: ../../mod/ping.php:262 -msgid "posted an event" +#: ../../mod/connections.php:537 ../../mod/connections.php:611 +msgid "Ignored" msgstr "" -#: ../../mod/filer.php:35 -msgid "- select -" +#: ../../mod/connections.php:542 ../../mod/connections.php:625 +msgid "Hidden" msgstr "" -#: ../../mod/menu.php:17 -msgid "Menu updated." +#: ../../mod/connections.php:547 ../../mod/connections.php:618 +msgid "Archived" msgstr "" -#: ../../mod/menu.php:21 -msgid "Unable to update menu." +#: ../../mod/connections.php:552 ../../mod/network.php:321 +#: ../../mod/menu.php:57 +msgid "New" msgstr "" -#: ../../mod/menu.php:26 -msgid "Menu created." +#: ../../mod/connections.php:558 +msgid "All" msgstr "" -#: ../../mod/menu.php:30 -msgid "Unable to create menu." +#: ../../mod/connections.php:579 +msgid "Suggestions" msgstr "" -#: ../../mod/menu.php:53 -msgid "Manage Menus" +#: ../../mod/connections.php:582 +msgid "Suggest new connections" msgstr "" -#: ../../mod/menu.php:56 -msgid "Drop" +#: ../../mod/connections.php:588 +msgid "Show pending (new) connections" msgstr "" -#: ../../mod/menu.php:57 ../../mod/network.php:321 -#: ../../mod/connections.php:552 -msgid "New" +#: ../../mod/connections.php:591 +msgid "All Connections" msgstr "" -#: ../../mod/menu.php:58 -msgid "Create a new menu" +#: ../../mod/connections.php:594 +msgid "Show all connections" msgstr "" -#: ../../mod/menu.php:59 -msgid "Delete this menu" +#: ../../mod/connections.php:597 +msgid "Unblocked" msgstr "" -#: ../../mod/menu.php:60 ../../mod/menu.php:104 -msgid "Edit menu contents" +#: ../../mod/connections.php:600 +msgid "Only show unblocked connections" msgstr "" -#: ../../mod/menu.php:61 -msgid "Edit this menu" +#: ../../mod/connections.php:607 +msgid "Only show blocked connections" msgstr "" -#: ../../mod/menu.php:76 -msgid "New Menu" +#: ../../mod/connections.php:614 +msgid "Only show ignored connections" msgstr "" -#: ../../mod/menu.php:77 ../../mod/menu.php:105 -msgid "Menu name" +#: ../../mod/connections.php:621 +msgid "Only show archived connections" msgstr "" -#: ../../mod/menu.php:77 ../../mod/menu.php:105 -msgid "Must be unique, only seen by you" +#: ../../mod/connections.php:628 +msgid "Only show hidden connections" msgstr "" -#: ../../mod/menu.php:78 ../../mod/menu.php:106 -msgid "Menu title" +#: ../../mod/connections.php:670 +#, php-format +msgid "%1$s [%2$s]" msgstr "" -#: ../../mod/menu.php:78 ../../mod/menu.php:106 -msgid "Menu title as seen by others" +#: ../../mod/connections.php:671 ../../mod/nogroup.php:41 +msgid "Edit contact" msgstr "" -#: ../../mod/menu.php:93 -msgid "Menu deleted." +#: ../../mod/connections.php:695 +msgid "Search your connections" msgstr "" -#: ../../mod/menu.php:95 -msgid "Menu could not be deleted." +#: ../../mod/connections.php:696 +msgid "Finding: " msgstr "" -#: ../../mod/menu.php:101 -msgid "Edit Menu" +#: ../../mod/network.php:302 +msgid "Commented Order" msgstr "" -#: ../../mod/menu.php:103 -msgid "Add or remove entries to this menu" +#: ../../mod/network.php:305 +msgid "Sort by Comment Date" msgstr "" -#: ../../mod/home.php:76 -#, php-format -msgid "Welcome to %s" +#: ../../mod/network.php:308 +msgid "Posted Order" msgstr "" -#: ../../mod/message.php:19 -msgid "Check Mail" +#: ../../mod/network.php:311 +msgid "Sort by Post Date" msgstr "" -#: ../../mod/message.php:56 -msgid "Unable to lookup recipient." +#: ../../mod/network.php:315 ../../mod/notifications.php:86 +msgid "Personal" msgstr "" -#: ../../mod/message.php:64 -msgid "Unable to communicate with requested channel." +#: ../../mod/network.php:318 +msgid "Posts that mention or involve you" msgstr "" -#: ../../mod/message.php:71 -msgid "Cannot verify requested channel." +#: ../../mod/network.php:324 +msgid "Activity Stream - by date" msgstr "" -#: ../../mod/message.php:97 -msgid "Selected channel has private message restrictions. Send failed." +#: ../../mod/network.php:331 +msgid "Starred" msgstr "" -#: ../../mod/message.php:223 ../../mod/notifications.php:101 -msgid "Messages" +#: ../../mod/network.php:334 +msgid "Favourite Posts" msgstr "" -#: ../../mod/message.php:234 -msgid "Message deleted." +#: ../../mod/network.php:341 +msgid "Spam" msgstr "" -#: ../../mod/message.php:241 -msgid "Conversation removed." +#: ../../mod/network.php:344 +msgid "Posts flagged as SPAM" msgstr "" -#: ../../mod/message.php:258 -msgid "Message recalled." +#: ../../mod/network.php:384 +msgid "Refresh" msgstr "" -#: ../../mod/message.php:316 -msgid "Send Private Message" +#: ../../mod/network.php:388 +msgid "Co-workers" msgstr "" -#: ../../mod/message.php:317 ../../mod/message.php:503 -msgid "To:" +#: ../../mod/network.php:391 +msgid "Everybody" msgstr "" -#: ../../mod/message.php:322 ../../mod/message.php:505 -msgid "Subject:" +#: ../../mod/network.php:408 +msgid "Search Results For:" msgstr "" -#: ../../mod/message.php:359 -msgid "No messages." +#: ../../mod/network.php:453 +msgid "No such group" msgstr "" -#: ../../mod/message.php:375 ../../mod/message.php:472 -msgid "Delete message" +#: ../../mod/network.php:484 +msgid "Connection: " msgstr "" -#: ../../mod/message.php:377 -msgid "D, d M Y - g:i A" +#: ../../mod/network.php:487 +msgid "Invalid connection." msgstr "" -#: ../../mod/message.php:396 -msgid "Message not found." +#: ../../mod/filestorage.php:35 +msgid "Permission Denied." msgstr "" -#: ../../mod/message.php:473 -msgid "Recall message" +#: ../../mod/filestorage.php:42 +msgid "Permission denied. VS." msgstr "" -#: ../../mod/message.php:475 -msgid "Message has been recalled." +#: ../../mod/filestorage.php:79 +msgid "Download" msgstr "" -#: ../../mod/message.php:492 -msgid "Private Conversation" +#: ../../mod/filestorage.php:84 +msgid "Used: " msgstr "" -#: ../../mod/message.php:496 -msgid "Delete conversation" +#: ../../mod/filestorage.php:86 +msgid "Limit: " msgstr "" -#: ../../mod/message.php:498 -msgid "" -"No secure communications available. You may be able to " -"respond from the sender's profile page." +#: ../../mod/page.php:35 +msgid "Invalid item." msgstr "" -#: ../../mod/message.php:502 -msgid "Send Reply" +#: ../../mod/import.php:36 +msgid "Nothing to import." msgstr "" -#: ../../mod/hcard.php:10 -msgid "No profile" +#: ../../mod/import.php:58 +msgid "Unable to download data from old server" msgstr "" -#: ../../mod/layouts.php:52 -msgid "Layout Help" +#: ../../mod/import.php:64 +msgid "Imported file is empty." msgstr "" -#: ../../mod/layouts.php:55 -msgid "Help with this feature" +#: ../../mod/import.php:88 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../mod/layouts.php:74 -msgid "Layout Name" +#: ../../mod/import.php:106 +msgid "Channel clone failed. Import failed." msgstr "" -#: ../../mod/help.php:41 -msgid "Help:" +#: ../../mod/import.php:116 +msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../mod/help.php:53 ../../index.php:226 -msgid "Not Found" +#: ../../mod/import.php:356 +msgid "Import completed." msgstr "" -#: ../../mod/rmagic.php:56 -msgid "Remote Authentication" +#: ../../mod/import.php:369 +msgid "You must be logged in to use this feature." msgstr "" -#: ../../mod/rmagic.php:57 -msgid "Enter your channel address (e.g. channel@example.com)" +#: ../../mod/import.php:374 +msgid "Import Channel" msgstr "" -#: ../../mod/rmagic.php:58 -msgid "Authenticate" +#: ../../mod/import.php:375 +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/network.php:164 ../../mod/search.php:20 -msgid "Remove term" +#: ../../mod/import.php:376 +msgid "File to Upload" msgstr "" -#: ../../mod/network.php:302 -msgid "Commented Order" +#: ../../mod/import.php:377 +msgid "Or provide the old server/hub details" msgstr "" -#: ../../mod/network.php:305 -msgid "Sort by Comment Date" +#: ../../mod/import.php:378 +msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../mod/network.php:308 -msgid "Posted Order" +#: ../../mod/import.php:379 +msgid "Your old login email address" msgstr "" -#: ../../mod/network.php:311 -msgid "Sort by Post Date" +#: ../../mod/import.php:380 +msgid "Your old login password" msgstr "" -#: ../../mod/network.php:315 ../../mod/notifications.php:86 -msgid "Personal" +#: ../../mod/import.php:381 +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/network.php:318 -msgid "Posts that mention or involve you" +#: ../../mod/import.php:382 +msgid "Make this hub my primary location" msgstr "" -#: ../../mod/network.php:324 -msgid "Activity Stream - by date" +#: ../../mod/notify.php:54 ../../mod/notifications.php:332 +msgid "No more system notifications." msgstr "" -#: ../../mod/network.php:331 -msgid "Starred" +#: ../../mod/notify.php:58 ../../mod/notifications.php:336 +msgid "System Notifications" msgstr "" -#: ../../mod/network.php:334 -msgid "Favourite Posts" +#: ../../mod/api.php:76 ../../mod/api.php:102 +msgid "Authorize application connection" msgstr "" -#: ../../mod/network.php:341 -msgid "Spam" +#: ../../mod/api.php:77 +msgid "Return to your app and insert this Securty Code:" msgstr "" -#: ../../mod/network.php:344 -msgid "Posts flagged as SPAM" +#: ../../mod/api.php:89 +msgid "Please login to continue." msgstr "" -#: ../../mod/network.php:384 -msgid "Refresh" +#: ../../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/network.php:385 ../../mod/connections.php:404 -msgid "Me" +#: ../../mod/api.php:105 ../../mod/settings.php:1009 +#: ../../mod/settings.php:1014 ../../mod/settings.php:1037 +#: ../../mod/settings.php:1039 ../../mod/settings.php:1040 +#: ../../mod/settings.php:1041 ../../mod/profiles.php:506 +msgid "Yes" msgstr "" -#: ../../mod/network.php:386 ../../mod/connections.php:406 -msgid "Best Friends" +#: ../../mod/api.php:106 ../../mod/settings.php:1009 +#: ../../mod/settings.php:1014 ../../mod/settings.php:1037 +#: ../../mod/settings.php:1039 ../../mod/settings.php:1040 +#: ../../mod/settings.php:1041 ../../mod/profiles.php:507 +msgid "No" msgstr "" -#: ../../mod/network.php:388 -msgid "Co-workers" +#: ../../mod/directory.php:160 ../../mod/profiles.php:584 +msgid "Age: " msgstr "" -#: ../../mod/network.php:389 ../../mod/connections.php:408 -msgid "Former Friends" +#: ../../mod/directory.php:163 +msgid "Gender: " msgstr "" -#: ../../mod/network.php:390 ../../mod/connections.php:409 -msgid "Acquaintances" +#: ../../mod/directory.php:222 +msgid "Finding:" msgstr "" -#: ../../mod/network.php:391 -msgid "Everybody" +#: ../../mod/directory.php:230 +msgid "next page" msgstr "" -#: ../../mod/network.php:408 -msgid "Search Results For:" +#: ../../mod/directory.php:230 +msgid "previous page" msgstr "" -#: ../../mod/network.php:453 -msgid "No such group" +#: ../../mod/directory.php:237 +msgid "No entries (some entries may be hidden)." msgstr "" -#: ../../mod/network.php:484 -msgid "Connection: " +#: ../../mod/home.php:76 +#, php-format +msgid "Welcome to %s" msgstr "" -#: ../../mod/network.php:487 -msgid "Invalid connection." +#: ../../mod/delegate.php:95 +msgid "No potential page delegates located." 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" +#: ../../mod/delegate.php:121 +msgid "Delegate Page Management" msgstr "" -#: ../../mod/intro.php:29 ../../mod/connections.php:122 -msgid "Connection updated." +#: ../../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/intro.php:31 -msgid "Connection update failed." +#: ../../mod/delegate.php:124 +msgid "Existing Page Managers" msgstr "" -#: ../../mod/intro.php:56 -msgid "Introductions and Connection Requests" +#: ../../mod/delegate.php:126 +msgid "Existing Page Delegates" msgstr "" -#: ../../mod/intro.php:67 -msgid "No pending introductions." +#: ../../mod/delegate.php:128 +msgid "Potential Delegates" msgstr "" -#: ../../mod/intro.php:72 -msgid "System error. Please try again later." +#: ../../mod/delegate.php:131 +msgid "Add" msgstr "" -#: ../../mod/intro.php:95 ../../mod/connections.php:496 -#: ../../mod/notifications.php:155 ../../mod/notifications.php:202 -msgid "Hide this contact from others" +#: ../../mod/delegate.php:132 +msgid "No entries." msgstr "" -#: ../../mod/intro.php:96 ../../mod/notifications.php:156 -#: ../../mod/notifications.php:203 -msgid "Post a new friend activity" +#: ../../mod/register.php:43 +msgid "Maximum daily site registrations exceeded. Please try again tomorrow." msgstr "" -#: ../../mod/intro.php:96 ../../mod/notifications.php:156 -#: ../../mod/notifications.php:203 -msgid "if applicable" +#: ../../mod/register.php:49 +msgid "" +"Please indicate acceptance of the Terms of Service. Registration failed." msgstr "" -#: ../../mod/intro.php:101 ../../mod/notifications.php:35 -#: ../../mod/notifications.php:163 ../../mod/notifications.php:209 -msgid "Discard" +#: ../../mod/register.php:77 +msgid "Passwords do not match." msgstr "" -#: ../../mod/connections.php:67 -msgid "Could not access contact record." +#: ../../mod/register.php:105 +msgid "" +"Registration successful. Please check your email for validation instructions." msgstr "" -#: ../../mod/connections.php:81 -msgid "Could not locate selected profile." +#: ../../mod/register.php:111 +msgid "Your registration is pending approval by the site owner." msgstr "" -#: ../../mod/connections.php:124 -msgid "Failed to update connection record." +#: ../../mod/register.php:114 +msgid "Your registration can not be processed." msgstr "" -#: ../../mod/connections.php:219 -msgid "Could not access address book record." +#: ../../mod/register.php:149 +msgid "" +"This site has exceeded the number of allowed daily account registrations. " +"Please try again tomorrow." msgstr "" -#: ../../mod/connections.php:233 -msgid "Refresh failed - channel is currently unavailable." +#: ../../mod/register.php:160 +msgid "Terms of Service" msgstr "" -#: ../../mod/connections.php:240 -msgid "Channel has been unblocked" +#: ../../mod/register.php:166 +#, php-format +msgid "I accept the %s for this website" msgstr "" -#: ../../mod/connections.php:241 -msgid "Channel has been blocked" +#: ../../mod/register.php:168 +#, php-format +msgid "I am over 13 years of age and accept the %s for this website" msgstr "" -#: ../../mod/connections.php:245 ../../mod/connections.php:257 -#: ../../mod/connections.php:269 ../../mod/connections.php:281 -#: ../../mod/connections.php:296 -msgid "Unable to set address book parameters." +#: ../../mod/register.php:183 +msgid "Membership on this site is by invitation only." msgstr "" -#: ../../mod/connections.php:252 -msgid "Channel has been unignored" +#: ../../mod/register.php:184 +msgid "Please enter your invitation code" msgstr "" -#: ../../mod/connections.php:253 -msgid "Channel has been ignored" +#: ../../mod/register.php:187 +msgid "Your email address" msgstr "" -#: ../../mod/connections.php:264 -msgid "Channel has been unarchived" +#: ../../mod/register.php:188 +msgid "Choose a password" msgstr "" -#: ../../mod/connections.php:265 -msgid "Channel has been archived" +#: ../../mod/register.php:189 +msgid "Please re-enter your password" msgstr "" -#: ../../mod/connections.php:276 -msgid "Channel has been unhidden" +#: ../../mod/hcard.php:10 +msgid "No profile" msgstr "" -#: ../../mod/connections.php:277 -msgid "Channel has been hidden" +#: ../../mod/editpost.php:31 +msgid "Item is not editable" msgstr "" -#: ../../mod/connections.php:291 -msgid "Channel has been approved" +#: ../../mod/invite.php:25 +msgid "Total invitation limit exceeded." msgstr "" -#: ../../mod/connections.php:292 -msgid "Channel has been unapproved" +#: ../../mod/invite.php:47 +#, php-format +msgid "%s : Not a valid email address." msgstr "" -#: ../../mod/connections.php:310 -msgid "Contact has been removed." +#: ../../mod/invite.php:74 +msgid "Please join us on Red" msgstr "" -#: ../../mod/connections.php:330 -#, php-format -msgid "View %s's profile" +#: ../../mod/invite.php:85 +msgid "Invitation limit exceeded. Please contact your site administrator." msgstr "" -#: ../../mod/connections.php:334 -msgid "Refresh Permissions" +#: ../../mod/invite.php:90 +#, php-format +msgid "%s : Message delivery failed." msgstr "" -#: ../../mod/connections.php:337 -msgid "Fetch updated permissions" -msgstr "" +#: ../../mod/invite.php:94 +#, php-format +msgid "%d message sent." +msgid_plural "%d messages sent." +msgstr[0] "" +msgstr[1] "" -#: ../../mod/connections.php:341 -msgid "Recent Activity" +#: ../../mod/invite.php:113 +msgid "You have no more invitations available" msgstr "" -#: ../../mod/connections.php:344 -msgid "View recent posts and comments" +#: ../../mod/invite.php:139 +msgid "Send invitations" msgstr "" -#: ../../mod/connections.php:351 -msgid "Block or Unblock this connection" +#: ../../mod/invite.php:140 +msgid "Enter email addresses, one per line:" msgstr "" -#: ../../mod/connections.php:355 ../../mod/connections.php:491 -msgid "Unignore" +#: ../../mod/invite.php:142 +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/connections.php:358 -msgid "Ignore or Unignore this connection" +#: ../../mod/invite.php:144 +msgid "You will need to supply this invitation code: $invite_code" msgstr "" -#: ../../mod/connections.php:361 -msgid "Unarchive" +#: ../../mod/invite.php:145 +msgid "Please visit my channel at" msgstr "" -#: ../../mod/connections.php:361 -msgid "Archive" +#: ../../mod/invite.php:149 +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/connections.php:364 -msgid "Archive or Unarchive this connection" +#: ../../mod/invite.php:151 +msgid "Click the [Register] link on the following page to join." msgstr "" - -#: ../../mod/connections.php:367 -msgid "Unhide" + +#: ../../mod/invite.php:153 +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 "" -#: ../../mod/connections.php:367 -msgid "Hide" +#: ../../mod/group.php:26 +msgid "Collection created." msgstr "" -#: ../../mod/connections.php:370 -msgid "Hide or Unhide this connection" +#: ../../mod/group.php:32 +msgid "Could not create collection." msgstr "" -#: ../../mod/connections.php:377 -msgid "Delete this connection" +#: ../../mod/group.php:60 +msgid "Collection name changed." msgstr "" -#: ../../mod/connections.php:410 -msgid "Unknown" +#: ../../mod/group.php:92 +msgid "Create a collection of channels." msgstr "" -#: ../../mod/connections.php:420 ../../mod/connections.php:449 -msgid "Approve this connection" +#: ../../mod/group.php:93 ../../mod/group.php:189 +msgid "Collection Name: " msgstr "" -#: ../../mod/connections.php:420 -msgid "Accept connection to allow communication" +#: ../../mod/group.php:95 ../../mod/group.php:192 +msgid "Members are visible to other channels" msgstr "" -#: ../../mod/connections.php:436 -msgid "Automatic Permissions Settings" +#: ../../mod/group.php:113 +msgid "Collection removed." msgstr "" -#: ../../mod/connections.php:436 -#, php-format -msgid "Connections: settings for %s" +#: ../../mod/group.php:115 +msgid "Unable to remove collection." msgstr "" -#: ../../mod/connections.php:440 -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/group.php:188 +msgid "Collection Editor" msgstr "" -#: ../../mod/connections.php:442 -msgid "Slide to adjust your degree of friendship" +#: ../../mod/group.php:202 +msgid "Members" msgstr "" -#: ../../mod/connections.php:448 -msgid "inherited" +#: ../../mod/group.php:204 +msgid "All Connected Channels" msgstr "" -#: ../../mod/connections.php:450 -msgid "Connection has no individual permissions!" +#: ../../mod/group.php:237 +msgid "Click on a channel to add or remove." msgstr "" -#: ../../mod/connections.php:451 -msgid "" -"This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"." +#: ../../mod/regmod.php:12 +msgid "Please login." msgstr "" -#: ../../mod/connections.php:453 -msgid "Profile Visibility" +#: ../../mod/photos.php:83 +msgid "Page owner information could not be retrieved." msgstr "" -#: ../../mod/connections.php:454 -#, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." +#: ../../mod/photos.php:103 +msgid "Album not found." msgstr "" -#: ../../mod/connections.php:455 -msgid "Contact Information / Notes" +#: ../../mod/photos.php:125 ../../mod/photos.php:780 +msgid "Delete Album" msgstr "" -#: ../../mod/connections.php:456 -msgid "Edit contact notes" +#: ../../mod/photos.php:165 ../../mod/photos.php:1041 +msgid "Delete Photo" msgstr "" -#: ../../mod/connections.php:458 -msgid "Their Settings" +#: ../../mod/photos.php:510 +#, php-format +msgid "%1$s was tagged in %2$s by %3$s" msgstr "" -#: ../../mod/connections.php:459 -msgid "My Settings" +#: ../../mod/photos.php:510 +msgid "a photo" msgstr "" -#: ../../mod/connections.php:461 -msgid "Forum Members" +#: ../../mod/photos.php:586 +msgid "No photos selected" msgstr "" -#: ../../mod/connections.php:462 -msgid "Soapbox" +#: ../../mod/photos.php:631 +msgid "Access to this item is restricted." msgstr "" -#: ../../mod/connections.php:463 -msgid "Full Sharing" +#: ../../mod/photos.php:696 +#, php-format +msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "" -#: ../../mod/connections.php:464 -msgid "Cautious Sharing" +#: ../../mod/photos.php:699 +#, php-format +msgid "You have used %1$.2f Mbytes of photo storage." msgstr "" -#: ../../mod/connections.php:465 -msgid "Follow Only" +#: ../../mod/photos.php:707 +msgid "Upload Photos" msgstr "" -#: ../../mod/connections.php:466 -msgid "Individual Permissions" +#: ../../mod/photos.php:711 ../../mod/photos.php:775 +msgid "New album name: " msgstr "" -#: ../../mod/connections.php:467 -msgid "" -"Some permissions may be inherited from your privacy " -"settings, which have higher priority. Changing those on this page will " -"have no effect." +#: ../../mod/photos.php:712 +msgid "or existing album name: " msgstr "" -#: ../../mod/connections.php:468 -msgid "Advanced Permissions" +#: ../../mod/photos.php:713 +msgid "Do not show a status post for this upload" msgstr "" -#: ../../mod/connections.php:469 -msgid "Quick Links" +#: ../../mod/photos.php:715 ../../mod/photos.php:1036 +msgid "Permissions" msgstr "" -#: ../../mod/connections.php:473 -#, php-format -msgid "Visit %s's profile - %s" +#: ../../mod/photos.php:764 ../../mod/photos.php:786 ../../mod/photos.php:1212 +#: ../../mod/photos.php:1227 +msgid "Contact Photos" msgstr "" -#: ../../mod/connections.php:474 -msgid "Block/Unblock contact" +#: ../../mod/photos.php:790 +msgid "Edit Album" msgstr "" -#: ../../mod/connections.php:475 -msgid "Ignore contact" +#: ../../mod/photos.php:796 +msgid "Show Newest First" msgstr "" -#: ../../mod/connections.php:476 -msgid "Repair URL settings" +#: ../../mod/photos.php:798 +msgid "Show Oldest First" msgstr "" -#: ../../mod/connections.php:477 -msgid "View conversations" +#: ../../mod/photos.php:842 ../../mod/photos.php:1259 +msgid "View Photo" msgstr "" -#: ../../mod/connections.php:479 -msgid "Delete contact" +#: ../../mod/photos.php:886 +msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/connections.php:482 -msgid "Last update:" +#: ../../mod/photos.php:888 +msgid "Photo not available" msgstr "" -#: ../../mod/connections.php:484 -msgid "Update public posts" +#: ../../mod/photos.php:946 +msgid "Use as profile photo" msgstr "" -#: ../../mod/connections.php:486 -msgid "Update now" +#: ../../mod/photos.php:970 +msgid "View Full Size" msgstr "" -#: ../../mod/connections.php:492 -msgid "Currently blocked" +#: ../../mod/photos.php:1024 +msgid "Edit photo" msgstr "" -#: ../../mod/connections.php:493 -msgid "Currently ignored" +#: ../../mod/photos.php:1026 +msgid "Rotate CW (right)" msgstr "" -#: ../../mod/connections.php:494 -msgid "Currently archived" +#: ../../mod/photos.php:1027 +msgid "Rotate CCW (left)" msgstr "" -#: ../../mod/connections.php:495 -msgid "Currently pending" +#: ../../mod/photos.php:1029 +msgid "New album name" msgstr "" -#: ../../mod/connections.php:496 -msgid "" -"Replies/likes to your public posts may still be visible" +#: ../../mod/photos.php:1032 +msgid "Caption" msgstr "" -#: ../../mod/connections.php:532 ../../mod/connections.php:604 -msgid "Blocked" +#: ../../mod/photos.php:1034 +msgid "Add a Tag" msgstr "" -#: ../../mod/connections.php:537 ../../mod/connections.php:611 -msgid "Ignored" +#: ../../mod/photos.php:1038 +msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/connections.php:542 ../../mod/connections.php:625 -msgid "Hidden" +#: ../../mod/photos.php:1265 +msgid "View Album" msgstr "" -#: ../../mod/connections.php:547 ../../mod/connections.php:618 -msgid "Archived" +#: ../../mod/photos.php:1274 +msgid "Recent Photos" msgstr "" -#: ../../mod/connections.php:558 -msgid "All" +#: ../../mod/editlayout.php:68 +msgid "Edit Layout" msgstr "" -#: ../../mod/connections.php:579 -msgid "Suggestions" +#: ../../mod/editlayout.php:140 +msgid "Delete Layout" msgstr "" -#: ../../mod/connections.php:582 -msgid "Suggest new connections" +#: ../../mod/common.php:10 +msgid "No channel." msgstr "" -#: ../../mod/connections.php:588 -msgid "Show pending (new) connections" +#: ../../mod/common.php:47 +msgid "Common connections" msgstr "" -#: ../../mod/connections.php:591 -msgid "All Connections" +#: ../../mod/common.php:52 +msgid "No connections in common." msgstr "" -#: ../../mod/connections.php:594 -msgid "Show all connections" +#: ../../mod/layouts.php:52 +msgid "Layout Help" msgstr "" -#: ../../mod/connections.php:597 -msgid "Unblocked" +#: ../../mod/layouts.php:55 +msgid "Help with this feature" msgstr "" -#: ../../mod/connections.php:600 -msgid "Only show unblocked connections" +#: ../../mod/layouts.php:74 +msgid "Layout Name" msgstr "" -#: ../../mod/connections.php:607 -msgid "Only show blocked connections" +#: ../../mod/filer.php:35 +msgid "- select -" msgstr "" -#: ../../mod/connections.php:614 -msgid "Only show ignored connections" +#: ../../mod/viewconnections.php:57 +msgid "No connections." msgstr "" -#: ../../mod/connections.php:621 -msgid "Only show archived connections" +#: ../../mod/viewconnections.php:69 ../../mod/nogroup.php:40 +#, php-format +msgid "Visit %s's profile [%s]" msgstr "" -#: ../../mod/connections.php:628 -msgid "Only show hidden connections" +#: ../../mod/viewconnections.php:84 +msgid "View Connnections" msgstr "" -#: ../../mod/connections.php:670 +#: ../../mod/subthread.php:105 #, php-format -msgid "%1$s [%2$s]" +msgid "%1$s is following %2$s's %3$s" msgstr "" -#: ../../mod/connections.php:671 ../../mod/nogroup.php:41 -msgid "Edit contact" +#: ../../mod/apps.php:8 +msgid "No installed applications." msgstr "" -#: ../../mod/connections.php:695 -msgid "Search your connections" +#: ../../mod/apps.php:13 +msgid "Applications" msgstr "" -#: ../../mod/connections.php:696 -msgid "Finding: " +#: ../../mod/suggest.php:41 +msgid "" +"No suggestions available. If this is a new site, please try again in 24 " +"hours." msgstr "" -#: ../../mod/dirsearch.php:21 -msgid "This site is not a directory server" +#: ../../mod/suggest.php:58 +msgid "Ignore/Hide" msgstr "" -#: ../../mod/lockview.php:34 -msgid "Remote privacy information not available." +#: ../../mod/match.php:12 +msgid "Profile Match" msgstr "" -#: ../../mod/lockview.php:43 -msgid "Visible to:" +#: ../../mod/match.php:20 +msgid "No keywords to match. Please add keywords to your default profile." msgstr "" -#: ../../mod/profiles.php:18 ../../mod/profiles.php:138 -#: ../../mod/profiles.php:179 ../../mod/profiles.php:486 -msgid "Profile not found." +#: ../../mod/match.php:57 +msgid "is interested in:" msgstr "" -#: ../../mod/profiles.php:38 -msgid "Profile deleted." +#: ../../mod/match.php:65 +msgid "No matches" msgstr "" -#: ../../mod/profiles.php:56 ../../mod/profiles.php:92 -msgid "Profile-" +#: ../../mod/dirsearch.php:21 +msgid "This site is not a directory server" msgstr "" -#: ../../mod/profiles.php:77 ../../mod/profiles.php:120 -msgid "New profile created." +#: ../../mod/siteinfo.php:51 +#, php-format +msgid "Version %s" msgstr "" -#: ../../mod/profiles.php:98 -msgid "Profile unavailable to clone." +#: ../../mod/siteinfo.php:65 +msgid "Installed plugins/addons/apps:" msgstr "" -#: ../../mod/profiles.php:189 -msgid "Profile Name is required." +#: ../../mod/siteinfo.php:78 +msgid "No installed plugins/addons/apps" msgstr "" -#: ../../mod/profiles.php:317 -msgid "Marital Status" +#: ../../mod/siteinfo.php:81 +msgid "Red" msgstr "" -#: ../../mod/profiles.php:321 -msgid "Romantic Partner" +#: ../../mod/siteinfo.php:82 +msgid "" +"This is a hub of the Red Matrix - a global cooperative network of " +"decentralised privacy enhanced websites." msgstr "" -#: ../../mod/profiles.php:325 -msgid "Likes" +#: ../../mod/siteinfo.php:84 +msgid "Running at web location" msgstr "" -#: ../../mod/profiles.php:329 -msgid "Dislikes" +#: ../../mod/siteinfo.php:85 +msgid "" +"Please visit GetZot.com to learn more " +"about the Red Matrix." msgstr "" -#: ../../mod/profiles.php:333 -msgid "Work/Employment" +#: ../../mod/siteinfo.php:86 +msgid "Bug reports and issues: please visit" msgstr "" -#: ../../mod/profiles.php:336 -msgid "Religion" +#: ../../mod/siteinfo.php:89 +msgid "" +"Suggestions, praise, donations, etc. - please email \"redmatrix\" at " +"librelist - dot com" msgstr "" -#: ../../mod/profiles.php:340 -msgid "Political Views" +#: ../../mod/menu.php:17 +msgid "Menu updated." msgstr "" -#: ../../mod/profiles.php:344 -msgid "Gender" +#: ../../mod/menu.php:21 +msgid "Unable to update menu." msgstr "" -#: ../../mod/profiles.php:348 -msgid "Sexual Preference" +#: ../../mod/menu.php:26 +msgid "Menu created." msgstr "" -#: ../../mod/profiles.php:352 -msgid "Homepage" +#: ../../mod/menu.php:30 +msgid "Unable to create menu." msgstr "" -#: ../../mod/profiles.php:356 -msgid "Interests" +#: ../../mod/menu.php:53 +msgid "Manage Menus" msgstr "" -#: ../../mod/profiles.php:360 -msgid "Address" +#: ../../mod/menu.php:56 +msgid "Drop" msgstr "" -#: ../../mod/profiles.php:367 ../../mod/pubsites.php:31 -msgid "Location" +#: ../../mod/menu.php:58 +msgid "Create a new menu" msgstr "" -#: ../../mod/profiles.php:450 -msgid "Profile updated." +#: ../../mod/menu.php:59 +msgid "Delete this menu" msgstr "" -#: ../../mod/profiles.php:505 -msgid "Hide your contact/friend list from viewers of this profile?" +#: ../../mod/menu.php:60 ../../mod/menu.php:104 +msgid "Edit menu contents" msgstr "" -#: ../../mod/profiles.php:528 -msgid "Edit Profile Details" +#: ../../mod/menu.php:61 +msgid "Edit this menu" msgstr "" -#: ../../mod/profiles.php:530 -msgid "View this profile" +#: ../../mod/menu.php:76 +msgid "New Menu" msgstr "" -#: ../../mod/profiles.php:531 -msgid "Change Profile Photo" +#: ../../mod/menu.php:77 ../../mod/menu.php:105 +msgid "Menu name" msgstr "" -#: ../../mod/profiles.php:532 -msgid "Create a new profile using these settings" +#: ../../mod/menu.php:77 ../../mod/menu.php:105 +msgid "Must be unique, only seen by you" msgstr "" -#: ../../mod/profiles.php:533 -msgid "Clone this profile" +#: ../../mod/menu.php:78 ../../mod/menu.php:106 +msgid "Menu title" msgstr "" -#: ../../mod/profiles.php:534 -msgid "Delete this profile" +#: ../../mod/menu.php:78 ../../mod/menu.php:106 +msgid "Menu title as seen by others" msgstr "" -#: ../../mod/profiles.php:535 -msgid "Profile Name:" +#: ../../mod/menu.php:93 +msgid "Menu deleted." msgstr "" -#: ../../mod/profiles.php:536 -msgid "Your Full Name:" +#: ../../mod/menu.php:95 +msgid "Menu could not be deleted." msgstr "" -#: ../../mod/profiles.php:537 -msgid "Title/Description:" +#: ../../mod/menu.php:101 +msgid "Edit Menu" msgstr "" -#: ../../mod/profiles.php:538 -msgid "Your Gender:" +#: ../../mod/menu.php:103 +msgid "Add or remove entries to this menu" msgstr "" -#: ../../mod/profiles.php:539 -#, php-format -msgid "Birthday (%s):" +#: ../../mod/thing.php:109 +msgid "Object store: failed" msgstr "" -#: ../../mod/profiles.php:540 -msgid "Street Address:" +#: ../../mod/thing.php:113 +msgid "thing/stuff added" msgstr "" -#: ../../mod/profiles.php:541 -msgid "Locality/City:" +#: ../../mod/thing.php:129 +#, php-format +msgid "OBJ: %1$s %2$s %3$s" msgstr "" -#: ../../mod/profiles.php:542 -msgid "Postal/Zip Code:" +#: ../../mod/thing.php:175 +msgid "not yet implemented." msgstr "" -#: ../../mod/profiles.php:543 -msgid "Country:" +#: ../../mod/thing.php:181 +msgid "Add Stuff to your Profile" msgstr "" -#: ../../mod/profiles.php:544 -msgid "Region/State:" +#: ../../mod/thing.php:183 +msgid "Select a profile" msgstr "" -#: ../../mod/profiles.php:545 -msgid "♥ Marital Status:" +#: ../../mod/thing.php:185 +msgid "Select a category of stuff. e.g. I ______ something" msgstr "" -#: ../../mod/profiles.php:546 -msgid "Who: (if applicable)" +#: ../../mod/thing.php:187 +msgid "Name of thing or stuff e.g. something" msgstr "" -#: ../../mod/profiles.php:547 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +#: ../../mod/thing.php:188 +msgid "URL of thing or stuff (optional)" msgstr "" -#: ../../mod/profiles.php:548 -msgid "Since [date]:" +#: ../../mod/thing.php:189 +msgid "URL for photo of thing or stuff (optional)" msgstr "" -#: ../../mod/profiles.php:550 -msgid "Homepage URL:" +#: ../../mod/notifications.php:26 +msgid "Invalid request identifier." msgstr "" -#: ../../mod/profiles.php:553 -msgid "Religious Views:" +#: ../../mod/notifications.php:76 +msgid "System" msgstr "" -#: ../../mod/profiles.php:554 -msgid "Keywords:" +#: ../../mod/notifications.php:96 +msgid "Introductions" msgstr "" -#: ../../mod/profiles.php:557 -msgid "Example: fishing photography software" +#: ../../mod/notifications.php:121 +msgid "Show Ignored Requests" msgstr "" -#: ../../mod/profiles.php:558 -msgid "Used in directory listings" +#: ../../mod/notifications.php:121 +msgid "Hide Ignored Requests" msgstr "" -#: ../../mod/profiles.php:559 -msgid "Tell us about yourself..." +#: ../../mod/notifications.php:147 ../../mod/notifications.php:193 +msgid "Notification type: " msgstr "" -#: ../../mod/profiles.php:560 -msgid "Hobbies/Interests" +#: ../../mod/notifications.php:148 +msgid "Friend Suggestion" msgstr "" -#: ../../mod/profiles.php:561 -msgid "Contact information and Social Networks" +#: ../../mod/notifications.php:150 +#, php-format +msgid "suggested by %s" msgstr "" -#: ../../mod/profiles.php:562 -msgid "My other channels" +#: ../../mod/notifications.php:179 +msgid "Claims to be known to you: " msgstr "" -#: ../../mod/profiles.php:563 -msgid "Musical interests" +#: ../../mod/notifications.php:179 +msgid "yes" msgstr "" -#: ../../mod/profiles.php:564 -msgid "Books, literature" +#: ../../mod/notifications.php:179 +msgid "no" msgstr "" -#: ../../mod/profiles.php:565 -msgid "Television" +#: ../../mod/notifications.php:186 +msgid "Approve as: " +msgstr "" + +#: ../../mod/notifications.php:187 +msgid "Friend" msgstr "" -#: ../../mod/profiles.php:566 -msgid "Film/dance/culture/entertainment" +#: ../../mod/notifications.php:188 +msgid "Sharer" msgstr "" -#: ../../mod/profiles.php:567 -msgid "Love/romance" +#: ../../mod/notifications.php:188 +msgid "Fan/Admirer" msgstr "" -#: ../../mod/profiles.php:568 -msgid "Work/employment" +#: ../../mod/notifications.php:194 +msgid "Friend/Connect Request" msgstr "" -#: ../../mod/profiles.php:569 -msgid "School/education" +#: ../../mod/notifications.php:194 +msgid "New Follower" msgstr "" -#: ../../mod/profiles.php:574 -msgid "" -"This is your public profile.
    It may " -"be visible to anybody using the internet." +#: ../../mod/notifications.php:215 +msgid "No introductions." msgstr "" -#: ../../mod/profiles.php:584 ../../mod/directory.php:160 -msgid "Age: " +#: ../../mod/notifications.php:257 ../../mod/notifications.php:382 +#: ../../mod/notifications.php:465 +#, php-format +msgid "%s liked %s's post" msgstr "" -#: ../../mod/profiles.php:623 -msgid "Edit/Manage Profiles" +#: ../../mod/notifications.php:266 ../../mod/notifications.php:391 +#: ../../mod/notifications.php:474 +#, php-format +msgid "%s disliked %s's post" msgstr "" -#: ../../mod/profiles.php:624 ../../boot.php:1755 -msgid "Change profile photo" +#: ../../mod/notifications.php:280 ../../mod/notifications.php:405 +#: ../../mod/notifications.php:488 +#, php-format +msgid "%s is now friends with %s" msgstr "" -#: ../../mod/profiles.php:625 ../../boot.php:1762 -msgid "Create New Profile" +#: ../../mod/notifications.php:287 ../../mod/notifications.php:412 +#, php-format +msgid "%s created a new post" msgstr "" -#: ../../mod/profiles.php:636 ../../boot.php:1776 -msgid "Profile Image" +#: ../../mod/notifications.php:288 ../../mod/notifications.php:413 +#: ../../mod/notifications.php:497 +#, php-format +msgid "%s commented on %s's post" msgstr "" -#: ../../mod/profiles.php:639 ../../boot.php:1779 -msgid "visible to everybody" +#: ../../mod/notifications.php:302 +msgid "No more network notifications." msgstr "" -#: ../../mod/profiles.php:640 ../../boot.php:1780 -msgid "Edit visibility" +#: ../../mod/notifications.php:306 +msgid "Network Notifications" msgstr "" -#: ../../mod/new_channel.php:107 -msgid "Add a Channel" +#: ../../mod/notifications.php:427 +msgid "No more personal notifications." 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/notifications.php:431 +msgid "Personal Notifications" msgstr "" -#: ../../mod/new_channel.php:111 -msgid "" -"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " -"Group\" " +#: ../../mod/notifications.php:504 +msgid "No more home notifications." msgstr "" -#: ../../mod/new_channel.php:112 -msgid "Choose a short nickname" +#: ../../mod/notifications.php:508 +msgid "Home Notifications" 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/editblock.php:82 +msgid "Edit Block" msgstr "" -#: ../../mod/new_channel.php:114 -msgid "" -"Or import an existing channel from another location" +#: ../../mod/editblock.php:156 +msgid "Delete Block" msgstr "" -#: ../../mod/filestorage.php:35 -msgid "Permission Denied." +#: ../../mod/tagger.php:98 +#, php-format +msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" -#: ../../mod/filestorage.php:42 -msgid "Permission denied. VS." +#: ../../mod/help.php:41 +msgid "Help:" msgstr "" -#: ../../mod/filestorage.php:79 -msgid "Download" +#: ../../mod/setup.php:161 +msgid "Red Matrix Server - Setup" msgstr "" -#: ../../mod/filestorage.php:84 -msgid "Used: " +#: ../../mod/setup.php:167 +msgid "Could not connect to database." msgstr "" -#: ../../mod/filestorage.php:86 -msgid "Limit: " +#: ../../mod/setup.php:171 +msgid "" +"Could not connect to specified site URL. Possible SSL certificate or DNS " +"issue." msgstr "" -#: ../../mod/lostpass.php:15 -msgid "No valid account found." +#: ../../mod/setup.php:176 +msgid "Could not create table." msgstr "" -#: ../../mod/lostpass.php:29 -msgid "Password reset request issued. Check your email." +#: ../../mod/setup.php:182 +msgid "Your site database has been installed." msgstr "" -#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102 -#, php-format -msgid "Site Member (%s)" +#: ../../mod/setup.php:187 +msgid "" +"You may need to import the file \"install/database.sql\" manually using " +"phpmyadmin or mysql." msgstr "" -#: ../../mod/lostpass.php:40 -#, php-format -msgid "Password reset requested at %s" +#: ../../mod/setup.php:188 ../../mod/setup.php:255 ../../mod/setup.php:584 +msgid "Please see the file \"install/INSTALL.txt\"." msgstr "" -#: ../../mod/lostpass.php:63 -msgid "" -"Request could not be verified. (You may have previously submitted it.) " -"Password reset failed." +#: ../../mod/setup.php:252 +msgid "System check" msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1469 -msgid "Password Reset" +#: ../../mod/setup.php:256 ../../mod/events.php:351 +msgid "Next" msgstr "" -#: ../../mod/lostpass.php:86 -msgid "Your password has been reset as requested." +#: ../../mod/setup.php:257 +msgid "Check again" msgstr "" -#: ../../mod/lostpass.php:87 -msgid "Your new password is" +#: ../../mod/setup.php:279 +msgid "Database connection" msgstr "" -#: ../../mod/lostpass.php:88 -msgid "Save or copy your new password - and then" +#: ../../mod/setup.php:280 +msgid "" +"In order to install Red Matrix we need to know how to connect to your " +"database." msgstr "" -#: ../../mod/lostpass.php:89 -msgid "click here to login" +#: ../../mod/setup.php:281 +msgid "" +"Please contact your hosting provider or site administrator if you have " +"questions about these settings." msgstr "" -#: ../../mod/lostpass.php:90 +#: ../../mod/setup.php:282 msgid "" -"Your password may be changed from the Settings page after " -"successful login." +"The database you specify below should already exist. If it does not, please " +"create it before continuing." msgstr "" -#: ../../mod/lostpass.php:107 -#, php-format -msgid "Your password has changed at %s" +#: ../../mod/setup.php:286 +msgid "Database Server Name" msgstr "" -#: ../../mod/lostpass.php:122 -msgid "Forgot your Password?" +#: ../../mod/setup.php:286 +msgid "Default is localhost" 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:287 +msgid "Database Port" msgstr "" -#: ../../mod/lostpass.php:124 -msgid "Email Address" +#: ../../mod/setup.php:287 +msgid "Communication port number - use 0 for default" msgstr "" -#: ../../mod/lostpass.php:125 -msgid "Reset" +#: ../../mod/setup.php:288 +msgid "Database Login Name" msgstr "" -#: ../../mod/import.php:36 -msgid "Nothing to import." +#: ../../mod/setup.php:289 +msgid "Database Login Password" msgstr "" -#: ../../mod/import.php:58 -msgid "Unable to download data from old server" +#: ../../mod/setup.php:290 +msgid "Database Name" msgstr "" -#: ../../mod/import.php:64 -msgid "Imported file is empty." +#: ../../mod/setup.php:292 ../../mod/setup.php:334 +msgid "Site administrator email address" msgstr "" -#: ../../mod/import.php:88 +#: ../../mod/setup.php:292 ../../mod/setup.php:334 msgid "" -"Cannot create a duplicate channel identifier on this system. Import failed." +"Your account email address must match this in order to use the web admin " +"panel." msgstr "" -#: ../../mod/import.php:106 -msgid "Channel clone failed. Import failed." +#: ../../mod/setup.php:293 ../../mod/setup.php:336 +msgid "Website URL" msgstr "" -#: ../../mod/import.php:116 -msgid "Cloned channel not found. Import failed." +#: ../../mod/setup.php:293 ../../mod/setup.php:336 +msgid "Please use SSL (https) URL if available." msgstr "" -#: ../../mod/import.php:356 -msgid "Import completed." +#: ../../mod/setup.php:296 ../../mod/setup.php:339 +msgid "Please select a default timezone for your website" msgstr "" -#: ../../mod/import.php:369 -msgid "You must be logged in to use this feature." +#: ../../mod/setup.php:323 +msgid "Site settings" msgstr "" -#: ../../mod/import.php:374 -msgid "Import Channel" +#: ../../mod/setup.php:379 +msgid "Could not find a command line version of PHP in the web server PATH." msgstr "" -#: ../../mod/import.php:375 +#: ../../mod/setup.php:380 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." +"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/import.php:376 -msgid "File to Upload" +#: ../../mod/setup.php:384 +msgid "PHP executable path" msgstr "" -#: ../../mod/import.php:377 -msgid "Or provide the old server/hub details" +#: ../../mod/setup.php:384 +msgid "" +"Enter full path to php executable. You can leave this blank to continue the " +"installation." msgstr "" -#: ../../mod/import.php:378 -msgid "Your old identity address (xyz@example.com)" +#: ../../mod/setup.php:389 +msgid "Command line PHP" msgstr "" -#: ../../mod/import.php:379 -msgid "Your old login email address" +#: ../../mod/setup.php:398 +msgid "" +"The command line version of PHP on your system does not have " +"\"register_argc_argv\" enabled." +msgstr "" + +#: ../../mod/setup.php:399 +msgid "This is required for message delivery to work." msgstr "" -#: ../../mod/import.php:380 -msgid "Your old login password" +#: ../../mod/setup.php:401 +msgid "PHP register_argc_argv" msgstr "" -#: ../../mod/import.php:381 +#: ../../mod/setup.php:422 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." +"Error: the \"openssl_pkey_new\" function on this system is not able to " +"generate encryption keys" msgstr "" -#: ../../mod/import.php:382 -msgid "Make this hub my primary location" +#: ../../mod/setup.php:423 +msgid "" +"If running under Windows, please see \"http://www.php.net/manual/en/openssl." +"installation.php\"." msgstr "" -#: ../../mod/manage.php:63 -#, php-format -msgid "You have created %1$.0f of %2$.0f allowed channels." +#: ../../mod/setup.php:425 +msgid "Generate encryption keys" msgstr "" -#: ../../mod/manage.php:71 -msgid "Create a new channel" +#: ../../mod/setup.php:432 +msgid "libCurl PHP module" msgstr "" -#: ../../mod/manage.php:76 -msgid "Channel Manager" +#: ../../mod/setup.php:433 +msgid "GD graphics PHP module" msgstr "" -#: ../../mod/manage.php:77 -msgid "Current Channel" +#: ../../mod/setup.php:434 +msgid "OpenSSL PHP module" msgstr "" -#: ../../mod/manage.php:79 -msgid "Attach to one of your channels by selecting it." +#: ../../mod/setup.php:435 +msgid "mysqli PHP module" msgstr "" -#: ../../mod/manage.php:80 -msgid "Default Channel" +#: ../../mod/setup.php:436 +msgid "mb_string PHP module" msgstr "" -#: ../../mod/manage.php:81 -msgid "Make Default" +#: ../../mod/setup.php:437 +msgid "mcrypt PHP module" msgstr "" -#: ../../mod/vote.php:97 -msgid "Total votes" +#: ../../mod/setup.php:442 ../../mod/setup.php:444 +msgid "Apache mod_rewrite module" msgstr "" -#: ../../mod/vote.php:98 -msgid "Average Rating" +#: ../../mod/setup.php:442 +msgid "" +"Error: Apache webserver mod-rewrite module is required but not installed." msgstr "" -#: ../../mod/match.php:12 -msgid "Profile Match" +#: ../../mod/setup.php:448 ../../mod/setup.php:451 +msgid "proc_open" msgstr "" -#: ../../mod/match.php:20 -msgid "No keywords to match. Please add keywords to your default profile." +#: ../../mod/setup.php:448 +msgid "" +"Error: proc_open is required but is either not installed or has been " +"disabled in php.ini" msgstr "" -#: ../../mod/match.php:57 -msgid "is interested in:" +#: ../../mod/setup.php:456 +msgid "Error: libCURL PHP module required but not installed." msgstr "" -#: ../../mod/match.php:65 -msgid "No matches" +#: ../../mod/setup.php:460 +msgid "" +"Error: GD graphics PHP module with JPEG support required but not installed." msgstr "" -#: ../../mod/crepair.php:102 -msgid "Contact settings applied." +#: ../../mod/setup.php:464 +msgid "Error: openssl PHP module required but not installed." msgstr "" -#: ../../mod/crepair.php:104 -msgid "Contact update failed." +#: ../../mod/setup.php:468 +msgid "Error: mysqli PHP module required but not installed." msgstr "" -#: ../../mod/crepair.php:129 ../../mod/fsuggest.php:20 -#: ../../mod/fsuggest.php:92 -msgid "Contact not found." +#: ../../mod/setup.php:472 +msgid "Error: mb_string PHP module required but not installed." msgstr "" -#: ../../mod/crepair.php:135 -msgid "Repair Contact Settings" +#: ../../mod/setup.php:476 +msgid "Error: mcrypt PHP module required but not installed." msgstr "" -#: ../../mod/crepair.php:137 +#: ../../mod/setup.php:492 msgid "" -"WARNING: This is highly advanced and if you enter incorrect " -"information your communications with this contact may stop working." +"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/crepair.php:138 +#: ../../mod/setup.php:493 msgid "" -"Please use your browser 'Back' button now if you are " -"uncertain what to do on this page." +"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/crepair.php:144 -msgid "Return to contact editor" +#: ../../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/crepair.php:149 -msgid "Account Nickname" +#: ../../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/crepair.php:150 -msgid "@Tagname - overrides Name/Nickname" +#: ../../mod/setup.php:498 +msgid ".htconfig.php is writable" msgstr "" -#: ../../mod/crepair.php:151 -msgid "Account URL" +#: ../../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/crepair.php:152 -msgid "Friend Request URL" +#: ../../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/crepair.php:153 -msgid "Friend Confirm URL" +#: ../../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/crepair.php:154 -msgid "Notification Endpoint URL" +#: ../../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/crepair.php:155 -msgid "Poll/Feed URL" +#: ../../mod/setup.php:514 +msgid "view/tpl/smarty3 is writable" msgstr "" -#: ../../mod/crepair.php:156 -msgid "New photo from this URL" +#: ../../mod/setup.php:528 +msgid "SSL certificate validation" msgstr "" -#: ../../mod/zfinger.php:23 -msgid "invalid target signature" +#: ../../mod/setup.php:528 +msgid "" +"SSL certificate cannot be validated. Fix certificate or disable https access " +"to this site." msgstr "" -#: ../../mod/follow.php:25 -msgid "Channel added." +#: ../../mod/setup.php:535 +msgid "" +"Url rewrite in .htaccess is not working. Check your server configuration." msgstr "" -#: ../../mod/editlayout.php:36 ../../mod/editwebpage.php:30 -#: ../../mod/editpost.php:20 ../../mod/editblock.php:36 -msgid "Item not found" +#: ../../mod/setup.php:537 +msgid "Url rewrite is working" msgstr "" -#: ../../mod/editlayout.php:68 -msgid "Edit Layout" +#: ../../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/editlayout.php:104 ../../mod/editwebpage.php:123 -#: ../../mod/editpost.php:101 ../../mod/editblock.php:118 -msgid "Insert YouTube video" +#: ../../mod/setup.php:571 +msgid "Errors encountered creating database tables." msgstr "" -#: ../../mod/editlayout.php:105 ../../mod/editwebpage.php:124 -#: ../../mod/editpost.php:102 ../../mod/editblock.php:119 -msgid "Insert Vorbis [.ogg] video" +#: ../../mod/setup.php:582 +msgid "

    What next

    " msgstr "" -#: ../../mod/editlayout.php:106 ../../mod/editwebpage.php:125 -#: ../../mod/editpost.php:103 ../../mod/editblock.php:120 -msgid "Insert Vorbis [.ogg] audio" +#: ../../mod/setup.php:583 +msgid "" +"IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" -#: ../../mod/editlayout.php:140 -msgid "Delete Layout" +#: ../../mod/sources.php:27 +msgid "Source created." msgstr "" -#: ../../mod/nogroup.php:58 -msgid "Contacts who are not members of a group" +#: ../../mod/sources.php:39 +msgid "Source updated." msgstr "" -#: ../../mod/profile_photo.php:54 -msgid "Image uploaded but image cropping failed." +#: ../../mod/sources.php:68 +msgid "Manage remote sources of content for your channel." msgstr "" -#: ../../mod/profile_photo.php:107 -msgid "Image resize failed." +#: ../../mod/sources.php:69 ../../mod/sources.php:79 +msgid "New Source" msgstr "" -#: ../../mod/profile_photo.php:151 +#: ../../mod/sources.php:80 ../../mod/sources.php:106 msgid "" -"Shift-reload the page or clear browser cache if the new photo does not " -"display immediately." +"Import all or selected content from the following channel into this channel " +"and distribute it according to your channel settings." msgstr "" -#: ../../mod/profile_photo.php:173 -#, php-format -msgid "Image exceeds size limit of %d" +#: ../../mod/sources.php:81 ../../mod/sources.php:107 +msgid "Only import content with these words (one per line)" msgstr "" -#: ../../mod/profile_photo.php:182 -msgid "Unable to process image." +#: ../../mod/sources.php:81 ../../mod/sources.php:107 +msgid "Leave blank to import all public content" msgstr "" -#: ../../mod/profile_photo.php:224 ../../mod/profile_photo.php:272 -msgid "Photo not available." +#: ../../mod/sources.php:96 ../../mod/sources.php:122 +msgid "Source not found." msgstr "" -#: ../../mod/profile_photo.php:291 -msgid "Upload File:" +#: ../../mod/sources.php:103 +msgid "Edit Source" msgstr "" -#: ../../mod/profile_photo.php:292 -msgid "Select a profile:" +#: ../../mod/sources.php:104 +msgid "Delete Source" msgstr "" -#: ../../mod/profile_photo.php:293 -msgid "Upload Profile Photo" +#: ../../mod/sources.php:130 +msgid "Source removed" msgstr "" -#: ../../mod/profile_photo.php:294 -msgid "Upload" +#: ../../mod/sources.php:132 +msgid "Unable to remove source." msgstr "" -#: ../../mod/profile_photo.php:298 -msgid "skip this step" +#: ../../mod/settings.php:53 +msgid "Account settings" msgstr "" -#: ../../mod/profile_photo.php:298 -msgid "select a photo from your photo albums" +#: ../../mod/settings.php:59 +msgid "Channel settings" msgstr "" -#: ../../mod/profile_photo.php:312 -msgid "Crop Image" +#: ../../mod/settings.php:65 +msgid "Additional features" msgstr "" -#: ../../mod/profile_photo.php:313 -msgid "Please adjust the image cropping for optimum viewing." +#: ../../mod/settings.php:71 +msgid "Feature settings" msgstr "" -#: ../../mod/profile_photo.php:315 -msgid "Done Editing" +#: ../../mod/settings.php:77 +msgid "Display settings" msgstr "" -#: ../../mod/profile_photo.php:350 -msgid "Image uploaded successfully." +#: ../../mod/settings.php:83 +msgid "Connected apps" msgstr "" -#: ../../mod/profile_photo.php:352 -msgid "Image upload failed." +#: ../../mod/settings.php:89 +msgid "Export channel" msgstr "" -#: ../../mod/profile_photo.php:361 -#, php-format -msgid "Image size reduction [%s] failed." +#: ../../mod/settings.php:101 +msgid "Automatic Permissions (Advanced)" msgstr "" -#: ../../mod/editwebpage.php:87 -msgid "Edit Webpage" +#: ../../mod/settings.php:111 +msgid "Premium Channel Settings" msgstr "" -#: ../../mod/editwebpage.php:162 -msgid "Delete Webpage" +#: ../../mod/settings.php:171 +msgid "Name is required" msgstr "" -#: ../../mod/notifications.php:26 -msgid "Invalid request identifier." +#: ../../mod/settings.php:175 +msgid "Key and Secret are required" msgstr "" -#: ../../mod/notifications.php:76 -msgid "System" +#: ../../mod/settings.php:179 ../../mod/settings.php:677 +msgid "Update" msgstr "" -#: ../../mod/notifications.php:96 -msgid "Introductions" +#: ../../mod/settings.php:292 +msgid "Passwords do not match. Password unchanged." msgstr "" -#: ../../mod/notifications.php:121 -msgid "Show Ignored Requests" +#: ../../mod/settings.php:296 +msgid "Empty passwords are not allowed. Password unchanged." msgstr "" -#: ../../mod/notifications.php:121 -msgid "Hide Ignored Requests" +#: ../../mod/settings.php:309 +msgid "Password changed." msgstr "" -#: ../../mod/notifications.php:147 ../../mod/notifications.php:193 -msgid "Notification type: " +#: ../../mod/settings.php:311 +msgid "Password update failed. Please try again." msgstr "" -#: ../../mod/notifications.php:148 -msgid "Friend Suggestion" +#: ../../mod/settings.php:325 +msgid "Not valid email." msgstr "" -#: ../../mod/notifications.php:150 -#, php-format -msgid "suggested by %s" +#: ../../mod/settings.php:328 +msgid "Protected email address. Cannot change to that email." msgstr "" -#: ../../mod/notifications.php:179 -msgid "Claims to be known to you: " +#: ../../mod/settings.php:337 +msgid "System failure storing new email. Please try again." msgstr "" -#: ../../mod/notifications.php:179 -msgid "yes" +#: ../../mod/settings.php:579 +msgid "Settings updated." msgstr "" -#: ../../mod/notifications.php:179 -msgid "no" +#: ../../mod/settings.php:650 ../../mod/settings.php:676 +#: ../../mod/settings.php:712 +msgid "Add application" msgstr "" -#: ../../mod/notifications.php:186 -msgid "Approve as: " +#: ../../mod/settings.php:653 +msgid "Name of application" msgstr "" -#: ../../mod/notifications.php:187 -msgid "Friend" +#: ../../mod/settings.php:654 ../../mod/settings.php:680 +msgid "Consumer Key" msgstr "" -#: ../../mod/notifications.php:188 -msgid "Sharer" +#: ../../mod/settings.php:654 ../../mod/settings.php:655 +msgid "Automatically generated - change if desired. Max length 20" msgstr "" -#: ../../mod/notifications.php:188 -msgid "Fan/Admirer" +#: ../../mod/settings.php:655 ../../mod/settings.php:681 +msgid "Consumer Secret" msgstr "" -#: ../../mod/notifications.php:194 -msgid "Friend/Connect Request" +#: ../../mod/settings.php:656 ../../mod/settings.php:682 +msgid "Redirect" msgstr "" -#: ../../mod/notifications.php:194 -msgid "New Follower" +#: ../../mod/settings.php:656 +msgid "" +"Redirect URI - leave blank unless your application specifically requires this" msgstr "" -#: ../../mod/notifications.php:215 -msgid "No introductions." +#: ../../mod/settings.php:657 ../../mod/settings.php:683 +msgid "Icon url" msgstr "" -#: ../../mod/notifications.php:257 ../../mod/notifications.php:382 -#: ../../mod/notifications.php:465 -#, php-format -msgid "%s liked %s's post" +#: ../../mod/settings.php:657 +msgid "Optional" msgstr "" -#: ../../mod/notifications.php:266 ../../mod/notifications.php:391 -#: ../../mod/notifications.php:474 -#, php-format -msgid "%s disliked %s's post" +#: ../../mod/settings.php:668 +msgid "You can't edit this application." msgstr "" -#: ../../mod/notifications.php:280 ../../mod/notifications.php:405 -#: ../../mod/notifications.php:488 -#, php-format -msgid "%s is now friends with %s" +#: ../../mod/settings.php:711 +msgid "Connected Apps" msgstr "" -#: ../../mod/notifications.php:287 ../../mod/notifications.php:412 -#, php-format -msgid "%s created a new post" +#: ../../mod/settings.php:715 +msgid "Client key starts with" msgstr "" -#: ../../mod/notifications.php:288 ../../mod/notifications.php:413 -#: ../../mod/notifications.php:497 -#, php-format -msgid "%s commented on %s's post" +#: ../../mod/settings.php:716 +msgid "No name" msgstr "" -#: ../../mod/notifications.php:302 -msgid "No more network notifications." +#: ../../mod/settings.php:717 +msgid "Remove authorization" msgstr "" -#: ../../mod/notifications.php:306 -msgid "Network Notifications" +#: ../../mod/settings.php:728 +msgid "No feature settings configured" msgstr "" -#: ../../mod/notifications.php:332 ../../mod/notify.php:54 -msgid "No more system notifications." +#: ../../mod/settings.php:736 +msgid "Feature Settings" msgstr "" -#: ../../mod/notifications.php:336 ../../mod/notify.php:58 -msgid "System Notifications" +#: ../../mod/settings.php:759 +msgid "Account Settings" msgstr "" -#: ../../mod/notifications.php:427 -msgid "No more personal notifications." +#: ../../mod/settings.php:760 +msgid "Password Settings" msgstr "" -#: ../../mod/notifications.php:431 -msgid "Personal Notifications" +#: ../../mod/settings.php:761 +msgid "New Password:" msgstr "" -#: ../../mod/notifications.php:504 -msgid "No more home notifications." +#: ../../mod/settings.php:762 +msgid "Confirm:" msgstr "" -#: ../../mod/notifications.php:508 -msgid "Home Notifications" +#: ../../mod/settings.php:762 +msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/blocks.php:65 -msgid "Block Name" +#: ../../mod/settings.php:764 ../../mod/settings.php:1063 +msgid "Email Address:" msgstr "" -#: ../../mod/oexchange.php:23 -msgid "Unable to find your hub." +#: ../../mod/settings.php:765 +msgid "Remove Account" msgstr "" -#: ../../mod/oexchange.php:37 -msgid "Post successful." +#: ../../mod/settings.php:766 +msgid "Warning: This action is permanent and cannot be reversed." msgstr "" -#: ../../mod/editpost.php:31 -msgid "Item is not editable" +#: ../../mod/settings.php:782 +msgid "Off" msgstr "" -#: ../../mod/profile.php:111 -msgid "Access to this profile has been restricted." +#: ../../mod/settings.php:782 +msgid "On" msgstr "" -#: ../../mod/poke.php:159 -msgid "Poke/Prod" +#: ../../mod/settings.php:789 +msgid "Additional Features" msgstr "" -#: ../../mod/poke.php:160 -msgid "poke, prod or do other things to somebody" +#: ../../mod/settings.php:814 +msgid "Connector Settings" msgstr "" -#: ../../mod/poke.php:161 -msgid "Recipient" +#: ../../mod/settings.php:884 +msgid "Display Settings" msgstr "" -#: ../../mod/poke.php:162 -msgid "Choose what you wish to do to recipient" +#: ../../mod/settings.php:890 +msgid "Display Theme:" msgstr "" -#: ../../mod/poke.php:165 -msgid "Make this post private" +#: ../../mod/settings.php:891 +msgid "Mobile Theme:" msgstr "" -#: ../../mod/wall_upload.php:41 ../../mod/item.php:1049 -msgid "Wall Photos" +#: ../../mod/settings.php:892 +msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/channel.php:120 -msgid "Insufficient permissions. Request redirected to profile page." +#: ../../mod/settings.php:892 +msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/community.php:23 -msgid "Not available." +#: ../../mod/settings.php:893 +msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../mod/community.php:32 -msgid "Community" +#: ../../mod/settings.php:893 +msgid "Maximum of 100 items" msgstr "" -#: ../../mod/community.php:63 ../../mod/community.php:88 -msgid "No results." +#: ../../mod/settings.php:894 +msgid "Don't show emoticons" msgstr "" -#: ../../mod/fbrowser.php:114 -msgid "Files" +#: ../../mod/settings.php:930 +msgid "Nobody except yourself" msgstr "" -#: ../../mod/fsuggest.php:63 -msgid "Friend suggestion sent." +#: ../../mod/settings.php:931 +msgid "Only those you specifically allow" msgstr "" -#: ../../mod/fsuggest.php:97 -msgid "Suggest Friends" +#: ../../mod/settings.php:932 +msgid "Anybody in your address book" msgstr "" -#: ../../mod/fsuggest.php:99 -#, php-format -msgid "Suggest a friend for %s" +#: ../../mod/settings.php:933 +msgid "Anybody on this website" msgstr "" -#: ../../mod/editblock.php:82 -msgid "Edit Block" +#: ../../mod/settings.php:934 +msgid "Anybody in this network" msgstr "" -#: ../../mod/editblock.php:156 -msgid "Delete Block" +#: ../../mod/settings.php:935 +msgid "Anybody on the internet" msgstr "" -#: ../../mod/profperm.php:34 ../../mod/profperm.php:64 -msgid "Invalid profile identifier." +#: ../../mod/settings.php:1009 +msgid "Publish your default profile in the network directory" msgstr "" -#: ../../mod/profperm.php:110 -msgid "Profile Visibility Editor" +#: ../../mod/settings.php:1014 +msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/profperm.php:114 -msgid "Click on a contact to add or remove." +#: ../../mod/settings.php:1023 +msgid "Your channel address is" msgstr "" -#: ../../mod/profperm.php:123 -msgid "Visible To" +#: ../../mod/settings.php:1034 +msgid "Automatically expire posts after this many days:" msgstr "" -#: ../../mod/profperm.php:139 -msgid "All Contacts (with secure profile access)" +#: ../../mod/settings.php:1034 +msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: ../../mod/item.php:136 -msgid "Unable to locate original post." +#: ../../mod/settings.php:1035 +msgid "Advanced expiration settings" msgstr "" -#: ../../mod/item.php:321 -msgid "Empty post discarded." +#: ../../mod/settings.php:1036 +msgid "Advanced Expiration" msgstr "" -#: ../../mod/item.php:363 -msgid "Executable content type not permitted to this channel." +#: ../../mod/settings.php:1037 +msgid "Expire posts:" msgstr "" -#: ../../mod/item.php:772 -msgid "System error. Post not saved." +#: ../../mod/settings.php:1039 +msgid "Expire starred posts:" msgstr "" -#: ../../mod/item.php:1128 -#, php-format -msgid "You have reached your limit of %1$.0f top level posts." +#: ../../mod/settings.php:1040 +msgid "Expire photos:" msgstr "" -#: ../../mod/item.php:1134 -#, php-format -msgid "You have reached your limit of %1$.0f webpages." +#: ../../mod/settings.php:1041 +msgid "Only expire posts by others:" msgstr "" -#: ../../mod/siteinfo.php:51 -#, php-format -msgid "Version %s" +#: ../../mod/settings.php:1052 +msgid "Channel Settings" msgstr "" -#: ../../mod/siteinfo.php:65 -msgid "Installed plugins/addons/apps:" +#: ../../mod/settings.php:1061 +msgid "Basic Settings" msgstr "" -#: ../../mod/siteinfo.php:78 -msgid "No installed plugins/addons/apps" +#: ../../mod/settings.php:1064 +msgid "Your Timezone:" msgstr "" -#: ../../mod/siteinfo.php:81 -msgid "Red" +#: ../../mod/settings.php:1065 +msgid "Default Post Location:" msgstr "" -#: ../../mod/siteinfo.php:82 -msgid "" -"This is a hub of the Red Matrix - a global cooperative network of " -"decentralised privacy enhanced websites." +#: ../../mod/settings.php:1066 +msgid "Use Browser Location:" msgstr "" -#: ../../mod/siteinfo.php:84 -msgid "Running at web location" +#: ../../mod/settings.php:1068 +msgid "Adult Content" msgstr "" -#: ../../mod/siteinfo.php:85 -msgid "" -"Please visit GetZot.com to learn more " -"about the Red Matrix." +#: ../../mod/settings.php:1068 +msgid "This channel publishes adult content." msgstr "" -#: ../../mod/siteinfo.php:86 -msgid "Bug reports and issues: please visit" +#: ../../mod/settings.php:1070 +msgid "Security and Privacy Settings" msgstr "" -#: ../../mod/siteinfo.php:89 -msgid "" -"Suggestions, praise, donations, etc. - please email \"redmatrix\" at " -"librelist - dot com" +#: ../../mod/settings.php:1072 +msgid "Quick Privacy Settings:" msgstr "" -#: ../../mod/suggest.php:41 -msgid "" -"No suggestions available. If this is a new site, please try again in 24 " -"hours." +#: ../../mod/settings.php:1073 +msgid "Very Public - extremely permissive" msgstr "" -#: ../../mod/suggest.php:58 -msgid "Ignore/Hide" +#: ../../mod/settings.php:1074 +msgid "Typical - default public, privacy when desired" msgstr "" -#: ../../mod/pubsites.php:22 -msgid "Public Sites" +#: ../../mod/settings.php:1075 +msgid "Private - default private, rarely open or public" msgstr "" -#: ../../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." +#: ../../mod/settings.php:1076 +msgid "Blocked - default blocked to/from everybody" msgstr "" -#: ../../mod/pubsites.php:31 -msgid "Site URL" +#: ../../mod/settings.php:1079 +msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/pubsites.php:31 -msgid "Access Type" +#: ../../mod/settings.php:1079 +msgid "May reduce spam activity" msgstr "" -#: ../../mod/pubsites.php:31 -msgid "Registration Policy" +#: ../../mod/settings.php:1080 +msgid "Default Post Permissions" msgstr "" -#: ../../mod/register.php:43 -msgid "Maximum daily site registrations exceeded. Please try again tomorrow." +#: ../../mod/settings.php:1081 +msgid "(click to open/close)" msgstr "" -#: ../../mod/register.php:49 -msgid "" -"Please indicate acceptance of the Terms of Service. Registration failed." +#: ../../mod/settings.php:1094 +msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../mod/register.php:77 -msgid "Passwords do not match." +#: ../../mod/settings.php:1094 +msgid "Useful to reduce spamming" msgstr "" -#: ../../mod/register.php:105 -msgid "" -"Registration successful. Please check your email for validation instructions." +#: ../../mod/settings.php:1097 +msgid "Notification Settings" msgstr "" -#: ../../mod/register.php:111 -msgid "Your registration is pending approval by the site owner." +#: ../../mod/settings.php:1098 +msgid "By default post a status message when:" msgstr "" -#: ../../mod/register.php:114 -msgid "Your registration can not be processed." +#: ../../mod/settings.php:1099 +msgid "accepting a friend request" msgstr "" -#: ../../mod/register.php:149 -msgid "" -"This site has exceeded the number of allowed daily account registrations. " -"Please try again tomorrow." +#: ../../mod/settings.php:1100 +msgid "joining a forum/community" msgstr "" -#: ../../mod/register.php:160 -msgid "Terms of Service" +#: ../../mod/settings.php:1101 +msgid "making an interesting profile change" msgstr "" -#: ../../mod/register.php:166 -#, php-format -msgid "I accept the %s for this website" +#: ../../mod/settings.php:1102 +msgid "Send a notification email when:" msgstr "" -#: ../../mod/register.php:168 -#, php-format -msgid "I am over 13 years of age and accept the %s for this website" +#: ../../mod/settings.php:1103 +msgid "You receive an introduction" msgstr "" -#: ../../mod/register.php:183 -msgid "Membership on this site is by invitation only." +#: ../../mod/settings.php:1104 +msgid "Your introductions are confirmed" msgstr "" -#: ../../mod/register.php:184 -msgid "Please enter your invitation code" +#: ../../mod/settings.php:1105 +msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/register.php:187 -msgid "Your email address" +#: ../../mod/settings.php:1106 +msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/register.php:188 -msgid "Choose a password" +#: ../../mod/settings.php:1107 +msgid "You receive a private message" msgstr "" -#: ../../mod/register.php:189 -msgid "Please re-enter your password" +#: ../../mod/settings.php:1108 +msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/regmod.php:12 -msgid "Please login." +#: ../../mod/settings.php:1109 +msgid "You are tagged in a post" msgstr "" -#: ../../mod/post.php:119 -msgid "" -"Remote authentication blocked. You are logged into this site locally. Please " -"logout and retry." +#: ../../mod/settings.php:1110 +msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../mod/post.php:132 -#, php-format -msgid "Welcome %s. Remote authentication successful." +#: ../../mod/settings.php:1113 +msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../mod/removeme.php:49 -msgid "Remove This Channel" +#: ../../mod/settings.php:1114 +msgid "Change the behaviour of this account for special situations" msgstr "" -#: ../../mod/removeme.php:50 -msgid "" -"This will completely remove this channel from the network. Once this has " -"been done it is not recoverable." +#: ../../mod/item.php:144 +msgid "Unable to locate original post." msgstr "" -#: ../../mod/removeme.php:51 -msgid "Please enter your password for verification:" +#: ../../mod/item.php:341 +msgid "Empty post discarded." msgstr "" -#: ../../mod/removeme.php:52 -msgid "Remove this channel and all its clones from the network" +#: ../../mod/item.php:383 +msgid "Executable content type not permitted to this channel." msgstr "" -#: ../../mod/removeme.php:52 -msgid "" -"By default only the instance of the channel located on this hub will be " -"removed from the network" +#: ../../mod/item.php:793 +msgid "System error. Post not saved." msgstr "" -#: ../../mod/removeme.php:53 -msgid "Remove My Account" +#: ../../mod/item.php:1153 +#, php-format +msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../mod/directory.php:163 -msgid "Gender: " +#: ../../mod/item.php:1159 +#, php-format +msgid "You have reached your limit of %1$.0f webpages." msgstr "" -#: ../../mod/directory.php:222 -msgid "Finding:" +#: ../../mod/attach.php:9 +msgid "Item not available." msgstr "" -#: ../../mod/directory.php:230 -msgid "next page" +#: ../../mod/manage.php:63 +#, php-format +msgid "You have created %1$.0f of %2$.0f allowed channels." msgstr "" -#: ../../mod/directory.php:230 -msgid "previous page" +#: ../../mod/manage.php:71 +msgid "Create a new channel" msgstr "" -#: ../../mod/directory.php:237 -msgid "No entries (some entries may be hidden)." +#: ../../mod/manage.php:76 +msgid "Channel Manager" msgstr "" -#: ../../mod/mood.php:133 -msgid "Mood" +#: ../../mod/manage.php:77 +msgid "Current Channel" msgstr "" -#: ../../mod/mood.php:134 -msgid "Set your current mood and tell your friends" +#: ../../mod/manage.php:79 +msgid "Attach to one of your channels by selecting it." msgstr "" -#: ../../view/theme/redbasic/php/config.php:74 -msgid "Scheme Default" +#: ../../mod/manage.php:80 +msgid "Default Channel" msgstr "" -#: ../../view/theme/redbasic/php/config.php:75 -msgid "red" +#: ../../mod/manage.php:81 +msgid "Make Default" msgstr "" -#: ../../view/theme/redbasic/php/config.php:76 -msgid "black" +#: ../../mod/allfriends.php:35 +#, php-format +msgid "Friends of %s" msgstr "" -#: ../../view/theme/redbasic/php/config.php:77 -msgid "silver" +#: ../../mod/allfriends.php:41 +msgid "No friends to display." msgstr "" -#: ../../view/theme/redbasic/php/config.php:88 -#: ../../view/theme/apw/php/config.php:234 -msgid "Theme settings" +#: ../../mod/nogroup.php:58 +msgid "Contacts who are not members of a group" msgstr "" -#: ../../view/theme/redbasic/php/config.php:89 -#: ../../view/theme/apw/php/config.php:235 -msgid "Set scheme" +#: ../../mod/channel.php:16 +msgid "You must be logged in to see this page." msgstr "" -#: ../../view/theme/redbasic/php/config.php:90 -msgid "Navigation bar colour" +#: ../../mod/channel.php:120 +msgid "Insufficient permissions. Request redirected to profile page." msgstr "" -#: ../../view/theme/redbasic/php/config.php:91 -msgid "Set font-colour for banner" +#: ../../mod/post.php:119 +msgid "" +"Remote authentication blocked. You are logged into this site locally. Please " +"logout and retry." msgstr "" -#: ../../view/theme/redbasic/php/config.php:92 -msgid "Set the background colour" +#: ../../mod/post.php:132 +#, php-format +msgid "Welcome %s. Remote authentication successful." msgstr "" -#: ../../view/theme/redbasic/php/config.php:93 -msgid "Set the background image" +#: ../../mod/profiles.php:18 ../../mod/profiles.php:138 +#: ../../mod/profiles.php:179 ../../mod/profiles.php:486 +msgid "Profile not found." msgstr "" -#: ../../view/theme/redbasic/php/config.php:94 -msgid "Set the background colour of items" +#: ../../mod/profiles.php:38 +msgid "Profile deleted." msgstr "" -#: ../../view/theme/redbasic/php/config.php:95 -msgid "Set the opacity of items" +#: ../../mod/profiles.php:56 ../../mod/profiles.php:92 +msgid "Profile-" msgstr "" -#: ../../view/theme/redbasic/php/config.php:96 -msgid "Set the basic colour for item icons" +#: ../../mod/profiles.php:77 ../../mod/profiles.php:120 +msgid "New profile created." msgstr "" -#: ../../view/theme/redbasic/php/config.php:97 -msgid "Set the hover colour for item icons" +#: ../../mod/profiles.php:98 +msgid "Profile unavailable to clone." msgstr "" -#: ../../view/theme/redbasic/php/config.php:98 -msgid "Set font-size for the entire application" +#: ../../mod/profiles.php:189 +msgid "Profile Name is required." msgstr "" -#: ../../view/theme/redbasic/php/config.php:99 -#: ../../view/theme/apw/php/config.php:236 -msgid "Set font-size for posts and comments" +#: ../../mod/profiles.php:317 +msgid "Marital Status" msgstr "" -#: ../../view/theme/redbasic/php/config.php:100 -msgid "Set font-colour for posts and comments" +#: ../../mod/profiles.php:321 +msgid "Romantic Partner" msgstr "" -#: ../../view/theme/redbasic/php/config.php:101 -msgid "Set radius of corners" +#: ../../mod/profiles.php:325 +msgid "Likes" msgstr "" -#: ../../view/theme/redbasic/php/config.php:102 -msgid "Set shadow depth of photos" +#: ../../mod/profiles.php:329 +msgid "Dislikes" msgstr "" -#: ../../view/theme/redbasic/php/config.php:103 -msgid "Set maximum width of conversation regions" +#: ../../mod/profiles.php:333 +msgid "Work/Employment" msgstr "" -#: ../../view/theme/redbasic/php/config.php:104 -msgid "Set minimum opacity of nav bar - to hide it" +#: ../../mod/profiles.php:336 +msgid "Religion" msgstr "" -#: ../../view/theme/redbasic/php/config.php:105 -msgid "Set size of conversation author photo" +#: ../../mod/profiles.php:340 +msgid "Political Views" msgstr "" -#: ../../view/theme/redbasic/php/config.php:106 -msgid "Set size of followup author photos" +#: ../../mod/profiles.php:344 +msgid "Gender" msgstr "" -#: ../../view/theme/redbasic/php/config.php:107 -msgid "Sloppy photo albums" +#: ../../mod/profiles.php:348 +msgid "Sexual Preference" msgstr "" -#: ../../view/theme/redbasic/php/config.php:107 -msgid "Are you a clean desk or a messy desk person?" +#: ../../mod/profiles.php:352 +msgid "Homepage" msgstr "" -#: ../../view/theme/apw/php/config.php:193 -#: ../../view/theme/apw/php/config.php:211 -msgid "Schema Default" +#: ../../mod/profiles.php:356 +msgid "Interests" msgstr "" -#: ../../view/theme/apw/php/config.php:194 -msgid "Sans-Serif" +#: ../../mod/profiles.php:360 +msgid "Address" msgstr "" -#: ../../view/theme/apw/php/config.php:195 -msgid "Monospace" +#: ../../mod/profiles.php:450 +msgid "Profile updated." msgstr "" -#: ../../view/theme/apw/php/config.php:237 -msgid "Set font face" +#: ../../mod/profiles.php:505 +msgid "Hide your contact/friend list from viewers of this profile?" msgstr "" -#: ../../view/theme/apw/php/config.php:238 -msgid "Set iconset" +#: ../../mod/profiles.php:528 +msgid "Edit Profile Details" msgstr "" -#: ../../view/theme/apw/php/config.php:239 -msgid "Set big shadow size, default 15px 15px 15px" +#: ../../mod/profiles.php:530 +msgid "View this profile" msgstr "" -#: ../../view/theme/apw/php/config.php:240 -msgid "Set small shadow size, default 5px 5px 5px" +#: ../../mod/profiles.php:531 +msgid "Change Profile Photo" msgstr "" -#: ../../view/theme/apw/php/config.php:241 -msgid "Set shadow colour, default #000" +#: ../../mod/profiles.php:532 +msgid "Create a new profile using these settings" msgstr "" -#: ../../view/theme/apw/php/config.php:242 -msgid "Set radius size, default 5px" +#: ../../mod/profiles.php:533 +msgid "Clone this profile" msgstr "" -#: ../../view/theme/apw/php/config.php:243 -msgid "Set line-height for posts and comments" +#: ../../mod/profiles.php:534 +msgid "Delete this profile" msgstr "" -#: ../../view/theme/apw/php/config.php:244 -msgid "Set background image" +#: ../../mod/profiles.php:535 +msgid "Profile Name:" msgstr "" -#: ../../view/theme/apw/php/config.php:245 -msgid "Set background colour" +#: ../../mod/profiles.php:536 +msgid "Your Full Name:" msgstr "" -#: ../../view/theme/apw/php/config.php:246 -msgid "Set section background image" +#: ../../mod/profiles.php:537 +msgid "Title/Description:" msgstr "" -#: ../../view/theme/apw/php/config.php:247 -msgid "Set section background colour" +#: ../../mod/profiles.php:538 +msgid "Your Gender:" msgstr "" -#: ../../view/theme/apw/php/config.php:248 -msgid "Set colour of items - use hex" +#: ../../mod/profiles.php:539 +#, php-format +msgid "Birthday (%s):" msgstr "" -#: ../../view/theme/apw/php/config.php:249 -msgid "Set colour of links - use hex" +#: ../../mod/profiles.php:540 +msgid "Street Address:" msgstr "" -#: ../../view/theme/apw/php/config.php:250 -msgid "Set max-width for items. Default 400px" +#: ../../mod/profiles.php:541 +msgid "Locality/City:" msgstr "" -#: ../../view/theme/apw/php/config.php:251 -msgid "Set min-width for items. Default 240px" +#: ../../mod/profiles.php:542 +msgid "Postal/Zip Code:" msgstr "" -#: ../../view/theme/apw/php/config.php:252 -msgid "Set the generic content wrapper width. Default 48%" +#: ../../mod/profiles.php:543 +msgid "Country:" msgstr "" -#: ../../view/theme/apw/php/config.php:253 -msgid "Set colour of fonts - use hex" +#: ../../mod/profiles.php:544 +msgid "Region/State:" msgstr "" -#: ../../view/theme/apw/php/config.php:254 -msgid "Set background-size element" +#: ../../mod/profiles.php:545 +msgid "♥ Marital Status:" msgstr "" -#: ../../view/theme/apw/php/config.php:255 -msgid "Item opacity" +#: ../../mod/profiles.php:546 +msgid "Who: (if applicable)" msgstr "" -#: ../../view/theme/apw/php/config.php:256 -msgid "Display post previews only" +#: ../../mod/profiles.php:547 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../view/theme/apw/php/config.php:257 -msgid "Display side bar on channel page" +#: ../../mod/profiles.php:548 +msgid "Since [date]:" msgstr "" -#: ../../view/theme/apw/php/config.php:258 -msgid "Colour of the navigation bar" +#: ../../mod/profiles.php:550 +msgid "Homepage URL:" msgstr "" -#: ../../view/theme/apw/php/config.php:259 -msgid "Item float" +#: ../../mod/profiles.php:553 +msgid "Religious Views:" msgstr "" -#: ../../view/theme/apw/php/config.php:260 -msgid "Left offset of the section element" +#: ../../mod/profiles.php:554 +msgid "Keywords:" msgstr "" -#: ../../view/theme/apw/php/config.php:261 -msgid "Right offset of the section element" +#: ../../mod/profiles.php:557 +msgid "Example: fishing photography software" msgstr "" -#: ../../view/theme/apw/php/config.php:262 -msgid "Section width" +#: ../../mod/profiles.php:558 +msgid "Used in directory listings" msgstr "" -#: ../../view/theme/apw/php/config.php:263 -msgid "Left offset of the aside" +#: ../../mod/profiles.php:559 +msgid "Tell us about yourself..." msgstr "" -#: ../../view/theme/apw/php/config.php:264 -msgid "Right offset of the aside element" +#: ../../mod/profiles.php:560 +msgid "Hobbies/Interests" msgstr "" -#: ../../boot.php:1274 -#, php-format -msgid "Update %s failed. See error logs." +#: ../../mod/profiles.php:561 +msgid "Contact information and Social Networks" msgstr "" -#: ../../boot.php:1277 -#, php-format -msgid "Update Error at %s" +#: ../../mod/profiles.php:562 +msgid "My other channels" msgstr "" -#: ../../boot.php:1434 -msgid "" -"Create an account to access services and applications within the Red Matrix" +#: ../../mod/profiles.php:563 +msgid "Musical interests" msgstr "" -#: ../../boot.php:1462 -msgid "Password" +#: ../../mod/profiles.php:564 +msgid "Books, literature" msgstr "" -#: ../../boot.php:1463 -msgid "Remember me" +#: ../../mod/profiles.php:565 +msgid "Television" msgstr "" -#: ../../boot.php:1468 -msgid "Forgot your password?" +#: ../../mod/profiles.php:566 +msgid "Film/dance/culture/entertainment" msgstr "" -#: ../../boot.php:1533 -msgid "permission denied" +#: ../../mod/profiles.php:567 +msgid "Love/romance" msgstr "" -#: ../../boot.php:1534 -msgid "Got Zot?" +#: ../../mod/profiles.php:568 +msgid "Work/employment" msgstr "" -#: ../../boot.php:1593 -msgid "Requested channel is not available." +#: ../../mod/profiles.php:569 +msgid "School/education" msgstr "" -#: ../../boot.php:1605 -msgid " Sorry, you don't have the permission to view this profile. " +#: ../../mod/profiles.php:574 +msgid "" +"This is your public profile.
    It may " +"be visible to anybody using the internet." msgstr "" -#: ../../boot.php:1761 -msgid "Profiles" +#: ../../mod/profiles.php:623 +msgid "Edit/Manage Profiles" msgstr "" -#: ../../boot.php:1761 -msgid "Manage/edit profiles" +#: ../../mod/events.php:66 +msgid "Event title and start time are required." msgstr "" -#: ../../boot.php:1765 -msgid "Edit Profile" +#: ../../mod/events.php:281 +msgid "l, F j" msgstr "" -#: ../../boot.php:1859 ../../boot.php:1939 -msgid "F d" +#: ../../mod/events.php:303 +msgid "Edit event" msgstr "" -#: ../../boot.php:1916 -msgid "Birthday Reminders" +#: ../../mod/events.php:349 +msgid "Create New Event" msgstr "" -#: ../../boot.php:1917 -msgid "Birthdays this week:" +#: ../../mod/events.php:350 +msgid "Previous" msgstr "" -#: ../../boot.php:1972 -msgid "[No description]" +#: ../../mod/events.php:425 +msgid "hour:minute" msgstr "" -#: ../../boot.php:1990 -msgid "Event Reminders" +#: ../../mod/events.php:435 +msgid "Event details" msgstr "" -#: ../../boot.php:1991 -msgid "Events this week:" +#: ../../mod/events.php:436 +#, php-format +msgid "Format is %s %s. Starting date and Title are required." msgstr "" -#: ../../boot.php:2225 -msgid "Channel" +#: ../../mod/events.php:438 +msgid "Event Starts:" msgstr "" -#: ../../boot.php:2228 -msgid "Status Messages and Posts" +#: ../../mod/events.php:438 ../../mod/events.php:452 +msgid "Required" msgstr "" -#: ../../boot.php:2232 -msgid "About" +#: ../../mod/events.php:441 +msgid "Finish date/time is not known or not relevant" msgstr "" -#: ../../boot.php:2235 -msgid "Profile Details" +#: ../../mod/events.php:443 +msgid "Event Finishes:" msgstr "" -#: ../../boot.php:2253 -msgid "Events and Calendar" +#: ../../mod/events.php:446 +msgid "Adjust for viewer timezone" msgstr "" -#: ../../boot.php:2258 -msgid "Webpages" +#: ../../mod/events.php:448 +msgid "Description:" msgstr "" -#: ../../boot.php:2261 -msgid "Manage Webpages" +#: ../../mod/events.php:452 +msgid "Title:" msgstr "" -#: ../../boot.php:2545 -msgid "toggle mobile" +#: ../../mod/events.php:454 +msgid "Share this event" msgstr "" -- cgit v1.2.3 From ff91541cfd753f0318f13835763bd86c5eafac53 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 28 Nov 2013 16:13:09 -0800 Subject: zot doco --- include/zot.php | 113 +++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 96 insertions(+), 17 deletions(-) diff --git a/include/zot.php b/include/zot.php index 0e92b0bff..6ee7665ee 100644 --- a/include/zot.php +++ b/include/zot.php @@ -353,7 +353,17 @@ function zot_refresh($them,$channel = null) { * @function: zot_gethub * * A guid and a url, both signed by the sender, distinguish a known sender at a known location - * This function looks these up to see if the channel is known. If not, we will need to verify it. + * This function looks these up to see if the channel is known and therefore previously verified. + * If not, we will need to verify it. + * + * @param array $arr + * $arr must contain: + * string $arr['guid'] => guid of conversant + * string $arr['guid_sig'] => guid signed with conversant's private key + * string $arr['url'] => URL of the origination hub of this communication + * string $arr['url_sig'] => URL signed with conversant's private key + * + * * @returns: array => hubloc record */ @@ -380,6 +390,27 @@ function zot_gethub($arr) { return null; } +/** + * @function zot_register_hub($arr) + * + * A communication has been received which has an unknown (to us) sender. + * Perform discovery based on our calculated hash of the sender at the origination address. + * This will fetch the discovery packet of the sender, which contains the public key we + * need to verify our guid and url signatures. + * + * @param array $arr + * $arr must contain: + * string $arr['guid'] => guid of conversant + * string $arr['guid_sig'] => guid signed with conversant's private key + * string $arr['url'] => URL of the origination hub of this communication + * string $arr['url_sig'] => URL signed with conversant's private key + * + * + * @returns array => 'success' (boolean true or false) + * 'message' (optional error string only if success is false) + */ + + function zot_register_hub($arr) { $result = array('success' => false); @@ -398,19 +429,43 @@ function zot_register_hub($arr) { if($x['success']) { $record = json_decode($x['body'],true); - $c = import_xchan($record); - if($c['success']) - $result['success'] = true; + + /* + * We now have a key - only continue registration if our signatures are valid + * AND the guid and guid sig in the returned packet match those provided in + * our current communication. + */ + + if((rsa_verify($arr['guid'],base64url_decode($arr['guid_sig']),$record['key'])) + && (rsa_verify($arr['url'],base64url_decode($arr['url_sig']),$record['key'])) + && ($arr['guid'] === $record['guid']) + && ($arr['guid_sig'] === $record['guid_sig'])) { + + $c = import_xchan($record); + if($c['success']) + $result['success'] = true; + } + else { + logger('zot_register_hub: failure to verify returned packet.'); + } } } return $result; } - -// Takes a json associative array from zot_finger and imports the xchan and hublocs -// If the xchan already exists, update the name and photo if these have changed. -// +/** + * @function 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. + * + * @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 + * + * @returns array => 'success' (boolean true or false) + * 'message' (optional error string only if success is false) + */ function import_xchan($arr,$ud_flags = 1) { @@ -436,7 +491,6 @@ function import_xchan($arr,$ud_flags = 1) { return $ret; } - logger('import_xchan: ' . $xchan_hash, LOGGER_DEBUG); $r = q("select * from xchan where xchan_hash = '%s' limit 1", @@ -753,6 +807,20 @@ function import_xchan($arr,$ud_flags = 1) { return $ret; } +/** + * @function zot_process_response($hub,$arr,$outq) { + * Called immediately after sending a zot message which is using queue processing + * Updates the queue item according to the response result and logs any information + * returned to aid communications troubleshooting. + * + * @param string $hub - url of site we just contacted + * @param array $arr - output of z_post_url() + * @param array $outq - The queue structure attached to this request + * + * @returns nothing + */ + + function zot_process_response($hub,$arr,$outq) { if(! $arr['success']) { @@ -788,14 +856,16 @@ function zot_process_response($hub,$arr,$outq) { } /** - * @function: zot_fetch + * @function zot_fetch($arr) * - * We received a notification packet (in mod/post.php) that a message is waiting for us, and we've verified the sender. - * Now send back a pickup message, using our message tracking ID ($arr['secret']), which we will sign. - * The entire pickup message is encrypted with the remote site's public key. - * If everything checks out on the remote end, we will receive back a packet containing one or more messages, - * which will be processed before returning. - * + * We received a notification packet (in mod/post.php) that a message is waiting for us, and we've verified the sender. + * Now send back a pickup message, using our message tracking ID ($arr['secret']), which we will sign with our site private key. + * The entire pickup message is encrypted with the remote site's public key. + * If everything checks out on the remote end, we will receive back a packet containing one or more messages, + * which will be processed and delivered before this function ultimately returns. + * + * @param array $arr + * decrypted and json decoded notify packet from remote site */ @@ -833,7 +903,16 @@ function zot_fetch($arr) { * Process an incoming array of messages which were obtained via pickup, and * import, update, delete as directed. * - * The message types handled here are 'activity' (e.g. posts), 'mail' and 'profile' + * @param array $arr => 'pickup' structure returned from remote site + * @param string $sender_url => the url specified by the sender in the initial communication + * we will verify the sender and url in each returned message structure and also verify + * that all the messages returned match the site url that we are currently processing. + * + * The message types handled here are 'activity' (e.g. posts), 'mail' , 'profile', and 'channel_sync' + * + * @returns array => array ( [0] => string $channel_hash, [1] => string $delivery_status, [2] => string $address ) + * suitable for logging remotely, enumerating the processing results of each message/recipient combination. + * */ function zot_import($arr, $sender_url) { -- cgit v1.2.3 From fafba385c1f7bebc61909ab4b9add075c08fcd4e Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 28 Nov 2013 16:46:47 -0800 Subject: only list undeleted hublocs in zot_finger --- include/zot.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/include/zot.php b/include/zot.php index 6ee7665ee..156a26e9c 100644 --- a/include/zot.php +++ b/include/zot.php @@ -19,7 +19,8 @@ function zot_new_uid($channel_nick) { /** * @function zot_get_hublocs($hash) - * Given a zot hash, return all distinct hubs + * Given a zot hash, return all distinct hubs. + * This function is used in building the zot discovery packet * @param string $hash - xchan_hash * @retuns array * @@ -27,10 +28,12 @@ function zot_new_uid($channel_nick) { function zot_get_hublocs($hash) { - $ret = q("select * from hubloc where hubloc_hash = '%s' group by hubloc_url ", - dbesc($hash) - ); + /** Only search for active hublocs - e.g. those that haven't been marked deleted */ + $ret = q("select * from hubloc where hubloc_hash = '%s' and not ( hubloc_flags & %d ) group by hubloc_url ", + dbesc($hash), + intval(HUBLOC_FLAGS_DELETED) + ); return $ret; } -- cgit v1.2.3 From 8e0d3c2d6f2c4e23eacb62203b8a754db20cfb8c Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 28 Nov 2013 17:47:33 -0800 Subject: doco --- include/zot.php | 47 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/include/zot.php b/include/zot.php index 156a26e9c..57c3d3601 100644 --- a/include/zot.php +++ b/include/zot.php @@ -6,7 +6,15 @@ require_once('include/items.php'); /** * * @function zot_new_uid($channel_nick) - * @channel_id = unique nickname of controlling entity + * + * Generates a unique string for use as a zot guid using our DNS-based url, the channel nickname and some entropy. + * The entropy ensures uniqueness against re-installs where the same URL and nickname are chosen. + * NOTE: zot doesn't require this to be unique. Internally we use a whirlpool hash of this guid and the signature + * of this guid signed with the channel private key. This can be verified and should make the probability of + * collision of the verified result negligible within the constraints of our immediate universe. + * + * @param string channel_nickname = unique nickname of controlling entity + * * @returns string * */ @@ -21,8 +29,25 @@ function zot_new_uid($channel_nick) { * @function zot_get_hublocs($hash) * Given a zot hash, return all distinct hubs. * This function is used in building the zot discovery packet + * and therefore should only be used by channels which are defined + * on this hub * @param string $hash - xchan_hash - * @retuns array + * @retuns array of hubloc (hub location structures) + * hubloc_id int + * hubloc_guid char(255) + * hubloc_guid_sig text + * hubloc_hash char(255) + * hubloc_addr char(255) + * hubloc_flags int + * hubloc_status int + * hubloc_url char(255) + * hubloc_url_sig text + * hubloc_host char(255) + * hubloc_callback char(255) + * hubloc_connect char(255) + * hubloc_sitekey text + * hubloc_updated datetime + * hubloc_connected datetime * */ @@ -37,12 +62,22 @@ function zot_get_hublocs($hash) { return $ret; } -/* +/** + * + * @function zot_build_packet($channel,$type = 'notify',$recipients = null, $remote_key = null, $secret = null) + * builds a zot notification packet that you can either + * store in the queue with a message array or call zot_zot to immediately + * zot it to the other side * - * zot_build_packet builds a notification packet that you can either - * store in the queue with a message array or call zot_zot to immediately - * zot it to the other side + * @param array $channel => sender channel structure + * @param string $type => one of 'ping', 'pickup', 'purge', 'refresh', 'notify', 'auth_check' + * @param array $recipients => envelope information, array of string $xchan_hash; 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 * + * @returns string json encoded zot packet */ function zot_build_packet($channel,$type = 'notify',$recipients = null, $remote_key = null, $secret = null) { -- cgit v1.2.3 From eae33275840495d27717f95f9647cf96c1c1d6cd Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 28 Nov 2013 18:10:04 -0800 Subject: item store hooks --- include/items.php | 15 +++++++++++++++ include/zot.php | 9 +++++++++ 2 files changed, 24 insertions(+) diff --git a/include/items.php b/include/items.php index 45c5f5ac9..e380be488 100755 --- a/include/items.php +++ b/include/items.php @@ -1432,6 +1432,12 @@ function encode_rel_links($links) { function item_store($arr,$allow_exec = false) { + $d = array('item' => $arr, 'allow_exec' => $allow_exec); + call_hooks('item_store', $d ); + $arr = $d['item']; + $allow_exec = $d['allow_exec']; + + $ret = array('result' => false, 'item_id' => 0); if(! $arr['uid']) { @@ -1808,6 +1814,15 @@ function item_store($arr,$allow_exec = false) { function item_store_update($arr,$allow_exec = false) { + + + $d = array('item' => $arr, 'allow_exec' => $allow_exec); + call_hooks('item_store_update', $d ); + $arr = $d['item']; + $allow_exec = $d['allow_exec']; + + + $ret = array('result' => false, 'item_id' => 0); if(! intval($arr['uid'])) { logger('item_store_update: no uid'); diff --git a/include/zot.php b/include/zot.php index 57c3d3601..725dc58e3 100644 --- a/include/zot.php +++ b/include/zot.php @@ -3,6 +3,15 @@ require_once('include/crypto.php'); require_once('include/items.php'); +/** + * Red implementation of zot protocol. + * + * https://github.com/friendica/red/wiki/zot + * https://github.com/friendica/red/wiki/Zot---A-High-Level-Overview + * + */ + + /** * * @function zot_new_uid($channel_nick) -- cgit v1.2.3 From 94c293f2c6c8ff7d7a1a0f45ab9ab2ecfaa16372 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 28 Nov 2013 18:46:59 -0800 Subject: doco --- include/zot.php | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/include/zot.php b/include/zot.php index 725dc58e3..9777f7ae4 100644 --- a/include/zot.php +++ b/include/zot.php @@ -79,8 +79,8 @@ function zot_get_hublocs($hash) { * zot it to the other side * * @param array $channel => sender channel structure - * @param string $type => one of 'ping', 'pickup', 'purge', 'refresh', 'notify', 'auth_check' - * @param array $recipients => envelope information, array of string $xchan_hash; empty for public posts + * @param string $type => packet type: one of 'ping', 'pickup', 'purge', '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 @@ -228,12 +228,27 @@ function zot_finger($webbie,$channel,$autofallback = true) { } /** - * @function: zot_refresh + * @function: zot_refresh($them, $channel = null) * - * zot_refresh is typically invoked when somebody has changed permissions of a channel and they are notified - * to fetch new permissions via a finger 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. + * 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. + * + * @param array $them => xchan structure of sender + * @param array $channel => local channel structure of target recipient, required for "friending" operations * + * @returns boolean true if successful, else false */ function zot_refresh($them,$channel = null) { -- cgit v1.2.3 From d1ab865ccf8a9200236e310c93ad56b8a7f93aad Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 28 Nov 2013 19:17:20 -0800 Subject: make the template processor (e.g. replace_macros) pluggable --- include/text.php | 5 ++++- mod/connections.php | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/text.php b/include/text.php index 54626a772..3d15a5c6b 100755 --- a/include/text.php +++ b/include/text.php @@ -15,8 +15,11 @@ require_once("include/friendica_smarty.php"); function replace_macros($s,$r) { $a = get_app(); + $arr = array('template' => $s, 'params' => $r); + call_hooks('replace_macros', $arr); + $t = $a->template_engine(); - $output = $t->replace_macros($s,$r); + $output = $t->replace_macros($arr['template'],$arr['params']); return $output; } diff --git a/mod/connections.php b/mod/connections.php index d7adf775b..39bef0209 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -464,7 +464,7 @@ function connections_content(&$a) { '$cautious' => t('Cautious Sharing'), '$follow' => t('Follow Only'), '$permlbl' => t('Individual Permissions'), - '$permnote' => t('Some permissions may be inherited from your privacy settings, which have higher priority. Changing those on this page will have no effect.'), + '$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'], -- cgit v1.2.3 From 8cd9a2c3a944e804c72ef461df801116c6b44ac7 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 28 Nov 2013 19:37:39 -0800 Subject: doc updates --- doc/html/BaseObject_8php.html | 2 +- doc/html/Contact_8php.html | 2 +- doc/html/ConversationObject_8php.html | 2 +- doc/html/ITemplateEngine_8php.html | 2 +- doc/html/ItemObject_8php.html | 2 +- doc/html/ProtoDriver_8php.html | 2 +- doc/html/__well__known_8php.html | 2 +- doc/html/account_8php.html | 2 +- doc/html/acl_8php.html | 2 +- doc/html/acl__selectors_8php.html | 2 +- doc/html/activities_8php.html | 2 +- doc/html/admin_8php.html | 2 +- doc/html/allfriends_8php.html | 2 +- doc/html/annotated.html | 2 +- doc/html/apps_8php.html | 2 +- doc/html/apw_2README_8md.html | 112 ++++++++++ doc/html/apw_2php_2style_8php.html | 2 +- doc/html/apw_2php_2theme_8php.html | 2 +- doc/html/auth_8php.html | 2 +- doc/html/bb2diaspora_8php.html | 2 +- doc/html/bbcode_8php.html | 2 +- doc/html/blocks_8php.html | 2 +- doc/html/blogga_2php_2README_8md.html | 112 ++++++++++ doc/html/blogga_2php_2theme_8php.html | 138 ++++++++++++ doc/html/blogga_2php_2theme_8php.js | 4 + .../blogga_2view_2theme_2blog_2theme_8php.html | 220 +++++++++++++++++++ doc/html/blogga_2view_2theme_2blog_2theme_8php.js | 8 + doc/html/boot_8php.html | 12 +- doc/html/cache_8php.html | 2 +- doc/html/channel_8php.html | 2 +- doc/html/chanview_8php.html | 2 +- doc/html/classApp-members.html | 2 +- doc/html/classApp.html | 2 +- doc/html/classBaseObject-members.html | 2 +- doc/html/classBaseObject.html | 2 +- doc/html/classCache-members.html | 2 +- doc/html/classCache.html | 2 +- doc/html/classConversation-members.html | 2 +- doc/html/classConversation.html | 2 +- doc/html/classFKOAuth1-members.html | 2 +- doc/html/classFKOAuth1.html | 2 +- doc/html/classFKOAuthDataStore-members.html | 2 +- doc/html/classFKOAuthDataStore.html | 2 +- doc/html/classFriendicaSmarty-members.html | 2 +- doc/html/classFriendicaSmarty.html | 2 +- doc/html/classFriendicaSmartyEngine-members.html | 2 +- doc/html/classFriendicaSmartyEngine.html | 2 +- doc/html/classItem-members.html | 2 +- doc/html/classItem.html | 2 +- doc/html/classProtoDriver-members.html | 2 +- doc/html/classProtoDriver.html | 2 +- doc/html/classRedBasicAuth-members.html | 2 +- doc/html/classRedBasicAuth.html | 2 +- doc/html/classRedDirectory-members.html | 2 +- doc/html/classRedDirectory.html | 2 +- doc/html/classRedFile-members.html | 2 +- doc/html/classRedFile.html | 2 +- doc/html/classRedInode-members.html | 2 +- doc/html/classRedInode.html | 2 +- doc/html/classTemplate-members.html | 2 +- doc/html/classTemplate.html | 2 +- doc/html/classZotDriver-members.html | 2 +- doc/html/classZotDriver.html | 2 +- doc/html/classdba__driver-members.html | 2 +- doc/html/classdba__driver.html | 2 +- doc/html/classdba__mysql-members.html | 2 +- doc/html/classdba__mysql.html | 2 +- doc/html/classdba__mysqli-members.html | 2 +- doc/html/classdba__mysqli.html | 2 +- doc/html/classenotify-members.html | 2 +- doc/html/classenotify.html | 2 +- doc/html/classes.html | 2 +- doc/html/classphoto__driver-members.html | 2 +- doc/html/classphoto__driver.html | 2 +- doc/html/classphoto__gd-members.html | 2 +- doc/html/classphoto__gd.html | 2 +- doc/html/classphoto__imagick-members.html | 2 +- doc/html/classphoto__imagick.html | 2 +- doc/html/cli__startup_8php.html | 2 +- doc/html/cli__suggest_8php.html | 2 +- doc/html/cloud_8php.html | 2 +- doc/html/comanche_8php.html | 2 +- doc/html/common_8php.html | 2 +- doc/html/community_8php.html | 2 +- doc/html/config_8md.html | 2 +- doc/html/connect_8php.html | 2 +- doc/html/connections_8php.html | 2 +- doc/html/contact__selectors_8php.html | 2 +- doc/html/contact__widgets_8php.html | 2 +- doc/html/contactgroup_8php.html | 2 +- doc/html/conversation_8php.html | 2 +- doc/html/crepair_8php.html | 2 +- doc/html/cronhooks_8php.html | 2 +- doc/html/crypto_8php.html | 4 +- doc/html/dark_8php.html | 2 +- doc/html/darkness_8php.html | 2 +- doc/html/darknessleftaside_8php.html | 2 +- doc/html/darknessrightaside_8php.html | 2 +- doc/html/datetime_8php.html | 2 +- doc/html/db__update_8php.html | 2 +- doc/html/dba__driver_8php.html | 6 +- doc/html/dba__mysql_8php.html | 2 +- doc/html/dba__mysqli_8php.html | 2 +- doc/html/delegate_8php.html | 2 +- doc/html/deliver_8php.html | 2 +- doc/html/dir_032dd9e2cfe278a2cfa5eb9547448eb9.html | 4 +- doc/html/dir_032dd9e2cfe278a2cfa5eb9547448eb9.js | 3 +- doc/html/dir_05f4fba29266e8fd7869afcd6cefb5cb.html | 2 +- doc/html/dir_0eaa4a0adae8ba4811e133c6e594aeee.html | 2 +- doc/html/dir_21bc5169ff11430004758be31dcfc6c4.html | 2 +- doc/html/dir_23ec12649285f9fabf3a6b7380226c28.html | 2 +- doc/html/dir_25f74a9991dbbca1b52a94e358ca73c1.html | 112 ++++++++++ doc/html/dir_25f74a9991dbbca1b52a94e358ca73c1.js | 4 + doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html | 2 +- doc/html/dir_55dbaf9b7b53c4fc605c9011743a7353.html | 2 +- doc/html/dir_6cee3bb9ace89cc4e2f065aa2ca7bc5b.html | 112 ++++++++++ doc/html/dir_6cee3bb9ace89cc4e2f065aa2ca7bc5b.js | 4 + doc/html/dir_720432dea4a717197ae070dbc42b8f20.html | 8 +- doc/html/dir_720432dea4a717197ae070dbc42b8f20.js | 2 +- doc/html/dir_817f6d302394b98e59575acdb59998bc.html | 6 +- doc/html/dir_817f6d302394b98e59575acdb59998bc.js | 4 +- doc/html/dir_8543001e5d25368a6edede3e63efb554.html | 4 +- doc/html/dir_8543001e5d25368a6edede3e63efb554.js | 1 + doc/html/dir_922c77e958c99a98db92d38a3a349bf2.html | 114 ++++++++++ doc/html/dir_922c77e958c99a98db92d38a3a349bf2.js | 5 + doc/html/dir_92d6b429199666aa3765c8a934db5e14.html | 112 ++++++++++ doc/html/dir_92d6b429199666aa3765c8a934db5e14.js | 4 + doc/html/dir__fns_8php.html | 2 +- doc/html/dir_a8a0005c2b8590c535262d232c22afab.html | 116 +++++++++++ doc/html/dir_a8a0005c2b8590c535262d232c22afab.js | 6 + doc/html/dir_aae29906d7bfc07d076125f669c8352e.html | 2 +- doc/html/dir_b2f003339c516cc00c8cadcafbe82f13.html | 2 +- doc/html/dir_c02447ad39a5307c81c64e880ec9e8d3.html | 118 +++++++++++ doc/html/dir_c02447ad39a5307c81c64e880ec9e8d3.js | 7 + doc/html/dir_cb8a8f75dcdd0b3fbfcc82e9eda410c5.html | 2 +- doc/html/dir_d41ce877eb409a4791b288730010abe2.html | 2 +- doc/html/dir_d44c64559bbebec7f509842c48db8b23.html | 2 +- doc/html/dir_d520c5cf583201d9437764f209363c22.html | 2 +- doc/html/dirsearch_8php.html | 2 +- doc/html/display_8php.html | 2 +- doc/html/docblox__errorchecker_8php.html | 2 +- doc/html/editblock_8php.html | 2 +- doc/html/editlayout_8php.html | 2 +- doc/html/editpost_8php.html | 2 +- doc/html/editwebpage_8php.html | 2 +- doc/html/enotify_8php.html | 2 +- doc/html/event_8php.html | 2 +- doc/html/events_8php.html | 2 +- doc/html/expire_8php.html | 2 +- doc/html/extract_8php.html | 4 +- doc/html/fbrowser_8php.html | 2 +- doc/html/features_8php.html | 2 +- doc/html/feed_8php.html | 2 +- doc/html/filer_8php.html | 2 +- doc/html/filerm_8php.html | 2 +- doc/html/files.html | 38 ++-- doc/html/filestorage_8php.html | 2 +- doc/html/fpostit_8php.html | 2 +- doc/html/fresh_8md.html | 2 +- doc/html/friendica-to-smarty-tpl_8py.html | 2 +- doc/html/friendica__smarty_8php.html | 2 +- doc/html/fsuggest_8php.html | 2 +- doc/html/full_8php.html | 2 +- doc/html/functions.html | 2 +- doc/html/functions_0x5f.html | 2 +- doc/html/functions_0x61.html | 2 +- doc/html/functions_0x62.html | 2 +- doc/html/functions_0x63.html | 2 +- doc/html/functions_0x64.html | 2 +- doc/html/functions_0x65.html | 2 +- doc/html/functions_0x66.html | 2 +- doc/html/functions_0x67.html | 2 +- doc/html/functions_0x68.html | 2 +- doc/html/functions_0x69.html | 2 +- doc/html/functions_0x6c.html | 2 +- doc/html/functions_0x6e.html | 2 +- doc/html/functions_0x6f.html | 2 +- doc/html/functions_0x70.html | 2 +- doc/html/functions_0x71.html | 2 +- doc/html/functions_0x72.html | 2 +- doc/html/functions_0x73.html | 2 +- doc/html/functions_0x74.html | 2 +- doc/html/functions_0x76.html | 2 +- doc/html/functions_func.html | 2 +- doc/html/functions_func_0x61.html | 2 +- doc/html/functions_func_0x62.html | 2 +- doc/html/functions_func_0x63.html | 2 +- doc/html/functions_func_0x64.html | 2 +- doc/html/functions_func_0x65.html | 2 +- doc/html/functions_func_0x66.html | 2 +- doc/html/functions_func_0x67.html | 2 +- doc/html/functions_func_0x68.html | 2 +- doc/html/functions_func_0x69.html | 2 +- doc/html/functions_func_0x6c.html | 2 +- doc/html/functions_func_0x6e.html | 2 +- doc/html/functions_func_0x6f.html | 2 +- doc/html/functions_func_0x70.html | 2 +- doc/html/functions_func_0x71.html | 2 +- doc/html/functions_func_0x72.html | 2 +- doc/html/functions_func_0x73.html | 2 +- doc/html/functions_func_0x74.html | 2 +- doc/html/functions_func_0x76.html | 2 +- doc/html/functions_vars.html | 2 +- doc/html/globals.html | 15 +- doc/html/globals_0x5f.html | 2 +- doc/html/globals_0x61.html | 2 +- doc/html/globals_0x62.html | 20 +- doc/html/globals_0x63.html | 2 +- doc/html/globals_0x64.html | 2 +- doc/html/globals_0x65.html | 2 +- doc/html/globals_0x66.html | 2 +- doc/html/globals_0x67.html | 2 +- doc/html/globals_0x68.html | 2 +- doc/html/globals_0x69.html | 4 +- doc/html/globals_0x6a.html | 2 +- doc/html/globals_0x6b.html | 2 +- doc/html/globals_0x6c.html | 2 +- doc/html/globals_0x6d.html | 2 +- doc/html/globals_0x6e.html | 2 +- doc/html/globals_0x6f.html | 2 +- doc/html/globals_0x70.html | 17 +- doc/html/globals_0x71.html | 2 +- doc/html/globals_0x72.html | 8 +- doc/html/globals_0x73.html | 2 +- doc/html/globals_0x74.html | 12 +- doc/html/globals_0x75.html | 2 +- doc/html/globals_0x76.html | 2 +- doc/html/globals_0x77.html | 2 +- doc/html/globals_0x78.html | 2 +- doc/html/globals_0x7a.html | 6 +- doc/html/globals_func.html | 2 +- doc/html/globals_func_0x61.html | 2 +- doc/html/globals_func_0x62.html | 20 +- doc/html/globals_func_0x63.html | 2 +- doc/html/globals_func_0x64.html | 2 +- doc/html/globals_func_0x65.html | 2 +- doc/html/globals_func_0x66.html | 2 +- doc/html/globals_func_0x67.html | 2 +- doc/html/globals_func_0x68.html | 2 +- doc/html/globals_func_0x69.html | 2 +- doc/html/globals_func_0x6a.html | 2 +- doc/html/globals_func_0x6b.html | 2 +- doc/html/globals_func_0x6c.html | 2 +- doc/html/globals_func_0x6d.html | 2 +- doc/html/globals_func_0x6e.html | 2 +- doc/html/globals_func_0x6f.html | 2 +- doc/html/globals_func_0x70.html | 17 +- doc/html/globals_func_0x71.html | 2 +- doc/html/globals_func_0x72.html | 8 +- doc/html/globals_func_0x73.html | 2 +- doc/html/globals_func_0x74.html | 12 +- doc/html/globals_func_0x75.html | 2 +- doc/html/globals_func_0x76.html | 2 +- doc/html/globals_func_0x77.html | 2 +- doc/html/globals_func_0x78.html | 2 +- doc/html/globals_func_0x7a.html | 6 +- doc/html/globals_vars.html | 15 +- doc/html/globals_vars_0x61.html | 2 +- doc/html/globals_vars_0x63.html | 2 +- doc/html/globals_vars_0x64.html | 2 +- doc/html/globals_vars_0x65.html | 2 +- doc/html/globals_vars_0x66.html | 2 +- doc/html/globals_vars_0x67.html | 2 +- doc/html/globals_vars_0x68.html | 2 +- doc/html/globals_vars_0x69.html | 4 +- doc/html/globals_vars_0x6a.html | 2 +- doc/html/globals_vars_0x6b.html | 2 +- doc/html/globals_vars_0x6c.html | 2 +- doc/html/globals_vars_0x6d.html | 2 +- doc/html/globals_vars_0x6e.html | 2 +- doc/html/globals_vars_0x70.html | 2 +- doc/html/globals_vars_0x72.html | 2 +- doc/html/globals_vars_0x73.html | 2 +- doc/html/globals_vars_0x74.html | 2 +- doc/html/globals_vars_0x75.html | 2 +- doc/html/globals_vars_0x77.html | 2 +- doc/html/globals_vars_0x78.html | 2 +- doc/html/globals_vars_0x7a.html | 2 +- doc/html/gprobe_8php.html | 2 +- doc/html/greenthumbnails_8php.html | 2 +- doc/html/hcard_8php.html | 2 +- doc/html/help_8php.html | 2 +- doc/html/hierarchy.html | 2 +- doc/html/home_8php.html | 2 +- doc/html/hostxrd_8php.html | 2 +- doc/html/html2bbcode_8php.html | 2 +- doc/html/html2plain_8php.html | 2 +- doc/html/identity_8php.html | 2 +- doc/html/import_8php.html | 2 +- doc/html/include_2api_8php.html | 2 +- doc/html/include_2attach_8php.html | 2 +- doc/html/include_2chanman_8php.html | 2 +- doc/html/include_2config_8php.html | 8 +- doc/html/include_2directory_8php.html | 2 +- doc/html/include_2follow_8php.html | 2 +- doc/html/include_2group_8php.html | 2 +- doc/html/include_2menu_8php.html | 2 +- doc/html/include_2message_8php.html | 2 +- doc/html/include_2network_8php.html | 2 +- doc/html/include_2notify_8php.html | 2 +- doc/html/include_2oembed_8php.html | 2 +- doc/html/include_2photos_8php.html | 2 +- doc/html/index.html | 2 +- doc/html/interfaceITemplateEngine-members.html | 2 +- doc/html/interfaceITemplateEngine.html | 2 +- doc/html/intro_8php.html | 2 +- doc/html/invite_8php.html | 2 +- doc/html/item_8php.html | 2 +- doc/html/items_8php.html | 2 +- doc/html/language_8php.html | 4 +- doc/html/lastpost_8php.html | 2 +- doc/html/layouts_8php.html | 2 +- doc/html/like_8php.html | 2 +- doc/html/lockview_8php.html | 2 +- doc/html/login_8php.html | 2 +- doc/html/lostpass_8php.html | 2 +- doc/html/magic_8php.html | 2 +- doc/html/manage_8php.html | 2 +- doc/html/match_8php.html | 2 +- doc/html/md_README.html | 2 +- doc/html/md_config.html | 2 +- doc/html/md_fresh.html | 2 +- doc/html/minimal_8php.html | 2 +- doc/html/minimalisticdarkness_8php.html | 2 +- doc/html/mitem_8php.html | 2 +- doc/html/mod_2api_8php.html | 2 +- doc/html/mod_2attach_8php.html | 2 +- doc/html/mod_2chanman_8php.html | 2 +- doc/html/mod_2directory_8php.html | 2 +- doc/html/mod_2follow_8php.html | 2 +- doc/html/mod_2group_8php.html | 2 +- doc/html/mod_2menu_8php.html | 2 +- doc/html/mod_2message_8php.html | 2 +- doc/html/mod_2network_8php.html | 2 +- doc/html/mod_2notify_8php.html | 2 +- doc/html/mod_2oembed_8php.html | 2 +- doc/html/mod_2photos_8php.html | 2 +- doc/html/mod__import_8php.html | 2 +- doc/html/mod__new__channel_8php.html | 2 +- doc/html/mod__register_8php.html | 2 +- doc/html/mood_8php.html | 2 +- doc/html/msearch_8php.html | 2 +- doc/html/namespaceFriendica.html | 2 +- doc/html/namespaceacl__selectors.html | 2 +- doc/html/namespacefriendica-to-smarty-tpl.html | 2 +- doc/html/namespacemembers.html | 2 +- doc/html/namespacemembers_func.html | 2 +- doc/html/namespacemembers_vars.html | 2 +- doc/html/namespaces.html | 2 +- doc/html/namespaceupdatetpl.html | 2 +- doc/html/namespaceutil.html | 2 +- doc/html/nav_8php.html | 2 +- doc/html/navtree.js | 15 +- doc/html/navtreeindex0.js | 18 +- doc/html/navtreeindex1.js | 18 +- doc/html/navtreeindex2.js | 18 +- doc/html/navtreeindex3.js | 38 ++-- doc/html/navtreeindex4.js | 28 +-- doc/html/navtreeindex5.js | 30 +-- doc/html/navtreeindex6.js | 144 ++++++------- doc/html/navtreeindex7.js | 72 ++++--- doc/html/navtreeindex8.js | 20 ++ doc/html/new__channel_8php.html | 2 +- doc/html/nogroup_8php.html | 2 +- doc/html/none_8php.html | 2 +- doc/html/notifications_8php.html | 2 +- doc/html/notifier_8php.html | 2 +- doc/html/oauth_8php.html | 2 +- doc/html/oexchange_8php.html | 2 +- doc/html/olddefault_8php.html | 2 +- doc/html/onedirsync_8php.html | 2 +- doc/html/onepoll_8php.html | 2 +- doc/html/opensearch_8php.html | 2 +- doc/html/page_8php.html | 2 +- doc/html/page__widgets_8php.html | 2 +- doc/html/pages.html | 2 +- doc/html/parse__url_8php.html | 2 +- doc/html/passion_8php.html | 2 +- doc/html/passionwide_8php.html | 2 +- doc/html/permissions_8php.html | 2 +- doc/html/photo_8php.html | 2 +- doc/html/photo__driver_8php.html | 2 +- doc/html/photo__gd_8php.html | 2 +- doc/html/photo__imagick_8php.html | 2 +- doc/html/php2po_8php.html | 4 +- doc/html/php_2default_8php.html | 2 +- doc/html/php_2theme__init_8php.html | 26 ++- doc/html/php_2theme__init_8php.js | 4 + doc/html/php_8php.html | 2 +- doc/html/pine_8php.html | 2 +- doc/html/ping_8php.html | 2 +- doc/html/plugin_8php.html | 10 +- doc/html/po2php_8php.html | 2 +- doc/html/poco_8php.html | 2 +- doc/html/poke_8php.html | 2 +- doc/html/poller_8php.html | 2 +- doc/html/post_8php.html | 2 +- doc/html/post__to__red_8php.html | 148 +++++++++++-- doc/html/post__to__red_8php.js | 7 +- doc/html/pretheme_8php.html | 2 +- doc/html/probe_8php.html | 2 +- doc/html/profile_8php.html | 2 +- doc/html/profile__advanced_8php.html | 2 +- doc/html/profile__photo_8php.html | 2 +- doc/html/profile__selectors_8php.html | 2 +- doc/html/profiles_8php.html | 2 +- doc/html/profperm_8php.html | 2 +- doc/html/pubsites_8php.html | 2 +- doc/html/qsearch_8php.html | 2 +- doc/html/queue_8php.html | 2 +- doc/html/queue__fn_8php.html | 2 +- doc/html/randprof_8php.html | 2 +- doc/html/redbasic_2php_2style_8php.html | 2 +- doc/html/redbasic_2php_2theme_8php.html | 2 +- doc/html/redbasic_8php.html | 2 +- doc/html/reddav_8php.html | 2 +- doc/html/redir_8php.html | 2 +- doc/html/register_8php.html | 2 +- doc/html/regmod_8php.html | 2 +- doc/html/removeme_8php.html | 2 +- doc/html/rm-64.png | Bin 0 -> 5236 bytes doc/html/rmagic_8php.html | 2 +- doc/html/rpost_8php.html | 2 +- doc/html/rsd__xml_8php.html | 2 +- doc/html/search/all_24.js | 5 +- doc/html/search/all_62.js | 6 + doc/html/search/all_63.js | 2 + doc/html/search/all_64.js | 4 +- doc/html/search/all_69.js | 2 +- doc/html/search/all_70.js | 5 +- doc/html/search/all_72.js | 5 +- doc/html/search/all_74.js | 12 +- doc/html/search/all_7a.js | 2 +- doc/html/search/files_63.js | 6 +- doc/html/search/files_64.js | 4 +- doc/html/search/files_72.js | 3 +- doc/html/search/files_74.js | 8 +- doc/html/search/functions_62.js | 6 + doc/html/search/functions_70.js | 5 +- doc/html/search/functions_72.js | 2 + doc/html/search/functions_74.js | 6 +- doc/html/search/functions_7a.js | 2 +- doc/html/search/variables_24.js | 5 +- doc/html/search/variables_69.js | 2 +- doc/html/search_8php.html | 2 +- doc/html/search__ac_8php.html | 2 +- doc/html/security_8php.html | 2 +- doc/html/session_8php.html | 2 +- doc/html/settings_8php.html | 2 +- doc/html/setup_8php.html | 2 +- doc/html/share_8php.html | 2 +- doc/html/siteinfo_8php.html | 2 +- doc/html/sitelist_8php.html | 2 +- doc/html/smilies_8php.html | 2 +- doc/html/socgraph_8php.html | 2 +- doc/html/sources_8php.html | 2 +- doc/html/starred_8php.html | 2 +- doc/html/subthread_8php.html | 2 +- doc/html/suggest_8php.html | 2 +- doc/html/system__unavailable_8php.html | 2 +- doc/html/tagger_8php.html | 2 +- doc/html/tagrm_8php.html | 2 +- doc/html/taxonomy_8php.html | 2 +- doc/html/template__processor_8php.html | 2 +- doc/html/text_8php.html | 8 +- doc/html/theme_2blogga_2php_2default_8php.html | 165 +++++++++++++++ doc/html/theme_2blogga_2php_2default_8php.js | 6 + doc/html/theme_2blogga_2php_2theme__init_8php.html | 112 ++++++++++ ...e_2blogga_2view_2theme_2blog_2default_8php.html | 161 ++++++++++++++ ...eme_2blogga_2view_2theme_2blog_2default_8php.js | 6 + .../theme_2redbasic_2php_2theme__init_8php.html | 112 ++++++++++ doc/html/thing_8php.html | 2 +- doc/html/toggle__mobile_8php.html | 2 +- doc/html/toggle__safesearch_8php.html | 2 +- doc/html/tpldebug_8php.html | 2 +- doc/html/typo_8php.html | 4 +- doc/html/typohelper_8php.html | 2 +- doc/html/uexport_8php.html | 2 +- doc/html/update__channel_8php.html | 2 +- doc/html/update__community_8php.html | 2 +- doc/html/update__display_8php.html | 2 +- doc/html/update__network_8php.html | 2 +- doc/html/update__search_8php.html | 2 +- doc/html/updatetpl_8py.html | 2 +- doc/html/view_2theme_2apw_2php_2config_8php.html | 2 +- .../view_2theme_2blogga_2php_2config_8php.html | 232 +++++++++++++++++++++ doc/html/view_2theme_2blogga_2php_2config_8php.js | 8 + ...me_2blogga_2view_2theme_2blog_2config_8php.html | 226 ++++++++++++++++++++ ...heme_2blogga_2view_2theme_2blog_2config_8php.js | 8 + .../view_2theme_2redbasic_2php_2config_8php.html | 2 +- doc/html/view_8php.html | 2 +- doc/html/viewconnections_8php.html | 2 +- doc/html/viewsrc_8php.html | 2 +- doc/html/vote_8php.html | 2 +- doc/html/wall__attach_8php.html | 2 +- doc/html/wall__upload_8php.html | 2 +- doc/html/webfinger_8php.html | 2 +- doc/html/webpages_8php.html | 2 +- doc/html/wfinger_8php.html | 2 +- doc/html/widedarkness_8php.html | 2 +- doc/html/widgets_8php.html | 2 +- doc/html/xchan_8php.html | 2 +- doc/html/xrd_8php.html | 2 +- doc/html/zfinger_8php.html | 2 +- doc/html/zot_8php.html | 128 +++++++++--- doc/html/zot_8php.js | 2 +- doc/html/zotfeed_8php.html | 2 +- doc/html/zping_8php.html | 2 +- 508 files changed, 3529 insertions(+), 741 deletions(-) create mode 100644 doc/html/apw_2README_8md.html create mode 100644 doc/html/blogga_2php_2README_8md.html create mode 100644 doc/html/blogga_2php_2theme_8php.html create mode 100644 doc/html/blogga_2php_2theme_8php.js create mode 100644 doc/html/blogga_2view_2theme_2blog_2theme_8php.html create mode 100644 doc/html/blogga_2view_2theme_2blog_2theme_8php.js create mode 100644 doc/html/dir_25f74a9991dbbca1b52a94e358ca73c1.html create mode 100644 doc/html/dir_25f74a9991dbbca1b52a94e358ca73c1.js create mode 100644 doc/html/dir_6cee3bb9ace89cc4e2f065aa2ca7bc5b.html create mode 100644 doc/html/dir_6cee3bb9ace89cc4e2f065aa2ca7bc5b.js create mode 100644 doc/html/dir_922c77e958c99a98db92d38a3a349bf2.html create mode 100644 doc/html/dir_922c77e958c99a98db92d38a3a349bf2.js create mode 100644 doc/html/dir_92d6b429199666aa3765c8a934db5e14.html create mode 100644 doc/html/dir_92d6b429199666aa3765c8a934db5e14.js create mode 100644 doc/html/dir_a8a0005c2b8590c535262d232c22afab.html create mode 100644 doc/html/dir_a8a0005c2b8590c535262d232c22afab.js create mode 100644 doc/html/dir_c02447ad39a5307c81c64e880ec9e8d3.html create mode 100644 doc/html/dir_c02447ad39a5307c81c64e880ec9e8d3.js create mode 100644 doc/html/navtreeindex8.js create mode 100644 doc/html/php_2theme__init_8php.js create mode 100644 doc/html/rm-64.png create mode 100644 doc/html/theme_2blogga_2php_2default_8php.html create mode 100644 doc/html/theme_2blogga_2php_2default_8php.js create mode 100644 doc/html/theme_2blogga_2php_2theme__init_8php.html create mode 100644 doc/html/theme_2blogga_2view_2theme_2blog_2default_8php.html create mode 100644 doc/html/theme_2blogga_2view_2theme_2blog_2default_8php.js create mode 100644 doc/html/theme_2redbasic_2php_2theme__init_8php.html create mode 100644 doc/html/view_2theme_2blogga_2php_2config_8php.html create mode 100644 doc/html/view_2theme_2blogga_2php_2config_8php.js create mode 100644 doc/html/view_2theme_2blogga_2view_2theme_2blog_2config_8php.html create mode 100644 doc/html/view_2theme_2blogga_2view_2theme_2blog_2config_8php.js diff --git a/doc/html/BaseObject_8php.html b/doc/html/BaseObject_8php.html index 73fcf06ee..b399ff36f 100644 --- a/doc/html/BaseObject_8php.html +++ b/doc/html/BaseObject_8php.html @@ -28,7 +28,7 @@
    {{$product}}
    - +
    The Red Matrix
    diff --git a/doc/html/Contact_8php.html b/doc/html/Contact_8php.html index 88019706d..c626f3a6b 100644 --- a/doc/html/Contact_8php.html +++ b/doc/html/Contact_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/ConversationObject_8php.html b/doc/html/ConversationObject_8php.html index e89d0e39d..02a09213b 100644 --- a/doc/html/ConversationObject_8php.html +++ b/doc/html/ConversationObject_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/ITemplateEngine_8php.html b/doc/html/ITemplateEngine_8php.html index 34cb6577b..a2e4e9a43 100644 --- a/doc/html/ITemplateEngine_8php.html +++ b/doc/html/ITemplateEngine_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/ItemObject_8php.html b/doc/html/ItemObject_8php.html index 4a72f4ca8..08b61619c 100644 --- a/doc/html/ItemObject_8php.html +++ b/doc/html/ItemObject_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/ProtoDriver_8php.html b/doc/html/ProtoDriver_8php.html index e419d0c4d..6d918344a 100644 --- a/doc/html/ProtoDriver_8php.html +++ b/doc/html/ProtoDriver_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/__well__known_8php.html b/doc/html/__well__known_8php.html index b78d77c12..96032186d 100644 --- a/doc/html/__well__known_8php.html +++ b/doc/html/__well__known_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/account_8php.html b/doc/html/account_8php.html index d8a3c2d6c..547c7016e 100644 --- a/doc/html/account_8php.html +++ b/doc/html/account_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/acl_8php.html b/doc/html/acl_8php.html index 933631019..fa0fe0018 100644 --- a/doc/html/acl_8php.html +++ b/doc/html/acl_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/acl__selectors_8php.html b/doc/html/acl__selectors_8php.html index 67752af0d..d16051349 100644 --- a/doc/html/acl__selectors_8php.html +++ b/doc/html/acl__selectors_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/activities_8php.html b/doc/html/activities_8php.html index 31a786664..86428ecc8 100644 --- a/doc/html/activities_8php.html +++ b/doc/html/activities_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/admin_8php.html b/doc/html/admin_8php.html index 4419c6ef4..ff835ad08 100644 --- a/doc/html/admin_8php.html +++ b/doc/html/admin_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/allfriends_8php.html b/doc/html/allfriends_8php.html index 9d55a584d..eb1568786 100644 --- a/doc/html/allfriends_8php.html +++ b/doc/html/allfriends_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/annotated.html b/doc/html/annotated.html index 1d15b5588..32271b4f4 100644 --- a/doc/html/annotated.html +++ b/doc/html/annotated.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/apps_8php.html b/doc/html/apps_8php.html index 67b133d31..47a49270a 100644 --- a/doc/html/apps_8php.html +++ b/doc/html/apps_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/apw_2README_8md.html b/doc/html/apw_2README_8md.html new file mode 100644 index 000000000..815c86f05 --- /dev/null +++ b/doc/html/apw_2README_8md.html @@ -0,0 +1,112 @@ + + + + + + +The Red Matrix: view/theme/apw/README.md File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +
    view/theme/apw/README.md File Reference
    +
    +
    +
    +
    + diff --git a/doc/html/apw_2php_2style_8php.html b/doc/html/apw_2php_2style_8php.html index 610640439..baa2cfdec 100644 --- a/doc/html/apw_2php_2style_8php.html +++ b/doc/html/apw_2php_2style_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/apw_2php_2theme_8php.html b/doc/html/apw_2php_2theme_8php.html index 07016cac2..10f7b089c 100644 --- a/doc/html/apw_2php_2theme_8php.html +++ b/doc/html/apw_2php_2theme_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/auth_8php.html b/doc/html/auth_8php.html index 4a3100253..79e1ce375 100644 --- a/doc/html/auth_8php.html +++ b/doc/html/auth_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/bb2diaspora_8php.html b/doc/html/bb2diaspora_8php.html index d7293a518..a10d17d51 100644 --- a/doc/html/bb2diaspora_8php.html +++ b/doc/html/bb2diaspora_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/bbcode_8php.html b/doc/html/bbcode_8php.html index daff36f2e..77c5e873b 100644 --- a/doc/html/bbcode_8php.html +++ b/doc/html/bbcode_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/blocks_8php.html b/doc/html/blocks_8php.html index b99143aee..8993de9ed 100644 --- a/doc/html/blocks_8php.html +++ b/doc/html/blocks_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/blogga_2php_2README_8md.html b/doc/html/blogga_2php_2README_8md.html new file mode 100644 index 000000000..77e6ad489 --- /dev/null +++ b/doc/html/blogga_2php_2README_8md.html @@ -0,0 +1,112 @@ + + + + + + +The Red Matrix: view/theme/blogga/php/README.md File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +
    view/theme/blogga/php/README.md File Reference
    +
    +
    +
    +
    + diff --git a/doc/html/blogga_2php_2theme_8php.html b/doc/html/blogga_2php_2theme_8php.html new file mode 100644 index 000000000..7dec443c3 --- /dev/null +++ b/doc/html/blogga_2php_2theme_8php.html @@ -0,0 +1,138 @@ + + + + + + +The Red Matrix: view/theme/blogga/php/theme.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +Functions
    +
    +
    theme.php File Reference
    +
    +
    + + + + +

    +Functions

     blog_init (&$a)
     
    +

    Function Documentation

    + +
    +
    + + + + + + + + +
    blog_init (& $a)
    +
    +

    Name: Blogga Version: 0.6 Description: Blog theme ported from Twenty Eleven wordpress theme, Licensed under GNU General Public License v2 or later Author: Fabio http://kirgroup.com/profile/fabrixxm Maintainer: Mike <zot:mike@.nosp@m.zoth.nosp@m.ub.co.nosp@m.m>

    + +
    +
    +
    +
    + diff --git a/doc/html/blogga_2php_2theme_8php.js b/doc/html/blogga_2php_2theme_8php.js new file mode 100644 index 000000000..6564e93f7 --- /dev/null +++ b/doc/html/blogga_2php_2theme_8php.js @@ -0,0 +1,4 @@ +var blogga_2php_2theme_8php = +[ + [ "blog_init", "blogga_2php_2theme_8php.html#aa55c1cb1f05087b5002ecb633b550b1b", null ] +]; \ No newline at end of file diff --git a/doc/html/blogga_2view_2theme_2blog_2theme_8php.html b/doc/html/blogga_2view_2theme_2blog_2theme_8php.html new file mode 100644 index 000000000..db3d2371d --- /dev/null +++ b/doc/html/blogga_2view_2theme_2blog_2theme_8php.html @@ -0,0 +1,220 @@ + + + + + + +The Red Matrix: view/theme/blogga/view/theme/blog/theme.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +Functions
    +
    +
    theme.php File Reference
    +
    +
    + + + + + + + + + + + + +

    +Functions

     blog_init (&$a)
     
     blog_install (&$a)
     
     blog_uninstall (&$a)
     
     blogtheme_imgurl ($headimg)
     
     blogtheme_display_item (&$a, &$data)
     
    +

    Function Documentation

    + +
    +
    + + + + + + + + +
    blog_init (& $a)
    +
    +

    Name: Blog Version: 0.6 Description: Blog theme ported from Twenty Eleven wordpress theme, Licensed under GNU General Public License v2 or later Author: Fabio http://kirgroup.com/profile/fabrixxm Maintainer: Fabio http://kirgroup.com/profile/fabrixxm

    + +
    +
    + +
    +
    + + + + + + + + +
    blog_install (& $a)
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    blog_uninstall (& $a)
    +
    + +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + +
    blogtheme_display_item (& $a,
    & $data 
    )
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    blogtheme_imgurl ( $headimg)
    +
    + +
    +
    +
    +
    + diff --git a/doc/html/blogga_2view_2theme_2blog_2theme_8php.js b/doc/html/blogga_2view_2theme_2blog_2theme_8php.js new file mode 100644 index 000000000..2098cac8b --- /dev/null +++ b/doc/html/blogga_2view_2theme_2blog_2theme_8php.js @@ -0,0 +1,8 @@ +var blogga_2view_2theme_2blog_2theme_8php = +[ + [ "blog_init", "blogga_2view_2theme_2blog_2theme_8php.html#aa55c1cb1f05087b5002ecb633b550b1b", null ], + [ "blog_install", "blogga_2view_2theme_2blog_2theme_8php.html#aae58cc837fe56473d9f3370abfe533ae", null ], + [ "blog_uninstall", "blogga_2view_2theme_2blog_2theme_8php.html#a3e77dbe111f330c64a1ff6c741cd515c", null ], + [ "blogtheme_display_item", "blogga_2view_2theme_2blog_2theme_8php.html#a028ae8e9f2824670dfa76a6651d817e5", null ], + [ "blogtheme_imgurl", "blogga_2view_2theme_2blog_2theme_8php.html#af634a3f721c5e238530d0636d33230ec", null ] +]; \ No newline at end of file diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index b0f57fa96..f4d387ae9 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    @@ -962,7 +962,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(), 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(), dfrn_deliver(), drop_item(), event_store(), fetch_url(), 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(), 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(), lrdd(), 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(), post_url(), 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(), dfrn_deliver(), drop_item(), event_store(), fetch_url(), 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(), 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(), lrdd(), 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(), post_url(), 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().

    @@ -1292,7 +1292,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(), profile_content(), regmod_content(), and rpost_content().

    +

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

    @@ -2579,7 +2579,7 @@ Variables
    -

    Referenced by channel_remove(), import_xchan(), notifier_run(), post_post(), remove_all_xchan_resources(), and zfinger_init().

    +

    Referenced by channel_remove(), import_xchan(), notifier_run(), post_post(), remove_all_xchan_resources(), zfinger_init(), and zot_get_hublocs().

    @@ -2593,7 +2593,7 @@ Variables
    -

    Referenced by create_identity(), import_author_xchan(), import_post(), import_xchan(), magic_init(), rconnect_url(), xchan_mail_query(), xchan_query(), zfinger_init(), zot_finger(), zot_get_hubloc(), and zot_refresh().

    +

    Referenced by create_identity(), import_author_xchan(), import_post(), import_xchan(), magic_init(), rconnect_url(), xchan_mail_query(), xchan_query(), zfinger_init(), zot_finger(), and zot_refresh().

    @@ -2723,7 +2723,7 @@ Variables
    -

    Referenced by consume_feed(), delete_item_lowlevel(), encode_item(), expire_run(), get_item_elements(), item_expire(), item_store(), like_content(), notifier_run(), photos_post(), poller_run(), and process_delivery().

    +

    Referenced by consume_feed(), delete_item_lowlevel(), drop_item(), encode_item(), expire_run(), get_item_elements(), item_expire(), item_store(), like_content(), notifier_run(), photos_post(), poller_run(), and process_delivery().

    diff --git a/doc/html/cache_8php.html b/doc/html/cache_8php.html index f88decc38..b7cbd6a1f 100644 --- a/doc/html/cache_8php.html +++ b/doc/html/cache_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/channel_8php.html b/doc/html/channel_8php.html index 76ac3beb6..bea337346 100644 --- a/doc/html/channel_8php.html +++ b/doc/html/channel_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/chanview_8php.html b/doc/html/chanview_8php.html index dafe62257..362affb17 100644 --- a/doc/html/chanview_8php.html +++ b/doc/html/chanview_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classApp-members.html b/doc/html/classApp-members.html index 495c1683e..577a14559 100644 --- a/doc/html/classApp-members.html +++ b/doc/html/classApp-members.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classApp.html b/doc/html/classApp.html index 313a7fc85..f5d4a8d21 100644 --- a/doc/html/classApp.html +++ b/doc/html/classApp.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classBaseObject-members.html b/doc/html/classBaseObject-members.html index 2cc4aed11..6ea953349 100644 --- a/doc/html/classBaseObject-members.html +++ b/doc/html/classBaseObject-members.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classBaseObject.html b/doc/html/classBaseObject.html index f83c0e393..6aa26d5ba 100644 --- a/doc/html/classBaseObject.html +++ b/doc/html/classBaseObject.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classCache-members.html b/doc/html/classCache-members.html index f45439a83..3244cad73 100644 --- a/doc/html/classCache-members.html +++ b/doc/html/classCache-members.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classCache.html b/doc/html/classCache.html index 9eaf93380..f2c1f7991 100644 --- a/doc/html/classCache.html +++ b/doc/html/classCache.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classConversation-members.html b/doc/html/classConversation-members.html index a68650bd6..b8df9ac33 100644 --- a/doc/html/classConversation-members.html +++ b/doc/html/classConversation-members.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classConversation.html b/doc/html/classConversation.html index fe9de72eb..cb5760686 100644 --- a/doc/html/classConversation.html +++ b/doc/html/classConversation.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classFKOAuth1-members.html b/doc/html/classFKOAuth1-members.html index dd4343883..a04cf959f 100644 --- a/doc/html/classFKOAuth1-members.html +++ b/doc/html/classFKOAuth1-members.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classFKOAuth1.html b/doc/html/classFKOAuth1.html index 7e3fb8590..60db51336 100644 --- a/doc/html/classFKOAuth1.html +++ b/doc/html/classFKOAuth1.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classFKOAuthDataStore-members.html b/doc/html/classFKOAuthDataStore-members.html index d5cab373b..92f47bd79 100644 --- a/doc/html/classFKOAuthDataStore-members.html +++ b/doc/html/classFKOAuthDataStore-members.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classFKOAuthDataStore.html b/doc/html/classFKOAuthDataStore.html index 9966c83e1..1abca9ae5 100644 --- a/doc/html/classFKOAuthDataStore.html +++ b/doc/html/classFKOAuthDataStore.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classFriendicaSmarty-members.html b/doc/html/classFriendicaSmarty-members.html index e160a346c..e4f7ff597 100644 --- a/doc/html/classFriendicaSmarty-members.html +++ b/doc/html/classFriendicaSmarty-members.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classFriendicaSmarty.html b/doc/html/classFriendicaSmarty.html index 49f77b903..e0edc33b3 100644 --- a/doc/html/classFriendicaSmarty.html +++ b/doc/html/classFriendicaSmarty.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classFriendicaSmartyEngine-members.html b/doc/html/classFriendicaSmartyEngine-members.html index 772ff8657..b63f0e70a 100644 --- a/doc/html/classFriendicaSmartyEngine-members.html +++ b/doc/html/classFriendicaSmartyEngine-members.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classFriendicaSmartyEngine.html b/doc/html/classFriendicaSmartyEngine.html index 40f28092f..756258847 100644 --- a/doc/html/classFriendicaSmartyEngine.html +++ b/doc/html/classFriendicaSmartyEngine.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classItem-members.html b/doc/html/classItem-members.html index bdafb9e14..a4c9c11b1 100644 --- a/doc/html/classItem-members.html +++ b/doc/html/classItem-members.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classItem.html b/doc/html/classItem.html index d37548bb6..5239498e5 100644 --- a/doc/html/classItem.html +++ b/doc/html/classItem.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classProtoDriver-members.html b/doc/html/classProtoDriver-members.html index 6eebcbc54..671b893d9 100644 --- a/doc/html/classProtoDriver-members.html +++ b/doc/html/classProtoDriver-members.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classProtoDriver.html b/doc/html/classProtoDriver.html index cb869b65b..4e95667dd 100644 --- a/doc/html/classProtoDriver.html +++ b/doc/html/classProtoDriver.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classRedBasicAuth-members.html b/doc/html/classRedBasicAuth-members.html index d12aa9a5e..10817e697 100644 --- a/doc/html/classRedBasicAuth-members.html +++ b/doc/html/classRedBasicAuth-members.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classRedBasicAuth.html b/doc/html/classRedBasicAuth.html index 0269822c9..8bf5996ca 100644 --- a/doc/html/classRedBasicAuth.html +++ b/doc/html/classRedBasicAuth.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classRedDirectory-members.html b/doc/html/classRedDirectory-members.html index 0fe498712..a3a9ea6a3 100644 --- a/doc/html/classRedDirectory-members.html +++ b/doc/html/classRedDirectory-members.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classRedDirectory.html b/doc/html/classRedDirectory.html index 118699a0e..bec72e8f4 100644 --- a/doc/html/classRedDirectory.html +++ b/doc/html/classRedDirectory.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classRedFile-members.html b/doc/html/classRedFile-members.html index 3f24d0365..31c1eb782 100644 --- a/doc/html/classRedFile-members.html +++ b/doc/html/classRedFile-members.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classRedFile.html b/doc/html/classRedFile.html index 68d4fc413..1fa5b9e54 100644 --- a/doc/html/classRedFile.html +++ b/doc/html/classRedFile.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classRedInode-members.html b/doc/html/classRedInode-members.html index 475100a71..3d8504822 100644 --- a/doc/html/classRedInode-members.html +++ b/doc/html/classRedInode-members.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classRedInode.html b/doc/html/classRedInode.html index 0f5267ba4..3f19069a6 100644 --- a/doc/html/classRedInode.html +++ b/doc/html/classRedInode.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classTemplate-members.html b/doc/html/classTemplate-members.html index ced57d9fa..c3620c316 100644 --- a/doc/html/classTemplate-members.html +++ b/doc/html/classTemplate-members.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classTemplate.html b/doc/html/classTemplate.html index 18a4ee771..9ea7d2643 100644 --- a/doc/html/classTemplate.html +++ b/doc/html/classTemplate.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classZotDriver-members.html b/doc/html/classZotDriver-members.html index 5970e2144..eb4c0a6b2 100644 --- a/doc/html/classZotDriver-members.html +++ b/doc/html/classZotDriver-members.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classZotDriver.html b/doc/html/classZotDriver.html index 5983ecd39..4e12e318e 100644 --- a/doc/html/classZotDriver.html +++ b/doc/html/classZotDriver.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classdba__driver-members.html b/doc/html/classdba__driver-members.html index 96b4a6225..cf4075c93 100644 --- a/doc/html/classdba__driver-members.html +++ b/doc/html/classdba__driver-members.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classdba__driver.html b/doc/html/classdba__driver.html index ffac32e66..e70d8bf1f 100644 --- a/doc/html/classdba__driver.html +++ b/doc/html/classdba__driver.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classdba__mysql-members.html b/doc/html/classdba__mysql-members.html index dfc7c777b..15a22064f 100644 --- a/doc/html/classdba__mysql-members.html +++ b/doc/html/classdba__mysql-members.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classdba__mysql.html b/doc/html/classdba__mysql.html index 0604ea688..df61678d5 100644 --- a/doc/html/classdba__mysql.html +++ b/doc/html/classdba__mysql.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classdba__mysqli-members.html b/doc/html/classdba__mysqli-members.html index e58c0dad1..cdfcb2dc4 100644 --- a/doc/html/classdba__mysqli-members.html +++ b/doc/html/classdba__mysqli-members.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classdba__mysqli.html b/doc/html/classdba__mysqli.html index 5b1ef74cb..985a7216b 100644 --- a/doc/html/classdba__mysqli.html +++ b/doc/html/classdba__mysqli.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classenotify-members.html b/doc/html/classenotify-members.html index df4eae18a..65681ca44 100644 --- a/doc/html/classenotify-members.html +++ b/doc/html/classenotify-members.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classenotify.html b/doc/html/classenotify.html index 99084ccb0..2dc2d8640 100644 --- a/doc/html/classenotify.html +++ b/doc/html/classenotify.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classes.html b/doc/html/classes.html index a6f23706c..ec9ffc484 100644 --- a/doc/html/classes.html +++ b/doc/html/classes.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classphoto__driver-members.html b/doc/html/classphoto__driver-members.html index 4a270d6bf..f22362fb4 100644 --- a/doc/html/classphoto__driver-members.html +++ b/doc/html/classphoto__driver-members.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classphoto__driver.html b/doc/html/classphoto__driver.html index 53f6d1ecc..8a8ed59ff 100644 --- a/doc/html/classphoto__driver.html +++ b/doc/html/classphoto__driver.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classphoto__gd-members.html b/doc/html/classphoto__gd-members.html index 9fe52168d..cd85d4020 100644 --- a/doc/html/classphoto__gd-members.html +++ b/doc/html/classphoto__gd-members.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classphoto__gd.html b/doc/html/classphoto__gd.html index b9da47576..f6d76b31c 100644 --- a/doc/html/classphoto__gd.html +++ b/doc/html/classphoto__gd.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classphoto__imagick-members.html b/doc/html/classphoto__imagick-members.html index 082ce2d75..6e8be9219 100644 --- a/doc/html/classphoto__imagick-members.html +++ b/doc/html/classphoto__imagick-members.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/classphoto__imagick.html b/doc/html/classphoto__imagick.html index 2efee443d..8b6f1c630 100644 --- a/doc/html/classphoto__imagick.html +++ b/doc/html/classphoto__imagick.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/cli__startup_8php.html b/doc/html/cli__startup_8php.html index bb8f5d25c..44e103312 100644 --- a/doc/html/cli__startup_8php.html +++ b/doc/html/cli__startup_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/cli__suggest_8php.html b/doc/html/cli__suggest_8php.html index b8b1f0e96..7a57f4baa 100644 --- a/doc/html/cli__suggest_8php.html +++ b/doc/html/cli__suggest_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/cloud_8php.html b/doc/html/cloud_8php.html index 05196301b..68c42f825 100644 --- a/doc/html/cloud_8php.html +++ b/doc/html/cloud_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/comanche_8php.html b/doc/html/comanche_8php.html index 965723a75..c35379c37 100644 --- a/doc/html/comanche_8php.html +++ b/doc/html/comanche_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/common_8php.html b/doc/html/common_8php.html index 378acf654..4fea80ece 100644 --- a/doc/html/common_8php.html +++ b/doc/html/common_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/community_8php.html b/doc/html/community_8php.html index 00cdb818b..71e1deaa5 100644 --- a/doc/html/community_8php.html +++ b/doc/html/community_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/config_8md.html b/doc/html/config_8md.html index 91c9e736b..03a435c31 100644 --- a/doc/html/config_8md.html +++ b/doc/html/config_8md.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/connect_8php.html b/doc/html/connect_8php.html index f2c267101..feb2c7cb2 100644 --- a/doc/html/connect_8php.html +++ b/doc/html/connect_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/connections_8php.html b/doc/html/connections_8php.html index e9f73801d..28d066222 100644 --- a/doc/html/connections_8php.html +++ b/doc/html/connections_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/contact__selectors_8php.html b/doc/html/contact__selectors_8php.html index 04f992db5..af2061db0 100644 --- a/doc/html/contact__selectors_8php.html +++ b/doc/html/contact__selectors_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/contact__widgets_8php.html b/doc/html/contact__widgets_8php.html index 6ee437953..179eded89 100644 --- a/doc/html/contact__widgets_8php.html +++ b/doc/html/contact__widgets_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/contactgroup_8php.html b/doc/html/contactgroup_8php.html index 58dbbe9a3..140b4ad12 100644 --- a/doc/html/contactgroup_8php.html +++ b/doc/html/contactgroup_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/conversation_8php.html b/doc/html/conversation_8php.html index 2f91c0913..063e41c95 100644 --- a/doc/html/conversation_8php.html +++ b/doc/html/conversation_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/crepair_8php.html b/doc/html/crepair_8php.html index a26c3a1e5..c9e347b75 100644 --- a/doc/html/crepair_8php.html +++ b/doc/html/crepair_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/cronhooks_8php.html b/doc/html/cronhooks_8php.html index dab018017..c8941d1d1 100644 --- a/doc/html/cronhooks_8php.html +++ b/doc/html/cronhooks_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/crypto_8php.html b/doc/html/crypto_8php.html index 2d52b3526..3bf683aef 100644 --- a/doc/html/crypto_8php.html +++ b/doc/html/crypto_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    @@ -456,7 +456,7 @@ Functions
    -

    Referenced by get_item_elements(), import_site(), import_xchan(), post_init(), post_post(), and zfinger_init().

    +

    Referenced by get_item_elements(), import_site(), import_xchan(), post_init(), post_post(), zfinger_init(), and zot_register_hub().

    diff --git a/doc/html/dark_8php.html b/doc/html/dark_8php.html index 4499c7c2f..df29c3249 100644 --- a/doc/html/dark_8php.html +++ b/doc/html/dark_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/darkness_8php.html b/doc/html/darkness_8php.html index aa085a9a5..d5ea426d6 100644 --- a/doc/html/darkness_8php.html +++ b/doc/html/darkness_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/darknessleftaside_8php.html b/doc/html/darknessleftaside_8php.html index 707a4ac74..033a7ce47 100644 --- a/doc/html/darknessleftaside_8php.html +++ b/doc/html/darknessleftaside_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/darknessrightaside_8php.html b/doc/html/darknessrightaside_8php.html index 8cb981205..9cc59d968 100644 --- a/doc/html/darknessrightaside_8php.html +++ b/doc/html/darknessrightaside_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/datetime_8php.html b/doc/html/datetime_8php.html index 1937b9b6b..3909d9f6d 100644 --- a/doc/html/datetime_8php.html +++ b/doc/html/datetime_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/db__update_8php.html b/doc/html/db__update_8php.html index 63485d5af..070216b38 100644 --- a/doc/html/db__update_8php.html +++ b/doc/html/db__update_8php.html @@ -28,7 +28,7 @@ - +

    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(), add_fcontact(), 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_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(), contacts_not_grouped(), 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(), dfrn_deliver(), 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_contact_ssl_policy(), 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_xchan(), 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_hubloc(), 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(), add_fcontact(), 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(), contacts_not_grouped(), 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(), dfrn_deliver(), 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_contact_ssl_policy(), 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_xchan(), 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().

    diff --git a/doc/html/dba__mysql_8php.html b/doc/html/dba__mysql_8php.html index 561d83101..da4db27d7 100644 --- a/doc/html/dba__mysql_8php.html +++ b/doc/html/dba__mysql_8php.html @@ -28,7 +28,7 @@
    The Red Matrix
    diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html index 1f4931492..968aa1722 100644 --- a/doc/html/dba__driver_8php.html +++ b/doc/html/dba__driver_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    @@ -202,7 +202,7 @@ Functions
    -

    Referenced by account_verify_password(), acl_init(), add_fcontact(), admin_page_users(), advanced_profile(), allowed_public_recips(), api_direct_messages_new(), api_get_user(), api_status_show(), api_statuses_mentions(), api_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_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(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), filerm_content(), filestorage_content(), fix_attached_photo_permissions(), fix_contact_ssl_policy(), fix_private_photos(), fix_system_urls(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config_from_storage(), get_events(), 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_xchan(), 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_hubloc(), zot_gethub(), zot_process_response(), zot_refresh(), and zotfeed_init().

    +

    Referenced by account_verify_password(), acl_init(), add_fcontact(), 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(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), filerm_content(), filestorage_content(), fix_attached_photo_permissions(), fix_contact_ssl_policy(), fix_private_photos(), fix_system_urls(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config_from_storage(), get_events(), 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_xchan(), 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().

    @@ -320,7 +320,7 @@ Functions
    - +
    The Red Matrix
    diff --git a/doc/html/dba__mysqli_8php.html b/doc/html/dba__mysqli_8php.html index 5af3efc87..9f580d4e9 100644 --- a/doc/html/dba__mysqli_8php.html +++ b/doc/html/dba__mysqli_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/delegate_8php.html b/doc/html/delegate_8php.html index 41ee03f50..3793b633e 100644 --- a/doc/html/delegate_8php.html +++ b/doc/html/delegate_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/deliver_8php.html b/doc/html/deliver_8php.html index ac9e5af77..4d1770429 100644 --- a/doc/html/deliver_8php.html +++ b/doc/html/deliver_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/dir_032dd9e2cfe278a2cfa5eb9547448eb9.html b/doc/html/dir_032dd9e2cfe278a2cfa5eb9547448eb9.html index 6d112b738..be89737ea 100644 --- a/doc/html/dir_032dd9e2cfe278a2cfa5eb9547448eb9.html +++ b/doc/html/dir_032dd9e2cfe278a2cfa5eb9547448eb9.html @@ -28,7 +28,7 @@ - + + +
    The Red Matrix
    @@ -110,6 +110,8 @@ Files
     
    file  theme.php
     
    file  theme_init.php
     
    diff --git a/doc/html/dir_032dd9e2cfe278a2cfa5eb9547448eb9.js b/doc/html/dir_032dd9e2cfe278a2cfa5eb9547448eb9.js index a9e861a3f..7633187b3 100644 --- a/doc/html/dir_032dd9e2cfe278a2cfa5eb9547448eb9.js +++ b/doc/html/dir_032dd9e2cfe278a2cfa5eb9547448eb9.js @@ -2,5 +2,6 @@ var dir_032dd9e2cfe278a2cfa5eb9547448eb9 = [ [ "config.php", "view_2theme_2redbasic_2php_2config_8php.html", "view_2theme_2redbasic_2php_2config_8php" ], [ "style.php", "redbasic_2php_2style_8php.html", "redbasic_2php_2style_8php" ], - [ "theme.php", "redbasic_2php_2theme_8php.html", "redbasic_2php_2theme_8php" ] + [ "theme.php", "redbasic_2php_2theme_8php.html", "redbasic_2php_2theme_8php" ], + [ "theme_init.php", "theme_2redbasic_2php_2theme__init_8php.html", null ] ]; \ No newline at end of file diff --git a/doc/html/dir_05f4fba29266e8fd7869afcd6cefb5cb.html b/doc/html/dir_05f4fba29266e8fd7869afcd6cefb5cb.html index 0a33e4c45..733c56cef 100644 --- a/doc/html/dir_05f4fba29266e8fd7869afcd6cefb5cb.html +++ b/doc/html/dir_05f4fba29266e8fd7869afcd6cefb5cb.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/dir_0eaa4a0adae8ba4811e133c6e594aeee.html b/doc/html/dir_0eaa4a0adae8ba4811e133c6e594aeee.html index f53ed2c0f..7a5f77a99 100644 --- a/doc/html/dir_0eaa4a0adae8ba4811e133c6e594aeee.html +++ b/doc/html/dir_0eaa4a0adae8ba4811e133c6e594aeee.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/dir_21bc5169ff11430004758be31dcfc6c4.html b/doc/html/dir_21bc5169ff11430004758be31dcfc6c4.html index 74f6d82bd..51284f865 100644 --- a/doc/html/dir_21bc5169ff11430004758be31dcfc6c4.html +++ b/doc/html/dir_21bc5169ff11430004758be31dcfc6c4.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/dir_23ec12649285f9fabf3a6b7380226c28.html b/doc/html/dir_23ec12649285f9fabf3a6b7380226c28.html index 0b859ac31..44036cc73 100644 --- a/doc/html/dir_23ec12649285f9fabf3a6b7380226c28.html +++ b/doc/html/dir_23ec12649285f9fabf3a6b7380226c28.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/dir_25f74a9991dbbca1b52a94e358ca73c1.html b/doc/html/dir_25f74a9991dbbca1b52a94e358ca73c1.html new file mode 100644 index 000000000..c5f57ad6f --- /dev/null +++ b/doc/html/dir_25f74a9991dbbca1b52a94e358ca73c1.html @@ -0,0 +1,112 @@ + + + + + + +The Red Matrix: util/wp/post_to_red Directory Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +
    post_to_red Directory Reference
    +
    +
    + + + + +

    +Files

    file  post_to_red.php
     
    +
    +
    + diff --git a/doc/html/dir_25f74a9991dbbca1b52a94e358ca73c1.js b/doc/html/dir_25f74a9991dbbca1b52a94e358ca73c1.js new file mode 100644 index 000000000..e521771ca --- /dev/null +++ b/doc/html/dir_25f74a9991dbbca1b52a94e358ca73c1.js @@ -0,0 +1,4 @@ +var dir_25f74a9991dbbca1b52a94e358ca73c1 = +[ + [ "post_to_red.php", "post__to__red_8php.html", "post__to__red_8php" ] +]; \ No newline at end of file diff --git a/doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html b/doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html index 12217cad9..52e50c910 100644 --- a/doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html +++ b/doc/html/dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/dir_55dbaf9b7b53c4fc605c9011743a7353.html b/doc/html/dir_55dbaf9b7b53c4fc605c9011743a7353.html index 1b2076720..382655c52 100644 --- a/doc/html/dir_55dbaf9b7b53c4fc605c9011743a7353.html +++ b/doc/html/dir_55dbaf9b7b53c4fc605c9011743a7353.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/dir_6cee3bb9ace89cc4e2f065aa2ca7bc5b.html b/doc/html/dir_6cee3bb9ace89cc4e2f065aa2ca7bc5b.html new file mode 100644 index 000000000..60379cb00 --- /dev/null +++ b/doc/html/dir_6cee3bb9ace89cc4e2f065aa2ca7bc5b.html @@ -0,0 +1,112 @@ + + + + + + +The Red Matrix: view/theme/blogga/view/theme Directory Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +
    theme Directory Reference
    +
    +
    + + + + +

    +Directories

    directory  blog
     
    +
    +
    + diff --git a/doc/html/dir_6cee3bb9ace89cc4e2f065aa2ca7bc5b.js b/doc/html/dir_6cee3bb9ace89cc4e2f065aa2ca7bc5b.js new file mode 100644 index 000000000..ae90f9671 --- /dev/null +++ b/doc/html/dir_6cee3bb9ace89cc4e2f065aa2ca7bc5b.js @@ -0,0 +1,4 @@ +var dir_6cee3bb9ace89cc4e2f065aa2ca7bc5b = +[ + [ "blog", "dir_a8a0005c2b8590c535262d232c22afab.html", "dir_a8a0005c2b8590c535262d232c22afab" ] +]; \ No newline at end of file diff --git a/doc/html/dir_720432dea4a717197ae070dbc42b8f20.html b/doc/html/dir_720432dea4a717197ae070dbc42b8f20.html index a61c006b5..1fe66c5e2 100644 --- a/doc/html/dir_720432dea4a717197ae070dbc42b8f20.html +++ b/doc/html/dir_720432dea4a717197ae070dbc42b8f20.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    @@ -102,9 +102,9 @@ $(document).ready(function(){initNavTree('dir_720432dea4a717197ae070dbc42b8f20.h
    - - + +

    -Files

    file  post_to_red.php

    +Directories

    directory  post_to_red
     
    diff --git a/doc/html/dir_720432dea4a717197ae070dbc42b8f20.js b/doc/html/dir_720432dea4a717197ae070dbc42b8f20.js index 8d76d72be..b394ccd3f 100644 --- a/doc/html/dir_720432dea4a717197ae070dbc42b8f20.js +++ b/doc/html/dir_720432dea4a717197ae070dbc42b8f20.js @@ -1,4 +1,4 @@ var dir_720432dea4a717197ae070dbc42b8f20 = [ - [ "post_to_red.php", "post__to__red_8php.html", "post__to__red_8php" ] + [ "post_to_red", "dir_25f74a9991dbbca1b52a94e358ca73c1.html", "dir_25f74a9991dbbca1b52a94e358ca73c1" ] ]; \ No newline at end of file diff --git a/doc/html/dir_817f6d302394b98e59575acdb59998bc.html b/doc/html/dir_817f6d302394b98e59575acdb59998bc.html index 0140685a8..bd41b7e86 100644 --- a/doc/html/dir_817f6d302394b98e59575acdb59998bc.html +++ b/doc/html/dir_817f6d302394b98e59575acdb59998bc.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    @@ -104,7 +104,7 @@ $(document).ready(function(){initNavTree('dir_817f6d302394b98e59575acdb59998bc.h - + @@ -118,7 +118,7 @@ Files - +

    Files

    file  default.php
    file  default.php
     
    file  full.php
     
     
    file  none.php
     
    file  theme_init.php
    file  theme_init.php
     
    diff --git a/doc/html/dir_817f6d302394b98e59575acdb59998bc.js b/doc/html/dir_817f6d302394b98e59575acdb59998bc.js index c7289c3d1..cceba4e93 100644 --- a/doc/html/dir_817f6d302394b98e59575acdb59998bc.js +++ b/doc/html/dir_817f6d302394b98e59575acdb59998bc.js @@ -1,11 +1,11 @@ var dir_817f6d302394b98e59575acdb59998bc = [ - [ "default.php", "default_8php.html", "default_8php" ], + [ "default.php", "php_2default_8php.html", "php_2default_8php" ], [ "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", "theme__init_8php.html", "theme__init_8php" ] + [ "theme_init.php", "php_2theme__init_8php.html", "php_2theme__init_8php" ] ]; \ No newline at end of file diff --git a/doc/html/dir_8543001e5d25368a6edede3e63efb554.html b/doc/html/dir_8543001e5d25368a6edede3e63efb554.html index 9d45e2983..c0ee68826 100644 --- a/doc/html/dir_8543001e5d25368a6edede3e63efb554.html +++ b/doc/html/dir_8543001e5d25368a6edede3e63efb554.html @@ -28,7 +28,7 @@ - + + +
    The Red Matrix
    @@ -106,6 +106,8 @@ $(document).ready(function(){initNavTree('dir_8543001e5d25368a6edede3e63efb554.h Directories
    directory  apw
     
    directory  blogga
     
    directory  redbasic
     
    diff --git a/doc/html/dir_8543001e5d25368a6edede3e63efb554.js b/doc/html/dir_8543001e5d25368a6edede3e63efb554.js index 9650af20a..29cbaeeef 100644 --- a/doc/html/dir_8543001e5d25368a6edede3e63efb554.js +++ b/doc/html/dir_8543001e5d25368a6edede3e63efb554.js @@ -1,5 +1,6 @@ var dir_8543001e5d25368a6edede3e63efb554 = [ [ "apw", "dir_d520c5cf583201d9437764f209363c22.html", "dir_d520c5cf583201d9437764f209363c22" ], + [ "blogga", "dir_922c77e958c99a98db92d38a3a349bf2.html", "dir_922c77e958c99a98db92d38a3a349bf2" ], [ "redbasic", "dir_55dbaf9b7b53c4fc605c9011743a7353.html", "dir_55dbaf9b7b53c4fc605c9011743a7353" ] ]; \ No newline at end of file diff --git a/doc/html/dir_922c77e958c99a98db92d38a3a349bf2.html b/doc/html/dir_922c77e958c99a98db92d38a3a349bf2.html new file mode 100644 index 000000000..a8fed5c16 --- /dev/null +++ b/doc/html/dir_922c77e958c99a98db92d38a3a349bf2.html @@ -0,0 +1,114 @@ + + + + + + +The Red Matrix: view/theme/blogga Directory Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +
    blogga Directory Reference
    +
    +
    + + + + + + +

    +Directories

    directory  php
     
    directory  view
     
    +
    +
    + diff --git a/doc/html/dir_922c77e958c99a98db92d38a3a349bf2.js b/doc/html/dir_922c77e958c99a98db92d38a3a349bf2.js new file mode 100644 index 000000000..d5e65e0d6 --- /dev/null +++ b/doc/html/dir_922c77e958c99a98db92d38a3a349bf2.js @@ -0,0 +1,5 @@ +var dir_922c77e958c99a98db92d38a3a349bf2 = +[ + [ "php", "dir_c02447ad39a5307c81c64e880ec9e8d3.html", "dir_c02447ad39a5307c81c64e880ec9e8d3" ], + [ "view", "dir_92d6b429199666aa3765c8a934db5e14.html", "dir_92d6b429199666aa3765c8a934db5e14" ] +]; \ No newline at end of file diff --git a/doc/html/dir_92d6b429199666aa3765c8a934db5e14.html b/doc/html/dir_92d6b429199666aa3765c8a934db5e14.html new file mode 100644 index 000000000..fbd8bf9e8 --- /dev/null +++ b/doc/html/dir_92d6b429199666aa3765c8a934db5e14.html @@ -0,0 +1,112 @@ + + + + + + +The Red Matrix: view/theme/blogga/view Directory Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +
    view Directory Reference
    +
    +
    + + + + +

    +Directories

    directory  theme
     
    +
    +
    + diff --git a/doc/html/dir_92d6b429199666aa3765c8a934db5e14.js b/doc/html/dir_92d6b429199666aa3765c8a934db5e14.js new file mode 100644 index 000000000..2a2dd8dc9 --- /dev/null +++ b/doc/html/dir_92d6b429199666aa3765c8a934db5e14.js @@ -0,0 +1,4 @@ +var dir_92d6b429199666aa3765c8a934db5e14 = +[ + [ "theme", "dir_6cee3bb9ace89cc4e2f065aa2ca7bc5b.html", "dir_6cee3bb9ace89cc4e2f065aa2ca7bc5b" ] +]; \ No newline at end of file diff --git a/doc/html/dir__fns_8php.html b/doc/html/dir__fns_8php.html index 494d32b53..5aeb02ea2 100644 --- a/doc/html/dir__fns_8php.html +++ b/doc/html/dir__fns_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/dir_a8a0005c2b8590c535262d232c22afab.html b/doc/html/dir_a8a0005c2b8590c535262d232c22afab.html new file mode 100644 index 000000000..dc599f8bb --- /dev/null +++ b/doc/html/dir_a8a0005c2b8590c535262d232c22afab.html @@ -0,0 +1,116 @@ + + + + + + +The Red Matrix: view/theme/blogga/view/theme/blog Directory Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +
    blog Directory Reference
    +
    +
    + + + + + + + + +

    +Files

    file  config.php
     
    file  default.php
     
    file  theme.php
     
    +
    +
    + diff --git a/doc/html/dir_a8a0005c2b8590c535262d232c22afab.js b/doc/html/dir_a8a0005c2b8590c535262d232c22afab.js new file mode 100644 index 000000000..9311d8a78 --- /dev/null +++ b/doc/html/dir_a8a0005c2b8590c535262d232c22afab.js @@ -0,0 +1,6 @@ +var dir_a8a0005c2b8590c535262d232c22afab = +[ + [ "config.php", "view_2theme_2blogga_2view_2theme_2blog_2config_8php.html", "view_2theme_2blogga_2view_2theme_2blog_2config_8php" ], + [ "default.php", "theme_2blogga_2view_2theme_2blog_2default_8php.html", "theme_2blogga_2view_2theme_2blog_2default_8php" ], + [ "theme.php", "blogga_2view_2theme_2blog_2theme_8php.html", "blogga_2view_2theme_2blog_2theme_8php" ] +]; \ No newline at end of file diff --git a/doc/html/dir_aae29906d7bfc07d076125f669c8352e.html b/doc/html/dir_aae29906d7bfc07d076125f669c8352e.html index 7fc269799..a12af8c64 100644 --- a/doc/html/dir_aae29906d7bfc07d076125f669c8352e.html +++ b/doc/html/dir_aae29906d7bfc07d076125f669c8352e.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/dir_b2f003339c516cc00c8cadcafbe82f13.html b/doc/html/dir_b2f003339c516cc00c8cadcafbe82f13.html index fe7eec594..4aa042ef0 100644 --- a/doc/html/dir_b2f003339c516cc00c8cadcafbe82f13.html +++ b/doc/html/dir_b2f003339c516cc00c8cadcafbe82f13.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/dir_c02447ad39a5307c81c64e880ec9e8d3.html b/doc/html/dir_c02447ad39a5307c81c64e880ec9e8d3.html new file mode 100644 index 000000000..af53f8b58 --- /dev/null +++ b/doc/html/dir_c02447ad39a5307c81c64e880ec9e8d3.html @@ -0,0 +1,118 @@ + + + + + + +The Red Matrix: view/theme/blogga/php Directory Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +
    php Directory Reference
    +
    +
    + + + + + + + + + + +

    +Files

    file  config.php
     
    file  default.php
     
    file  theme.php
     
    file  theme_init.php
     
    +
    +
    + diff --git a/doc/html/dir_c02447ad39a5307c81c64e880ec9e8d3.js b/doc/html/dir_c02447ad39a5307c81c64e880ec9e8d3.js new file mode 100644 index 000000000..9013b22b6 --- /dev/null +++ b/doc/html/dir_c02447ad39a5307c81c64e880ec9e8d3.js @@ -0,0 +1,7 @@ +var dir_c02447ad39a5307c81c64e880ec9e8d3 = +[ + [ "config.php", "view_2theme_2blogga_2php_2config_8php.html", "view_2theme_2blogga_2php_2config_8php" ], + [ "default.php", "theme_2blogga_2php_2default_8php.html", "theme_2blogga_2php_2default_8php" ], + [ "theme.php", "blogga_2php_2theme_8php.html", "blogga_2php_2theme_8php" ], + [ "theme_init.php", "theme_2blogga_2php_2theme__init_8php.html", null ] +]; \ No newline at end of file diff --git a/doc/html/dir_cb8a8f75dcdd0b3fbfcc82e9eda410c5.html b/doc/html/dir_cb8a8f75dcdd0b3fbfcc82e9eda410c5.html index bdc531993..d5d596a86 100644 --- a/doc/html/dir_cb8a8f75dcdd0b3fbfcc82e9eda410c5.html +++ b/doc/html/dir_cb8a8f75dcdd0b3fbfcc82e9eda410c5.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html index 820ec85e2..e4892d91d 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html index c5588a75e..7a44f4d12 100644 --- a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html +++ b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/dir_d520c5cf583201d9437764f209363c22.html b/doc/html/dir_d520c5cf583201d9437764f209363c22.html index f96396581..5d99e87f7 100644 --- a/doc/html/dir_d520c5cf583201d9437764f209363c22.html +++ b/doc/html/dir_d520c5cf583201d9437764f209363c22.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/dirsearch_8php.html b/doc/html/dirsearch_8php.html index 37bdcb100..806a32354 100644 --- a/doc/html/dirsearch_8php.html +++ b/doc/html/dirsearch_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/display_8php.html b/doc/html/display_8php.html index e31582288..c2f2d8664 100644 --- a/doc/html/display_8php.html +++ b/doc/html/display_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/docblox__errorchecker_8php.html b/doc/html/docblox__errorchecker_8php.html index 9de8c6867..537f36a2a 100644 --- a/doc/html/docblox__errorchecker_8php.html +++ b/doc/html/docblox__errorchecker_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/editblock_8php.html b/doc/html/editblock_8php.html index 12660853a..f33d0956e 100644 --- a/doc/html/editblock_8php.html +++ b/doc/html/editblock_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/editlayout_8php.html b/doc/html/editlayout_8php.html index c32a6bd5b..e59994c3e 100644 --- a/doc/html/editlayout_8php.html +++ b/doc/html/editlayout_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/editpost_8php.html b/doc/html/editpost_8php.html index 6daa6563e..a86d5d3c6 100644 --- a/doc/html/editpost_8php.html +++ b/doc/html/editpost_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/editwebpage_8php.html b/doc/html/editwebpage_8php.html index a27badd7f..e8f689b67 100644 --- a/doc/html/editwebpage_8php.html +++ b/doc/html/editwebpage_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/enotify_8php.html b/doc/html/enotify_8php.html index 9566f447d..9c468a042 100644 --- a/doc/html/enotify_8php.html +++ b/doc/html/enotify_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/event_8php.html b/doc/html/event_8php.html index e5f82b84d..bef857f32 100644 --- a/doc/html/event_8php.html +++ b/doc/html/event_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/events_8php.html b/doc/html/events_8php.html index 97f2c709d..ecd63f5a1 100644 --- a/doc/html/events_8php.html +++ b/doc/html/events_8php.html @@ -28,7 +28,7 @@ - +

    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
    • The Red Matrix
    diff --git a/doc/html/expire_8php.html b/doc/html/expire_8php.html index 43e034032..61e0731b5 100644 --- a/doc/html/expire_8php.html +++ b/doc/html/expire_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html index 0c6a3452b..29b7e390c 100644 --- a/doc/html/extract_8php.html +++ b/doc/html/extract_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    @@ -132,7 +132,7 @@ Variables
    -

    Referenced by activity_sanitise(), add_fcontact(), 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(), event_store(), feature_enabled(), fetch_xrd_links(), find_xchan_in_array(), format_like(), get_all_perms(), get_atom_elements(), get_features(), get_item_elements(), get_mail_elements(), get_mood_verbs(), get_poke_verbs(), get_profile_elements(), Item\get_template_data(), get_terms_oftype(), App\get_widgets(), group_select(), identity_basic_import(), ids_to_querystr(), import_directory_profile(), import_post(), import_site(), import_xchan(), item_getfeedattach(), item_store(), item_store_update(), items_fetch(), like_content(), like_puller(), load_database(), lrdd(), 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(), profile_tabs(), profiles_content(), redbasic_form(), register_post(), remove_community_tag(), 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_get_hubloc(), zot_gethub(), zot_import(), zot_process_response(), and zot_register_hub().

    +

    Referenced by activity_sanitise(), add_fcontact(), api_rss_extra(), array_sanitise(), attach_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(), fetch_xrd_links(), find_xchan_in_array(), format_like(), get_all_perms(), get_atom_elements(), get_features(), get_item_elements(), get_mail_elements(), get_mood_verbs(), get_poke_verbs(), get_profile_elements(), Item\get_template_data(), get_terms_oftype(), App\get_widgets(), group_select(), identity_basic_import(), ids_to_querystr(), import_directory_profile(), import_post(), import_site(), import_xchan(), item_getfeedattach(), item_store(), item_store_update(), items_fetch(), like_content(), like_puller(), load_database(), lrdd(), 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(), profile_tabs(), 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().

    diff --git a/doc/html/fbrowser_8php.html b/doc/html/fbrowser_8php.html index e62617305..0ccc72963 100644 --- a/doc/html/fbrowser_8php.html +++ b/doc/html/fbrowser_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/features_8php.html b/doc/html/features_8php.html index 47d0a971d..58537417c 100644 --- a/doc/html/features_8php.html +++ b/doc/html/features_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/feed_8php.html b/doc/html/feed_8php.html index eee97f745..8b44eacb2 100644 --- a/doc/html/feed_8php.html +++ b/doc/html/feed_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/filer_8php.html b/doc/html/filer_8php.html index f43782620..1c74122fd 100644 --- a/doc/html/filer_8php.html +++ b/doc/html/filer_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/filerm_8php.html b/doc/html/filerm_8php.html index 95b780624..ce948f3b1 100644 --- a/doc/html/filerm_8php.html +++ b/doc/html/filerm_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/files.html b/doc/html/files.html index 88f5ddabe..5649062c8 100644 --- a/doc/html/files.html +++ b/doc/html/files.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    @@ -108,7 +108,7 @@ $(document).ready(function(){initNavTree('files.html','');});
    Here is a list of all files with brief descriptions:
    -
    [detail level 12345]
    +
    [detail level 1234567]
    @@ -321,7 +321,8 @@ $(document).ready(function(){initNavTree('files.html','');}); - + + @@ -334,14 +335,14 @@ $(document).ready(function(){initNavTree('files.html','');}); - + - + @@ -360,13 +361,26 @@ $(document).ready(function(){initNavTree('files.html','');}); - - - - - - - + + + + + + + + + + + + + + + + + + + +
    o+include
    o+view
    \*boot.php
    diff --git a/doc/html/filestorage_8php.html b/doc/html/filestorage_8php.html index 9b886f8bc..7b3d146ab 100644 --- a/doc/html/filestorage_8php.html +++ b/doc/html/filestorage_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/fpostit_8php.html b/doc/html/fpostit_8php.html index 38716cd89..c0007a22e 100644 --- a/doc/html/fpostit_8php.html +++ b/doc/html/fpostit_8php.html @@ -28,7 +28,7 @@ - + - +
    The Red Matrix
    diff --git a/doc/html/fresh_8md.html b/doc/html/fresh_8md.html index 1624daf40..91f73cfed 100644 --- a/doc/html/fresh_8md.html +++ b/doc/html/fresh_8md.html @@ -28,7 +28,7 @@ - + - +
    The Red Matrix
    diff --git a/doc/html/friendica-to-smarty-tpl_8py.html b/doc/html/friendica-to-smarty-tpl_8py.html index cbf96d98a..dc7ba225d 100644 --- a/doc/html/friendica-to-smarty-tpl_8py.html +++ b/doc/html/friendica-to-smarty-tpl_8py.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/friendica__smarty_8php.html b/doc/html/friendica__smarty_8php.html index c242f3933..eef7ff752 100644 --- a/doc/html/friendica__smarty_8php.html +++ b/doc/html/friendica__smarty_8php.html @@ -28,7 +28,7 @@ - +
    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
    The Red Matrix
    diff --git a/doc/html/fsuggest_8php.html b/doc/html/fsuggest_8php.html index 1bb670262..07d2127ab 100644 --- a/doc/html/fsuggest_8php.html +++ b/doc/html/fsuggest_8php.html @@ -28,7 +28,7 @@ - +
    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
    The Red Matrix
    diff --git a/doc/html/full_8php.html b/doc/html/full_8php.html index 483a31152..2e22f58c7 100644 --- a/doc/html/full_8php.html +++ b/doc/html/full_8php.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions.html b/doc/html/functions.html index 63d828fc9..07bf3f97b 100644 --- a/doc/html/functions.html +++ b/doc/html/functions.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_0x5f.html b/doc/html/functions_0x5f.html index aaa4e3619..ed59f06f7 100644 --- a/doc/html/functions_0x5f.html +++ b/doc/html/functions_0x5f.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_0x61.html b/doc/html/functions_0x61.html index 78d8582fe..d5a0d01c9 100644 --- a/doc/html/functions_0x61.html +++ b/doc/html/functions_0x61.html @@ -28,7 +28,7 @@ - + - -
    The Red Matrix
    diff --git a/doc/html/functions_0x62.html b/doc/html/functions_0x62.html index 2109a048c..a7a7a884c 100644 --- a/doc/html/functions_0x62.html +++ b/doc/html/functions_0x62.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_0x63.html b/doc/html/functions_0x63.html index c5a14375b..94f4ffba9 100644 --- a/doc/html/functions_0x63.html +++ b/doc/html/functions_0x63.html @@ -28,7 +28,7 @@ - +

    Referenced by settings_post().

    - - - -
    -
    -
    The Red Matrix
    diff --git a/doc/html/functions_0x64.html b/doc/html/functions_0x64.html index 50612a4cf..34949c740 100644 --- a/doc/html/functions_0x64.html +++ b/doc/html/functions_0x64.html @@ -28,7 +28,7 @@ - + - -
    The Red Matrix
    diff --git a/doc/html/functions_0x65.html b/doc/html/functions_0x65.html index d9ce44b5c..74e2892f6 100644 --- a/doc/html/functions_0x65.html +++ b/doc/html/functions_0x65.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_0x66.html b/doc/html/functions_0x66.html index 7172c99a9..377f92696 100644 --- a/doc/html/functions_0x66.html +++ b/doc/html/functions_0x66.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_0x67.html b/doc/html/functions_0x67.html index 7197b42f9..d59047383 100644 --- a/doc/html/functions_0x67.html +++ b/doc/html/functions_0x67.html @@ -28,7 +28,7 @@ - +

    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
    The Red Matrix
    diff --git a/doc/html/functions_0x68.html b/doc/html/functions_0x68.html index 9cd17ba4a..ef9f36a46 100644 --- a/doc/html/functions_0x68.html +++ b/doc/html/functions_0x68.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_0x69.html b/doc/html/functions_0x69.html index 3bd5d0893..d503230a3 100644 --- a/doc/html/functions_0x69.html +++ b/doc/html/functions_0x69.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_0x6c.html b/doc/html/functions_0x6c.html index ec2ce797d..4f3e0deb8 100644 --- a/doc/html/functions_0x6c.html +++ b/doc/html/functions_0x6c.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_0x6e.html b/doc/html/functions_0x6e.html index 1a93d117a..06ee4dee8 100644 --- a/doc/html/functions_0x6e.html +++ b/doc/html/functions_0x6e.html @@ -28,7 +28,7 @@ - +
    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
    The Red Matrix
    diff --git a/doc/html/functions_0x6f.html b/doc/html/functions_0x6f.html index 2d5a3fc61..9d147d3cf 100644 --- a/doc/html/functions_0x6f.html +++ b/doc/html/functions_0x6f.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_0x70.html b/doc/html/functions_0x70.html index 81d3b41ed..d9c25ebde 100644 --- a/doc/html/functions_0x70.html +++ b/doc/html/functions_0x70.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_0x71.html b/doc/html/functions_0x71.html index 3445bb050..50b8df7f7 100644 --- a/doc/html/functions_0x71.html +++ b/doc/html/functions_0x71.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_0x72.html b/doc/html/functions_0x72.html index 11ec483d4..1b6db3f69 100644 --- a/doc/html/functions_0x72.html +++ b/doc/html/functions_0x72.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_0x73.html b/doc/html/functions_0x73.html index 1664702a7..9f77236f3 100644 --- a/doc/html/functions_0x73.html +++ b/doc/html/functions_0x73.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_0x74.html b/doc/html/functions_0x74.html index 1eb41e3fb..a56945cc0 100644 --- a/doc/html/functions_0x74.html +++ b/doc/html/functions_0x74.html @@ -28,7 +28,7 @@ - + - +
    The Red Matrix
    diff --git a/doc/html/functions_0x76.html b/doc/html/functions_0x76.html index d17bd2049..35645c2c6 100644 --- a/doc/html/functions_0x76.html +++ b/doc/html/functions_0x76.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_func.html b/doc/html/functions_func.html index 636e241ad..d4e774f53 100644 --- a/doc/html/functions_func.html +++ b/doc/html/functions_func.html @@ -28,7 +28,7 @@ - + - - + + @@ -226,7 +226,7 @@ Functions
    The Red Matrix
    diff --git a/doc/html/functions_func_0x61.html b/doc/html/functions_func_0x61.html index 0fd5f689b..b0646c0f3 100644 --- a/doc/html/functions_func_0x61.html +++ b/doc/html/functions_func_0x61.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_func_0x62.html b/doc/html/functions_func_0x62.html index c8ddf26e4..27bd27bf9 100644 --- a/doc/html/functions_func_0x62.html +++ b/doc/html/functions_func_0x62.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_func_0x63.html b/doc/html/functions_func_0x63.html index 5fafc662b..db2571d28 100644 --- a/doc/html/functions_func_0x63.html +++ b/doc/html/functions_func_0x63.html @@ -28,7 +28,7 @@ - +

    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
    The Red Matrix
    diff --git a/doc/html/functions_func_0x64.html b/doc/html/functions_func_0x64.html index c37b0ea76..0eff5a139 100644 --- a/doc/html/functions_func_0x64.html +++ b/doc/html/functions_func_0x64.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_func_0x65.html b/doc/html/functions_func_0x65.html index 34be3e1d0..26b61b5c1 100644 --- a/doc/html/functions_func_0x65.html +++ b/doc/html/functions_func_0x65.html @@ -28,7 +28,7 @@ - + + +
    The Red Matrix
    diff --git a/doc/html/functions_func_0x66.html b/doc/html/functions_func_0x66.html index 1c57a8edb..08eb65b1e 100644 --- a/doc/html/functions_func_0x66.html +++ b/doc/html/functions_func_0x66.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_func_0x67.html b/doc/html/functions_func_0x67.html index 6fb756340..95a99abca 100644 --- a/doc/html/functions_func_0x67.html +++ b/doc/html/functions_func_0x67.html @@ -28,7 +28,7 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -266,52 +266,50 @@ $(document).ready(function(){initNavTree('files.html','');}); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -334,10 +332,8 @@ $(document).ready(function(){initNavTree('files.html','');}); - - - - + + 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','');});
    The Red Matrix
    diff --git a/doc/html/functions_func_0x68.html b/doc/html/functions_func_0x68.html index 93aa721d3..ff61d438c 100644 --- a/doc/html/functions_func_0x68.html +++ b/doc/html/functions_func_0x68.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_func_0x69.html b/doc/html/functions_func_0x69.html index 5952356db..478fdab39 100644 --- a/doc/html/functions_func_0x69.html +++ b/doc/html/functions_func_0x69.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_func_0x6c.html b/doc/html/functions_func_0x6c.html index 3a6959653..7eade1b08 100644 --- a/doc/html/functions_func_0x6c.html +++ b/doc/html/functions_func_0x6c.html @@ -28,7 +28,7 @@ - +

    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 - - - - 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 - - @@ -136,6 +134,8 @@ Files + + @@ -258,12 +258,8 @@ Files - - - - 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
    The Red Matrix
    diff --git a/doc/html/functions_func_0x6e.html b/doc/html/functions_func_0x6e.html index 9a400dd49..99ffb26f6 100644 --- a/doc/html/functions_func_0x6e.html +++ b/doc/html/functions_func_0x6e.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_func_0x6f.html b/doc/html/functions_func_0x6f.html index 39ccbd89c..c0d02523c 100644 --- a/doc/html/functions_func_0x6f.html +++ b/doc/html/functions_func_0x6f.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_func_0x70.html b/doc/html/functions_func_0x70.html index 2fc9536da..b036e941f 100644 --- a/doc/html/functions_func_0x70.html +++ b/doc/html/functions_func_0x70.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_func_0x71.html b/doc/html/functions_func_0x71.html index 3a8b3c931..fb02d6f5e 100644 --- a/doc/html/functions_func_0x71.html +++ b/doc/html/functions_func_0x71.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_func_0x72.html b/doc/html/functions_func_0x72.html index 7253a7d8f..6c9e9ab8e 100644 --- a/doc/html/functions_func_0x72.html +++ b/doc/html/functions_func_0x72.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_func_0x73.html b/doc/html/functions_func_0x73.html index 80016b95c..00ca8ced4 100644 --- a/doc/html/functions_func_0x73.html +++ b/doc/html/functions_func_0x73.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_func_0x74.html b/doc/html/functions_func_0x74.html index dfb6d581f..8b2d47dca 100644 --- a/doc/html/functions_func_0x74.html +++ b/doc/html/functions_func_0x74.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/functions_func_0x76.html b/doc/html/functions_func_0x76.html index e2fb97e1a..be21dc444 100644 --- a/doc/html/functions_func_0x76.html +++ b/doc/html/functions_func_0x76.html @@ -28,7 +28,7 @@ - + - - @@ -124,22 +122,6 @@ Functions
    The Red Matrix
    diff --git a/doc/html/functions_vars.html b/doc/html/functions_vars.html index 0a00599c1..ad6f3d122 100644 --- a/doc/html/functions_vars.html +++ b/doc/html/functions_vars.html @@ -28,7 +28,7 @@ - + + + @@ -1454,6 +1456,18 @@ Private Attributes
    The Red Matrix
    diff --git a/doc/html/globals.html b/doc/html/globals.html index ec31017c1..85e38e7d5 100644 --- a/doc/html/globals.html +++ b/doc/html/globals.html @@ -28,7 +28,7 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    The Red Matrix
    @@ -168,11 +168,14 @@ $(document).ready(function(){initNavTree('globals.html','');});
  • $body_font_size : style.php
    • +
  • $bodyclass +: default.php +
  • $called_api : api.php
  • $channel -: theme_init.php +: theme_init.php
  • $comment_indent : style.php @@ -206,6 +209,12 @@ $(document).ready(function(){initNavTree('globals.html','');});
  • $gc_probability : session.php
    • +
  • $headimg +: default.php +
    • +
  • $headimghome +: default.php +
  • $i : docblox_errorchecker.php
    • @@ -315,7 +324,7 @@ $(document).ready(function(){initNavTree('globals.html','');}); : style.php
  • $uid -: style.php +: style.php
  • $width : minimalisticdarkness.php diff --git a/doc/html/globals_0x5f.html b/doc/html/globals_0x5f.html index 425dac2bc..ab0af6a66 100644 --- a/doc/html/globals_0x5f.html +++ b/doc/html/globals_0x5f.html @@ -28,7 +28,7 @@ - +

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

    + + + +
    +
    +
    The Red Matrix
    diff --git a/doc/html/globals_0x61.html b/doc/html/globals_0x61.html index 0e079c6b2..580315ad6 100644 --- a/doc/html/globals_0x61.html +++ b/doc/html/globals_0x61.html @@ -28,7 +28,7 @@ - +

    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
    The Red Matrix
    diff --git a/doc/html/globals_0x62.html b/doc/html/globals_0x62.html index e49d6d9eb..c1db54272 100644 --- a/doc/html/globals_0x62.html +++ b/doc/html/globals_0x62.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    @@ -189,6 +189,24 @@ $(document).ready(function(){initNavTree('globals_0x62.html','');});
  • blocks_content() : blocks.php
    • +
  • blog_init() +: theme.php +
    • +
  • blog_install() +: theme.php +
    • +
  • blog_uninstall() +: theme.php +
    • +
  • blogtheme_display_item() +: theme.php +
    • +
  • blogtheme_form() +: config.php +
    • +
  • blogtheme_imgurl() +: theme.php +
  • breaklines() : html2plain.php
    • diff --git a/doc/html/globals_0x63.html b/doc/html/globals_0x63.html index 8b6dbf253..f1c85c131 100644 --- a/doc/html/globals_0x63.html +++ b/doc/html/globals_0x63.html @@ -28,7 +28,7 @@ - +

    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
    The Red Matrix
    diff --git a/doc/html/globals_0x64.html b/doc/html/globals_0x64.html index 64271db96..80f742451 100644 --- a/doc/html/globals_0x64.html +++ b/doc/html/globals_0x64.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_0x65.html b/doc/html/globals_0x65.html index dc540eaf9..952cadff7 100644 --- a/doc/html/globals_0x65.html +++ b/doc/html/globals_0x65.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_0x66.html b/doc/html/globals_0x66.html index 0cb5d6eb2..16b62535a 100644 --- a/doc/html/globals_0x66.html +++ b/doc/html/globals_0x66.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_0x67.html b/doc/html/globals_0x67.html index 9797611b1..f24792026 100644 --- a/doc/html/globals_0x67.html +++ b/doc/html/globals_0x67.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_0x68.html b/doc/html/globals_0x68.html index 5103e6fe6..fd225fed0 100644 --- a/doc/html/globals_0x68.html +++ b/doc/html/globals_0x68.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_0x69.html b/doc/html/globals_0x69.html index a0f507d21..e2b53d537 100644 --- a/doc/html/globals_0x69.html +++ b/doc/html/globals_0x69.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    @@ -159,7 +159,7 @@ $(document).ready(function(){initNavTree('globals_0x69.html','');});
  • if : style.php , php2po.php -, default.php +, default.php , full.php
  • import_author_xchan() diff --git a/doc/html/globals_0x6a.html b/doc/html/globals_0x6a.html index bd919192e..6d66a0bd4 100644 --- a/doc/html/globals_0x6a.html +++ b/doc/html/globals_0x6a.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_0x6b.html b/doc/html/globals_0x6b.html index e45270b14..54bff469b 100644 --- a/doc/html/globals_0x6b.html +++ b/doc/html/globals_0x6b.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_0x6c.html b/doc/html/globals_0x6c.html index e10884157..518b831a7 100644 --- a/doc/html/globals_0x6c.html +++ b/doc/html/globals_0x6c.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_0x6d.html b/doc/html/globals_0x6d.html index 7e5d7b9df..c61a2e1e6 100644 --- a/doc/html/globals_0x6d.html +++ b/doc/html/globals_0x6d.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_0x6e.html b/doc/html/globals_0x6e.html index e4ff51d56..1ff7d7e87 100644 --- a/doc/html/globals_0x6e.html +++ b/doc/html/globals_0x6e.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_0x6f.html b/doc/html/globals_0x6f.html index ff112eca9..0d80bf4f8 100644 --- a/doc/html/globals_0x6f.html +++ b/doc/html/globals_0x6f.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_0x70.html b/doc/html/globals_0x70.html index 7f8dd0a80..de1349ac6 100644 --- a/doc/html/globals_0x70.html +++ b/doc/html/globals_0x70.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    @@ -395,6 +395,12 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
  • post_to_red_deactivate() : post_to_red.php
    • +
  • post_to_red_delete_comment() +: post_to_red.php +
    • +
  • post_to_red_delete_post() +: post_to_red.php +
  • post_to_red_display_admin_page() : post_to_red.php
    • @@ -404,15 +410,18 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
  • post_to_red_get_acct_name() : post_to_red.php
    • +
  • post_to_red_get_avatar() +: post_to_red.php +
    • +
  • post_to_red_get_channel_name() +: post_to_red.php +
  • post_to_red_get_password() : post_to_red.php
  • post_to_red_get_seed_location() : post_to_red.php
    • -
  • post_to_red_get_user_name() -: post_to_red.php -
  • post_to_red_path : post_to_red.php
    • diff --git a/doc/html/globals_0x71.html b/doc/html/globals_0x71.html index 5ce2ce29b..c495a1b81 100644 --- a/doc/html/globals_0x71.html +++ b/doc/html/globals_0x71.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_0x72.html b/doc/html/globals_0x72.html index fdd45bb5d..2dcfbb68c 100644 --- a/doc/html/globals_0x72.html +++ b/doc/html/globals_0x72.html @@ -28,7 +28,7 @@ - +

    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
    The Red Matrix
    @@ -165,12 +165,18 @@ $(document).ready(function(){initNavTree('globals_0x72.html','');});
  • rebuild_theme_table() : admin.php
    • +
  • red_comment() +: post_to_red.php +
  • RED_PLATFORM : boot.php
  • RED_VERSION : boot.php
    • +
  • red_xmlrpc_methods() +: post_to_red.php +
  • red_zrl_callback() : items.php
    • diff --git a/doc/html/globals_0x73.html b/doc/html/globals_0x73.html index ac6b57d31..bb8384a0e 100644 --- a/doc/html/globals_0x73.html +++ b/doc/html/globals_0x73.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_0x74.html b/doc/html/globals_0x74.html index 23e1139f6..8f69addac 100644 --- a/doc/html/globals_0x74.html +++ b/doc/html/globals_0x74.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    @@ -228,17 +228,23 @@ $(document).ready(function(){initNavTree('globals_0x74.html','');});
  • tgroup_check() : items.php
    • +
  • theme_admin() +: config.php +
    • +
  • theme_admin_post() +: config.php +
  • theme_attachments() : text.php
  • theme_content() -: config.php +: config.php
  • theme_include() : plugin.php
  • theme_post() -: config.php +: config.php
  • theme_status() : admin.php diff --git a/doc/html/globals_0x75.html b/doc/html/globals_0x75.html index 0c057ceb8..2da566338 100644 --- a/doc/html/globals_0x75.html +++ b/doc/html/globals_0x75.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_0x76.html b/doc/html/globals_0x76.html index 324ca6f9c..b6a1e3208 100644 --- a/doc/html/globals_0x76.html +++ b/doc/html/globals_0x76.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_0x77.html b/doc/html/globals_0x77.html index 0c34d1783..7de93fd83 100644 --- a/doc/html/globals_0x77.html +++ b/doc/html/globals_0x77.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_0x78.html b/doc/html/globals_0x78.html index 434ab8b68..4435d4f57 100644 --- a/doc/html/globals_0x78.html +++ b/doc/html/globals_0x78.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_0x7a.html b/doc/html/globals_0x7a.html index 9aded7ced..8b9ab909d 100644 --- a/doc/html/globals_0x7a.html +++ b/doc/html/globals_0x7a.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    @@ -201,8 +201,8 @@ $(document).ready(function(){initNavTree('globals_0x7a.html','');});
  • zot_finger() : zot.php
    • -
  • zot_get_hubloc() -: zot.php +
  • zot_get_hublocs() +: zot.php
  • zot_gethub() : zot.php diff --git a/doc/html/globals_func.html b/doc/html/globals_func.html index 3abdac47c..6c305e4c3 100644 --- a/doc/html/globals_func.html +++ b/doc/html/globals_func.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_func_0x61.html b/doc/html/globals_func_0x61.html index 1fa26b2b8..50cd70a18 100644 --- a/doc/html/globals_func_0x61.html +++ b/doc/html/globals_func_0x61.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_func_0x62.html b/doc/html/globals_func_0x62.html index 0736bb974..16b779949 100644 --- a/doc/html/globals_func_0x62.html +++ b/doc/html/globals_func_0x62.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    @@ -188,6 +188,24 @@ $(document).ready(function(){initNavTree('globals_func_0x62.html','');});
  • blocks_content() : blocks.php
    • +
  • blog_init() +: theme.php +
    • +
  • blog_install() +: theme.php +
    • +
  • blog_uninstall() +: theme.php +
    • +
  • blogtheme_display_item() +: theme.php +
    • +
  • blogtheme_form() +: config.php +
    • +
  • blogtheme_imgurl() +: theme.php +
  • breaklines() : html2plain.php
    • diff --git a/doc/html/globals_func_0x63.html b/doc/html/globals_func_0x63.html index fcf1bc606..0af2f408c 100644 --- a/doc/html/globals_func_0x63.html +++ b/doc/html/globals_func_0x63.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_func_0x64.html b/doc/html/globals_func_0x64.html index 37f9fc64c..ff8424b47 100644 --- a/doc/html/globals_func_0x64.html +++ b/doc/html/globals_func_0x64.html @@ -28,7 +28,7 @@ - + + + @@ -456,6 +458,8 @@ Variables + + @@ -596,10 +600,12 @@ Variables - - + + + + @@ -698,7 +704,7 @@ Variables
    The Red Matrix
    diff --git a/doc/html/globals_func_0x65.html b/doc/html/globals_func_0x65.html index 290ea76b4..1ca8149c3 100644 --- a/doc/html/globals_func_0x65.html +++ b/doc/html/globals_func_0x65.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_func_0x66.html b/doc/html/globals_func_0x66.html index e99245f92..90fa2553b 100644 --- a/doc/html/globals_func_0x66.html +++ b/doc/html/globals_func_0x66.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_func_0x67.html b/doc/html/globals_func_0x67.html index 69cba7bab..3673ee05d 100644 --- a/doc/html/globals_func_0x67.html +++ b/doc/html/globals_func_0x67.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_func_0x68.html b/doc/html/globals_func_0x68.html index 9bb63890e..b5382ad9d 100644 --- a/doc/html/globals_func_0x68.html +++ b/doc/html/globals_func_0x68.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_func_0x69.html b/doc/html/globals_func_0x69.html index 898c8f3df..774b9e17d 100644 --- a/doc/html/globals_func_0x69.html +++ b/doc/html/globals_func_0x69.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_func_0x6a.html b/doc/html/globals_func_0x6a.html index 1dc0cd6cb..dcc3f4af6 100644 --- a/doc/html/globals_func_0x6a.html +++ b/doc/html/globals_func_0x6a.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_func_0x6b.html b/doc/html/globals_func_0x6b.html index b00fe5da8..b7adf9d4f 100644 --- a/doc/html/globals_func_0x6b.html +++ b/doc/html/globals_func_0x6b.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_func_0x6c.html b/doc/html/globals_func_0x6c.html index 37e7a3b17..0c553dabb 100644 --- a/doc/html/globals_func_0x6c.html +++ b/doc/html/globals_func_0x6c.html @@ -28,7 +28,7 @@ - + - -
    The Red Matrix
    diff --git a/doc/html/globals_func_0x6d.html b/doc/html/globals_func_0x6d.html index 2e63556bf..fdd3edaab 100644 --- a/doc/html/globals_func_0x6d.html +++ b/doc/html/globals_func_0x6d.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_func_0x6e.html b/doc/html/globals_func_0x6e.html index 10a7c856b..a82a11757 100644 --- a/doc/html/globals_func_0x6e.html +++ b/doc/html/globals_func_0x6e.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_func_0x6f.html b/doc/html/globals_func_0x6f.html index bfb4f4e4c..2f5e4b314 100644 --- a/doc/html/globals_func_0x6f.html +++ b/doc/html/globals_func_0x6f.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_func_0x70.html b/doc/html/globals_func_0x70.html index 9aab42fcc..124675cca 100644 --- a/doc/html/globals_func_0x70.html +++ b/doc/html/globals_func_0x70.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    @@ -269,6 +269,12 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');});
  • post_to_red_deactivate() : post_to_red.php
    • +
  • post_to_red_delete_comment() +: post_to_red.php +
    • +
  • post_to_red_delete_post() +: post_to_red.php +
  • post_to_red_display_admin_page() : post_to_red.php
    • @@ -278,15 +284,18 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');});
  • post_to_red_get_acct_name() : post_to_red.php
    • +
  • post_to_red_get_avatar() +: post_to_red.php +
    • +
  • post_to_red_get_channel_name() +: post_to_red.php +
  • post_to_red_get_password() : post_to_red.php
  • post_to_red_get_seed_location() : post_to_red.php
    • -
  • post_to_red_get_user_name() -: post_to_red.php -
  • post_to_red_post() : post_to_red.php
    • diff --git a/doc/html/globals_func_0x71.html b/doc/html/globals_func_0x71.html index 4a96236c7..d4e6316bf 100644 --- a/doc/html/globals_func_0x71.html +++ b/doc/html/globals_func_0x71.html @@ -28,7 +28,7 @@ - +
    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
    The Red Matrix
    diff --git a/doc/html/globals_func_0x72.html b/doc/html/globals_func_0x72.html index 63b4cd48f..c49e5d97c 100644 --- a/doc/html/globals_func_0x72.html +++ b/doc/html/globals_func_0x72.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    @@ -158,6 +158,12 @@ $(document).ready(function(){initNavTree('globals_func_0x72.html','');});
  • rebuild_theme_table() : admin.php
    • +
  • red_comment() +: post_to_red.php +
    • +
  • red_xmlrpc_methods() +: post_to_red.php +
  • red_zrl_callback() : items.php
    • diff --git a/doc/html/globals_func_0x73.html b/doc/html/globals_func_0x73.html index ccec53426..ca9a9361b 100644 --- a/doc/html/globals_func_0x73.html +++ b/doc/html/globals_func_0x73.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_func_0x74.html b/doc/html/globals_func_0x74.html index a8a3bdee7..f7a827882 100644 --- a/doc/html/globals_func_0x74.html +++ b/doc/html/globals_func_0x74.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    @@ -185,17 +185,23 @@ $(document).ready(function(){initNavTree('globals_func_0x74.html','');});
  • tgroup_check() : items.php
    • +
  • theme_admin() +: config.php +
    • +
  • theme_admin_post() +: config.php +
  • theme_attachments() : text.php
  • theme_content() -: config.php +: config.php
  • theme_include() : plugin.php
  • theme_post() -: config.php +: config.php
  • theme_status() : admin.php diff --git a/doc/html/globals_func_0x75.html b/doc/html/globals_func_0x75.html index 7059f84da..7d53ad29c 100644 --- a/doc/html/globals_func_0x75.html +++ b/doc/html/globals_func_0x75.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_func_0x76.html b/doc/html/globals_func_0x76.html index bf69a6911..c61a91b6b 100644 --- a/doc/html/globals_func_0x76.html +++ b/doc/html/globals_func_0x76.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_func_0x77.html b/doc/html/globals_func_0x77.html index 110ffab01..96406899a 100644 --- a/doc/html/globals_func_0x77.html +++ b/doc/html/globals_func_0x77.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_func_0x78.html b/doc/html/globals_func_0x78.html index 992f1acef..f0f230193 100644 --- a/doc/html/globals_func_0x78.html +++ b/doc/html/globals_func_0x78.html @@ -28,7 +28,7 @@ - +
    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
    The Red Matrix
    diff --git a/doc/html/globals_func_0x7a.html b/doc/html/globals_func_0x7a.html index bfdd75ee2..67ec3efa7 100644 --- a/doc/html/globals_func_0x7a.html +++ b/doc/html/globals_func_0x7a.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    @@ -197,8 +197,8 @@ $(document).ready(function(){initNavTree('globals_func_0x7a.html','');});
  • zot_finger() : zot.php
    • -
  • zot_get_hubloc() -: zot.php +
  • zot_get_hublocs() +: zot.php
  • zot_gethub() : zot.php diff --git a/doc/html/globals_vars.html b/doc/html/globals_vars.html index e466fa2e3..152e8159d 100644 --- a/doc/html/globals_vars.html +++ b/doc/html/globals_vars.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    @@ -163,11 +163,14 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
  • $body_font_size : style.php
    • +
  • $bodyclass +: default.php +
  • $called_api : api.php
  • $channel -: theme_init.php +: theme_init.php
  • $comment_indent : style.php @@ -201,6 +204,12 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
  • $gc_probability : session.php
    • +
  • $headimg +: default.php +
    • +
  • $headimghome +: default.php +
  • $i : docblox_errorchecker.php
    • @@ -310,7 +319,7 @@ $(document).ready(function(){initNavTree('globals_vars.html','');}); : style.php
  • $uid -: style.php +: style.php
  • $width : minimalisticdarkness.php diff --git a/doc/html/globals_vars_0x61.html b/doc/html/globals_vars_0x61.html index c7c2cf186..8493d5b7d 100644 --- a/doc/html/globals_vars_0x61.html +++ b/doc/html/globals_vars_0x61.html @@ -28,7 +28,7 @@ - + + + @@ -358,7 +360,7 @@ Variables
    The Red Matrix
    diff --git a/doc/html/globals_vars_0x63.html b/doc/html/globals_vars_0x63.html index 91e566b58..6899381a8 100644 --- a/doc/html/globals_vars_0x63.html +++ b/doc/html/globals_vars_0x63.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_vars_0x64.html b/doc/html/globals_vars_0x64.html index e642dd020..06a3e585a 100644 --- a/doc/html/globals_vars_0x64.html +++ b/doc/html/globals_vars_0x64.html @@ -28,7 +28,7 @@ - +
    The Red Matrix
    diff --git a/doc/html/globals_vars_0x65.html b/doc/html/globals_vars_0x65.html index 4539792cb..b39b21f8a 100644 --- a/doc/html/globals_vars_0x65.html +++ b/doc/html/globals_vars_0x65.html @@ -28,7 +28,7 @@ - +

    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
    The Red Matrix
    diff --git a/doc/html/globals_vars_0x66.html b/doc/html/globals_vars_0x66.html index 9d435e94a..ac01ed206 100644 --- a/doc/html/globals_vars_0x66.html +++ b/doc/html/globals_vars_0x66.html @@ -28,7 +28,7 @@ - + - -
    The Red Matrix
    diff --git a/doc/html/globals_vars_0x67.html b/doc/html/globals_vars_0x67.html index ed4d31490..350a44913 100644 --- a/doc/html/globals_vars_0x67.html +++ b/doc/html/globals_vars_0x67.html @@ -28,7 +28,7 @@ - + - -
    The Red Matrix
    diff --git a/doc/html/globals_vars_0x68.html b/doc/html/globals_vars_0x68.html index 1cf8653e9..aaa124015 100644 --- a/doc/html/globals_vars_0x68.html +++ b/doc/html/globals_vars_0x68.html @@ -28,7 +28,7 @@ - + - -
    The Red Matrix
    diff --git a/doc/html/globals_vars_0x69.html b/doc/html/globals_vars_0x69.html index fdaac05a0..09db932b0 100644 --- a/doc/html/globals_vars_0x69.html +++ b/doc/html/globals_vars_0x69.html @@ -28,7 +28,7 @@ - + - -
    The Red Matrix
    @@ -141,7 +141,7 @@ $(document).ready(function(){initNavTree('globals_vars_0x69.html','');});

    - i -

    • if : php2po.php -, default.php +, default.php , style.php , full.php
      • diff --git a/doc/html/globals_vars_0x6a.html b/doc/html/globals_vars_0x6a.html index 8f3835e21..b2d1d4353 100644 --- a/doc/html/globals_vars_0x6a.html +++ b/doc/html/globals_vars_0x6a.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/globals_vars_0x6b.html b/doc/html/globals_vars_0x6b.html index 5a1054bc9..8ebbfc2e3 100644 --- a/doc/html/globals_vars_0x6b.html +++ b/doc/html/globals_vars_0x6b.html @@ -28,7 +28,7 @@ - +

      Referenced by poller_run().

      + + + +
      +
      +
      The Red Matrix
      diff --git a/doc/html/globals_vars_0x6c.html b/doc/html/globals_vars_0x6c.html index 1123f0847..f771e49cb 100644 --- a/doc/html/globals_vars_0x6c.html +++ b/doc/html/globals_vars_0x6c.html @@ -28,7 +28,7 @@ - +

      Referenced by App\build_pagehead().

      + + + +
      +
      +
      The Red Matrix
      diff --git a/doc/html/globals_vars_0x6d.html b/doc/html/globals_vars_0x6d.html index 34d259ddc..b05529db2 100644 --- a/doc/html/globals_vars_0x6d.html +++ b/doc/html/globals_vars_0x6d.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/globals_vars_0x6e.html b/doc/html/globals_vars_0x6e.html index a621d30d3..8fcd642b9 100644 --- a/doc/html/globals_vars_0x6e.html +++ b/doc/html/globals_vars_0x6e.html @@ -28,7 +28,7 @@ - +

      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 + + + + + + @@ -192,7 +198,7 @@ Functions
      The Red Matrix
      diff --git a/doc/html/globals_vars_0x70.html b/doc/html/globals_vars_0x70.html index 46d6b28a2..55e1dd040 100644 --- a/doc/html/globals_vars_0x70.html +++ b/doc/html/globals_vars_0x70.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/globals_vars_0x72.html b/doc/html/globals_vars_0x72.html index d0ed87061..12c800d3f 100644 --- a/doc/html/globals_vars_0x72.html +++ b/doc/html/globals_vars_0x72.html @@ -28,7 +28,7 @@ - +
      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
      The Red Matrix
      diff --git a/doc/html/globals_vars_0x73.html b/doc/html/globals_vars_0x73.html index 4bdfffd91..578fb9bd7 100644 --- a/doc/html/globals_vars_0x73.html +++ b/doc/html/globals_vars_0x73.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/globals_vars_0x74.html b/doc/html/globals_vars_0x74.html index bc94bea8d..ea2637f84 100644 --- a/doc/html/globals_vars_0x74.html +++ b/doc/html/globals_vars_0x74.html @@ -28,7 +28,7 @@ - + - -
      The Red Matrix
      diff --git a/doc/html/globals_vars_0x75.html b/doc/html/globals_vars_0x75.html index 73305fe63..c8c461099 100644 --- a/doc/html/globals_vars_0x75.html +++ b/doc/html/globals_vars_0x75.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/globals_vars_0x77.html b/doc/html/globals_vars_0x77.html index 5b6227b38..c9cdeb78a 100644 --- a/doc/html/globals_vars_0x77.html +++ b/doc/html/globals_vars_0x77.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/globals_vars_0x78.html b/doc/html/globals_vars_0x78.html index 74f1231f6..b115c36a0 100644 --- a/doc/html/globals_vars_0x78.html +++ b/doc/html/globals_vars_0x78.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/globals_vars_0x7a.html b/doc/html/globals_vars_0x7a.html index ca89a798d..1d8482c2c 100644 --- a/doc/html/globals_vars_0x7a.html +++ b/doc/html/globals_vars_0x7a.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/gprobe_8php.html b/doc/html/gprobe_8php.html index 03273c090..e145841f3 100644 --- a/doc/html/gprobe_8php.html +++ b/doc/html/gprobe_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/greenthumbnails_8php.html b/doc/html/greenthumbnails_8php.html index 218421646..69c3376e3 100644 --- a/doc/html/greenthumbnails_8php.html +++ b/doc/html/greenthumbnails_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/hcard_8php.html b/doc/html/hcard_8php.html index cdf57807d..581077cb3 100644 --- a/doc/html/hcard_8php.html +++ b/doc/html/hcard_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/help_8php.html b/doc/html/help_8php.html index 3cf14b906..4eb654d30 100644 --- a/doc/html/help_8php.html +++ b/doc/html/help_8php.html @@ -28,7 +28,7 @@ - + - +
      The Red Matrix
      diff --git a/doc/html/hierarchy.html b/doc/html/hierarchy.html index 7f857db49..2a65d1ce0 100644 --- a/doc/html/hierarchy.html +++ b/doc/html/hierarchy.html @@ -28,7 +28,7 @@ - + - - + + @@ -300,7 +300,7 @@ Functions
      The Red Matrix
      diff --git a/doc/html/home_8php.html b/doc/html/home_8php.html index 02a9998f1..33376ec42 100644 --- a/doc/html/home_8php.html +++ b/doc/html/home_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/hostxrd_8php.html b/doc/html/hostxrd_8php.html index b9b6bf159..fd11d46d4 100644 --- a/doc/html/hostxrd_8php.html +++ b/doc/html/hostxrd_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/html2bbcode_8php.html b/doc/html/html2bbcode_8php.html index 4d08aa5a1..9c8651b9a 100644 --- a/doc/html/html2bbcode_8php.html +++ b/doc/html/html2bbcode_8php.html @@ -28,7 +28,7 @@ - +

      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
      The Red Matrix
      diff --git a/doc/html/html2plain_8php.html b/doc/html/html2plain_8php.html index 9a8e81a00..bf8dd4f1e 100644 --- a/doc/html/html2plain_8php.html +++ b/doc/html/html2plain_8php.html @@ -28,7 +28,7 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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
      The Red Matrix
      diff --git a/doc/html/identity_8php.html b/doc/html/identity_8php.html index e48a5e79a..8885d5be7 100644 --- a/doc/html/identity_8php.html +++ b/doc/html/identity_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/import_8php.html b/doc/html/import_8php.html index 13e836ac8..9d9d05950 100644 --- a/doc/html/import_8php.html +++ b/doc/html/import_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/include_2api_8php.html b/doc/html/include_2api_8php.html index a09a6c142..5a1460ab8 100644 --- a/doc/html/include_2api_8php.html +++ b/doc/html/include_2api_8php.html @@ -28,7 +28,7 @@ - +

      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 - - @@ -174,8 +172,6 @@ Files - - @@ -184,14 +180,10 @@ Files - - - - @@ -222,6 +214,8 @@ Files + + 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
      The Red Matrix
      diff --git a/doc/html/include_2attach_8php.html b/doc/html/include_2attach_8php.html index 338bbb45d..1a69949ee 100644 --- a/doc/html/include_2attach_8php.html +++ b/doc/html/include_2attach_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/include_2chanman_8php.html b/doc/html/include_2chanman_8php.html index db5b19ce8..b6e21596d 100644 --- a/doc/html/include_2chanman_8php.html +++ b/doc/html/include_2chanman_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html index 387a56baa..bc38d8da0 100644 --- a/doc/html/include_2config_8php.html +++ b/doc/html/include_2config_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      @@ -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(), dfrn_deliver(), 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(), fetch_url(), fetch_xrd_links(), find_upstream_directory(), findpeople_widget(), Item\get_comment_box(), get_item_elements(), get_mail_elements(), 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(), match_content(), 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(), post_url(), 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(), 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(), dfrn_deliver(), 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(), fetch_url(), fetch_xrd_links(), find_upstream_directory(), findpeople_widget(), Item\get_comment_box(), get_item_elements(), get_mail_elements(), 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(), match_content(), 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(), post_url(), 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().

      @@ -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(), network_init(), notifications_content(), profile_activity(), profile_load(), profile_sidebar(), profperm_content(), remove_community_tag(), rpost_content(), set_pconfig(), smilies(), tag_deliver(), and theme_content().

      +

      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(), network_init(), notifications_content(), profile_activity(), profile_load(), profile_sidebar(), profperm_content(), remove_community_tag(), rpost_content(), search_content(), set_pconfig(), smilies(), tag_deliver(), and theme_content().

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

      +

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

      diff --git a/doc/html/include_2directory_8php.html b/doc/html/include_2directory_8php.html index 136d7715b..eaa201077 100644 --- a/doc/html/include_2directory_8php.html +++ b/doc/html/include_2directory_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/include_2follow_8php.html b/doc/html/include_2follow_8php.html index 8b42bcb0a..64e43db27 100644 --- a/doc/html/include_2follow_8php.html +++ b/doc/html/include_2follow_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/include_2group_8php.html b/doc/html/include_2group_8php.html index a491fc476..ba0123d14 100644 --- a/doc/html/include_2group_8php.html +++ b/doc/html/include_2group_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/include_2menu_8php.html b/doc/html/include_2menu_8php.html index 271ad177b..d233c89f8 100644 --- a/doc/html/include_2menu_8php.html +++ b/doc/html/include_2menu_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/include_2message_8php.html b/doc/html/include_2message_8php.html index 69d06c33e..d66e4bfa1 100644 --- a/doc/html/include_2message_8php.html +++ b/doc/html/include_2message_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/include_2network_8php.html b/doc/html/include_2network_8php.html index e2a7be147..3655d207a 100644 --- a/doc/html/include_2network_8php.html +++ b/doc/html/include_2network_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/include_2notify_8php.html b/doc/html/include_2notify_8php.html index 8f9feff11..1ea576fa0 100644 --- a/doc/html/include_2notify_8php.html +++ b/doc/html/include_2notify_8php.html @@ -28,7 +28,7 @@ - +
    • 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
      The Red Matrix
      diff --git a/doc/html/include_2oembed_8php.html b/doc/html/include_2oembed_8php.html index e3beaa1d9..b2e1efc44 100644 --- a/doc/html/include_2oembed_8php.html +++ b/doc/html/include_2oembed_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/include_2photos_8php.html b/doc/html/include_2photos_8php.html index 927fa57bf..677c57517 100644 --- a/doc/html/include_2photos_8php.html +++ b/doc/html/include_2photos_8php.html @@ -28,7 +28,7 @@ - +

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

      - - - -
      -
      -
      The Red Matrix
      diff --git a/doc/html/index.html b/doc/html/index.html index 472a884df..3d2dc4d76 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/interfaceITemplateEngine-members.html b/doc/html/interfaceITemplateEngine-members.html index 600dfad9c..d0f6d96cb 100644 --- a/doc/html/interfaceITemplateEngine-members.html +++ b/doc/html/interfaceITemplateEngine-members.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/interfaceITemplateEngine.html b/doc/html/interfaceITemplateEngine.html index 45e1f031a..ae3452db8 100644 --- a/doc/html/interfaceITemplateEngine.html +++ b/doc/html/interfaceITemplateEngine.html @@ -28,7 +28,7 @@ - + - -
      The Red Matrix
      diff --git a/doc/html/intro_8php.html b/doc/html/intro_8php.html index 28ca22cc8..50850d8f6 100644 --- a/doc/html/intro_8php.html +++ b/doc/html/intro_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/invite_8php.html b/doc/html/invite_8php.html index 5e25bdd3d..e52b88602 100644 --- a/doc/html/invite_8php.html +++ b/doc/html/invite_8php.html @@ -28,7 +28,7 @@ - + - -
      The Red Matrix
      diff --git a/doc/html/item_8php.html b/doc/html/item_8php.html index 31e88a3fd..17307d39a 100644 --- a/doc/html/item_8php.html +++ b/doc/html/item_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/items_8php.html b/doc/html/items_8php.html index 5f9663fca..852603068 100644 --- a/doc/html/items_8php.html +++ b/doc/html/items_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html index e18eace92..30260aaaa 100644 --- a/doc/html/language_8php.html +++ b/doc/html/language_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      @@ -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(), 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(), nogroup_content(), 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(), profile_tabs(), 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(), 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(), nogroup_content(), 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(), profile_tabs(), 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().

      diff --git a/doc/html/lastpost_8php.html b/doc/html/lastpost_8php.html index a5752d4f8..36b01df45 100644 --- a/doc/html/lastpost_8php.html +++ b/doc/html/lastpost_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/layouts_8php.html b/doc/html/layouts_8php.html index 809bee6c7..01db274f4 100644 --- a/doc/html/layouts_8php.html +++ b/doc/html/layouts_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/like_8php.html b/doc/html/like_8php.html index c21ee8815..7e6a1db83 100644 --- a/doc/html/like_8php.html +++ b/doc/html/like_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/lockview_8php.html b/doc/html/lockview_8php.html index 7db48f0d0..9db692f74 100644 --- a/doc/html/lockview_8php.html +++ b/doc/html/lockview_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/login_8php.html b/doc/html/login_8php.html index b26bfc750..361ce22f6 100644 --- a/doc/html/login_8php.html +++ b/doc/html/login_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/lostpass_8php.html b/doc/html/lostpass_8php.html index f8c12deda..1df357a61 100644 --- a/doc/html/lostpass_8php.html +++ b/doc/html/lostpass_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/magic_8php.html b/doc/html/magic_8php.html index 79231f66f..7fc8c7597 100644 --- a/doc/html/magic_8php.html +++ b/doc/html/magic_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/manage_8php.html b/doc/html/manage_8php.html index b64321642..b7bb732e7 100644 --- a/doc/html/manage_8php.html +++ b/doc/html/manage_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/match_8php.html b/doc/html/match_8php.html index 576b896bc..6e5794287 100644 --- a/doc/html/match_8php.html +++ b/doc/html/match_8php.html @@ -28,7 +28,7 @@ - +

      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
      The Red Matrix
      diff --git a/doc/html/md_README.html b/doc/html/md_README.html index 37ea462a7..0b2875d59 100644 --- a/doc/html/md_README.html +++ b/doc/html/md_README.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/md_config.html b/doc/html/md_config.html index 466f0200d..db80ea68c 100644 --- a/doc/html/md_config.html +++ b/doc/html/md_config.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/md_fresh.html b/doc/html/md_fresh.html index 710177107..636f58b97 100644 --- a/doc/html/md_fresh.html +++ b/doc/html/md_fresh.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/minimal_8php.html b/doc/html/minimal_8php.html index 410c086ff..6b37d2cc0 100644 --- a/doc/html/minimal_8php.html +++ b/doc/html/minimal_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/minimalisticdarkness_8php.html b/doc/html/minimalisticdarkness_8php.html index 38cf4809d..2c40df315 100644 --- a/doc/html/minimalisticdarkness_8php.html +++ b/doc/html/minimalisticdarkness_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/mitem_8php.html b/doc/html/mitem_8php.html index cd82d3cce..83570dc4b 100644 --- a/doc/html/mitem_8php.html +++ b/doc/html/mitem_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/mod_2api_8php.html b/doc/html/mod_2api_8php.html index 829fb2cf7..d9d6febdd 100644 --- a/doc/html/mod_2api_8php.html +++ b/doc/html/mod_2api_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/mod_2attach_8php.html b/doc/html/mod_2attach_8php.html index 034d27ae7..575cd97e1 100644 --- a/doc/html/mod_2attach_8php.html +++ b/doc/html/mod_2attach_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/mod_2chanman_8php.html b/doc/html/mod_2chanman_8php.html index a795f8fc7..1e9aa9a48 100644 --- a/doc/html/mod_2chanman_8php.html +++ b/doc/html/mod_2chanman_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/mod_2directory_8php.html b/doc/html/mod_2directory_8php.html index 25a40e698..be5007e01 100644 --- a/doc/html/mod_2directory_8php.html +++ b/doc/html/mod_2directory_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/mod_2follow_8php.html b/doc/html/mod_2follow_8php.html index 45c1294b9..8ec4d4051 100644 --- a/doc/html/mod_2follow_8php.html +++ b/doc/html/mod_2follow_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/mod_2group_8php.html b/doc/html/mod_2group_8php.html index 7405dbefe..7b1c8a85d 100644 --- a/doc/html/mod_2group_8php.html +++ b/doc/html/mod_2group_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/mod_2menu_8php.html b/doc/html/mod_2menu_8php.html index 756912442..4e6574c40 100644 --- a/doc/html/mod_2menu_8php.html +++ b/doc/html/mod_2menu_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/mod_2message_8php.html b/doc/html/mod_2message_8php.html index aa81f81cd..4fddb1d45 100644 --- a/doc/html/mod_2message_8php.html +++ b/doc/html/mod_2message_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/mod_2network_8php.html b/doc/html/mod_2network_8php.html index acb93b9c7..df2ec7124 100644 --- a/doc/html/mod_2network_8php.html +++ b/doc/html/mod_2network_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/mod_2notify_8php.html b/doc/html/mod_2notify_8php.html index 67a9fc74b..dae4949c1 100644 --- a/doc/html/mod_2notify_8php.html +++ b/doc/html/mod_2notify_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/mod_2oembed_8php.html b/doc/html/mod_2oembed_8php.html index 22dd69196..539616a76 100644 --- a/doc/html/mod_2oembed_8php.html +++ b/doc/html/mod_2oembed_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/mod_2photos_8php.html b/doc/html/mod_2photos_8php.html index 597449f36..f81b628f5 100644 --- a/doc/html/mod_2photos_8php.html +++ b/doc/html/mod_2photos_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/mod__import_8php.html b/doc/html/mod__import_8php.html index 73cc22718..6f1e15632 100644 --- a/doc/html/mod__import_8php.html +++ b/doc/html/mod__import_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/mod__new__channel_8php.html b/doc/html/mod__new__channel_8php.html index 70dd374f4..82bfb3f1e 100644 --- a/doc/html/mod__new__channel_8php.html +++ b/doc/html/mod__new__channel_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/mod__register_8php.html b/doc/html/mod__register_8php.html index a20f3ecd7..e42a107a2 100644 --- a/doc/html/mod__register_8php.html +++ b/doc/html/mod__register_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/mood_8php.html b/doc/html/mood_8php.html index 8215acc76..2a4ba4f5b 100644 --- a/doc/html/mood_8php.html +++ b/doc/html/mood_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/msearch_8php.html b/doc/html/msearch_8php.html index 4231ba63a..be2a16b75 100644 --- a/doc/html/msearch_8php.html +++ b/doc/html/msearch_8php.html @@ -28,7 +28,7 @@ - +

      Referenced by rpost_callback(), and rpost_content().

      + + + +
      +
      +
      The Red Matrix
      diff --git a/doc/html/namespaceFriendica.html b/doc/html/namespaceFriendica.html index a4d16b022..6d350cbbf 100644 --- a/doc/html/namespaceFriendica.html +++ b/doc/html/namespaceFriendica.html @@ -28,7 +28,7 @@ - + + +
      The Red Matrix
      diff --git a/doc/html/namespaceacl__selectors.html b/doc/html/namespaceacl__selectors.html index ad98afb3a..72ecab5ed 100644 --- a/doc/html/namespaceacl__selectors.html +++ b/doc/html/namespaceacl__selectors.html @@ -28,7 +28,7 @@ - +
      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(), nogroup_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(), profile_tabs(), 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(), 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().

      diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html index 1535474f3..c643c7fae 100644 --- a/doc/html/typo_8php.html +++ b/doc/html/typo_8php.html @@ -134,7 +134,7 @@ Variables
      The Red Matrix
      diff --git a/doc/html/namespacefriendica-to-smarty-tpl.html b/doc/html/namespacefriendica-to-smarty-tpl.html index 6fb22cd2b..dc2d9796a 100644 --- a/doc/html/namespacefriendica-to-smarty-tpl.html +++ b/doc/html/namespacefriendica-to-smarty-tpl.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/namespacemembers.html b/doc/html/namespacemembers.html index 0075b4f63..1d3f9ea06 100644 --- a/doc/html/namespacemembers.html +++ b/doc/html/namespacemembers.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/namespacemembers_func.html b/doc/html/namespacemembers_func.html index 998f6e1c2..1e4f0fcaa 100644 --- a/doc/html/namespacemembers_func.html +++ b/doc/html/namespacemembers_func.html @@ -28,7 +28,7 @@ - +
      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(), profile_tabs(), 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(), qsearch_init(), register_post(), sanitise_acl(), settings_post(), setup_content(), setup_post(), subthread_content(), tagger_content(), and xrd_init().

      @@ -1486,7 +1484,7 @@ Variables
      The Red Matrix
      diff --git a/doc/html/namespacemembers_vars.html b/doc/html/namespacemembers_vars.html index 6c3eed784..55cdd0ee1 100644 --- a/doc/html/namespacemembers_vars.html +++ b/doc/html/namespacemembers_vars.html @@ -28,7 +28,7 @@ - +

      Compare two URLs to see if they are the same, but ignore slight but hopefully insignificant differences such as if one is https and the other isn't, or if one is www.something and the other isn't - and also ignore case differences.

      Return true if the URLs match, otherwise false.

      -

      Referenced by consume_feed(), like_puller(), tag_deliver(), tgroup_check(), and zid().

      +

      Referenced by consume_feed(), like_puller(), tag_deliver(), tgroup_check(), and zid().

      @@ -1259,7 +1257,7 @@ Variables

      Function: linkify

      Replace naked text hyperlink with HTML formatted hyperlink

      -

      Referenced by advanced_profile(), and profile_activity().

      +

      Referenced by advanced_profile(), and profile_activity().

      @@ -1287,7 +1285,7 @@ Variables
      The Red Matrix
      diff --git a/doc/html/namespaces.html b/doc/html/namespaces.html index c6d8c4715..8ff7eddf2 100644 --- a/doc/html/namespaces.html +++ b/doc/html/namespaces.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/namespaceupdatetpl.html b/doc/html/namespaceupdatetpl.html index c56391257..4dd30a85c 100644 --- a/doc/html/namespaceupdatetpl.html +++ b/doc/html/namespaceupdatetpl.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/namespaceutil.html b/doc/html/namespaceutil.html index c35b5b089..9991102cd 100644 --- a/doc/html/namespaceutil.html +++ b/doc/html/namespaceutil.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/nav_8php.html b/doc/html/nav_8php.html index a2f9e61b6..c63c5e7ca 100644 --- a/doc/html/nav_8php.html +++ b/doc/html/nav_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/navtree.js b/doc/html/navtree.js index 522a59cf0..f39b11f5c 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#a8da836617174eed9fc2ac8054125354b", -"classConversation.html#af84ea6ccd72214c9bb4c504461cc8b09", -"contact__selectors_8php.html#a9839e8fdaac7ffb37bf1420493f5c28f", -"globals_0x6a.html", -"include_2oembed_8php.html#ab953a6e7c11bc6498ce01ed73e2ba319", -"photo__driver_8php.html#a7273b82b017fd96d29b2c57bab03aea6", -"tagger_8php.html" +"boot_8php.html#a8663f32171568489dbb2a01dd00371f8", +"classConversation.html#a87a0d704d5f2b1a008cc2e9ce06a1bcd", +"connections_8php.html", +"globals.html", +"include_2network_8php.html#adf6008b38c555e98e7ed10da9ede2335", +"permissions_8php.html", +"socgraph_8php.html#a5ef8bef37161df53718a21e93d02fbd6", +"zot_8php.html#a95528377d7303131958c9f0b7158fdce" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js index a7675931a..24bb4d1ae 100644 --- a/doc/html/navtreeindex0.js +++ b/doc/html/navtreeindex0.js @@ -98,6 +98,14 @@ var NAVTREEINDEX0 = "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], +"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], "boot_8php.html":[5,0,4], "boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[5,0,4,140], "boot_8php.html#a01353c9abebc3544ea080ac161729632":[5,0,4,43], @@ -241,13 +249,5 @@ var NAVTREEINDEX0 = "boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed":[5,0,4,205], "boot_8php.html#a84057c5bfa1bca5fba8497fe005ee4d8":[5,0,4,61], "boot_8php.html#a845891f82bf6edd7fa2d578b66703112":[5,0,4,118], -"boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688":[5,0,4,65], -"boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[5,0,4,130], -"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[5,0,4,257], -"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[5,0,4,256], -"boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[5,0,4,184], -"boot_8php.html#a899d24fd074594ceebbf72e1feff335f":[5,0,4,17], -"boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[5,0,4,106], -"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[5,0,4,231], -"boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[5,0,4,133] +"boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688":[5,0,4,65] }; diff --git a/doc/html/navtreeindex1.js b/doc/html/navtreeindex1.js index 152f09044..42a958d4b 100644 --- a/doc/html/navtreeindex1.js +++ b/doc/html/navtreeindex1.js @@ -1,5 +1,13 @@ var NAVTREEINDEX1 = { +"boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[5,0,4,130], +"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[5,0,4,257], +"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[5,0,4,256], +"boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[5,0,4,184], +"boot_8php.html#a899d24fd074594ceebbf72e1feff335f":[5,0,4,17], +"boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[5,0,4,106], +"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[5,0,4,231], +"boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[5,0,4,133], "boot_8php.html#a8da836617174eed9fc2ac8054125354b":[5,0,4,127], "boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[5,0,4,238], "boot_8php.html#a9255af5ae9c887520091ea04763c1a88":[5,0,4,34], @@ -241,13 +249,5 @@ var NAVTREEINDEX1 = "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#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#a8748445aa26047ebed5141f3c3cbc244":[4,0,8,16] }; diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js index 92f5eb1b2..7b35ecfb0 100644 --- a/doc/html/navtreeindex2.js +++ b/doc/html/navtreeindex2.js @@ -1,5 +1,13 @@ var NAVTREEINDEX2 = { +"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#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], @@ -241,13 +249,5 @@ var NAVTREEINDEX2 = "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], -"contact__selectors_8php.html":[5,0,0,18], -"contact__selectors_8php.html#a2c743d2eb526eb758d943a1490162d75":[5,0,0,18,1] +"connect_8php.html#ad46a38f32fd7a3d324b1fa26373efa36":[5,0,1,14,1] }; diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js index 8ead73d31..3ce92948a 100644 --- a/doc/html/navtreeindex3.js +++ b/doc/html/navtreeindex3.js @@ -1,5 +1,13 @@ var NAVTREEINDEX3 = { +"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], +"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], @@ -52,7 +60,7 @@ var NAVTREEINDEX3 = "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,1,1,0], +"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], @@ -82,22 +90,24 @@ 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], -"default_8php.html":[5,0,3,0,0], -"default_8php.html#a23bc1996b18e69c1a3ab44536613a762":[5,0,3,0,0,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,1,0], +"dir_032dd9e2cfe278a2cfa5eb9547448eb9.html":[5,0,3,1,2,0], "dir_05f4fba29266e8fd7869afcd6cefb5cb.html":[5,0,3,1,0,1], "dir_0eaa4a0adae8ba4811e133c6e594aeee.html":[5,0,2,0], "dir_21bc5169ff11430004758be31dcfc6c4.html":[5,0,0,0], "dir_23ec12649285f9fabf3a6b7380226c28.html":[5,0,2], -"dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html":[5,0,3,1,1,1], -"dir_55dbaf9b7b53c4fc605c9011743a7353.html":[5,0,3,1,1], +"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_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], @@ -105,8 +115,10 @@ var NAVTREEINDEX3 = "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_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_d41ce877eb409a4791b288730010abe2.html":[5,0,1], "dir_d44c64559bbebec7f509842c48db8b23.html":[5,0,0], @@ -237,17 +249,5 @@ var NAVTREEINDEX3 = "functions_func_0x73.html":[4,3,1,16], "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_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] +"functions_vars.html":[4,3,2] }; diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js index 9187fb896..14db66ba4 100644 --- a/doc/html/navtreeindex4.js +++ b/doc/html/navtreeindex4.js @@ -1,5 +1,17 @@ var NAVTREEINDEX4 = { +"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], +"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], @@ -43,8 +55,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], @@ -237,17 +249,5 @@ var NAVTREEINDEX4 = "include_2network_8php.html#ab07ce9d75eae559865ed90aad2154bd7":[5,0,0,46,3], "include_2network_8php.html#aba38458a2ff2d92d3536488dbb119694":[5,0,0,46,1], "include_2network_8php.html#ad4056d3ce69988f5c1a997a79f503246":[5,0,0,46,4], -"include_2network_8php.html#adbc7fe45cc7fd9cd78f6b2f425ee9041":[5,0,0,46,14], -"include_2network_8php.html#adf6008b38c555e98e7ed10da9ede2335":[5,0,0,46,21], -"include_2network_8php.html#ae8d9c41a11000fb8667039fc71b4f73f":[5,0,0,46,17], -"include_2network_8php.html#aee35d9ad6b3f872bfb39ba3598936aa7":[5,0,0,46,2], -"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_2network_8php.html#adbc7fe45cc7fd9cd78f6b2f425ee9041":[5,0,0,46,14] }; diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js index db8b56edb..c558ec73b 100644 --- a/doc/html/navtreeindex5.js +++ b/doc/html/navtreeindex5.js @@ -1,5 +1,17 @@ var NAVTREEINDEX5 = { +"include_2network_8php.html#adf6008b38c555e98e7ed10da9ede2335":[5,0,0,46,21], +"include_2network_8php.html#ae8d9c41a11000fb8667039fc71b4f73f":[5,0,0,46,17], +"include_2network_8php.html#aee35d9ad6b3f872bfb39ba3598936aa7":[5,0,0,46,2], +"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], @@ -183,8 +195,8 @@ var NAVTREEINDEX5 = "msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[5,0,1,56,0], "namespaceFriendica.html":[3,0,1], "namespaceFriendica.html":[4,0,1], -"namespaceacl__selectors.html":[4,0,0], "namespaceacl__selectors.html":[3,0,0], +"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], @@ -193,8 +205,8 @@ var NAVTREEINDEX5 = "namespaces.html":[3,0], "namespaceupdatetpl.html":[4,0,3], "namespaceupdatetpl.html":[3,0,3], -"namespaceutil.html":[4,0,4], "namespaceutil.html":[3,0,4], +"namespaceutil.html":[4,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], @@ -237,17 +249,5 @@ var NAVTREEINDEX5 = "parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a":[5,0,1,66,1], "parse__url_8php.html#aa7dd8f961bea042d62726ed909e4a868":[5,0,1,66,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,67], -"photo_8php.html#a582779d24882b0d31ee909a91d70a448":[5,0,1,67,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#a32e2817faa25d7f11f60a8abff565035":[5,0,0,1,0,4] +"passionwide_8php.html":[5,0,3,1,0,1,7] }; diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index 6accdb665..5b838bd51 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -1,5 +1,17 @@ var NAVTREEINDEX6 = { +"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,67], +"photo_8php.html#a582779d24882b0d31ee909a91d70a448":[5,0,1,67,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#a32e2817faa25d7f11f60a8abff565035":[5,0,0,1,0,4], "photo__driver_8php.html#a7273b82b017fd96d29b2c57bab03aea6":[5,0,0,1,0,1], "photo__gd_8php.html":[5,0,0,1,1], "photo__imagick_8php.html":[5,0,0,1,2], @@ -12,6 +24,10 @@ 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,7], +"php_2theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864":[5,0,3,0,7,0], "php_8php.html":[5,0,1,69], "php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[5,0,1,69,0], "pine_8php.html":[5,0,3,1,0,1,8], @@ -56,26 +72,31 @@ var NAVTREEINDEX6 = "post_8php.html":[5,0,1,73], "post_8php.html#af4b48181ce773ef0cdfc972441445c34":[5,0,1,73,0], "post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[5,0,1,73,1], -"post__to__red_8php.html":[5,0,2,1,0], -"post__to__red_8php.html#a0f139dea77a94c98f26007963eea639c":[5,0,2,1,0,9], -"post__to__red_8php.html#a49fd35f7b1cdddfe6e26ddfcf8d3c4ec":[5,0,2,1,0,1], -"post__to__red_8php.html#a4d90ac085c14f53ff4d8ab4c23477ea6":[5,0,2,1,0,5], -"post__to__red_8php.html#a588cea66afe0b32f27f2713d44940119":[5,0,2,1,0,16], -"post__to__red_8php.html#a6210f39392a5f0fa0255cc7d3760493a":[5,0,2,1,0,17], -"post__to__red_8php.html#a75db5d87226a0287a0ac0fa315f2bcfd":[5,0,2,1,0,3], -"post__to__red_8php.html#a7e68a8d9c83cb28d032aad3ea85ce0a6":[5,0,2,1,0,10], -"post__to__red_8php.html#a8ec8f8809e3c5d1b2c9598c8185d63aa":[5,0,2,1,0,2], -"post__to__red_8php.html#a906be8f72cf1aa2e199c0683ea6a4017":[5,0,2,1,0,12], -"post__to__red_8php.html#a9497cd6a80c6897dbbf9aabde62b53e7":[5,0,2,1,0,7], -"post__to__red_8php.html#a96d0ccecb96600ef1bfd50ab3f77315f":[5,0,2,1,0,6], -"post__to__red_8php.html#a99811555b30bde504a863e44015f2f19":[5,0,2,1,0,15], -"post__to__red_8php.html#aa97aeda12ef080665f16311a4e1eb901":[5,0,2,1,0,11], -"post__to__red_8php.html#ada8a7130088351710bb02ed622d6bf65":[5,0,2,1,0,14], -"post__to__red_8php.html#ae6f3a2c0561cbeacda5be565b06de8a7":[5,0,2,1,0,4], -"post__to__red_8php.html#aeec4125719184e7b097b3b9fba3101b5":[5,0,2,1,0,0], -"post__to__red_8php.html#af2713018a2dc97e88f121fc6215beb66":[5,0,2,1,0,13], -"post__to__red_8php.html#af3e7ebd361d4ed7cb6d43209970cd94a":[5,0,2,1,0,18], -"post__to__red_8php.html#af5fd50e2c42ede85f8a9e8d9ee3cf540":[5,0,2,1,0,8], +"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], +"post__to__red_8php.html#a3a2af6ad845239f26e86fccabf8639e1":[5,0,2,1,0,0,17], +"post__to__red_8php.html#a4674bb5ce2baa32c559607460c39a2c5":[5,0,2,1,0,0,3], +"post__to__red_8php.html#a49fd35f7b1cdddfe6e26ddfcf8d3c4ec":[5,0,2,1,0,0,1], +"post__to__red_8php.html#a4d90ac085c14f53ff4d8ab4c23477ea6":[5,0,2,1,0,0,9], +"post__to__red_8php.html#a588cea66afe0b32f27f2713d44940119":[5,0,2,1,0,0,21], +"post__to__red_8php.html#a5cc2a89a6d33cdb8e2ca557a69bef42d":[5,0,2,1,0,0,2], +"post__to__red_8php.html#a6210f39392a5f0fa0255cc7d3760493a":[5,0,2,1,0,0,22], +"post__to__red_8php.html#a75db5d87226a0287a0ac0fa315f2bcfd":[5,0,2,1,0,0,5], +"post__to__red_8php.html#a7e68a8d9c83cb28d032aad3ea85ce0a6":[5,0,2,1,0,0,13], +"post__to__red_8php.html#a8ec8f8809e3c5d1b2c9598c8185d63aa":[5,0,2,1,0,0,4], +"post__to__red_8php.html#a906be8f72cf1aa2e199c0683ea6a4017":[5,0,2,1,0,0,15], +"post__to__red_8php.html#a96d0ccecb96600ef1bfd50ab3f77315f":[5,0,2,1,0,0,10], +"post__to__red_8php.html#a99811555b30bde504a863e44015f2f19":[5,0,2,1,0,0,20], +"post__to__red_8php.html#aa97aeda12ef080665f16311a4e1eb901":[5,0,2,1,0,0,14], +"post__to__red_8php.html#aacba7a0646fc00ae6ac4f5dc383fccab":[5,0,2,1,0,0,8], +"post__to__red_8php.html#ada8a7130088351710bb02ed622d6bf65":[5,0,2,1,0,0,19], +"post__to__red_8php.html#ae0b881461afbdba93d9329068ea52136":[5,0,2,1,0,0,7], +"post__to__red_8php.html#ae6f3a2c0561cbeacda5be565b06de8a7":[5,0,2,1,0,0,6], +"post__to__red_8php.html#aeec4125719184e7b097b3b9fba3101b5":[5,0,2,1,0,0,0], +"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,74], "pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[5,0,1,74,0], "probe_8php.html":[5,0,1,75], @@ -114,36 +135,36 @@ var NAVTREEINDEX6 = "queue__fn_8php.html#a8fe71e981399bbf5d000a6ca42f57b24":[5,0,0,62,0], "randprof_8php.html":[5,0,1,82], "randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[5,0,1,82,0], -"redbasic_2php_2style_8php.html":[5,0,3,1,1,0,1], -"redbasic_2php_2style_8php.html#a01c151bf47f7da2b979aaa4cb868da4c":[5,0,3,1,1,0,1,12], -"redbasic_2php_2style_8php.html#a0b070f2c9140a7a12a0b1f88601a29e4":[5,0,3,1,1,0,1,16], -"redbasic_2php_2style_8php.html#a0bdce350cf14bac44976e786d1be6574":[5,0,3,1,1,0,1,2], -"redbasic_2php_2style_8php.html#a0cb037986e32302685d4f580dedd6473":[5,0,3,1,1,0,1,5], -"redbasic_2php_2style_8php.html#a109bbd7f4add27541707b191b73ef84a":[5,0,3,1,1,0,1,23], -"redbasic_2php_2style_8php.html#a136b0a2cdeb37f3fa506d28f82dcdbf8":[5,0,3,1,1,0,1,9], -"redbasic_2php_2style_8php.html#a27cb59bbc750341f448cd0c298a7ea16":[5,0,3,1,1,0,1,8], -"redbasic_2php_2style_8php.html#a339624aeef6604a2f00209a3962c6e1c":[5,0,3,1,1,0,1,0], -"redbasic_2php_2style_8php.html#a4161f6b8aa923f67e53f54dfb6554cdb":[5,0,3,1,1,0,1,21], -"redbasic_2php_2style_8php.html#a5bff5012c56e34da6b3b2ed475726b27":[5,0,3,1,1,0,1,4], -"redbasic_2php_2style_8php.html#a61891d0d3e6894f52410d507b04e565d":[5,0,3,1,1,0,1,24], -"redbasic_2php_2style_8php.html#a6502bedd57105ad1fb2dee2be9cf6351":[5,0,3,1,1,0,1,15], -"redbasic_2php_2style_8php.html#a68e3ff836ec87ae1370c9f4a12c21c6b":[5,0,3,1,1,0,1,6], -"redbasic_2php_2style_8php.html#a6ffadaf926b41ad84c30da319011e9ad":[5,0,3,1,1,0,1,19], -"redbasic_2php_2style_8php.html#a810142b4bdd35a1d377ab279b02b47eb":[5,0,3,1,1,0,1,22], -"redbasic_2php_2style_8php.html#a83022b1d70799d2bde3d64dca9cb40ee":[5,0,3,1,1,0,1,17], -"redbasic_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a":[5,0,3,1,1,0,1,26], -"redbasic_2php_2style_8php.html#a8fdd5874587a9ad86fb05ed0be265649":[5,0,3,1,1,0,1,10], -"redbasic_2php_2style_8php.html#a9b489f1c595b867212d30eca0c85b38c":[5,0,3,1,1,0,1,13], -"redbasic_2php_2style_8php.html#ab00dfc29448b183055d2ae61a0e1874a":[5,0,3,1,1,0,1,18], -"redbasic_2php_2style_8php.html#ab3afb90d611eca90819f597a2c0bb459":[5,0,3,1,1,0,1,25], -"redbasic_2php_2style_8php.html#ab5ec5703848e0132f8a8f3d3a53a58e1":[5,0,3,1,1,0,1,11], -"redbasic_2php_2style_8php.html#ac98bd8264411bd207a5740d08e81a158":[5,0,3,1,1,0,1,14], -"redbasic_2php_2style_8php.html#acfd00ec469ca3c5e8bfac787573093f3":[5,0,3,1,1,0,1,20], -"redbasic_2php_2style_8php.html#ad78cb8a1793834626d73aca22a1501f8":[5,0,3,1,1,0,1,3], -"redbasic_2php_2style_8php.html#ae587aa6949ab6e4aa77a591e60f67ee0":[5,0,3,1,1,0,1,1], -"redbasic_2php_2style_8php.html#afcbcf57d0b90d2e4226c2e8a1171befc":[5,0,3,1,1,0,1,7], -"redbasic_2php_2theme_8php.html":[5,0,3,1,1,0,2], -"redbasic_2php_2theme_8php.html#af6eb813e9fc7e2d76ac1b82bc5c0ed9b":[5,0,3,1,1,0,2,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,63], "redir_8php.html":[5,0,1,83], @@ -228,26 +249,5 @@ var NAVTREEINDEX6 = "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], -"starred_8php.html":[5,0,1,99], -"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[5,0,1,99,0], -"subthread_8php.html":[5,0,1,100], -"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[5,0,1,100,0], -"suggest_8php.html":[5,0,1,101], -"suggest_8php.html#a4df91c84594d51ba56b5918de414230d":[5,0,1,101,0], -"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[5,0,1,101,1], -"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[5,0,1,101,2], -"system__unavailable_8php.html":[5,0,0,67], -"system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa":[5,0,0,67,0] +"socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586":[5,0,0,66,0] }; diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js index 364e45cf3..defedd888 100644 --- a/doc/html/navtreeindex7.js +++ b/doc/html/navtreeindex7.js @@ -1,5 +1,26 @@ var NAVTREEINDEX7 = { +"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], +"starred_8php.html":[5,0,1,99], +"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[5,0,1,99,0], +"subthread_8php.html":[5,0,1,100], +"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[5,0,1,100,0], +"suggest_8php.html":[5,0,1,101], +"suggest_8php.html#a4df91c84594d51ba56b5918de414230d":[5,0,1,101,0], +"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[5,0,1,101,1], +"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[5,0,1,101,2], +"system__unavailable_8php.html":[5,0,0,67], +"system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa":[5,0,0,67,0], "tagger_8php.html":[5,0,1,102], "tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[5,0,1,102,0], "tagrm_8php.html":[5,0,1,103], @@ -113,8 +134,16 @@ var NAVTREEINDEX7 = "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__init_8php.html":[5,0,3,0,7], -"theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864":[5,0,3,0,7,0], +"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,104], "thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[5,0,1,104,0], "thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[5,0,1,104,1], @@ -158,10 +187,22 @@ var NAVTREEINDEX7 = "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_2redbasic_2php_2config_8php.html":[5,0,3,1,1,0,0], -"view_2theme_2redbasic_2php_2config_8php.html#a8574a41fa9735ee391ba57ab24b93793":[5,0,3,1,1,0,0,0], -"view_2theme_2redbasic_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[5,0,3,1,1,0,0,1], -"view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[5,0,3,1,1,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,113], "view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[5,0,1,113,0], "viewconnections_8php.html":[5,0,1,114], @@ -208,22 +249,5 @@ var NAVTREEINDEX7 = "zot_8php.html#a703f528ade8382cf374e4119bd6f7859":[5,0,0,72,0], "zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d":[5,0,0,72,24], "zot_8php.html#a8e22dbc6f884be3644a892a876cbd972":[5,0,0,72,3], -"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[5,0,0,72,23], -"zot_8php.html#a95528377d7303131958c9f0b7158fdce":[5,0,0,72,18], -"zot_8php.html#a9a57b40669351c9791126b925cb7ef3b":[5,0,0,72,11], -"zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc":[5,0,0,72,10], -"zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10":[5,0,0,72,13], -"zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7":[5,0,0,72,22], -"zot_8php.html#ab319d1d9fff9c7775d9daef42d1f33dd":[5,0,0,72,15], -"zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142":[5,0,0,72,26], -"zot_8php.html#ac301c67864917c35922257950ae0f95c":[5,0,0,72,8], -"zot_8php.html#ac34e479d27f32b82dd6b33542f81a6a7":[5,0,0,72,1], -"zot_8php.html#acdea9362d78a63dce948fdf0ea73ef0e":[5,0,0,72,19], -"zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72":[5,0,0,72,2], -"zot_8php.html#aeea071f17e306fe3d0c488551906bfab":[5,0,0,72,21], -"zot_8php.html#aeec89da5b6ff090c63a79de4de884a35":[5,0,0,72,5], -"zotfeed_8php.html":[5,0,1,125], -"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,125,0], -"zping_8php.html":[5,0,1,126], -"zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75":[5,0,1,126,0] +"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[5,0,0,72,23] }; diff --git a/doc/html/navtreeindex8.js b/doc/html/navtreeindex8.js new file mode 100644 index 000000000..8c6b54b87 --- /dev/null +++ b/doc/html/navtreeindex8.js @@ -0,0 +1,20 @@ +var NAVTREEINDEX8 = +{ +"zot_8php.html#a95528377d7303131958c9f0b7158fdce":[5,0,0,72,18], +"zot_8php.html#a9a57b40669351c9791126b925cb7ef3b":[5,0,0,72,11], +"zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc":[5,0,0,72,10], +"zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10":[5,0,0,72,13], +"zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7":[5,0,0,72,22], +"zot_8php.html#ab319d1d9fff9c7775d9daef42d1f33dd":[5,0,0,72,15], +"zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142":[5,0,0,72,26], +"zot_8php.html#ac301c67864917c35922257950ae0f95c":[5,0,0,72,8], +"zot_8php.html#ac34e479d27f32b82dd6b33542f81a6a7":[5,0,0,72,1], +"zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72":[5,0,0,72,2], +"zot_8php.html#ae7cec2b417b5858fd4a41070f843d1d7":[5,0,0,72,19], +"zot_8php.html#aeea071f17e306fe3d0c488551906bfab":[5,0,0,72,21], +"zot_8php.html#aeec89da5b6ff090c63a79de4de884a35":[5,0,0,72,5], +"zotfeed_8php.html":[5,0,1,125], +"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,125,0], +"zping_8php.html":[5,0,1,126], +"zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75":[5,0,1,126,0] +}; diff --git a/doc/html/new__channel_8php.html b/doc/html/new__channel_8php.html index 08bbf1f72..90ff4a197 100644 --- a/doc/html/new__channel_8php.html +++ b/doc/html/new__channel_8php.html @@ -28,7 +28,7 @@ - +

      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 advanced_profile(), obj_verb_selector(), and thing_init().

      diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index 9953a6ee9..b4472a962 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -405,8 +405,6 @@ Variables
      The Red Matrix
      diff --git a/doc/html/nogroup_8php.html b/doc/html/nogroup_8php.html index 963628cb8..313b10074 100644 --- a/doc/html/nogroup_8php.html +++ b/doc/html/nogroup_8php.html @@ -28,7 +28,7 @@ - +

      Check if the sender is already verified here

      Have never seen this guid or this guid coming from this location. Check it and register it.

      This hub has now been proven to be valid. Any hub with the same URL and a different sitekey cannot be valid. Get rid of them (mark them deleted). There's a good chance they were re-installs.

      +

      Requestor visits /magic/?dest=somewhere on their own site with a browser magic redirects them to $destsite/post [with auth args....] $destsite sends an auth_check packet to originator site The auth_check packet is handled here by the originator's site

      +
        +
      • the browser session is still waiting inside $destsite/post for everything to verify If everything checks out we'll return a token to $destsite and then $destsite will verify the token, authenticate the browser session and then redirect to the original destination. If authentication fails, the redirection to the original destination will still take place but without authentication.
        • +
      diff --git a/doc/html/redbasic_2php_2style_8php.html b/doc/html/redbasic_2php_2style_8php.html index 8aa0e8224..e816fa304 100644 --- a/doc/html/redbasic_2php_2style_8php.html +++ b/doc/html/redbasic_2php_2style_8php.html @@ -112,7 +112,7 @@ $(document).ready(function(){initNavTree('redbasic_2php_2style_8php.html','');})
      The Red Matrix
      diff --git a/doc/html/none_8php.html b/doc/html/none_8php.html index de5c43817..b844d9f92 100644 --- a/doc/html/none_8php.html +++ b/doc/html/none_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/notifications_8php.html b/doc/html/notifications_8php.html index 685798ac3..92995ca3d 100644 --- a/doc/html/notifications_8php.html +++ b/doc/html/notifications_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/notifier_8php.html b/doc/html/notifier_8php.html index bb0eadec9..9cccb089c 100644 --- a/doc/html/notifier_8php.html +++ b/doc/html/notifier_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/oauth_8php.html b/doc/html/oauth_8php.html index 03718f507..a9e782687 100644 --- a/doc/html/oauth_8php.html +++ b/doc/html/oauth_8php.html @@ -28,7 +28,7 @@ - +

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

      diff --git a/doc/html/plugin_8php.html b/doc/html/plugin_8php.html index 6d293b3a8..6a9842f46 100644 --- a/doc/html/plugin_8php.html +++ b/doc/html/plugin_8php.html @@ -192,7 +192,7 @@ Functions
      The Red Matrix
      diff --git a/doc/html/oexchange_8php.html b/doc/html/oexchange_8php.html index 10ade1462..7207c36be 100644 --- a/doc/html/oexchange_8php.html +++ b/doc/html/oexchange_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/olddefault_8php.html b/doc/html/olddefault_8php.html index 740dbb6a8..d7a533f92 100644 --- a/doc/html/olddefault_8php.html +++ b/doc/html/olddefault_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/onedirsync_8php.html b/doc/html/onedirsync_8php.html index 93437572e..21915dc38 100644 --- a/doc/html/onedirsync_8php.html +++ b/doc/html/onedirsync_8php.html @@ -28,7 +28,7 @@ - + Functions - - + +
      The Red Matrix
      diff --git a/doc/html/onepoll_8php.html b/doc/html/onepoll_8php.html index f65bd5004..812fd6fbd 100644 --- a/doc/html/onepoll_8php.html +++ b/doc/html/onepoll_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/opensearch_8php.html b/doc/html/opensearch_8php.html index 6c7bd1a74..6cba2519b 100644 --- a/doc/html/opensearch_8php.html +++ b/doc/html/opensearch_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/page_8php.html b/doc/html/page_8php.html index c1fbcc5c8..462d8a853 100644 --- a/doc/html/page_8php.html +++ b/doc/html/page_8php.html @@ -28,7 +28,7 @@ - + - -
      The Red Matrix
      diff --git a/doc/html/page__widgets_8php.html b/doc/html/page__widgets_8php.html index cc6abc718..b40ab3c50 100644 --- a/doc/html/page__widgets_8php.html +++ b/doc/html/page__widgets_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/pages.html b/doc/html/pages.html index 8d7b7f54f..c120de869 100644 --- a/doc/html/pages.html +++ b/doc/html/pages.html @@ -28,7 +28,7 @@ - +

      xml2array() will convert the given XML text to an array in the XML structure. Link: http://www.bin-co.com/php/scripts/xml2array/ Portions significantly re-written by mike@.nosp@m.macg.nosp@m.irvin.nosp@m..com for Friendica (namespaces, lowercase tags, get_attribute default changed, more...) Arguments : $contents - The XML text $namespaces - true or false include namespace information in the returned array as array elements. $get_attributes - 1 or 0. If this is 1 the function will get the attributes as well as the tag values - this results in a different array structure in the return value. $priority - Can be 'tag' or 'attribute'. This will change the way the resulting array sturcture. For 'tag', the tags are given more importance. Return: The parsed XML in an array form. Use print_r() to see the resulting array structure. Examples: $array = xml2array(file_get_contents('feed.xml')); $array = xml2array(file_get_contents('feed.xml', true, 1, 'attribute'));

      -

      Referenced by fetch_xrd_links().

      -
      @@ -858,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(), navbar_complete(), oembed_fetch_url(), oexchange_content(), onepoll_run(), parseurl_getsiteinfo(), poco_load(), pubsites_content(), setup_post(), sync_directories(), update_suggestions(), z_post_url(), zot_finger(), and zot_register_hub().

      +

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

      diff --git a/doc/html/include_2network_8php.js b/doc/html/include_2network_8php.js index 2244fa323..15e2bab93 100644 --- a/doc/html/include_2network_8php.js +++ b/doc/html/include_2network_8php.js @@ -1,6 +1,5 @@ var include_2network_8php = [ - [ "add_fcontact", "include_2network_8php.html#a0bdc4b0bfc54797c249dc4eca25aeda4", null ], [ "allowed_email", "include_2network_8php.html#aba38458a2ff2d92d3536488dbb119694", null ], [ "allowed_url", "include_2network_8php.html#aee35d9ad6b3f872bfb39ba3598936aa7", null ], [ "avatar_img", "include_2network_8php.html#ab07ce9d75eae559865ed90aad2154bd7", null ], @@ -8,15 +7,10 @@ var include_2network_8php = [ "email_header_encode", "include_2network_8php.html#a469b9bd700269cd07d954f1a16c5899b", null ], [ "email_send", "include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0", null ], [ "fetch_lrdd_template", "include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0", null ], - [ "fetch_url", "include_2network_8php.html#a37ddeb88a3fd1dee9e8339723f9edf9a", null ], - [ "fetch_xrd_links", "include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d", null ], - [ "fix_contact_ssl_policy", "include_2network_8php.html#a2729d012410e470c527a62a3f777ded8", null ], [ "get_capath", "include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7", null ], [ "http_status_exit", "include_2network_8php.html#a4cfb2c05a1c295317283d762440ce0b2", null ], [ "json_return_and_die", "include_2network_8php.html#a4c5d50079e089168d9248427018fffd4", null ], - [ "lrdd", "include_2network_8php.html#adbc7fe45cc7fd9cd78f6b2f425ee9041", null ], [ "parse_xml_string", "include_2network_8php.html#a27a951b59d8d622c0b3e7b0673ba74c6", null ], - [ "post_url", "include_2network_8php.html#aa44d9e33a579d930e9e79c4ebb3d6b5e", null ], [ "scale_external_images", "include_2network_8php.html#ae8d9c41a11000fb8667039fc71b4f73f", null ], [ "validate_email", "include_2network_8php.html#a897e7112d86eb95526cbd0bff9375f02", null ], [ "validate_url", "include_2network_8php.html#a5caa264fab6d2b2344e6bd5b298b08f2", null ], diff --git a/doc/html/items_8php.html b/doc/html/items_8php.html index 852603068..cdb6587c5 100644 --- a/doc/html/items_8php.html +++ b/doc/html/items_8php.html @@ -182,8 +182,6 @@ Functions - - @@ -634,46 +632,6 @@ Functions

      Referenced by drop_item().

      - - - -
      -
      -
      The Red Matrix
      diff --git a/doc/html/parse__url_8php.html b/doc/html/parse__url_8php.html index 43e4dce07..7dc41c44c 100644 --- a/doc/html/parse__url_8php.html +++ b/doc/html/parse__url_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/passion_8php.html b/doc/html/passion_8php.html index 212555895..18df80d20 100644 --- a/doc/html/passion_8php.html +++ b/doc/html/passion_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/passionwide_8php.html b/doc/html/passionwide_8php.html index 05820ffdd..d7e908cb2 100644 --- a/doc/html/passionwide_8php.html +++ b/doc/html/passionwide_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/permissions_8php.html b/doc/html/permissions_8php.html index 668f4d376..82914d970 100644 --- a/doc/html/permissions_8php.html +++ b/doc/html/permissions_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/photo_8php.html b/doc/html/photo_8php.html index 45b803f6a..18f517a7c 100644 --- a/doc/html/photo_8php.html +++ b/doc/html/photo_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/photo__driver_8php.html b/doc/html/photo__driver_8php.html index a35d02b1e..88ced8259 100644 --- a/doc/html/photo__driver_8php.html +++ b/doc/html/photo__driver_8php.html @@ -28,7 +28,7 @@ - +

      Referenced by webfinger().

      - - - -
      -
      -
      The Red Matrix
      diff --git a/doc/html/photo__gd_8php.html b/doc/html/photo__gd_8php.html index 9e9ea72b9..1af203cae 100644 --- a/doc/html/photo__gd_8php.html +++ b/doc/html/photo__gd_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/photo__imagick_8php.html b/doc/html/photo__imagick_8php.html index ce8965204..608403c36 100644 --- a/doc/html/photo__imagick_8php.html +++ b/doc/html/photo__imagick_8php.html @@ -28,7 +28,7 @@ - + - - - - @@ -134,12 +130,8 @@ Functions - - - - @@ -152,12 +144,8 @@ Functions - - - - @@ -166,32 +154,6 @@ Functions
      The Red Matrix
      diff --git a/doc/html/php2po_8php.html b/doc/html/php2po_8php.html index b5aa1c70a..3aad42e67 100644 --- a/doc/html/php2po_8php.html +++ b/doc/html/php2po_8php.html @@ -28,7 +28,7 @@ - + Initial value:
      {
      showForm(null, $content)
      -

      Referenced by oembed_format_object().

      +

      Referenced by oembed_format_object(), and red_comment().

      diff --git a/doc/html/php_2default_8php.html b/doc/html/php_2default_8php.html index d76f7eb14..0ca6ea675 100644 --- a/doc/html/php_2default_8php.html +++ b/doc/html/php_2default_8php.html @@ -28,7 +28,7 @@
      The Red Matrix
      @@ -224,7 +224,7 @@ Variables
      - +
      The Red Matrix
      diff --git a/doc/html/php_2theme__init_8php.html b/doc/html/php_2theme__init_8php.html index a96e2385a..e4336a025 100644 --- a/doc/html/php_2theme__init_8php.html +++ b/doc/html/php_2theme__init_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      @@ -103,10 +103,34 @@ $(document).ready(function(){initNavTree('php_2theme__init_8php.html','');});
      +
      +Variables
      theme_init.php File Reference
      + + + + +

      +Variables

       $channel = get_app()->get_channel()
       
      +

      Variable Documentation

      + +
      +
      + + + + +
      $channel = get_app()->get_channel()
      +
      +

      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_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(), profile_tabs(), 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/php_2theme__init_8php.js b/doc/html/php_2theme__init_8php.js new file mode 100644 index 000000000..e5e495b9f --- /dev/null +++ b/doc/html/php_2theme__init_8php.js @@ -0,0 +1,4 @@ +var php_2theme__init_8php = +[ + [ "$channel", "php_2theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864", null ] +]; \ No newline at end of file diff --git a/doc/html/php_8php.html b/doc/html/php_8php.html index fcc7e84e4..f49bb096f 100644 --- a/doc/html/php_8php.html +++ b/doc/html/php_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/pine_8php.html b/doc/html/pine_8php.html index 1f73bd25a..c4f964c33 100644 --- a/doc/html/pine_8php.html +++ b/doc/html/pine_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/ping_8php.html b/doc/html/ping_8php.html index 165fa7295..0e34df51f 100644 --- a/doc/html/ping_8php.html +++ b/doc/html/ping_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/plugin_8php.html b/doc/html/plugin_8php.html index 4f77cd3b5..a7ec08409 100644 --- a/doc/html/plugin_8php.html +++ b/doc/html/plugin_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      @@ -190,7 +190,7 @@ Functions
      -

      Referenced by api_login(), atom_author(), atom_entry(), authenticate_success(), avatar_img(), bb2diaspora(), bbcode(), channel_remove(), check_account_email(), check_account_invite(), check_account_password(), connect_content(), connections_content(), connections_post(), contact_block(), contact_select(), conversation(), create_identity(), cronhooks_run(), directory_content(), 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_directory_profile(), 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(), profile_tabs(), profiles_content(), profiles_post(), settings_post(), sexpref_selector(), siteinfo_content(), smilies(), subthread_content(), validate_channelname(), wfinger_init(), xrd_init(), zid(), and zid_init().

      +

      Referenced by api_login(), atom_author(), atom_entry(), authenticate_success(), avatar_img(), bb2diaspora(), bbcode(), channel_remove(), check_account_email(), check_account_invite(), check_account_password(), 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_directory_profile(), 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(), profile_tabs(), profiles_content(), profiles_post(), replace_macros(), settings_post(), sexpref_selector(), siteinfo_content(), smilies(), subthread_content(), validate_channelname(), wfinger_init(), xrd_init(), zid(), and zid_init().

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

      Referenced by admin_content(), admin_page_dbsync(), admin_page_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(), 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(), nogroup_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(), profile_tabs(), 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(), 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(), nogroup_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(), profile_tabs(), 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().

      @@ -509,6 +509,8 @@ Functions
      +

      Referenced by blog_install().

      +
      @@ -684,6 +686,8 @@ Functions
      +

      Referenced by blog_uninstall().

      +
      diff --git a/doc/html/po2php_8php.html b/doc/html/po2php_8php.html index cb9d2e389..439411fd6 100644 --- a/doc/html/po2php_8php.html +++ b/doc/html/po2php_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/poco_8php.html b/doc/html/poco_8php.html index 900678fc0..c9e29cfcb 100644 --- a/doc/html/poco_8php.html +++ b/doc/html/poco_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/poke_8php.html b/doc/html/poke_8php.html index f761dfe08..b7033bde3 100644 --- a/doc/html/poke_8php.html +++ b/doc/html/poke_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/poller_8php.html b/doc/html/poller_8php.html index 89d5875a4..54f854214 100644 --- a/doc/html/poller_8php.html +++ b/doc/html/poller_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/post_8php.html b/doc/html/post_8php.html index bbaa4c652..a16d5872c 100644 --- a/doc/html/post_8php.html +++ b/doc/html/post_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/post__to__red_8php.html b/doc/html/post__to__red_8php.html index 51e9f5069..0bec890ac 100644 --- a/doc/html/post__to__red_8php.html +++ b/doc/html/post__to__red_8php.html @@ -4,7 +4,7 @@ -The Red Matrix: util/wp/post_to_red.php File Reference +The Red Matrix: util/wp/post_to_red/post_to_red.php File Reference @@ -28,7 +28,7 @@ - + - - + + + + + + @@ -139,6 +143,12 @@ Functions + + + + + +
      The Red Matrix
      @@ -119,12 +119,16 @@ Functions
       
       post_to_red_get_acct_name ()
       
       post_to_red_get_user_name ()
       
       post_to_red_get_channel_name ()
       
       post_to_red_get_password ()
       
       post_to_red_post ($post_id)
       
       post_to_red_delete_post ($post_id)
       
       post_to_red_delete_comment ($post_id)
       
       post_to_red_displayAdminContent ()
       
       post_to_red_post_checkbox ()
       
       post_to_red_admin ()
       
       red_xmlrpc_methods ($methods)
       
       red_comment ($args)
       
       post_to_red_get_avatar ($avatar, $id_or_email, $size, $default, $alt)
       
       xpost_to_html2bbcode ($text)
       
      @@ -184,6 +194,38 @@ Variables
      +
      + + +
      +
      + + + + + + + + +
      post_to_red_delete_comment ( $post_id)
      +
      + +
      +
      + +
      +
      + + + + + + + + +
      post_to_red_delete_post ( $post_id)
      +
      +
      @@ -231,16 +273,60 @@ Variables
      -

      Referenced by post_to_red_displayAdminContent().

      +

      Referenced by post_to_red_delete_comment(), post_to_red_delete_post(), post_to_red_displayAdminContent(), and post_to_red_post().

      - +
      - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      post_to_red_get_password post_to_red_get_avatar ( $avatar,
       $id_or_email,
       $size,
       $default,
       $alt 
      )
      +
      + +
      +
      + +
      +
      + + + @@ -248,16 +334,16 @@ Variables
      post_to_red_get_channel_name ( )
      -

      Referenced by post_to_red_displayAdminContent(), and post_to_red_post().

      +

      Referenced by post_to_red_delete_comment(), post_to_red_delete_post(), post_to_red_displayAdminContent(), and post_to_red_post().

      - +
      - + @@ -265,16 +351,16 @@ Variables
      post_to_red_get_seed_location post_to_red_get_password ( )
      -

      Referenced by post_to_red_displayAdminContent(), and post_to_red_post().

      +

      Referenced by post_to_red_delete_comment(), post_to_red_delete_post(), post_to_red_displayAdminContent(), and post_to_red_post().

      - +
      - + @@ -282,7 +368,7 @@ Variables
      post_to_red_get_user_name post_to_red_get_seed_location ( )
      -

      Referenced by post_to_red_post().

      +

      Referenced by post_to_red_delete_comment(), post_to_red_delete_post(), post_to_red_displayAdminContent(), and post_to_red_post().

      @@ -363,6 +449,38 @@ Variables
      +
      + + +
      +
      + + + + + + + + +
      red_comment ( $args)
      +
      + +
      +
      + +
      +
      + + + + + + + + +
      red_xmlrpc_methods ( $methods)
      +
      +
      @@ -420,8 +538,6 @@ Variables
      -

      Referenced by post_to_red_deactivate(), post_to_red_display_admin_page(), and post_to_red_get_acct_name().

      -
      diff --git a/doc/html/post__to__red_8php.js b/doc/html/post__to__red_8php.js index 42057c549..b2a2c31f5 100644 --- a/doc/html/post__to__red_8php.js +++ b/doc/html/post__to__red_8php.js @@ -2,17 +2,22 @@ var post__to__red_8php = [ [ "post_to_red_admin", "post__to__red_8php.html#aeec4125719184e7b097b3b9fba3101b5", null ], [ "post_to_red_deactivate", "post__to__red_8php.html#a49fd35f7b1cdddfe6e26ddfcf8d3c4ec", null ], + [ "post_to_red_delete_comment", "post__to__red_8php.html#a5cc2a89a6d33cdb8e2ca557a69bef42d", null ], + [ "post_to_red_delete_post", "post__to__red_8php.html#a4674bb5ce2baa32c559607460c39a2c5", null ], [ "post_to_red_display_admin_page", "post__to__red_8php.html#a8ec8f8809e3c5d1b2c9598c8185d63aa", null ], [ "post_to_red_displayAdminContent", "post__to__red_8php.html#a75db5d87226a0287a0ac0fa315f2bcfd", null ], [ "post_to_red_get_acct_name", "post__to__red_8php.html#ae6f3a2c0561cbeacda5be565b06de8a7", null ], + [ "post_to_red_get_avatar", "post__to__red_8php.html#ae0b881461afbdba93d9329068ea52136", null ], + [ "post_to_red_get_channel_name", "post__to__red_8php.html#aacba7a0646fc00ae6ac4f5dc383fccab", null ], [ "post_to_red_get_password", "post__to__red_8php.html#a4d90ac085c14f53ff4d8ab4c23477ea6", null ], [ "post_to_red_get_seed_location", "post__to__red_8php.html#a96d0ccecb96600ef1bfd50ab3f77315f", null ], - [ "post_to_red_get_user_name", "post__to__red_8php.html#a9497cd6a80c6897dbbf9aabde62b53e7", null ], [ "post_to_red_post", "post__to__red_8php.html#af5fd50e2c42ede85f8a9e8d9ee3cf540", null ], [ "post_to_red_post_checkbox", "post__to__red_8php.html#a0f139dea77a94c98f26007963eea639c", null ], [ "post_to_red_post_field_data", "post__to__red_8php.html#a7e68a8d9c83cb28d032aad3ea85ce0a6", null ], [ "post_to_red_post_meta_content", "post__to__red_8php.html#aa97aeda12ef080665f16311a4e1eb901", null ], [ "post_to_red_settings_link", "post__to__red_8php.html#a906be8f72cf1aa2e199c0683ea6a4017", null ], + [ "red_comment", "post__to__red_8php.html#a085c250d4ceff5e4f10052f3d2039823", null ], + [ "red_xmlrpc_methods", "post__to__red_8php.html#a3a2af6ad845239f26e86fccabf8639e1", null ], [ "xpost_to_html2bbcode", "post__to__red_8php.html#af2713018a2dc97e88f121fc6215beb66", null ], [ "$plugin", "post__to__red_8php.html#ada8a7130088351710bb02ed622d6bf65", null ], [ "$plugin_dir", "post__to__red_8php.html#a99811555b30bde504a863e44015f2f19", null ], diff --git a/doc/html/pretheme_8php.html b/doc/html/pretheme_8php.html index 2ac289362..e05e6a253 100644 --- a/doc/html/pretheme_8php.html +++ b/doc/html/pretheme_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/probe_8php.html b/doc/html/probe_8php.html index 7db24ab66..f0aa7e854 100644 --- a/doc/html/probe_8php.html +++ b/doc/html/probe_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/profile_8php.html b/doc/html/profile_8php.html index eb5e74417..a44f39cf3 100644 --- a/doc/html/profile_8php.html +++ b/doc/html/profile_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/profile__advanced_8php.html b/doc/html/profile__advanced_8php.html index 592a567cb..d94f42c1b 100644 --- a/doc/html/profile__advanced_8php.html +++ b/doc/html/profile__advanced_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/profile__photo_8php.html b/doc/html/profile__photo_8php.html index f47e1be9f..769fa21a7 100644 --- a/doc/html/profile__photo_8php.html +++ b/doc/html/profile__photo_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/profile__selectors_8php.html b/doc/html/profile__selectors_8php.html index 4c010f5f1..b118aba11 100644 --- a/doc/html/profile__selectors_8php.html +++ b/doc/html/profile__selectors_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/profiles_8php.html b/doc/html/profiles_8php.html index f8af843af..17239b852 100644 --- a/doc/html/profiles_8php.html +++ b/doc/html/profiles_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/profperm_8php.html b/doc/html/profperm_8php.html index ffb8dd4d5..315bc21bb 100644 --- a/doc/html/profperm_8php.html +++ b/doc/html/profperm_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/pubsites_8php.html b/doc/html/pubsites_8php.html index 46c645e55..f9f83cae7 100644 --- a/doc/html/pubsites_8php.html +++ b/doc/html/pubsites_8php.html @@ -28,7 +28,7 @@ - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -249,74 +248,73 @@ $(document).ready(function(){initNavTree('files.html','');}); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/html/functions_0x67.html b/doc/html/functions_0x67.html index d59047383..65da95e12 100644 --- a/doc/html/functions_0x67.html +++ b/doc/html/functions_0x67.html @@ -179,12 +179,6 @@ $(document).ready(function(){initNavTree('functions_0x67.html','');});
    • get_conversation() : Item
      • -
    • get_curl_code() -: App -
      • -
    • get_curl_headers() -: App -
    • get_data() : Item
      • @@ -283,9 +277,9 @@ $(document).ready(function(){initNavTree('functions_0x67.html','');}); : photo_driver
    • getImage() -: photo_driver +: photo_imagick +, photo_driver , photo_gd -, photo_imagick
    • getLastModified() : RedInode diff --git a/doc/html/functions_0x73.html b/doc/html/functions_0x73.html index 9f77236f3..3b042769b 100644 --- a/doc/html/functions_0x73.html +++ b/doc/html/functions_0x73.html @@ -181,12 +181,6 @@ $(document).ready(function(){initNavTree('functions_0x73.html','');});
    • set_conversation() : Item
      • -
    • set_curl_code() -: App -
      • -
    • set_curl_headers() -: App -
    • set_groups() : App
      • @@ -235,9 +229,9 @@ $(document).ready(function(){initNavTree('functions_0x73.html','');}); : photo_driver
    • supportedTypes() -: photo_driver +: photo_imagick +, photo_driver , photo_gd -, photo_imagick
      • diff --git a/doc/html/functions_func_0x67.html b/doc/html/functions_func_0x67.html index 95a99abca..a4e4046a9 100644 --- a/doc/html/functions_func_0x67.html +++ b/doc/html/functions_func_0x67.html @@ -178,12 +178,6 @@ $(document).ready(function(){initNavTree('functions_func_0x67.html','');});
    • get_conversation() : Item
      • -
    • get_curl_code() -: App -
      • -
    • get_curl_headers() -: App -
    • get_data() : Item
      • @@ -282,9 +276,9 @@ $(document).ready(function(){initNavTree('functions_func_0x67.html','');}); : photo_driver
    • getImage() -: photo_driver +: photo_imagick +, photo_driver , photo_gd -, photo_imagick
    • getLastModified() : RedInode diff --git a/doc/html/functions_func_0x73.html b/doc/html/functions_func_0x73.html index 00ca8ced4..be0ab7e00 100644 --- a/doc/html/functions_func_0x73.html +++ b/doc/html/functions_func_0x73.html @@ -180,12 +180,6 @@ $(document).ready(function(){initNavTree('functions_func_0x73.html','');});
    • set_conversation() : Item
      • -
    • set_curl_code() -: App -
      • -
    • set_curl_headers() -: App -
    • set_groups() : App
      • @@ -234,9 +228,9 @@ $(document).ready(function(){initNavTree('functions_func_0x73.html','');}); : photo_driver
    • supportedTypes() -: photo_driver +: photo_imagick +, photo_driver , photo_gd -, photo_imagick
      • diff --git a/doc/html/globals_0x61.html b/doc/html/globals_0x61.html index 580315ad6..a4bef56e4 100644 --- a/doc/html/globals_0x61.html +++ b/doc/html/globals_0x61.html @@ -312,9 +312,6 @@ $(document).ready(function(){initNavTree('globals_0x61.html','');});
    • add_children_to_list() : conversation.php
      • -
    • add_fcontact() -: network.php -
    • admin_content() : admin.php
      • @@ -358,7 +355,7 @@ $(document).ready(function(){initNavTree('globals_0x61.html','');}); : admin.php
    • advanced_profile() -: profile_advanced.php +: identity.php
    • AES256CBC_decrypt() : crypto.php diff --git a/doc/html/globals_0x63.html b/doc/html/globals_0x63.html index f1c85c131..3e16d0a6d 100644 --- a/doc/html/globals_0x63.html +++ b/doc/html/globals_0x63.html @@ -405,9 +405,6 @@ $(document).ready(function(){initNavTree('globals_0x63.html','');});
    • contactgroup_content() : contactgroup.php
      • -
    • contacts_not_grouped() -: Contact.php -
    • conv_sort() : conversation.php
      • diff --git a/doc/html/globals_0x64.html b/doc/html/globals_0x64.html index 80f742451..bf0bb5f4d 100644 --- a/doc/html/globals_0x64.html +++ b/doc/html/globals_0x64.html @@ -216,9 +216,6 @@ $(document).ready(function(){initNavTree('globals_0x64.html','');});
    • detect_language() : language.php
      • -
    • dfrn_deliver() -: items.php -
    • diaspora2bb() : bb2diaspora.php
      • diff --git a/doc/html/globals_0x66.html b/doc/html/globals_0x66.html index 16b62535a..e5f1aed68 100644 --- a/doc/html/globals_0x66.html +++ b/doc/html/globals_0x66.html @@ -165,12 +165,6 @@ $(document).ready(function(){initNavTree('globals_0x66.html','');});
    • fetch_post_tags() : items.php
      • -
    • fetch_url() -: network.php -
      • -
    • fetch_xrd_links() -: network.php -
    • field_timezone() : datetime.php
      • @@ -216,9 +210,6 @@ $(document).ready(function(){initNavTree('globals_0x66.html','');});
    • fix_attached_photo_permissions() : item.php
      • -
    • fix_contact_ssl_policy() -: network.php -
    • fix_mce_lf() : text.php
      • diff --git a/doc/html/globals_0x67.html b/doc/html/globals_0x67.html index f24792026..b671ce7ba 100644 --- a/doc/html/globals_0x67.html +++ b/doc/html/globals_0x67.html @@ -169,7 +169,7 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');}); : language.php
    • get_birthdays() -: boot.php +: identity.php
    • get_browser_language() : language.php @@ -193,7 +193,7 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');}); : datetime.php
    • get_events() -: boot.php +: identity.php
    • get_features() : features.php @@ -235,10 +235,10 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');}); : text.php
    • get_my_address() -: boot.php +: identity.php
    • get_my_url() -: boot.php +: identity.php
    • get_observer_hash() : boot.php @@ -286,7 +286,7 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');}); : plugin.php
    • get_theme_uid() -: boot.php +: identity.php
    • get_xconfig() : config.php @@ -346,7 +346,7 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');}); : group.php
    • guess_image_type() -: photo_driver.php +: photo_driver.php
      • diff --git a/doc/html/globals_0x69.html b/doc/html/globals_0x69.html index d5eaad595..b7e2cc9a6 100644 --- a/doc/html/globals_0x69.html +++ b/doc/html/globals_0x69.html @@ -147,9 +147,6 @@ $(document).ready(function(){initNavTree('globals_0x69.html','');});
    • identity_basic_export() : identity.php
      • -
    • identity_basic_import() -: identity.php -
    • identity_check_service_class() : identity.php
      • @@ -157,14 +154,18 @@ $(document).ready(function(){initNavTree('globals_0x69.html','');}); : text.php
    • if -: style.php -, php2po.php +: php2po.php +, style.php , default.php , full.php +, style.php
    • import_author_xchan() : items.php
      • +
    • import_author_zot() +: zot.php +
    • import_channel_photo() : photo_driver.php
      • diff --git a/doc/html/globals_0x6c.html b/doc/html/globals_0x6c.html index 518b831a7..3124f0a25 100644 --- a/doc/html/globals_0x6c.html +++ b/doc/html/globals_0x6c.html @@ -255,9 +255,6 @@ $(document).ready(function(){initNavTree('globals_0x6c.html','');});
    • lostpass_post() : lostpass.php
      • -
    • lrdd() -: network.php -
      • diff --git a/doc/html/globals_0x6e.html b/doc/html/globals_0x6e.html index 1ff7d7e87..2c71a4ccb 100644 --- a/doc/html/globals_0x6e.html +++ b/doc/html/globals_0x6e.html @@ -243,8 +243,8 @@ $(document).ready(function(){initNavTree('globals_0x6e.html','');});
    • NETWORK_PHANTOM : boot.php
      • -
    • network_query_get_sel_tab() -: network.php +
    • network_tabs() +: conversation.php
    • network_to_name() : contact_selectors.php @@ -279,12 +279,6 @@ $(document).ready(function(){initNavTree('globals_0x6e.html','');});
    • node2bbcodesub() : html2bbcode.php
      • -
    • nogroup_content() -: nogroup.php -
      • -
    • nogroup_init() -: nogroup.php -
    • normalise_link() : text.php
      • diff --git a/doc/html/globals_0x70.html b/doc/html/globals_0x70.html index de1349ac6..b5a650642 100644 --- a/doc/html/globals_0x70.html +++ b/doc/html/globals_0x70.html @@ -375,7 +375,7 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');}); : language.php
    • populate_acl() -: acl_selectors.php +: acl_selectors.php
    • post_activity_item() : items.php @@ -443,9 +443,6 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
    • post_to_red_version : post_to_red.php
      • -
    • post_url() -: network.php -
    • posted_date_widget() : items.php
      • @@ -516,13 +513,13 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');}); : profile.php
    • profile_create_sidebar() -: boot.php +: identity.php
    • profile_init() : profile.php
    • profile_load() -: boot.php +: identity.php
    • profile_photo_aside() : profile_photo.php @@ -534,10 +531,10 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');}); : profile_photo.php
    • profile_sidebar() -: boot.php +: identity.php
    • profile_tabs() -: boot.php +: conversation.php
    • profiler() : text.php diff --git a/doc/html/globals_0x72.html b/doc/html/globals_0x72.html index 2dcfbb68c..8822626d2 100644 --- a/doc/html/globals_0x72.html +++ b/doc/html/globals_0x72.html @@ -145,7 +145,7 @@ $(document).ready(function(){initNavTree('globals_0x72.html','');});

      - r -

      • random_profile() -: Contact.php +: Contact.php
      • random_string() : text.php diff --git a/doc/html/globals_0x7a.html b/doc/html/globals_0x7a.html index 8b9ab909d..4b52df618 100644 --- a/doc/html/globals_0x7a.html +++ b/doc/html/globals_0x7a.html @@ -145,7 +145,7 @@ $(document).ready(function(){initNavTree('globals_0x7a.html','');});

        - z -

        • z_birthday() -: boot.php +: datetime.php
        • z_fetch_url() : network.php @@ -175,10 +175,10 @@ $(document).ready(function(){initNavTree('globals_0x7a.html','');}); : zfinger.php
        • zid() -: boot.php +: identity.php
        • zid_init() -: boot.php +: identity.php
        • zidify_callback() : text.php diff --git a/doc/html/globals_func_0x61.html b/doc/html/globals_func_0x61.html index 50cd70a18..b1e765e82 100644 --- a/doc/html/globals_func_0x61.html +++ b/doc/html/globals_func_0x61.html @@ -176,9 +176,6 @@ $(document).ready(function(){initNavTree('globals_func_0x61.html','');});
        • add_children_to_list() : conversation.php
          • -
        • add_fcontact() -: network.php -
        • admin_content() : admin.php
          • @@ -222,7 +219,7 @@ $(document).ready(function(){initNavTree('globals_func_0x61.html','');}); : admin.php
        • advanced_profile() -: profile_advanced.php +: identity.php
        • AES256CBC_decrypt() : crypto.php diff --git a/doc/html/globals_func_0x63.html b/doc/html/globals_func_0x63.html index 0af2f408c..f4cbc1954 100644 --- a/doc/html/globals_func_0x63.html +++ b/doc/html/globals_func_0x63.html @@ -386,9 +386,6 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');});
        • contactgroup_content() : contactgroup.php
          • -
        • contacts_not_grouped() -: Contact.php -
        • conv_sort() : conversation.php
          • diff --git a/doc/html/globals_func_0x64.html b/doc/html/globals_func_0x64.html index ff8424b47..407338bb3 100644 --- a/doc/html/globals_func_0x64.html +++ b/doc/html/globals_func_0x64.html @@ -209,9 +209,6 @@ $(document).ready(function(){initNavTree('globals_func_0x64.html','');});
        • detect_language() : language.php
          • -
        • dfrn_deliver() -: items.php -
        • diaspora2bb() : bb2diaspora.php
          • diff --git a/doc/html/globals_func_0x66.html b/doc/html/globals_func_0x66.html index 90fa2553b..89475dd1f 100644 --- a/doc/html/globals_func_0x66.html +++ b/doc/html/globals_func_0x66.html @@ -164,12 +164,6 @@ $(document).ready(function(){initNavTree('globals_func_0x66.html','');});
        • fetch_post_tags() : items.php
          • -
        • fetch_url() -: network.php -
          • -
        • fetch_xrd_links() -: network.php -
        • field_timezone() : datetime.php
          • @@ -215,9 +209,6 @@ $(document).ready(function(){initNavTree('globals_func_0x66.html','');});
        • fix_attached_photo_permissions() : item.php
          • -
        • fix_contact_ssl_policy() -: network.php -
        • fix_mce_lf() : text.php
          • diff --git a/doc/html/globals_func_0x67.html b/doc/html/globals_func_0x67.html index 3673ee05d..34086b120 100644 --- a/doc/html/globals_func_0x67.html +++ b/doc/html/globals_func_0x67.html @@ -168,7 +168,7 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');}); : language.php
        • get_birthdays() -: boot.php +: identity.php
        • get_browser_language() : language.php @@ -192,7 +192,7 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');}); : datetime.php
        • get_events() -: boot.php +: identity.php
        • get_features() : features.php @@ -234,10 +234,10 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');}); : text.php
        • get_my_address() -: boot.php +: identity.php
        • get_my_url() -: boot.php +: identity.php
        • get_observer_hash() : boot.php @@ -285,7 +285,7 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');}); : plugin.php
        • get_theme_uid() -: boot.php +: identity.php
        • get_xconfig() : config.php @@ -336,7 +336,7 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');}); : group.php
        • guess_image_type() -: photo_driver.php +: photo_driver.php
        diff --git a/doc/html/globals_func_0x69.html b/doc/html/globals_func_0x69.html index b5bd8b5a1..cd82b3b08 100644 --- a/doc/html/globals_func_0x69.html +++ b/doc/html/globals_func_0x69.html @@ -146,9 +146,6 @@ $(document).ready(function(){initNavTree('globals_func_0x69.html','');});
      • identity_basic_export() : identity.php
        • -
      • identity_basic_import() -: identity.php -
      • identity_check_service_class() : identity.php
        • @@ -158,6 +155,9 @@ $(document).ready(function(){initNavTree('globals_func_0x69.html','');});
      • import_author_xchan() : items.php
        • +
      • import_author_zot() +: zot.php +
      • import_channel_photo() : photo_driver.php
        • diff --git a/doc/html/globals_func_0x6c.html b/doc/html/globals_func_0x6c.html index 0c553dabb..d361f9967 100644 --- a/doc/html/globals_func_0x6c.html +++ b/doc/html/globals_func_0x6c.html @@ -233,9 +233,6 @@ $(document).ready(function(){initNavTree('globals_func_0x6c.html','');});
      • lostpass_post() : lostpass.php
        • -
      • lrdd() -: network.php -
      diff --git a/doc/html/globals_func_0x6e.html b/doc/html/globals_func_0x6e.html index a82a11757..0197c2b99 100644 --- a/doc/html/globals_func_0x6e.html +++ b/doc/html/globals_func_0x6e.html @@ -161,8 +161,8 @@ $(document).ready(function(){initNavTree('globals_func_0x6e.html','');});
    • network_init() : network.php
      • -
    • network_query_get_sel_tab() -: network.php +
    • network_tabs() +: conversation.php
    • network_to_name() : contact_selectors.php @@ -191,12 +191,6 @@ $(document).ready(function(){initNavTree('globals_func_0x6e.html','');});
    • node2bbcodesub() : html2bbcode.php
      • -
    • nogroup_content() -: nogroup.php -
      • -
    • nogroup_init() -: nogroup.php -
    • normalise_link() : text.php
      • diff --git a/doc/html/globals_func_0x70.html b/doc/html/globals_func_0x70.html index 124675cca..b9d28bdc8 100644 --- a/doc/html/globals_func_0x70.html +++ b/doc/html/globals_func_0x70.html @@ -252,7 +252,7 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');}); : language.php
    • populate_acl() -: acl_selectors.php +: acl_selectors.php
    • post_activity_item() : items.php @@ -311,9 +311,6 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');});
    • post_to_red_settings_link() : post_to_red.php
      • -
    • post_url() -: network.php -
    • posted_date_widget() : items.php
      • @@ -384,13 +381,13 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');}); : profile.php
    • profile_create_sidebar() -: boot.php +: identity.php
    • profile_init() : profile.php
    • profile_load() -: boot.php +: identity.php
    • profile_photo_aside() : profile_photo.php @@ -402,10 +399,10 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');}); : profile_photo.php
    • profile_sidebar() -: boot.php +: identity.php
    • profile_tabs() -: boot.php +: conversation.php
    • profiler() : text.php diff --git a/doc/html/globals_func_0x72.html b/doc/html/globals_func_0x72.html index c49e5d97c..a1b9af5a9 100644 --- a/doc/html/globals_func_0x72.html +++ b/doc/html/globals_func_0x72.html @@ -144,7 +144,7 @@ $(document).ready(function(){initNavTree('globals_func_0x72.html','');});

      - r -

      • random_profile() -: Contact.php +: Contact.php
      • random_string() : text.php diff --git a/doc/html/globals_func_0x7a.html b/doc/html/globals_func_0x7a.html index 67ec3efa7..e64c265ec 100644 --- a/doc/html/globals_func_0x7a.html +++ b/doc/html/globals_func_0x7a.html @@ -144,7 +144,7 @@ $(document).ready(function(){initNavTree('globals_func_0x7a.html','');});

        - z -

        • z_birthday() -: boot.php +: datetime.php
        • z_fetch_url() : network.php @@ -171,10 +171,10 @@ $(document).ready(function(){initNavTree('globals_func_0x7a.html','');}); : zfinger.php
        • zid() -: boot.php +: identity.php
        • zid_init() -: boot.php +: identity.php
        • zidify_callback() : text.php diff --git a/doc/html/identity_8php.html b/doc/html/identity_8php.html index 8885d5be7..6bd7cb296 100644 --- a/doc/html/identity_8php.html +++ b/doc/html/identity_8php.html @@ -126,10 +126,48 @@ Functions
      • - - + + + + + + + + + + + + + + + + + + + + + +
      The Red Matrix
      diff --git a/doc/html/qsearch_8php.html b/doc/html/qsearch_8php.html index 85db51091..b8b166904 100644 --- a/doc/html/qsearch_8php.html +++ b/doc/html/qsearch_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/queue_8php.html b/doc/html/queue_8php.html index fe235bc6c..86cae6f6c 100644 --- a/doc/html/queue_8php.html +++ b/doc/html/queue_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/queue__fn_8php.html b/doc/html/queue__fn_8php.html index cff4b21cd..9bb6a3995 100644 --- a/doc/html/queue__fn_8php.html +++ b/doc/html/queue__fn_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/randprof_8php.html b/doc/html/randprof_8php.html index 7913f0525..c7d7aacfe 100644 --- a/doc/html/randprof_8php.html +++ b/doc/html/randprof_8php.html @@ -28,7 +28,7 @@ - +

      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(), add_fcontact(), 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(), contacts_not_grouped(), 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(), dfrn_deliver(), 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_contact_ssl_policy(), 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_xchan(), 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(), 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().

      diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html index e4892d91d..6360d6c4d 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html @@ -222,8 +222,6 @@ Files - - diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js index 409993767..25d9c4366 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js @@ -59,7 +59,6 @@ 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" ], - [ "nogroup.php", "nogroup_8php.html", "nogroup_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/dir_d44c64559bbebec7f509842c48db8b23.html b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html index 7a44f4d12..1f931673f 100644 --- a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html +++ b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html @@ -223,8 +223,6 @@ Files - - diff --git a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js index bf6e62274..fdcafcad3 100644 --- a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js +++ b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js @@ -71,7 +71,6 @@ var dir_d44c64559bbebec7f509842c48db8b23 = [ "photos.php", "include_2photos_8php.html", "include_2photos_8php" ], [ "plugin.php", "plugin_8php.html", "plugin_8php" ], [ "poller.php", "poller_8php.html", "poller_8php" ], - [ "profile_advanced.php", "profile__advanced_8php.html", "profile__advanced_8php" ], [ "profile_selectors.php", "profile__selectors_8php.html", "profile__selectors_8php" ], [ "ProtoDriver.php", "ProtoDriver_8php.html", [ [ "ProtoDriver", "classProtoDriver.html", "classProtoDriver" ], diff --git a/doc/html/docblox__errorchecker_8php.html b/doc/html/docblox__errorchecker_8php.html index 537f36a2a..b17226b25 100644 --- a/doc/html/docblox__errorchecker_8php.html +++ b/doc/html/docblox__errorchecker_8php.html @@ -279,7 +279,7 @@ Variables
      The Red Matrix
      diff --git a/doc/html/redbasic_2php_2style_8php.html b/doc/html/redbasic_2php_2style_8php.html index 962e09fb4..8aa0e8224 100644 --- a/doc/html/redbasic_2php_2style_8php.html +++ b/doc/html/redbasic_2php_2style_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/redbasic_2php_2theme_8php.html b/doc/html/redbasic_2php_2theme_8php.html index eb9630b87..c71a95829 100644 --- a/doc/html/redbasic_2php_2theme_8php.html +++ b/doc/html/redbasic_2php_2theme_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/redbasic_8php.html b/doc/html/redbasic_8php.html index 81af39086..31861ac51 100644 --- a/doc/html/redbasic_8php.html +++ b/doc/html/redbasic_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/reddav_8php.html b/doc/html/reddav_8php.html index 2b9d4d7e9..49b7d62ff 100644 --- a/doc/html/reddav_8php.html +++ b/doc/html/reddav_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/redir_8php.html b/doc/html/redir_8php.html index a77e53757..ce368c49b 100644 --- a/doc/html/redir_8php.html +++ b/doc/html/redir_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/register_8php.html b/doc/html/register_8php.html index 792200577..c60337a73 100644 --- a/doc/html/register_8php.html +++ b/doc/html/register_8php.html @@ -28,7 +28,7 @@ - + + +
      The Red Matrix
      diff --git a/doc/html/regmod_8php.html b/doc/html/regmod_8php.html index b001c82e8..e5ac39365 100644 --- a/doc/html/regmod_8php.html +++ b/doc/html/regmod_8php.html @@ -28,7 +28,7 @@ - +

      Referenced by page_content().

      + + + +
      +
      +
      The Red Matrix
      diff --git a/doc/html/removeme_8php.html b/doc/html/removeme_8php.html index 9223fcebb..f0325ad4d 100644 --- a/doc/html/removeme_8php.html +++ b/doc/html/removeme_8php.html @@ -28,7 +28,7 @@ - +

      Referenced by api_format_items(), conversation(), format_notification(), Item\get_template_data(), and notification().

      + + + +
      +
      +
      The Red Matrix
      diff --git a/doc/html/rm-64.png b/doc/html/rm-64.png new file mode 100644 index 000000000..30341bfa4 Binary files /dev/null and b/doc/html/rm-64.png differ diff --git a/doc/html/rmagic_8php.html b/doc/html/rmagic_8php.html index 55723768d..e98328483 100644 --- a/doc/html/rmagic_8php.html +++ b/doc/html/rmagic_8php.html @@ -28,7 +28,7 @@ - + + + + +
      The Red Matrix
      diff --git a/doc/html/rpost_8php.html b/doc/html/rpost_8php.html index 559a2fbff..c642a0a93 100644 --- a/doc/html/rpost_8php.html +++ b/doc/html/rpost_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/rsd__xml_8php.html b/doc/html/rsd__xml_8php.html index 5012184b6..9761872c4 100644 --- a/doc/html/rsd__xml_8php.html +++ b/doc/html/rsd__xml_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/search/all_24.js b/doc/html/search/all_24.js index 0947880f2..529ec0c2d 100644 --- a/doc/html/search/all_24.js +++ b/doc/html/search/all_24.js @@ -16,11 +16,12 @@ var searchData= ['_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']]], ['_24cached_5fprofile_5fimage',['$cached_profile_image',['../classApp.html#abe0e4fa91097f7a6588e1213a834121c',1,'App']]], ['_24cached_5fprofile_5fpicdate',['$cached_profile_picdate',['../classApp.html#aab4a685d15a363bb1d7edbbc20bfb94e',1,'App']]], ['_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()'],['../theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864',1,'$channel(): theme_init.php']]], + ['_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']]], ['_24children',['$children',['../classItem.html#a80dcd0fb7673776c0967839d429c2a0f',1,'Item']]], ['_24cid',['$cid',['../classApp.html#ad1c8eb91a6fd470b94f34b7fdad3a2d0',1,'App']]], @@ -57,6 +58,8 @@ var searchData= ['_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']]], + ['_24headimg',['$headimg',['../theme_2blogga_2php_2default_8php.html#ac7062908d1eb80c0735270f7997c4527',1,'$headimg(): default.php'],['../theme_2blogga_2view_2theme_2blog_2default_8php.html#a52d9dd070ed541729088395c22502539',1,'$headimg(): default.php']]], + ['_24headimghome',['$headimghome',['../theme_2blogga_2php_2default_8php.html#a1230ab83d4ec9785d8f3a966f33dc5f3',1,'$headimghome(): default.php'],['../theme_2blogga_2view_2theme_2blog_2default_8php.html#a1230ab83d4ec9785d8f3a966f33dc5f3',1,'$headimghome(): default.php']]], ['_24height',['$height',['../classphoto__driver.html#aea560be5dfba09117d36c12bacbf3b80',1,'photo_driver']]], ['_24hooks',['$hooks',['../classApp.html#a3694aa1907aa103a2adbc71f926f0fa0',1,'App']]], ['_24hostname',['$hostname',['../classApp.html#a037049cba88dfc6ff94f4b5b779e3fd3',1,'App']]], diff --git a/doc/html/search/all_62.js b/doc/html/search/all_62.js index 7f994ee27..48cba8636 100644 --- a/doc/html/search/all_62.js +++ b/doc/html/search/all_62.js @@ -20,6 +20,12 @@ var searchData= ['best_5flink_5furl',['best_link_url',['../conversation_8php.html#ad470fc7766f0db66d138fa1916c7a8b7',1,'conversation.php']]], ['blocks_2ephp',['blocks.php',['../blocks_8php.html',1,'']]], ['blocks_5fcontent',['blocks_content',['../blocks_8php.html#a2531a8fd51db3cecb2eb20c002c66e12',1,'blocks.php']]], + ['blog_5finit',['blog_init',['../blogga_2php_2theme_8php.html#aa55c1cb1f05087b5002ecb633b550b1b',1,'blog_init(&$a): theme.php'],['../blogga_2view_2theme_2blog_2theme_8php.html#aa55c1cb1f05087b5002ecb633b550b1b',1,'blog_init(&$a): theme.php']]], + ['blog_5finstall',['blog_install',['../blogga_2view_2theme_2blog_2theme_8php.html#aae58cc837fe56473d9f3370abfe533ae',1,'theme.php']]], + ['blog_5funinstall',['blog_uninstall',['../blogga_2view_2theme_2blog_2theme_8php.html#a3e77dbe111f330c64a1ff6c741cd515c',1,'theme.php']]], + ['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']]], ['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 73a94e96b..c12c927e3 100644 --- a/doc/html/search/all_63.js +++ b/doc/html/search/all_63.js @@ -85,6 +85,8 @@ var searchData= ['completeurl',['completeurl',['../parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a',1,'parse_url.php']]], ['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_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,'']]], ['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()']]], diff --git a/doc/html/search/all_64.js b/doc/html/search/all_64.js index 78e28d067..261686a29 100644 --- a/doc/html/search/all_64.js +++ b/doc/html/search/all_64.js @@ -25,7 +25,9 @@ var searchData= ['dbg',['dbg',['../classdba__driver.html#adcc1f8955120fec0708bce39202d0422',1,'dba_driver\dbg()'],['../dba__driver_8php.html#aa6607893d8f60ade9122bcfbd1a53ffb',1,'dbg(): dba_driver.php']]], ['dbq',['dbq',['../dba__driver_8php.html#aa377074e70981e8c4e82ca0accd068ee',1,'dba_driver.php']]], ['decode_5ftags',['decode_tags',['../items_8php.html#a56b2a4abcadfac71175cd50555528cc3',1,'items.php']]], - ['default_2ephp',['default.php',['../default_8php.html',1,'']]], + ['default_2ephp',['default.php',['../php_2default_8php.html',1,'']]], + ['default_2ephp',['default.php',['../theme_2blogga_2php_2default_8php.html',1,'']]], + ['default_2ephp',['default.php',['../theme_2blogga_2view_2theme_2blog_2default_8php.html',1,'']]], ['default_5fdb_5fengine',['DEFAULT_DB_ENGINE',['../boot_8php.html#aa8a2b61e70900139d1ca28e46f1da49d',1,'boot.php']]], ['del_5fconfig',['del_config',['../include_2config_8php.html#a549910227348003efc3c05c9105c42da',1,'config.php']]], ['del_5fpconfig',['del_pconfig',['../include_2config_8php.html#a7ad2081c5f812ac4387fd76f3762d941',1,'config.php']]], diff --git a/doc/html/search/all_69.js b/doc/html/search/all_69.js index 8e07b9665..bcc5b7f9b 100644 --- a/doc/html/search/all_69.js +++ b/doc/html/search/all_69.js @@ -5,7 +5,7 @@ var searchData= ['identity_5fbasic_5fimport',['identity_basic_import',['../identity_8php.html#a77ee7d66eb0758f7e7882f70ad0f9485',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'],['../default_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'],['../redbasic_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']]], diff --git a/doc/html/search/all_70.js b/doc/html/search/all_70.js index 1480b53d2..560505c46 100644 --- a/doc/html/search/all_70.js +++ b/doc/html/search/all_70.js @@ -112,12 +112,15 @@ var searchData= ['post_5fto_5fred_5facct_5fname',['post_to_red_acct_name',['../post__to__red_8php.html#a588cea66afe0b32f27f2713d44940119',1,'post_to_red.php']]], ['post_5fto_5fred_5fadmin',['post_to_red_admin',['../post__to__red_8php.html#aeec4125719184e7b097b3b9fba3101b5',1,'post_to_red.php']]], ['post_5fto_5fred_5fdeactivate',['post_to_red_deactivate',['../post__to__red_8php.html#a49fd35f7b1cdddfe6e26ddfcf8d3c4ec',1,'post_to_red.php']]], + ['post_5fto_5fred_5fdelete_5fcomment',['post_to_red_delete_comment',['../post__to__red_8php.html#a5cc2a89a6d33cdb8e2ca557a69bef42d',1,'post_to_red.php']]], + ['post_5fto_5fred_5fdelete_5fpost',['post_to_red_delete_post',['../post__to__red_8php.html#a4674bb5ce2baa32c559607460c39a2c5',1,'post_to_red.php']]], ['post_5fto_5fred_5fdisplay_5fadmin_5fpage',['post_to_red_display_admin_page',['../post__to__red_8php.html#a8ec8f8809e3c5d1b2c9598c8185d63aa',1,'post_to_red.php']]], ['post_5fto_5fred_5fdisplayadmincontent',['post_to_red_displayAdminContent',['../post__to__red_8php.html#a75db5d87226a0287a0ac0fa315f2bcfd',1,'post_to_red.php']]], ['post_5fto_5fred_5fget_5facct_5fname',['post_to_red_get_acct_name',['../post__to__red_8php.html#ae6f3a2c0561cbeacda5be565b06de8a7',1,'post_to_red.php']]], + ['post_5fto_5fred_5fget_5favatar',['post_to_red_get_avatar',['../post__to__red_8php.html#ae0b881461afbdba93d9329068ea52136',1,'post_to_red.php']]], + ['post_5fto_5fred_5fget_5fchannel_5fname',['post_to_red_get_channel_name',['../post__to__red_8php.html#aacba7a0646fc00ae6ac4f5dc383fccab',1,'post_to_red.php']]], ['post_5fto_5fred_5fget_5fpassword',['post_to_red_get_password',['../post__to__red_8php.html#a4d90ac085c14f53ff4d8ab4c23477ea6',1,'post_to_red.php']]], ['post_5fto_5fred_5fget_5fseed_5flocation',['post_to_red_get_seed_location',['../post__to__red_8php.html#a96d0ccecb96600ef1bfd50ab3f77315f',1,'post_to_red.php']]], - ['post_5fto_5fred_5fget_5fuser_5fname',['post_to_red_get_user_name',['../post__to__red_8php.html#a9497cd6a80c6897dbbf9aabde62b53e7',1,'post_to_red.php']]], ['post_5fto_5fred_5fpath',['post_to_red_path',['../post__to__red_8php.html#a6210f39392a5f0fa0255cc7d3760493a',1,'post_to_red.php']]], ['post_5fto_5fred_5fpost',['post_to_red_post',['../post__to__red_8php.html#af5fd50e2c42ede85f8a9e8d9ee3cf540',1,'post_to_red.php']]], ['post_5fto_5fred_5fpost_5fcheckbox',['post_to_red_post_checkbox',['../post__to__red_8php.html#a0f139dea77a94c98f26007963eea639c',1,'post_to_red.php']]], diff --git a/doc/html/search/all_72.js b/doc/html/search/all_72.js index 67dee5054..229e73743 100644 --- a/doc/html/search/all_72.js +++ b/doc/html/search/all_72.js @@ -8,10 +8,13 @@ var searchData= ['randprof_5finit',['randprof_init',['../randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090',1,'randprof.php']]], ['rconnect_5furl',['rconnect_url',['../Contact_8php.html#a2f4f495d53f2a334ab75292af79d3c91',1,'Contact.php']]], ['rdelim',['rdelim',['../namespacefriendica-to-smarty-tpl.html#a8540514fb7c4aa18ad2dffa2a975036b',1,'friendica-to-smarty-tpl']]], - ['readme_2emd',['README.md',['../README_8md.html',1,'']]], + ['readme_2emd',['README.md',['../apw_2README_8md.html',1,'']]], + ['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_5fplatform',['RED_PLATFORM',['../boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4',1,'boot.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']]], ['redbasic_2ephp',['redbasic.php',['../redbasic_8php.html',1,'']]], ['redbasic_5fform',['redbasic_form',['../view_2theme_2redbasic_2php_2config_8php.html#a8574a41fa9735ee391ba57ab24b93793',1,'config.php']]], diff --git a/doc/html/search/all_74.js b/doc/html/search/all_74.js index f40452852..a93bf7ab4 100644 --- a/doc/html/search/all_74.js +++ b/doc/html/search/all_74.js @@ -36,12 +36,18 @@ var searchData= ['text_2ephp',['text.php',['../text_8php.html',1,'']]], ['tgroup_5fcheck',['tgroup_check',['../items_8php.html#a88c6cf7649ac836fbbed82a7a0315110',1,'items.php']]], ['theme_2ephp',['theme.php',['../apw_2php_2theme_8php.html',1,'']]], + ['theme_2ephp',['theme.php',['../blogga_2php_2theme_8php.html',1,'']]], + ['theme_2ephp',['theme.php',['../blogga_2view_2theme_2blog_2theme_8php.html',1,'']]], ['theme_2ephp',['theme.php',['../redbasic_2php_2theme_8php.html',1,'']]], + ['theme_5fadmin',['theme_admin',['../view_2theme_2blogga_2php_2config_8php.html#a09cd81013505f83aea0771243a1e4e53',1,'theme_admin(&$a): config.php'],['../view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#a09cd81013505f83aea0771243a1e4e53',1,'theme_admin(&$a): config.php']]], + ['theme_5fadmin_5fpost',['theme_admin_post',['../view_2theme_2blogga_2php_2config_8php.html#aef2da5582b7cb6b5f63e5ca5d69fd30b',1,'theme_admin_post(&$a): config.php'],['../view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#aef2da5582b7cb6b5f63e5ca5d69fd30b',1,'theme_admin_post(&$a): config.php']]], ['theme_5fattachments',['theme_attachments',['../text_8php.html#af9c9ac3f74c82dc60acfa404d0e9dc53',1,'text.php']]], - ['theme_5fcontent',['theme_content',['../view_2theme_2apw_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d',1,'theme_content(&$a): config.php'],['../view_2theme_2redbasic_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d',1,'theme_content(&$a): config.php']]], + ['theme_5fcontent',['theme_content',['../view_2theme_2apw_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d',1,'theme_content(&$a): config.php'],['../view_2theme_2blogga_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d',1,'theme_content(&$a): config.php'],['../view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d',1,'theme_content(&$a): config.php'],['../view_2theme_2redbasic_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d',1,'theme_content(&$a): config.php']]], ['theme_5finclude',['theme_include',['../plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2',1,'plugin.php']]], - ['theme_5finit_2ephp',['theme_init.php',['../theme__init_8php.html',1,'']]], - ['theme_5fpost',['theme_post',['../view_2theme_2apw_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6',1,'theme_post(&$a): config.php'],['../view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6',1,'theme_post(&$a): config.php']]], + ['theme_5finit_2ephp',['theme_init.php',['../php_2theme__init_8php.html',1,'']]], + ['theme_5finit_2ephp',['theme_init.php',['../theme_2blogga_2php_2theme__init_8php.html',1,'']]], + ['theme_5finit_2ephp',['theme_init.php',['../theme_2redbasic_2php_2theme__init_8php.html',1,'']]], + ['theme_5fpost',['theme_post',['../view_2theme_2apw_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6',1,'theme_post(&$a): config.php'],['../view_2theme_2blogga_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6',1,'theme_post(&$a): config.php'],['../view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6',1,'theme_post(&$a): config.php'],['../view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6',1,'theme_post(&$a): config.php']]], ['theme_5fstatus',['theme_status',['../admin_8php.html#ad4f74f33944a98b56d2c8c7601f124a4',1,'admin.php']]], ['thing_2ephp',['thing.php',['../thing_8php.html',1,'']]], ['thing_5fcontent',['thing_content',['../thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b',1,'thing.php']]], diff --git a/doc/html/search/all_7a.js b/doc/html/search/all_7a.js index a65f8dc97..caf8b84ca 100644 --- a/doc/html/search/all_7a.js +++ b/doc/html/search/all_7a.js @@ -21,7 +21,7 @@ var searchData= ['zot_5ffeed',['zot_feed',['../items_8php.html#a004e89d86b0f29b2c4da20108ecc4091',1,'items.php']]], ['zot_5ffetch',['zot_fetch',['../zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea',1,'zot.php']]], ['zot_5ffinger',['zot_finger',['../zot_8php.html#a95528377d7303131958c9f0b7158fdce',1,'zot.php']]], - ['zot_5fget_5fhubloc',['zot_get_hubloc',['../zot_8php.html#acdea9362d78a63dce948fdf0ea73ef0e',1,'zot.php']]], + ['zot_5fget_5fhublocs',['zot_get_hublocs',['../zot_8php.html#ae7cec2b417b5858fd4a41070f843d1d7',1,'zot.php']]], ['zot_5fgethub',['zot_gethub',['../zot_8php.html#a55056e863a7860bc0cf922e78fcce073',1,'zot.php']]], ['zot_5fimport',['zot_import',['../zot_8php.html#aeea071f17e306fe3d0c488551906bfab',1,'zot.php']]], ['zot_5fnew_5fuid',['zot_new_uid',['../zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7',1,'zot.php']]], diff --git a/doc/html/search/files_63.js b/doc/html/search/files_63.js index 5de40d62e..531b158b2 100644 --- a/doc/html/search/files_63.js +++ b/doc/html/search/files_63.js @@ -1,8 +1,8 @@ var searchData= [ ['cache_2ephp',['cache.php',['../cache_8php.html',1,'']]], - ['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,'']]], ['channel_2ephp',['channel.php',['../channel_8php.html',1,'']]], ['chanview_2ephp',['chanview.php',['../chanview_8php.html',1,'']]], ['cli_5fstartup_2ephp',['cli_startup.php',['../cli__startup_8php.html',1,'']]], @@ -12,9 +12,11 @@ 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_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_2redbasic_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,'']]], ['contact_2ephp',['Contact.php',['../Contact_8php.html',1,'']]], diff --git a/doc/html/search/files_64.js b/doc/html/search/files_64.js index f2ac54231..7829f65a6 100644 --- a/doc/html/search/files_64.js +++ b/doc/html/search/files_64.js @@ -9,7 +9,9 @@ var searchData= ['dba_5fdriver_2ephp',['dba_driver.php',['../dba__driver_8php.html',1,'']]], ['dba_5fmysql_2ephp',['dba_mysql.php',['../dba__mysql_8php.html',1,'']]], ['dba_5fmysqli_2ephp',['dba_mysqli.php',['../dba__mysqli_8php.html',1,'']]], - ['default_2ephp',['default.php',['../default_8php.html',1,'']]], + ['default_2ephp',['default.php',['../theme_2blogga_2php_2default_8php.html',1,'']]], + ['default_2ephp',['default.php',['../theme_2blogga_2view_2theme_2blog_2default_8php.html',1,'']]], + ['default_2ephp',['default.php',['../php_2default_8php.html',1,'']]], ['delegate_2ephp',['delegate.php',['../delegate_8php.html',1,'']]], ['deliver_2ephp',['deliver.php',['../deliver_8php.html',1,'']]], ['dir_5ffns_2ephp',['dir_fns.php',['../dir__fns_8php.html',1,'']]], diff --git a/doc/html/search/files_72.js b/doc/html/search/files_72.js index 76466a56a..00e4c63ae 100644 --- a/doc/html/search/files_72.js +++ b/doc/html/search/files_72.js @@ -1,7 +1,8 @@ var searchData= [ ['randprof_2ephp',['randprof.php',['../randprof_8php.html',1,'']]], - ['readme_2emd',['README.md',['../README_8md.html',1,'']]], + ['readme_2emd',['README.md',['../apw_2README_8md.html',1,'']]], + ['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,'']]], diff --git a/doc/html/search/files_74.js b/doc/html/search/files_74.js index dbd4cf5c3..ae0686730 100644 --- a/doc/html/search/files_74.js +++ b/doc/html/search/files_74.js @@ -5,9 +5,13 @@ var searchData= ['taxonomy_2ephp',['taxonomy.php',['../taxonomy_8php.html',1,'']]], ['template_5fprocessor_2ephp',['template_processor.php',['../template__processor_8php.html',1,'']]], ['text_2ephp',['text.php',['../text_8php.html',1,'']]], - ['theme_2ephp',['theme.php',['../apw_2php_2theme_8php.html',1,'']]], + ['theme_2ephp',['theme.php',['../blogga_2view_2theme_2blog_2theme_8php.html',1,'']]], + ['theme_2ephp',['theme.php',['../blogga_2php_2theme_8php.html',1,'']]], ['theme_2ephp',['theme.php',['../redbasic_2php_2theme_8php.html',1,'']]], - ['theme_5finit_2ephp',['theme_init.php',['../theme__init_8php.html',1,'']]], + ['theme_2ephp',['theme.php',['../apw_2php_2theme_8php.html',1,'']]], + ['theme_5finit_2ephp',['theme_init.php',['../theme_2blogga_2php_2theme__init_8php.html',1,'']]], + ['theme_5finit_2ephp',['theme_init.php',['../php_2theme__init_8php.html',1,'']]], + ['theme_5finit_2ephp',['theme_init.php',['../theme_2redbasic_2php_2theme__init_8php.html',1,'']]], ['thing_2ephp',['thing.php',['../thing_8php.html',1,'']]], ['toggle_5fmobile_2ephp',['toggle_mobile.php',['../toggle__mobile_8php.html',1,'']]], ['toggle_5fsafesearch_2ephp',['toggle_safesearch.php',['../toggle__safesearch_8php.html',1,'']]], diff --git a/doc/html/search/functions_62.js b/doc/html/search/functions_62.js index 4a02db2e4..e4f1a9615 100644 --- a/doc/html/search/functions_62.js +++ b/doc/html/search/functions_62.js @@ -15,6 +15,12 @@ var searchData= ['bbtovcal',['bbtovcal',['../event_8php.html#a184d6b9690e5b6dee35a0aa9edd47279',1,'event.php']]], ['best_5flink_5furl',['best_link_url',['../conversation_8php.html#ad470fc7766f0db66d138fa1916c7a8b7',1,'conversation.php']]], ['blocks_5fcontent',['blocks_content',['../blocks_8php.html#a2531a8fd51db3cecb2eb20c002c66e12',1,'blocks.php']]], + ['blog_5finit',['blog_init',['../blogga_2php_2theme_8php.html#aa55c1cb1f05087b5002ecb633b550b1b',1,'blog_init(&$a): theme.php'],['../blogga_2view_2theme_2blog_2theme_8php.html#aa55c1cb1f05087b5002ecb633b550b1b',1,'blog_init(&$a): theme.php']]], + ['blog_5finstall',['blog_install',['../blogga_2view_2theme_2blog_2theme_8php.html#aae58cc837fe56473d9f3370abfe533ae',1,'theme.php']]], + ['blog_5funinstall',['blog_uninstall',['../blogga_2view_2theme_2blog_2theme_8php.html#a3e77dbe111f330c64a1ff6c741cd515c',1,'theme.php']]], + ['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']]], ['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_70.js b/doc/html/search/functions_70.js index 26db791a3..daed5c765 100644 --- a/doc/html/search/functions_70.js +++ b/doc/html/search/functions_70.js @@ -43,12 +43,15 @@ var searchData= ['post_5fpost',['post_post',['../post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75',1,'post.php']]], ['post_5fto_5fred_5fadmin',['post_to_red_admin',['../post__to__red_8php.html#aeec4125719184e7b097b3b9fba3101b5',1,'post_to_red.php']]], ['post_5fto_5fred_5fdeactivate',['post_to_red_deactivate',['../post__to__red_8php.html#a49fd35f7b1cdddfe6e26ddfcf8d3c4ec',1,'post_to_red.php']]], + ['post_5fto_5fred_5fdelete_5fcomment',['post_to_red_delete_comment',['../post__to__red_8php.html#a5cc2a89a6d33cdb8e2ca557a69bef42d',1,'post_to_red.php']]], + ['post_5fto_5fred_5fdelete_5fpost',['post_to_red_delete_post',['../post__to__red_8php.html#a4674bb5ce2baa32c559607460c39a2c5',1,'post_to_red.php']]], ['post_5fto_5fred_5fdisplay_5fadmin_5fpage',['post_to_red_display_admin_page',['../post__to__red_8php.html#a8ec8f8809e3c5d1b2c9598c8185d63aa',1,'post_to_red.php']]], ['post_5fto_5fred_5fdisplayadmincontent',['post_to_red_displayAdminContent',['../post__to__red_8php.html#a75db5d87226a0287a0ac0fa315f2bcfd',1,'post_to_red.php']]], ['post_5fto_5fred_5fget_5facct_5fname',['post_to_red_get_acct_name',['../post__to__red_8php.html#ae6f3a2c0561cbeacda5be565b06de8a7',1,'post_to_red.php']]], + ['post_5fto_5fred_5fget_5favatar',['post_to_red_get_avatar',['../post__to__red_8php.html#ae0b881461afbdba93d9329068ea52136',1,'post_to_red.php']]], + ['post_5fto_5fred_5fget_5fchannel_5fname',['post_to_red_get_channel_name',['../post__to__red_8php.html#aacba7a0646fc00ae6ac4f5dc383fccab',1,'post_to_red.php']]], ['post_5fto_5fred_5fget_5fpassword',['post_to_red_get_password',['../post__to__red_8php.html#a4d90ac085c14f53ff4d8ab4c23477ea6',1,'post_to_red.php']]], ['post_5fto_5fred_5fget_5fseed_5flocation',['post_to_red_get_seed_location',['../post__to__red_8php.html#a96d0ccecb96600ef1bfd50ab3f77315f',1,'post_to_red.php']]], - ['post_5fto_5fred_5fget_5fuser_5fname',['post_to_red_get_user_name',['../post__to__red_8php.html#a9497cd6a80c6897dbbf9aabde62b53e7',1,'post_to_red.php']]], ['post_5fto_5fred_5fpost',['post_to_red_post',['../post__to__red_8php.html#af5fd50e2c42ede85f8a9e8d9ee3cf540',1,'post_to_red.php']]], ['post_5fto_5fred_5fpost_5fcheckbox',['post_to_red_post_checkbox',['../post__to__red_8php.html#a0f139dea77a94c98f26007963eea639c',1,'post_to_red.php']]], ['post_5fto_5fred_5fpost_5ffield_5fdata',['post_to_red_post_field_data',['../post__to__red_8php.html#a7e68a8d9c83cb28d032aad3ea85ce0a6',1,'post_to_red.php']]], diff --git a/doc/html/search/functions_72.js b/doc/html/search/functions_72.js index 5df1d71d2..fe9a6ae9b 100644 --- a/doc/html/search/functions_72.js +++ b/doc/html/search/functions_72.js @@ -5,6 +5,8 @@ var searchData= ['randprof_5finit',['randprof_init',['../randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090',1,'randprof.php']]], ['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_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']]], ['redbasic_5finit',['redbasic_init',['../redbasic_2php_2theme_8php.html#af6eb813e9fc7e2d76ac1b82bc5c0ed9b',1,'theme.php']]], diff --git a/doc/html/search/functions_74.js b/doc/html/search/functions_74.js index a2cae7e1d..6b9dca5d7 100644 --- a/doc/html/search/functions_74.js +++ b/doc/html/search/functions_74.js @@ -15,10 +15,12 @@ var searchData= ['terminate_5ffriendship',['terminate_friendship',['../Contact_8php.html#a38daa1c210b78385307123450ca9a1fc',1,'Contact.php']]], ['termtype',['termtype',['../items_8php.html#ad34827ed330898456783fb14c7b46154',1,'items.php']]], ['tgroup_5fcheck',['tgroup_check',['../items_8php.html#a88c6cf7649ac836fbbed82a7a0315110',1,'items.php']]], + ['theme_5fadmin',['theme_admin',['../view_2theme_2blogga_2php_2config_8php.html#a09cd81013505f83aea0771243a1e4e53',1,'theme_admin(&$a): config.php'],['../view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#a09cd81013505f83aea0771243a1e4e53',1,'theme_admin(&$a): config.php']]], + ['theme_5fadmin_5fpost',['theme_admin_post',['../view_2theme_2blogga_2php_2config_8php.html#aef2da5582b7cb6b5f63e5ca5d69fd30b',1,'theme_admin_post(&$a): config.php'],['../view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#aef2da5582b7cb6b5f63e5ca5d69fd30b',1,'theme_admin_post(&$a): config.php']]], ['theme_5fattachments',['theme_attachments',['../text_8php.html#af9c9ac3f74c82dc60acfa404d0e9dc53',1,'text.php']]], - ['theme_5fcontent',['theme_content',['../view_2theme_2apw_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d',1,'theme_content(&$a): config.php'],['../view_2theme_2redbasic_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d',1,'theme_content(&$a): config.php']]], + ['theme_5fcontent',['theme_content',['../view_2theme_2apw_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d',1,'theme_content(&$a): config.php'],['../view_2theme_2blogga_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d',1,'theme_content(&$a): config.php'],['../view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d',1,'theme_content(&$a): config.php'],['../view_2theme_2redbasic_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d',1,'theme_content(&$a): config.php']]], ['theme_5finclude',['theme_include',['../plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2',1,'plugin.php']]], - ['theme_5fpost',['theme_post',['../view_2theme_2apw_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6',1,'theme_post(&$a): config.php'],['../view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6',1,'theme_post(&$a): config.php']]], + ['theme_5fpost',['theme_post',['../view_2theme_2apw_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6',1,'theme_post(&$a): config.php'],['../view_2theme_2blogga_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6',1,'theme_post(&$a): config.php'],['../view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6',1,'theme_post(&$a): config.php'],['../view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6',1,'theme_post(&$a): config.php']]], ['theme_5fstatus',['theme_status',['../admin_8php.html#ad4f74f33944a98b56d2c8c7601f124a4',1,'admin.php']]], ['thing_5fcontent',['thing_content',['../thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b',1,'thing.php']]], ['thing_5finit',['thing_init',['../thing_8php.html#a8be23b1d475ec3d9291999221c674c80',1,'thing.php']]], diff --git a/doc/html/search/functions_7a.js b/doc/html/search/functions_7a.js index d98aa7283..f1f59bfdc 100644 --- a/doc/html/search/functions_7a.js +++ b/doc/html/search/functions_7a.js @@ -18,7 +18,7 @@ var searchData= ['zot_5ffeed',['zot_feed',['../items_8php.html#a004e89d86b0f29b2c4da20108ecc4091',1,'items.php']]], ['zot_5ffetch',['zot_fetch',['../zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea',1,'zot.php']]], ['zot_5ffinger',['zot_finger',['../zot_8php.html#a95528377d7303131958c9f0b7158fdce',1,'zot.php']]], - ['zot_5fget_5fhubloc',['zot_get_hubloc',['../zot_8php.html#acdea9362d78a63dce948fdf0ea73ef0e',1,'zot.php']]], + ['zot_5fget_5fhublocs',['zot_get_hublocs',['../zot_8php.html#ae7cec2b417b5858fd4a41070f843d1d7',1,'zot.php']]], ['zot_5fgethub',['zot_gethub',['../zot_8php.html#a55056e863a7860bc0cf922e78fcce073',1,'zot.php']]], ['zot_5fimport',['zot_import',['../zot_8php.html#aeea071f17e306fe3d0c488551906bfab',1,'zot.php']]], ['zot_5fnew_5fuid',['zot_new_uid',['../zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7',1,'zot.php']]], diff --git a/doc/html/search/variables_24.js b/doc/html/search/variables_24.js index 0947880f2..529ec0c2d 100644 --- a/doc/html/search/variables_24.js +++ b/doc/html/search/variables_24.js @@ -16,11 +16,12 @@ var searchData= ['_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']]], ['_24cached_5fprofile_5fimage',['$cached_profile_image',['../classApp.html#abe0e4fa91097f7a6588e1213a834121c',1,'App']]], ['_24cached_5fprofile_5fpicdate',['$cached_profile_picdate',['../classApp.html#aab4a685d15a363bb1d7edbbc20bfb94e',1,'App']]], ['_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()'],['../theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864',1,'$channel(): theme_init.php']]], + ['_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']]], ['_24children',['$children',['../classItem.html#a80dcd0fb7673776c0967839d429c2a0f',1,'Item']]], ['_24cid',['$cid',['../classApp.html#ad1c8eb91a6fd470b94f34b7fdad3a2d0',1,'App']]], @@ -57,6 +58,8 @@ var searchData= ['_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']]], + ['_24headimg',['$headimg',['../theme_2blogga_2php_2default_8php.html#ac7062908d1eb80c0735270f7997c4527',1,'$headimg(): default.php'],['../theme_2blogga_2view_2theme_2blog_2default_8php.html#a52d9dd070ed541729088395c22502539',1,'$headimg(): default.php']]], + ['_24headimghome',['$headimghome',['../theme_2blogga_2php_2default_8php.html#a1230ab83d4ec9785d8f3a966f33dc5f3',1,'$headimghome(): default.php'],['../theme_2blogga_2view_2theme_2blog_2default_8php.html#a1230ab83d4ec9785d8f3a966f33dc5f3',1,'$headimghome(): default.php']]], ['_24height',['$height',['../classphoto__driver.html#aea560be5dfba09117d36c12bacbf3b80',1,'photo_driver']]], ['_24hooks',['$hooks',['../classApp.html#a3694aa1907aa103a2adbc71f926f0fa0',1,'App']]], ['_24hostname',['$hostname',['../classApp.html#a037049cba88dfc6ff94f4b5b779e3fd3',1,'App']]], diff --git a/doc/html/search/variables_69.js b/doc/html/search/variables_69.js index e46f2ce95..c71968467 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'],['../default_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'],['../redbasic_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a',1,'if(): style.php']]], ['item_5fblocked',['ITEM_BLOCKED',['../boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f',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']]], diff --git a/doc/html/search_8php.html b/doc/html/search_8php.html index d88613963..74adf4da0 100644 --- a/doc/html/search_8php.html +++ b/doc/html/search_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/search__ac_8php.html b/doc/html/search__ac_8php.html index b8e9202ec..93c763f53 100644 --- a/doc/html/search__ac_8php.html +++ b/doc/html/search__ac_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/security_8php.html b/doc/html/security_8php.html index 56cd97703..b1263fa59 100644 --- a/doc/html/security_8php.html +++ b/doc/html/security_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/session_8php.html b/doc/html/session_8php.html index 26dce80b2..0c02c1ec6 100644 --- a/doc/html/session_8php.html +++ b/doc/html/session_8php.html @@ -28,7 +28,7 @@ - + - - @@ -194,8 +192,6 @@ $(document).ready(function(){initNavTree('classApp.html','');}); - - diff --git a/doc/html/classApp.html b/doc/html/classApp.html index f5d4a8d21..38ed4ada3 100644 --- a/doc/html/classApp.html +++ b/doc/html/classApp.html @@ -165,14 +165,6 @@ Public Member Functions - - - - - - - - @@ -414,36 +406,6 @@ Private Attributes
      The Red Matrix
      diff --git a/doc/html/settings_8php.html b/doc/html/settings_8php.html index 9b6afedab..8cd9e7063 100644 --- a/doc/html/settings_8php.html +++ b/doc/html/settings_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/setup_8php.html b/doc/html/setup_8php.html index 6289f702b..ab0d78658 100644 --- a/doc/html/setup_8php.html +++ b/doc/html/setup_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/share_8php.html b/doc/html/share_8php.html index 0ebf74ae1..89298f55f 100644 --- a/doc/html/share_8php.html +++ b/doc/html/share_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/siteinfo_8php.html b/doc/html/siteinfo_8php.html index a04ae5de8..c53a3c42f 100644 --- a/doc/html/siteinfo_8php.html +++ b/doc/html/siteinfo_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/sitelist_8php.html b/doc/html/sitelist_8php.html index ceb8d1564..976943283 100644 --- a/doc/html/sitelist_8php.html +++ b/doc/html/sitelist_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/smilies_8php.html b/doc/html/smilies_8php.html index ae04db800..624cb9b90 100644 --- a/doc/html/smilies_8php.html +++ b/doc/html/smilies_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/socgraph_8php.html b/doc/html/socgraph_8php.html index fc4890986..5f67be58c 100644 --- a/doc/html/socgraph_8php.html +++ b/doc/html/socgraph_8php.html @@ -28,7 +28,7 @@ - +

      Network and protocol family types

      -

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

      +

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

      @@ -3493,7 +3157,7 @@ Variables
      The Red Matrix
      diff --git a/doc/html/sources_8php.html b/doc/html/sources_8php.html index a528ae5e4..5e565616e 100644 --- a/doc/html/sources_8php.html +++ b/doc/html/sources_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/starred_8php.html b/doc/html/starred_8php.html index f5cec3e80..43fa8769e 100644 --- a/doc/html/starred_8php.html +++ b/doc/html/starred_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/subthread_8php.html b/doc/html/subthread_8php.html index 1f318b4e5..ec10a25fa 100644 --- a/doc/html/subthread_8php.html +++ b/doc/html/subthread_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/suggest_8php.html b/doc/html/suggest_8php.html index e9676b70d..9dcf0c0e7 100644 --- a/doc/html/suggest_8php.html +++ b/doc/html/suggest_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/system__unavailable_8php.html b/doc/html/system__unavailable_8php.html index 812387b18..35036ed15 100644 --- a/doc/html/system__unavailable_8php.html +++ b/doc/html/system__unavailable_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/tagger_8php.html b/doc/html/tagger_8php.html index 61d449590..ee6c23754 100644 --- a/doc/html/tagger_8php.html +++ b/doc/html/tagger_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/tagrm_8php.html b/doc/html/tagrm_8php.html index c539a2caf..2350816ae 100644 --- a/doc/html/tagrm_8php.html +++ b/doc/html/tagrm_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/taxonomy_8php.html b/doc/html/taxonomy_8php.html index 937249bf9..ee96e0101 100644 --- a/doc/html/taxonomy_8php.html +++ b/doc/html/taxonomy_8php.html @@ -28,7 +28,7 @@ - +
      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(), 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(), nogroup_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(), profile_tabs(), 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(), 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(), nogroup_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(), profile_tabs(), 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().

      diff --git a/doc/html/theme_2blogga_2php_2default_8php.html b/doc/html/theme_2blogga_2php_2default_8php.html new file mode 100644 index 000000000..7e1aeec61 --- /dev/null +++ b/doc/html/theme_2blogga_2php_2default_8php.html @@ -0,0 +1,165 @@ + + + + + + +The Red Matrix: view/theme/blogga/php/default.php File Reference + + + + + + + + + + + + + +
      +
      +
      The Red Matrix
      diff --git a/doc/html/template__processor_8php.html b/doc/html/template__processor_8php.html index d499ee3e3..256076b85 100644 --- a/doc/html/template__processor_8php.html +++ b/doc/html/template__processor_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index 052071915..9953a6ee9 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      @@ -449,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(), and zfinger_init().

      +

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

      @@ -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(), 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(), dfrn_deliver(), directory_content(), directory_run(), email_send(), encode_item(), expire_run(), feed_init(), fetch_lrdd_template(), fetch_xrd_links(), 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_xchan(), 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(), lrdd(), 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(), crepair_post(), cronhooks_run(), datetime_convert(), delete_imported_item(), deliver_run(), detect_language(), dfrn_deliver(), directory_content(), directory_run(), email_send(), encode_item(), expire_run(), feed_init(), fetch_lrdd_template(), fetch_xrd_links(), 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_xchan(), 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(), lrdd(), 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().

      @@ -1772,7 +1772,7 @@ Variables
      + + + + + + +
      +
      The Red Matrix +
      +
      + + + + + + + +
      + +
      +
      +
      + +
      + + + + +
      + +
      + +
      +
      +Variables
      +
      +
      default.php File Reference
      +
      +
      + + + + + + + + +

      +Variables

       $headimg = get_config('blogtheme', 'headimg')
       
       $headimghome = get_config('blogtheme', 'headimghome')
       
      if($a->module=='display') $bodyclass =""
       
      +

      Variable Documentation

      + +
      +
      + + + + +
      if ($a->module=='display') $bodyclass =""
      +
      + +
      +
      + +
      +
      + + + + +
      $headimg = get_config('blogtheme', 'headimg')
      +
      + +

      Referenced by blogtheme_form(), blogtheme_imgurl(), theme_admin(), and theme_content().

      + +
      +
      + +
      +
      + + + + +
      $headimghome = get_config('blogtheme', 'headimghome')
      +
      + +

      Referenced by blogtheme_form(), theme_admin(), and theme_content().

      + +
      +
      +
      +
      + diff --git a/doc/html/theme_2blogga_2php_2default_8php.js b/doc/html/theme_2blogga_2php_2default_8php.js new file mode 100644 index 000000000..5cade9149 --- /dev/null +++ b/doc/html/theme_2blogga_2php_2default_8php.js @@ -0,0 +1,6 @@ +var theme_2blogga_2php_2default_8php = +[ + [ "$bodyclass", "theme_2blogga_2php_2default_8php.html#a720581ae288aa09511670563e4205a4a", null ], + [ "$headimg", "theme_2blogga_2php_2default_8php.html#ac7062908d1eb80c0735270f7997c4527", null ], + [ "$headimghome", "theme_2blogga_2php_2default_8php.html#a1230ab83d4ec9785d8f3a966f33dc5f3", null ] +]; \ No newline at end of file diff --git a/doc/html/theme_2blogga_2php_2theme__init_8php.html b/doc/html/theme_2blogga_2php_2theme__init_8php.html new file mode 100644 index 000000000..06acd8602 --- /dev/null +++ b/doc/html/theme_2blogga_2php_2theme__init_8php.html @@ -0,0 +1,112 @@ + + + + + + +The Red Matrix: view/theme/blogga/php/theme_init.php File Reference + + + + + + + + + + + + + +
      +
      + + + + + + + +
      +
      The Red Matrix +
      +
      +
      + + + + + +
      +
      + +
      +
      +
      + +
      + + + + +
      + +
      + +
      +
      +
      theme_init.php File Reference
      +
      +
      +
      +
      + diff --git a/doc/html/theme_2blogga_2view_2theme_2blog_2default_8php.html b/doc/html/theme_2blogga_2view_2theme_2blog_2default_8php.html new file mode 100644 index 000000000..eafbefc24 --- /dev/null +++ b/doc/html/theme_2blogga_2view_2theme_2blog_2default_8php.html @@ -0,0 +1,161 @@ + + + + + + +The Red Matrix: view/theme/blogga/view/theme/blog/default.php File Reference + + + + + + + + + + + + + +
      +
      + + + + + + + +
      +
      The Red Matrix +
      +
      +
      + + + + + +
      +
      + +
      +
      +
      + +
      + + + + +
      + +
      + +
      +
      +Variables
      +
      +
      default.php File Reference
      +
      +
      + + + + + + + + +

      +Variables

       $headimg = get_config('blogtheme', 'headimg')
       
       $headimghome = get_config('blogtheme', 'headimghome')
       
      if($a->module=='display') $bodyclass =""
       
      +

      Variable Documentation

      + +
      +
      + + + + +
      if ($a->module=='display') $bodyclass =""
      +
      + +
      +
      + +
      +
      + + + + +
      if (local_user()) $headimg = get_config('blogtheme', 'headimg')
      +
      + +
      +
      + +
      +
      + + + + +
      $headimghome = get_config('blogtheme', 'headimghome')
      +
      + +
      +
      +
      +
      + diff --git a/doc/html/theme_2blogga_2view_2theme_2blog_2default_8php.js b/doc/html/theme_2blogga_2view_2theme_2blog_2default_8php.js new file mode 100644 index 000000000..6f23bcd93 --- /dev/null +++ b/doc/html/theme_2blogga_2view_2theme_2blog_2default_8php.js @@ -0,0 +1,6 @@ +var theme_2blogga_2view_2theme_2blog_2default_8php = +[ + [ "$bodyclass", "theme_2blogga_2view_2theme_2blog_2default_8php.html#a720581ae288aa09511670563e4205a4a", null ], + [ "$headimg", "theme_2blogga_2view_2theme_2blog_2default_8php.html#a52d9dd070ed541729088395c22502539", null ], + [ "$headimghome", "theme_2blogga_2view_2theme_2blog_2default_8php.html#a1230ab83d4ec9785d8f3a966f33dc5f3", null ] +]; \ No newline at end of file diff --git a/doc/html/theme_2redbasic_2php_2theme__init_8php.html b/doc/html/theme_2redbasic_2php_2theme__init_8php.html new file mode 100644 index 000000000..078c11e4a --- /dev/null +++ b/doc/html/theme_2redbasic_2php_2theme__init_8php.html @@ -0,0 +1,112 @@ + + + + + + +The Red Matrix: view/theme/redbasic/php/theme_init.php File Reference + + + + + + + + + + + + + +
      +
      + + + + + + + +
      +
      The Red Matrix +
      +
      +
      + + + + + +
      +
      + +
      +
      +
      + +
      + + + + +
      + +
      + +
      +
      +
      theme_init.php File Reference
      +
      +
      +
      +
      + diff --git a/doc/html/thing_8php.html b/doc/html/thing_8php.html index 1ef632d27..f8cfdd7cc 100644 --- a/doc/html/thing_8php.html +++ b/doc/html/thing_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/toggle__mobile_8php.html b/doc/html/toggle__mobile_8php.html index afecb5ca9..5f3db201a 100644 --- a/doc/html/toggle__mobile_8php.html +++ b/doc/html/toggle__mobile_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/toggle__safesearch_8php.html b/doc/html/toggle__safesearch_8php.html index c30ebc415..c91a17ec7 100644 --- a/doc/html/toggle__safesearch_8php.html +++ b/doc/html/toggle__safesearch_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/tpldebug_8php.html b/doc/html/tpldebug_8php.html index e153e1758..fc1d1a91f 100644 --- a/doc/html/tpldebug_8php.html +++ b/doc/html/tpldebug_8php.html @@ -28,7 +28,7 @@ - +

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

      - - - - -
      -
      -
      The Red Matrix
      diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html index 169430c6c..7a7bea527 100644 --- a/doc/html/typo_8php.html +++ b/doc/html/typo_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      @@ -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(), 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(), dfrn_deliver(), 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(), fetch_url(), 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_max_import_size(), get_pconfig(), get_plink(), Item\get_template_data(), get_theme_screenshot(), get_xconfig(), gprobe_run(), group_aside(), group_content(), group_post(), group_select(), guess_image_type(), handle_tag(), hcard_aside(), hcard_init(), head_get_icon(), head_set_icon(), help_content(), hostxrd_init(), import_channel_photo(), import_post(), import_profile_photo(), info(), intro_aside(), intro_content(), invite_content(), invite_post(), is_site_admin(), item_content(), item_photo_menu(), item_post(), items_fetch(), lang_selector(), 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(), lrdd(), 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(), nogroup_content(), nogroup_init(), notice(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), oexchange_content(), oexchange_init(), 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(), post_url(), preg_heart(), prepare_body(), probe_content(), proc_run(), profile_activity(), profile_aside(), profile_content(), profile_create_sidebar(), profile_init(), profile_load(), profile_photo_aside(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profile_tabs(), profiles_aside(), profiles_content(), profiles_init(), profiles_post(), profperm_aside(), profperm_content(), profperm_init(), push_lang(), queue_run(), randprof_init(), redbasic_form(), 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_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_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(), dfrn_deliver(), 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(), fetch_url(), 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_max_import_size(), get_pconfig(), get_plink(), Item\get_template_data(), get_theme_screenshot(), get_xconfig(), gprobe_run(), group_aside(), group_content(), group_post(), group_select(), guess_image_type(), handle_tag(), hcard_aside(), hcard_init(), head_get_icon(), head_set_icon(), help_content(), hostxrd_init(), import_channel_photo(), import_post(), import_profile_photo(), info(), intro_aside(), intro_content(), invite_content(), invite_post(), is_site_admin(), item_content(), item_photo_menu(), item_post(), items_fetch(), lang_selector(), 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(), lrdd(), 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(), nogroup_content(), nogroup_init(), notice(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), oexchange_content(), oexchange_init(), 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(), post_url(), preg_heart(), prepare_body(), probe_content(), proc_run(), profile_activity(), profile_aside(), profile_content(), profile_create_sidebar(), profile_init(), profile_load(), profile_photo_aside(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profile_tabs(), profiles_aside(), profiles_content(), profiles_init(), profiles_post(), profperm_aside(), profperm_content(), profperm_init(), push_lang(), queue_run(), randprof_init(), redbasic_form(), 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().

      diff --git a/doc/html/typohelper_8php.html b/doc/html/typohelper_8php.html index 1b72515e1..a84627eb5 100644 --- a/doc/html/typohelper_8php.html +++ b/doc/html/typohelper_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/uexport_8php.html b/doc/html/uexport_8php.html index 539b75123..ac904249a 100644 --- a/doc/html/uexport_8php.html +++ b/doc/html/uexport_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/update__channel_8php.html b/doc/html/update__channel_8php.html index f1f1df780..db2663d76 100644 --- a/doc/html/update__channel_8php.html +++ b/doc/html/update__channel_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/update__community_8php.html b/doc/html/update__community_8php.html index 8c8827419..c869c47b3 100644 --- a/doc/html/update__community_8php.html +++ b/doc/html/update__community_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/update__display_8php.html b/doc/html/update__display_8php.html index 4ececcb64..d4bdfc89a 100644 --- a/doc/html/update__display_8php.html +++ b/doc/html/update__display_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/update__network_8php.html b/doc/html/update__network_8php.html index 87ef35d5e..72e54103c 100644 --- a/doc/html/update__network_8php.html +++ b/doc/html/update__network_8php.html @@ -28,7 +28,7 @@ - +

      Referenced by limit_body_size().

      - - - -
      -
      -
      The Red Matrix
      diff --git a/doc/html/update__search_8php.html b/doc/html/update__search_8php.html index 3a85e55f8..402d8eec3 100644 --- a/doc/html/update__search_8php.html +++ b/doc/html/update__search_8php.html @@ -28,7 +28,7 @@ - +

      Referenced by construct_page().

      - - - -
      -
      -
      The Red Matrix
      diff --git a/doc/html/updatetpl_8py.html b/doc/html/updatetpl_8py.html index 365993ea3..08ad9b393 100644 --- a/doc/html/updatetpl_8py.html +++ b/doc/html/updatetpl_8py.html @@ -28,7 +28,7 @@ - +
      Returns
      string
      -

      Referenced by network_init().

      - @@ -962,22 +936,7 @@ Variables
      The Red Matrix
      diff --git a/doc/html/view_2theme_2apw_2php_2config_8php.html b/doc/html/view_2theme_2apw_2php_2config_8php.html index fdc825a6e..110191973 100644 --- a/doc/html/view_2theme_2apw_2php_2config_8php.html +++ b/doc/html/view_2theme_2apw_2php_2config_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/view_2theme_2blogga_2php_2config_8php.html b/doc/html/view_2theme_2blogga_2php_2config_8php.html new file mode 100644 index 000000000..2f384b38a --- /dev/null +++ b/doc/html/view_2theme_2blogga_2php_2config_8php.html @@ -0,0 +1,232 @@ + + + + + + +The Red Matrix: view/theme/blogga/php/config.php File Reference + + + + + + + + + + + + + +
      +
      + + + + + + + +
      +
      The Red Matrix +
      +
      +
      + + + + + +
      +
      + +
      +
      +
      + +
      + + + + +
      + +
      + +
      +
      +Functions
      +
      +
      config.php File Reference
      +
      +
      + + + + + + + + + + + + +

      +Functions

       theme_content (&$a)
       
       theme_post (&$a)
       
       theme_admin (&$a)
       
       theme_admin_post (&$a)
       
       blogtheme_form (&$a, $headimg, $headimghome)
       
      +

      Function Documentation

      + +
      +
      + + + + + + + + + + + + + + + + + + + + + + + + +
      blogtheme_form (& $a,
       $headimg,
       $headimghome 
      )
      +
      + +

      Referenced by theme_admin(), and theme_content().

      + +
      +
      + +
      +
      + + + + + + + + +
      theme_admin (& $a)
      +
      + +

      Referenced by admin_page_themes().

      + +
      +
      + +
      +
      + + + + + + + + +
      theme_admin_post (& $a)
      +
      + +

      Referenced by admin_post().

      + +
      +
      + +
      +
      + + + + + + + + +
      theme_content (& $a)
      +
      +

      Theme settings

      + +
      +
      + +
      +
      + + + + + + + + +
      theme_post (& $a)
      +
      + +
      +
      +
      +
      + diff --git a/doc/html/view_2theme_2blogga_2php_2config_8php.js b/doc/html/view_2theme_2blogga_2php_2config_8php.js new file mode 100644 index 000000000..7d1e21a69 --- /dev/null +++ b/doc/html/view_2theme_2blogga_2php_2config_8php.js @@ -0,0 +1,8 @@ +var view_2theme_2blogga_2php_2config_8php = +[ + [ "blogtheme_form", "view_2theme_2blogga_2php_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27", null ], + [ "theme_admin", "view_2theme_2blogga_2php_2config_8php.html#a09cd81013505f83aea0771243a1e4e53", null ], + [ "theme_admin_post", "view_2theme_2blogga_2php_2config_8php.html#aef2da5582b7cb6b5f63e5ca5d69fd30b", null ], + [ "theme_content", "view_2theme_2blogga_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d", null ], + [ "theme_post", "view_2theme_2blogga_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6", null ] +]; \ No newline at end of file diff --git a/doc/html/view_2theme_2blogga_2view_2theme_2blog_2config_8php.html b/doc/html/view_2theme_2blogga_2view_2theme_2blog_2config_8php.html new file mode 100644 index 000000000..614fbcb7b --- /dev/null +++ b/doc/html/view_2theme_2blogga_2view_2theme_2blog_2config_8php.html @@ -0,0 +1,226 @@ + + + + + + +The Red Matrix: view/theme/blogga/view/theme/blog/config.php File Reference + + + + + + + + + + + + + +
      +
      + + + + + + + +
      +
      The Red Matrix +
      +
      +
      + + + + + +
      +
      + +
      +
      +
      + +
      + + + + +
      + +
      + +
      +
      +Functions
      +
      +
      config.php File Reference
      +
      +
      + + + + + + + + + + + + +

      +Functions

       theme_content (&$a)
       
       theme_post (&$a)
       
       theme_admin (&$a)
       
       theme_admin_post (&$a)
       
       blogtheme_form (&$a, $headimg, $headimghome)
       
      +

      Function Documentation

      + +
      +
      + + + + + + + + + + + + + + + + + + + + + + + + +
      blogtheme_form (& $a,
       $headimg,
       $headimghome 
      )
      +
      + +
      +
      + +
      +
      + + + + + + + + +
      theme_admin (& $a)
      +
      + +
      +
      + +
      +
      + + + + + + + + +
      theme_admin_post (& $a)
      +
      + +
      +
      + +
      +
      + + + + + + + + +
      theme_content (& $a)
      +
      +

      Theme settings

      + +
      +
      + +
      +
      + + + + + + + + +
      theme_post (& $a)
      +
      + +
      +
      +
      +
      + diff --git a/doc/html/view_2theme_2blogga_2view_2theme_2blog_2config_8php.js b/doc/html/view_2theme_2blogga_2view_2theme_2blog_2config_8php.js new file mode 100644 index 000000000..1603323f9 --- /dev/null +++ b/doc/html/view_2theme_2blogga_2view_2theme_2blog_2config_8php.js @@ -0,0 +1,8 @@ +var view_2theme_2blogga_2view_2theme_2blog_2config_8php = +[ + [ "blogtheme_form", "view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27", null ], + [ "theme_admin", "view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#a09cd81013505f83aea0771243a1e4e53", null ], + [ "theme_admin_post", "view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#aef2da5582b7cb6b5f63e5ca5d69fd30b", null ], + [ "theme_content", "view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d", null ], + [ "theme_post", "view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6", null ] +]; \ No newline at end of file diff --git a/doc/html/view_2theme_2redbasic_2php_2config_8php.html b/doc/html/view_2theme_2redbasic_2php_2config_8php.html index fa5473c94..ea12c42cb 100644 --- a/doc/html/view_2theme_2redbasic_2php_2config_8php.html +++ b/doc/html/view_2theme_2redbasic_2php_2config_8php.html @@ -28,7 +28,7 @@ - + - - - - - - - - - - - - - - - - - - - - - - @@ -213,8 +191,6 @@ Functions - -
      The Red Matrix
      diff --git a/doc/html/view_8php.html b/doc/html/view_8php.html index 08a8b7479..b6524b793 100644 --- a/doc/html/view_8php.html +++ b/doc/html/view_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/viewconnections_8php.html b/doc/html/viewconnections_8php.html index c4598e8b7..944b4efe2 100644 --- a/doc/html/viewconnections_8php.html +++ b/doc/html/viewconnections_8php.html @@ -28,7 +28,7 @@ - + - +
      The Red Matrix
      diff --git a/doc/html/viewsrc_8php.html b/doc/html/viewsrc_8php.html index 4c209fba5..e0d9de8ef 100644 --- a/doc/html/viewsrc_8php.html +++ b/doc/html/viewsrc_8php.html @@ -28,7 +28,7 @@ - + - - + +
      The Red Matrix
      diff --git a/doc/html/vote_8php.html b/doc/html/vote_8php.html index dd610e85d..944e87e2d 100644 --- a/doc/html/vote_8php.html +++ b/doc/html/vote_8php.html @@ -28,7 +28,7 @@ - + - +
      The Red Matrix
      diff --git a/doc/html/wall__attach_8php.html b/doc/html/wall__attach_8php.html index 6f6abd199..55f751f2a 100644 --- a/doc/html/wall__attach_8php.html +++ b/doc/html/wall__attach_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/wall__upload_8php.html b/doc/html/wall__upload_8php.html index dd8bc42df..991281577 100644 --- a/doc/html/wall__upload_8php.html +++ b/doc/html/wall__upload_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/webfinger_8php.html b/doc/html/webfinger_8php.html index 8ef8f3ae1..288c6a5d2 100644 --- a/doc/html/webfinger_8php.html +++ b/doc/html/webfinger_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/webpages_8php.html b/doc/html/webpages_8php.html index f54d67fb2..303ce4718 100644 --- a/doc/html/webpages_8php.html +++ b/doc/html/webpages_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/wfinger_8php.html b/doc/html/wfinger_8php.html index bdede93d8..088eb9aad 100644 --- a/doc/html/wfinger_8php.html +++ b/doc/html/wfinger_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/widedarkness_8php.html b/doc/html/widedarkness_8php.html index c222cabd4..1825b557e 100644 --- a/doc/html/widedarkness_8php.html +++ b/doc/html/widedarkness_8php.html @@ -28,7 +28,7 @@ - +

      zot_import

      Process an incoming array of messages which were obtained via pickup, and import, update, delete as directed.

      -

      The message types handled here are 'activity' (e.g. posts), 'mail' and 'profile'

      +
      Parameters
      +
      The Red Matrix
      diff --git a/doc/html/widgets_8php.html b/doc/html/widgets_8php.html index 20905a013..d91f1a939 100644 --- a/doc/html/widgets_8php.html +++ b/doc/html/widgets_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/xchan_8php.html b/doc/html/xchan_8php.html index d9113c36b..ab34d568a 100644 --- a/doc/html/xchan_8php.html +++ b/doc/html/xchan_8php.html @@ -28,7 +28,7 @@ - + - +
      The Red Matrix
      diff --git a/doc/html/xrd_8php.html b/doc/html/xrd_8php.html index 5f3219297..b774c08b6 100644 --- a/doc/html/xrd_8php.html +++ b/doc/html/xrd_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/zfinger_8php.html b/doc/html/zfinger_8php.html index a6d87856e..e41ca2a51 100644 --- a/doc/html/zfinger_8php.html +++ b/doc/html/zfinger_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      diff --git a/doc/html/zot_8php.html b/doc/html/zot_8php.html index ae895864c..3fa97efb2 100644 --- a/doc/html/zot_8php.html +++ b/doc/html/zot_8php.html @@ -28,7 +28,7 @@ - + - - + + @@ -392,6 +392,15 @@ Functions
      The Red Matrix
      @@ -114,8 +114,8 @@ $(document).ready(function(){initNavTree('zot_8php.html','');}); Functions
       zot_new_uid ($channel_nick)
       
       zot_get_hubloc ($arr, $primary=false)
       
       zot_get_hublocs ($hash)
       
       zot_build_packet ($channel, $type= 'notify', $recipients=null, $remote_key=null, $secret=null)
       
       zot_zot ($url, $data)
      +

      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.

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

      @@ -706,6 +715,18 @@ Functions
      +

      zot_build_packet($channel,$type = 'notify',$recipients = null, $remote_key = null, $secret = null) builds a zot notification packet that you can either store in the queue with a message array or call zot_zot to immediately zot it to the other side

      +
      Parameters
      + + + + + + +
      array$channel=> sender channel structure
      string$type=> packet type: one of 'ping', 'pickup', 'purge', '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
      +
      +
      +
      Returns
      string json encoded zot packet

      Referenced by build_sync_packet(), directory_run(), notifier_run(), post_init(), and zping_content().

      @@ -724,8 +745,18 @@ Functions
      -

      : zot_fetch

      -

      We received a notification packet (in mod/post.php) that a message is waiting for us, and we've verified the sender. Now send back a pickup message, using our message tracking ID ($arr['secret']), which we will sign. The entire pickup message is encrypted with the remote site's public key. If everything checks out on the remote end, we will receive back a packet containing one or more messages, which will be processed before returning.

      +

      zot_fetch($arr)

      +
      We received a notification packet (in mod/post.php) that a message is waiting for us, and we've verified the sender.
+Now send back a pickup message, using our message tracking ID ($arr['secret']), which we will sign with our site private key.
+The entire pickup message is encrypted with the remote site's public key. 
+If everything checks out on the remote end, we will receive back a packet containing one or more messages,
+which will be processed and delivered before this function ultimately returns.
+
      Parameters
      + + +
      array$arrdecrypted and json decoded notify packet from remote site
      +
      +

      Referenced by post_post().

      @@ -776,30 +807,27 @@ Functions
      - + - - - - - - - - - + - -
      zot_get_hubloc zot_get_hublocs (  $arr,
       $primary = false 
      $hash) )
      -

      Given an array of zot hashes, return all distinct hubs If primary is true, return only primary hubs Result is ordered by url to assist in batching. Return only the first primary hub as there should only be one.

      +

      zot_get_hublocs($hash) Given a zot hash, return all distinct hubs. This function is used in building the zot discovery packet and therefore should only be used by channels which are defined on this hub

      +
      Parameters
      + + +
      string$hash- xchan_hash array of hubloc (hub location structures) hubloc_id int hubloc_guid char(255) hubloc_guid_sig text hubloc_hash char(255) hubloc_addr char(255) hubloc_flags int hubloc_status int hubloc_url char(255) hubloc_url_sig text hubloc_host char(255) hubloc_callback char(255) hubloc_connect char(255) hubloc_sitekey text hubloc_updated datetime hubloc_connected datetime
      +
      +
      +

      Only search for active hublocs - e.g. those that haven't been marked deleted

      Referenced by zfinger_init().

      @@ -819,7 +847,13 @@ Functions

      : zot_gethub

      -

      A guid and a url, both signed by the sender, distinguish a known sender at a known location This function looks these up to see if the channel is known. If not, we will need to verify it.

      +

      A guid and a url, both signed by the sender, distinguish a known sender at a known location This function looks these up to see if the channel is known and therefore previously verified. If not, we will need to verify it.

      +
      Parameters
      + + +
      array$arr$arr must contain: string $arr['guid'] => guid of conversant string $arr['guid_sig'] => guid signed with conversant's private key string $arr['url'] => URL of the origination hub of this communication string $arr['url_sig'] => URL signed with conversant's private key
      +
      +
      Returns
      : array => hubloc record

      Referenced by import_post(), post_post(), zot_fetch(), and zot_import().

      @@ -851,7 +885,15 @@ Functions
      + + +
      array$arr=> 'pickup' structure returned from remote site
      string$sender_url=> the url specified by the sender in the initial communication we will verify the sender and url in each returned message structure and also verify that all the messages returned match the site url that we are currently processing.
      + + +

      The message types handled here are 'activity' (e.g. posts), 'mail' , 'profile', and 'channel_sync'

      +
      Returns
      array => array ( [0] => string $channel_hash, [1] => string $delivery_status, [2] => string $address ) suitable for logging remotely, enumerating the processing results of each message/recipient combination.

      Referenced by deliver_run(), and zot_fetch().

      @@ -870,7 +912,16 @@ Functions
      -

      zot_new_uid($channel_nick) = unique nickname of controlling entity

      +

      Red implementation of zot protocol.

      +

      https://github.com/friendica/red/wiki/zot https://github.com/friendica/red/wiki/Zot&mdash;A-High-Level-Overview

      +

      zot_new_uid($channel_nick)

      +

      Generates a unique string for use as a zot guid using our DNS-based url, the channel nickname and some entropy. The entropy ensures uniqueness against re-installs where the same URL and nickname are chosen. NOTE: zot doesn't require this to be unique. Internally we use a whirlpool hash of this guid and the signature of this guid signed with the channel private key. This can be verified and should make the probability of collision of the verified result negligible within the constraints of our immediate universe.

      +
      Parameters
      + + +
      stringchannel_nickname = unique nickname of controlling entity
      +
      +
      Returns
      string

      Referenced by create_identity().

      @@ -906,6 +957,16 @@ Functions
      +

      zot_process_response($hub,$arr,$outq) { Called immediately after sending a zot message which is using queue processing Updates the queue item according to the response result and logs any information returned to aid communications troubleshooting.

      +
      Parameters
      + + + + +
      string$hub- url of site we just contacted
      array$arr- output of z_post_url()
      array$outq- The queue structure attached to this request
      +
      +
      +
      Returns
      nothing

      Referenced by deliver_run(), and queue_run().

      @@ -934,8 +995,18 @@ Functions
      -

      : zot_refresh

      -

      zot_refresh is typically invoked when somebody has changed permissions of a channel and they are notified to fetch new permissions via a finger 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.

      +

      : zot_refresh($them, $channel = null)

      +

      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.

      +
      Parameters
      + + + +
      array$them=> xchan structure of sender
      array$channel=> local channel structure of target recipient, required for "friending" operations
      +
      +
      +
      Returns
      boolean true if successful, else false

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

      @@ -954,6 +1025,15 @@ Functions
      +

      zot_register_hub($arr)

      +

      A communication has been received which has an unknown (to us) sender. Perform discovery based on our calculated hash of the sender at the origination address. This will fetch the discovery packet of the sender, which contains the public key we need to verify our guid and url signatures.

      +
      Parameters
      + + +
      array$arr$arr must contain: string $arr['guid'] => guid of conversant string $arr['guid_sig'] => guid signed with conversant's private key string $arr['url'] => URL of the origination hub of this communication string $arr['url_sig'] => URL signed with conversant's private key
      +
      +
      +
      Returns
      array => 'success' (boolean true or false) 'message' (optional error string only if success is false)

      Referenced by post_post().

      diff --git a/doc/html/zot_8php.js b/doc/html/zot_8php.js index 3b7b0c60b..5a0ae148c 100644 --- a/doc/html/zot_8php.js +++ b/doc/html/zot_8php.js @@ -19,7 +19,7 @@ var zot_8php = [ "zot_build_packet", "zot_8php.html#a3862b3161b2c8557dc1a95020179bd81", null ], [ "zot_fetch", "zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea", null ], [ "zot_finger", "zot_8php.html#a95528377d7303131958c9f0b7158fdce", null ], - [ "zot_get_hubloc", "zot_8php.html#acdea9362d78a63dce948fdf0ea73ef0e", null ], + [ "zot_get_hublocs", "zot_8php.html#ae7cec2b417b5858fd4a41070f843d1d7", null ], [ "zot_gethub", "zot_8php.html#a55056e863a7860bc0cf922e78fcce073", null ], [ "zot_import", "zot_8php.html#aeea071f17e306fe3d0c488551906bfab", null ], [ "zot_new_uid", "zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7", null ], diff --git a/doc/html/zotfeed_8php.html b/doc/html/zotfeed_8php.html index 7cce145b0..804fc8d80 100644 --- a/doc/html/zotfeed_8php.html +++ b/doc/html/zotfeed_8php.html @@ -28,7 +28,7 @@ - + + + @@ -418,6 +420,42 @@ Functions

      Referenced by App\build_pagehead().

      + + + +
      +
      +
      The Red Matrix
      diff --git a/doc/html/zping_8php.html b/doc/html/zping_8php.html index 76fcac8a3..612181d13 100644 --- a/doc/html/zping_8php.html +++ b/doc/html/zping_8php.html @@ -28,7 +28,7 @@ - +
      The Red Matrix
      -- cgit v1.2.3 From 7536ed6e449e0d405394155b50f5e1ce96fd7776 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 28 Nov 2013 20:17:07 -0800 Subject: allow themes to mess with the navbar contents without a custom template. It's done as a callback using a transient plugin hook. For instance to get rid of the notifications link: insert_hook('nav','strip_notify'); function strip_notify($a,&$b) { unset($b['nav']['notifications']); } --- boot.php | 3 ++- include/nav.php | 7 +++++-- include/plugin.php | 37 +++++++++++++++++++++++++++++++++++-- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/boot.php b/boot.php index 53d756e93..dc9021745 100755 --- a/boot.php +++ b/boot.php @@ -2459,6 +2459,8 @@ function construct_page(&$a) { * Build the page - now that we have all the components */ + require_once(theme_include('theme_init.php')); + $installing = false; if($a->module == 'setup') @@ -2473,7 +2475,6 @@ function construct_page(&$a) { } } - require_once(theme_include('theme_init.php')); if(($p = theme_include(current_theme() . '.js')) != '') head_add_js($p); diff --git a/include/nav.php b/include/nav.php index 51c1cc583..56644f6fd 100644 --- a/include/nav.php +++ b/include/nav.php @@ -201,16 +201,19 @@ EOT; if($banner === false) $banner = 'red'; + $x = array('nav' => $nav, 'usermenu' => $userinfo ); + call_hooks('nav', $x); + $tpl = get_markup_template('nav.tpl'); $a->page['nav'] .= replace_macros($tpl, array( '$baseurl' => $a->get_baseurl(), '$langselector' => ((get_config('system','select_language')) ? lang_selector() : ''), '$sitelocation' => $sitelocation, - '$nav' => $nav, + '$nav' => $x['nav'], '$banner' => $banner, '$emptynotifications' => t('Nothing new here'), - '$userinfo' => $userinfo, + '$userinfo' => $x['usermenu'], '$localuser' => local_user(), '$sel' => $a->nav_sel, '$apps' => $a->get_apps(), diff --git a/include/plugin.php b/include/plugin.php index d90434b3a..fd58fb7dd 100755 --- a/include/plugin.php +++ b/include/plugin.php @@ -181,12 +181,14 @@ function unregister_hook($hook,$file,$function) { // // It might not be obvious but themes can manually add hooks to the $a->hooks // array in their theme_init() and use this to customise the app behaviour. +// UPDATE: use insert_hook($hookname,$function_name) to do this // function load_hooks() { $a = get_app(); - $a->hooks = array(); + if(! is_array($a->hooks)) + $a->hooks = array(); $r = q("SELECT * FROM hook WHERE true ORDER BY priority DESC"); if($r) { foreach($r as $rr) { @@ -197,6 +199,36 @@ function load_hooks() { } } +/** + * + * @function insert_hook($hook,$fn) + * + * Insert a short-lived hook into the running page request. + * Hooks are normally persistent so that they can be called + * across asynchronous processes such as delivery and poll + * processes. + * + * insert_hook lets you attach a hook callback immediately + * which will not persist beyond the life of this page request + * or the current process. + * + * @param string $hook; + * name of hook to attach callback + * @param string $fn; + * function name of callback handler + * + */ + +function insert_hook($hook,$fn) { + $a = get_app(); + if(! is_array($a->hooks)) + $a->hooks = array(); + if(! array_key_exists($hook,$a->hooks)) + $a->hooks[$hook] = array(); + $a->hooks[$hook][] = array('',$fn); +} + + function call_hooks($name, &$data = null) { @@ -204,7 +236,8 @@ function call_hooks($name, &$data = null) { if((is_array($a->hooks)) && (array_key_exists($name,$a->hooks))) { foreach($a->hooks[$name] as $hook) { - @include_once($hook[0]); + if($hook[0]) + @include_once($hook[0]); if(function_exists($hook[1])) { $func = $hook[1]; $func($a,$data); -- cgit v1.2.3 From 2563edab43a40d5f6473b4a85ef40509813b6435 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 29 Nov 2013 00:57:33 -0800 Subject: doc updates --- doc/html/boot_8php.html | 2 +- doc/html/globals_0x69.html | 3 +++ doc/html/globals_func_0x69.html | 3 +++ doc/html/navtree.js | 4 ++-- doc/html/navtreeindex4.js | 2 +- doc/html/navtreeindex5.js | 4 ++-- doc/html/navtreeindex6.js | 32 ++++++++++++++++---------------- doc/html/navtreeindex7.js | 4 ++-- doc/html/navtreeindex8.js | 1 + doc/html/plugin_8php.html | 38 ++++++++++++++++++++++++++++++++++++++ doc/html/plugin_8php.js | 1 + doc/html/search/all_69.js | 1 + doc/html/search/functions_69.js | 1 + doc/html/typo_8php.html | 2 +- 14 files changed, 73 insertions(+), 25 deletions(-) diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index f4d387ae9..ee8487d93 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -962,7 +962,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(), dfrn_deliver(), drop_item(), event_store(), fetch_url(), 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(), 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(), lrdd(), 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(), post_url(), 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(), dfrn_deliver(), drop_item(), event_store(), fetch_url(), 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(), lrdd(), 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(), post_url(), 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().

      diff --git a/doc/html/globals_0x69.html b/doc/html/globals_0x69.html index e2b53d537..d5eaad595 100644 --- a/doc/html/globals_0x69.html +++ b/doc/html/globals_0x69.html @@ -195,6 +195,9 @@ $(document).ready(function(){initNavTree('globals_0x69.html','');});
    • info() : boot.php
      • +
    • insert_hook() +: plugin.php +
    • install_plugin() : plugin.php
      • diff --git a/doc/html/globals_func_0x69.html b/doc/html/globals_func_0x69.html index 774b9e17d..b5bd8b5a1 100644 --- a/doc/html/globals_func_0x69.html +++ b/doc/html/globals_func_0x69.html @@ -188,6 +188,9 @@ $(document).ready(function(){initNavTree('globals_func_0x69.html','');});
    • info() : boot.php
      • +
    • insert_hook() +: plugin.php +
    • install_plugin() : plugin.php
      • diff --git a/doc/html/navtree.js b/doc/html/navtree.js index f39b11f5c..a49ef1909 100644 --- a/doc/html/navtree.js +++ b/doc/html/navtree.js @@ -42,8 +42,8 @@ var NAVTREEINDEX = "globals.html", "include_2network_8php.html#adf6008b38c555e98e7ed10da9ede2335", "permissions_8php.html", -"socgraph_8php.html#a5ef8bef37161df53718a21e93d02fbd6", -"zot_8php.html#a95528377d7303131958c9f0b7158fdce" +"socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586", +"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js index 14db66ba4..981a152e7 100644 --- a/doc/html/navtreeindex4.js +++ b/doc/html/navtreeindex4.js @@ -55,8 +55,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], diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js index c558ec73b..05598c353 100644 --- a/doc/html/navtreeindex5.js +++ b/doc/html/navtreeindex5.js @@ -195,8 +195,8 @@ var NAVTREEINDEX5 = "msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[5,0,1,56,0], "namespaceFriendica.html":[3,0,1], "namespaceFriendica.html":[4,0,1], -"namespaceacl__selectors.html":[3,0,0], "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], @@ -205,8 +205,8 @@ var NAVTREEINDEX5 = "namespaces.html":[3,0], "namespaceupdatetpl.html":[4,0,3], "namespaceupdatetpl.html":[3,0,3], -"namespaceutil.html":[3,0,4], "namespaceutil.html":[4,0,4], +"namespaceutil.html":[3,0,4], "nav_8php.html":[5,0,0,45], "nav_8php.html#a43be0df73b90647ea70947ce004e231e":[5,0,0,45,0], "nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a":[5,0,0,45,1], diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index 5b838bd51..74cc22d87 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -34,31 +34,32 @@ var NAVTREEINDEX6 = "ping_8php.html":[5,0,1,70], "ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[5,0,1,70,0], "plugin_8php.html":[5,0,0,56], -"plugin_8php.html#a030cec6793b909c439c0336ba39b1571":[5,0,0,56,17], -"plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76":[5,0,0,56,20], +"plugin_8php.html#a030cec6793b909c439c0336ba39b1571":[5,0,0,56,18], +"plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76":[5,0,0,56,21], "plugin_8php.html#a23c4fccf1eb5fcd63b24783ba1f05f7a":[5,0,0,56,8], -"plugin_8php.html#a326365e48ef94f0b9a0a771b8d75e813":[5,0,0,56,13], -"plugin_8php.html#a425472c5f3afc137268b2ad45652b209":[5,0,0,56,15], +"plugin_8php.html#a326365e48ef94f0b9a0a771b8d75e813":[5,0,0,56,14], +"plugin_8php.html#a425472c5f3afc137268b2ad45652b209":[5,0,0,56,16], "plugin_8php.html#a48047edfbef770125a5508dcc2f9282f":[5,0,0,56,7], -"plugin_8php.html#a482131013272a1d5d5c1b1469c6c55d5":[5,0,0,56,12], -"plugin_8php.html#a4fc13e528367f510fcb6d8bbfc559040":[5,0,0,56,24], +"plugin_8php.html#a482131013272a1d5d5c1b1469c6c55d5":[5,0,0,56,13], +"plugin_8php.html#a4fc13e528367f510fcb6d8bbfc559040":[5,0,0,56,25], "plugin_8php.html#a516591850f4fd49fd1425cfa54089db8":[5,0,0,56,9], -"plugin_8php.html#a56f71fe5adf9586ce950523d8180443e":[5,0,0,56,22], +"plugin_8php.html#a56f71fe5adf9586ce950523d8180443e":[5,0,0,56,23], "plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1":[5,0,0,56,11], -"plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2":[5,0,0,56,19], -"plugin_8php.html#a754d7f53b3abc557b753c057dc4e021d":[5,0,0,56,23], +"plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2":[5,0,0,56,20], +"plugin_8php.html#a754d7f53b3abc557b753c057dc4e021d":[5,0,0,56,24], "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,25], +"plugin_8php.html#a901657dd078e070516cf97285e0bada7":[5,0,0,56,26], "plugin_8php.html#a9039e15aae27676af7777dcbee5a11d6":[5,0,0,56,1], -"plugin_8php.html#a90538627db68605aeb6db17a8ead6523":[5,0,0,56,21], -"plugin_8php.html#a905b54e10704b283ac64680a8abc0971":[5,0,0,56,18], -"plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d":[5,0,0,56,14], +"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#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#af92789f559b89a380e49d303218aeeca":[5,0,0,56,10], -"plugin_8php.html#af9ac19004dca49adae1ac7a0d9f3b025":[5,0,0,56,16], +"plugin_8php.html#af9ac19004dca49adae1ac7a0d9f3b025":[5,0,0,56,17], "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], @@ -248,6 +249,5 @@ var NAVTREEINDEX6 = "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":[5,0,0,66] }; diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js index defedd888..dbb305484 100644 --- a/doc/html/navtreeindex7.js +++ b/doc/html/navtreeindex7.js @@ -1,5 +1,6 @@ var NAVTREEINDEX7 = { +"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], @@ -248,6 +249,5 @@ var NAVTREEINDEX7 = "zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea":[5,0,0,72,17], "zot_8php.html#a703f528ade8382cf374e4119bd6f7859":[5,0,0,72,0], "zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d":[5,0,0,72,24], -"zot_8php.html#a8e22dbc6f884be3644a892a876cbd972":[5,0,0,72,3], -"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[5,0,0,72,23] +"zot_8php.html#a8e22dbc6f884be3644a892a876cbd972":[5,0,0,72,3] }; diff --git a/doc/html/navtreeindex8.js b/doc/html/navtreeindex8.js index 8c6b54b87..76a6a2a1e 100644 --- a/doc/html/navtreeindex8.js +++ b/doc/html/navtreeindex8.js @@ -1,5 +1,6 @@ var NAVTREEINDEX8 = { +"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[5,0,0,72,23], "zot_8php.html#a95528377d7303131958c9f0b7158fdce":[5,0,0,72,18], "zot_8php.html#a9a57b40669351c9791126b925cb7ef3b":[5,0,0,72,11], "zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc":[5,0,0,72,10], diff --git a/doc/html/plugin_8php.html b/doc/html/plugin_8php.html index a7ec08409..6d293b3a8 100644 --- a/doc/html/plugin_8php.html +++ b/doc/html/plugin_8php.html @@ -128,6 +128,8 @@ Functions
       
       load_hooks ()
       
       insert_hook ($hook, $fn)
       
       call_hooks ($name, &$data=null)
       
       get_plugin_info ($plugin)
      + + + + + + + + + + + + + + + + + +
      insert_hook ( $hook,
       $fn 
      )
      +
      +

      insert_hook($hook,$fn)

      +

      Insert a short-lived hook into the running page request. Hooks are normally persistent so that they can be called across asynchronous processes such as delivery and poll processes.

      +

      insert_hook lets you attach a hook callback immediately which will not persist beyond the life of this page request or the current process.

      +
      Parameters
      + + + +
      string$hook,;name of hook to attach callback
      string$fn,;function name of callback handler
      +
      +
      +
      diff --git a/doc/html/plugin_8php.js b/doc/html/plugin_8php.js index 4d2d79f2d..ff6745471 100644 --- a/doc/html/plugin_8php.js +++ b/doc/html/plugin_8php.js @@ -12,6 +12,7 @@ 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 ], + [ "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 ], diff --git a/doc/html/search/all_69.js b/doc/html/search/all_69.js index bcc5b7f9b..4b778b719 100644 --- a/doc/html/search/all_69.js +++ b/doc/html/search/all_69.js @@ -19,6 +19,7 @@ var searchData= ['import_5fxchan',['import_xchan',['../zot_8php.html#a56f3f65514e4e7f0cd117d01735aebd1',1,'zot.php']]], ['in_5farrayi',['in_arrayi',['../text_8php.html#a75c326298519ed14ebe762194c8a3f2a',1,'text.php']]], ['info',['info',['../boot_8php.html#adfb2fc7be5a4226c0a8e24131da9d498',1,'boot.php']]], + ['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,'']]], diff --git a/doc/html/search/functions_69.js b/doc/html/search/functions_69.js index 4f605002a..bb2eae50c 100644 --- a/doc/html/search/functions_69.js +++ b/doc/html/search/functions_69.js @@ -16,6 +16,7 @@ var searchData= ['import_5fxchan',['import_xchan',['../zot_8php.html#a56f3f65514e4e7f0cd117d01735aebd1',1,'zot.php']]], ['in_5farrayi',['in_arrayi',['../text_8php.html#a75c326298519ed14ebe762194c8a3f2a',1,'text.php']]], ['info',['info',['../boot_8php.html#adfb2fc7be5a4226c0a8e24131da9d498',1,'boot.php']]], + ['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']]], diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html index 7a7bea527..1535474f3 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(), dfrn_deliver(), 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(), fetch_url(), 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_max_import_size(), get_pconfig(), get_plink(), Item\get_template_data(), get_theme_screenshot(), get_xconfig(), gprobe_run(), group_aside(), group_content(), group_post(), group_select(), guess_image_type(), handle_tag(), hcard_aside(), hcard_init(), head_get_icon(), head_set_icon(), help_content(), hostxrd_init(), import_channel_photo(), import_post(), import_profile_photo(), info(), intro_aside(), intro_content(), invite_content(), invite_post(), is_site_admin(), item_content(), item_photo_menu(), item_post(), items_fetch(), lang_selector(), 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(), lrdd(), 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(), nogroup_content(), nogroup_init(), notice(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), oexchange_content(), oexchange_init(), 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(), post_url(), preg_heart(), prepare_body(), probe_content(), proc_run(), profile_activity(), profile_aside(), profile_content(), profile_create_sidebar(), profile_init(), profile_load(), profile_photo_aside(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profile_tabs(), profiles_aside(), profiles_content(), profiles_init(), profiles_post(), profperm_aside(), profperm_content(), profperm_init(), push_lang(), queue_run(), randprof_init(), redbasic_form(), 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_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(), dfrn_deliver(), 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(), fetch_url(), 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_max_import_size(), get_pconfig(), get_plink(), Item\get_template_data(), get_theme_screenshot(), get_xconfig(), gprobe_run(), group_aside(), group_content(), group_post(), group_select(), guess_image_type(), handle_tag(), hcard_aside(), hcard_init(), 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(), lrdd(), 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(), nogroup_content(), nogroup_init(), notice(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), oexchange_content(), oexchange_init(), 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(), post_url(), preg_heart(), prepare_body(), probe_content(), proc_run(), profile_activity(), profile_aside(), profile_content(), profile_create_sidebar(), profile_init(), profile_load(), profile_photo_aside(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profile_tabs(), profiles_aside(), profiles_content(), profiles_init(), profiles_post(), profperm_aside(), profperm_content(), profperm_init(), push_lang(), queue_run(), randprof_init(), redbasic_form(), 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().

      -- cgit v1.2.3 From df66c510c9e47750ec7382d6933ff72372c426c1 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 29 Nov 2013 00:57:47 -0800 Subject: allow zot-info to return results for address= with webbies or naked nicknames --- mod/zfinger.php | 3 +- util/messages.po | 7031 +++++++++++++++++++------------------ version.inc | 2 +- view/theme/redbasic/css/style.css | 3 +- 4 files changed, 3536 insertions(+), 3503 deletions(-) diff --git a/mod/zfinger.php b/mod/zfinger.php index 2eb6adc75..ff1bf3a35 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -53,7 +53,8 @@ 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' limit 1", + where ( channel_address = '%s' or xchan_addr = '%s' ) limit 1", + dbesc($zaddr), dbesc($zaddr) ); } diff --git a/util/messages.po b/util/messages.po index 2156e2ef9..d0b4e1b21 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2013-11-27.510\n" +"Project-Id-Version: 2013-11-29.512\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-28 09:40+0100\n" +"POT-Creation-Date: 2013-11-29 00:03-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,693 +18,593 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: ../../view/theme/red-theme-bootstrap/php/config.php:90 -#: ../../view/theme/redstrap/php/config.php:131 -#: ../../view/theme/redstrap3/php/config.php:51 -#: ../../view/theme/redbasic/php/config.php:85 -#: ../../view/theme/redstrap-multiengine/php/config.php:131 -#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:91 -#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:111 -#: ../../view/theme/redmatrixthemes/newsportal/php/config.php:63 -#: ../../view/theme/redmatrixthemes/newsportal/php/config.php:74 -#: ../../view/theme/redmatrixthemes/bookbasic/php/config.php:63 -#: ../../view/theme/redmatrixthemes/bookbasic/php/config.php:74 -#: ../../include/ItemObject.php:530 ../../mod/message.php:333 -#: ../../mod/message.php:515 ../../mod/poke.php:166 ../../mod/fsuggest.php:108 -#: ../../mod/mood.php:137 ../../mod/crepair.php:166 ../../mod/connect.php:96 -#: ../../mod/admin.php:418 ../../mod/admin.php:683 ../../mod/admin.php:823 -#: ../../mod/admin.php:1022 ../../mod/admin.php:1109 -#: ../../mod/connections.php:452 ../../mod/import.php:385 -#: ../../mod/invite.php:154 ../../mod/group.php:87 ../../mod/photos.php:685 -#: ../../mod/photos.php:779 ../../mod/photos.php:1040 -#: ../../mod/photos.php:1080 ../../mod/photos.php:1167 ../../mod/thing.php:190 -#: ../../mod/setup.php:302 ../../mod/setup.php:345 ../../mod/sources.php:83 -#: ../../mod/sources.php:110 ../../mod/settings.php:651 -#: ../../mod/settings.php:763 ../../mod/settings.php:791 -#: ../../mod/settings.php:815 ../../mod/settings.php:886 -#: ../../mod/settings.php:1054 ../../mod/profiles.php:529 -#: ../../mod/events.php:458 -msgid "Submit" +#: ../../include/acl_selectors.php:235 +msgid "Visible to everybody" msgstr "" -#: ../../view/theme/red-theme-bootstrap/php/config.php:92 -#: ../../view/theme/redstrap/php/config.php:133 -#: ../../view/theme/redstrap3/php/config.php:54 -#: ../../view/theme/redbasic/php/config.php:88 -#: ../../view/theme/redstrap-multiengine/php/config.php:133 -#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:93 -#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:113 -#: ../../view/theme/redmatrixthemes/newsportal/php/config.php:65 -#: ../../view/theme/redmatrixthemes/newsportal/php/config.php:76 -#: ../../view/theme/redmatrixthemes/bookbasic/php/config.php:65 -#: ../../view/theme/redmatrixthemes/bookbasic/php/config.php:76 -msgid "Theme settings" +#: ../../include/acl_selectors.php:236 +msgid "show" msgstr "" -#: ../../view/theme/red-theme-bootstrap/php/config.php:93 -#: ../../view/theme/redstrap/php/config.php:134 -#: ../../view/theme/redbasic/php/config.php:99 -#: ../../view/theme/redstrap-multiengine/php/config.php:134 -#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:94 -#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:114 -#: ../../view/theme/redmatrixthemes/newsportal/php/config.php:66 -#: ../../view/theme/redmatrixthemes/newsportal/php/config.php:77 -#: ../../view/theme/redmatrixthemes/bookbasic/php/config.php:66 -#: ../../view/theme/redmatrixthemes/bookbasic/php/config.php:77 -msgid "Set font-size for posts and comments" +#: ../../include/acl_selectors.php:237 +msgid "don't show" msgstr "" -#: ../../view/theme/red-theme-bootstrap/php/config.php:94 -#: ../../view/theme/redstrap/php/config.php:135 -#: ../../view/theme/redstrap-multiengine/php/config.php:135 -#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:96 -#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:116 -#: ../../view/theme/redmatrixthemes/newsportal/php/config.php:67 -#: ../../view/theme/redmatrixthemes/newsportal/php/config.php:79 -#: ../../view/theme/redmatrixthemes/bookbasic/php/config.php:67 -#: ../../view/theme/redmatrixthemes/bookbasic/php/config.php:79 -msgid "Set line-height for posts and comments" +#: ../../include/activities.php:37 +msgid " and " msgstr "" -#: ../../view/theme/red-theme-bootstrap/php/config.php:95 -#: ../../view/theme/redstrap/php/config.php:140 -#: ../../view/theme/redstrap-multiengine/php/config.php:140 -#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:98 -msgid "Display colour of links - hex value, do not include the #" +#: ../../include/activities.php:45 +msgid "public profile" msgstr "" -#: ../../view/theme/redstrap/php/config.php:136 -#: ../../view/theme/redstrap-multiengine/php/config.php:136 -msgid "Set colour scheme" +#: ../../include/activities.php:50 +#, php-format +msgid "%1$s changed %2$s to “%3$s”" msgstr "" -#: ../../view/theme/redstrap/php/config.php:137 -#: ../../view/theme/redstrap-multiengine/php/config.php:137 -#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:104 -#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:120 -msgid "Draw shadows" +#: ../../include/activities.php:51 +#, php-format +msgid "Visit %1$s's %2$s" msgstr "" -#: ../../view/theme/redstrap/php/config.php:138 -#: ../../view/theme/redstrap3/php/config.php:56 -#: ../../view/theme/redbasic/php/config.php:90 -#: ../../view/theme/redstrap-multiengine/php/config.php:138 -#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:97 -#: ../../view/theme/redmatrixthemes/newsportal/php/config.php:68 -#: ../../view/theme/redmatrixthemes/bookbasic/php/config.php:68 -msgid "Navigation bar colour" +#: ../../include/activities.php:54 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../view/theme/redstrap/php/config.php:139 -#: ../../view/theme/redstrap-multiengine/php/config.php:139 -msgid "Display style" +#: ../../include/enotify.php:36 +msgid "Red Matrix Notification" msgstr "" -#: ../../view/theme/redstrap/php/config.php:141 -#: ../../view/theme/redstrap-multiengine/php/config.php:141 -#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:99 -msgid "Icons" +#: ../../include/enotify.php:37 +msgid "redmatrix" msgstr "" -#: ../../view/theme/redstrap/php/config.php:142 -#: ../../view/theme/redstrap-multiengine/php/config.php:142 -msgid "Shiny style" +#: ../../include/enotify.php:39 +msgid "Thank You," msgstr "" -#: ../../view/theme/redstrap3/php/config.php:28 -#: ../../view/theme/redbasic/php/config.php:62 ../../include/comanche.php:35 -msgid "Default" +#: ../../include/enotify.php:41 +#, php-format +msgid "%s Administrator" msgstr "" -#: ../../view/theme/redstrap3/php/config.php:40 -#: ../../view/theme/redbasic/php/config.php:74 -msgid "Scheme Default" +#: ../../include/enotify.php:76 +#, php-format +msgid "%s " msgstr "" -#: ../../view/theme/redstrap3/php/config.php:41 -#: ../../view/theme/redbasic/php/config.php:75 -msgid "red" +#: ../../include/enotify.php:80 +#, php-format +msgid "[Red:Notify] New mail received at %s" msgstr "" -#: ../../view/theme/redstrap3/php/config.php:42 -#: ../../view/theme/redbasic/php/config.php:76 -msgid "black" +#: ../../include/enotify.php:82 +#, php-format +msgid "%1$s, %2$s sent you a new private message at %3$s." msgstr "" -#: ../../view/theme/redstrap3/php/config.php:43 -#: ../../view/theme/redbasic/php/config.php:77 -msgid "silver" +#: ../../include/enotify.php:83 +#, php-format +msgid "%1$s sent you %2$s." msgstr "" -#: ../../view/theme/redstrap3/php/config.php:55 -#: ../../view/theme/redbasic/php/config.php:89 -msgid "Set scheme" +#: ../../include/enotify.php:83 +msgid "a private message" msgstr "" -#: ../../view/theme/redbasic/php/config.php:91 -msgid "Set font-colour for banner" +#: ../../include/enotify.php:84 +#, php-format +msgid "Please visit %s to view and/or reply to your private messages." msgstr "" -#: ../../view/theme/redbasic/php/config.php:92 -msgid "Set the background colour" +#: ../../include/enotify.php:135 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]" msgstr "" -#: ../../view/theme/redbasic/php/config.php:93 -msgid "Set the background image" +#: ../../include/enotify.php:143 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]" msgstr "" -#: ../../view/theme/redbasic/php/config.php:94 -msgid "Set the background colour of items" +#: ../../include/enotify.php:152 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]" msgstr "" -#: ../../view/theme/redbasic/php/config.php:95 -msgid "Set the opacity of items" +#: ../../include/enotify.php:163 +#, php-format +msgid "[Red:Notify] Comment to conversation #%1$d by %2$s" msgstr "" -#: ../../view/theme/redbasic/php/config.php:96 -msgid "Set the basic colour for item icons" +#: ../../include/enotify.php:164 +#, php-format +msgid "%1$s, %2$s commented on an item/conversation you have been following." msgstr "" -#: ../../view/theme/redbasic/php/config.php:97 -msgid "Set the hover colour for item icons" +#: ../../include/enotify.php:167 ../../include/enotify.php:186 +#: ../../include/enotify.php:212 ../../include/enotify.php:231 +#: ../../include/enotify.php:245 +#, php-format +msgid "Please visit %s to view and/or reply to the conversation." msgstr "" -#: ../../view/theme/redbasic/php/config.php:98 -msgid "Set font-size for the entire application" +#: ../../include/enotify.php:174 +#, php-format +msgid "[Red:Notify] %s posted to your profile wall" msgstr "" -#: ../../view/theme/redbasic/php/config.php:100 -msgid "Set font-colour for posts and comments" +#: ../../include/enotify.php:176 +#, php-format +msgid "%1$s, %2$s posted to your profile wall at %3$s" msgstr "" -#: ../../view/theme/redbasic/php/config.php:101 -msgid "Set radius of corners" +#: ../../include/enotify.php:178 +#, php-format +msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" msgstr "" -#: ../../view/theme/redbasic/php/config.php:102 -msgid "Set shadow depth of photos" +#: ../../include/enotify.php:205 +#, php-format +msgid "[Red:Notify] %s tagged you" msgstr "" -#: ../../view/theme/redbasic/php/config.php:103 -msgid "Set maximum width of conversation regions" +#: ../../include/enotify.php:206 +#, php-format +msgid "%1$s, %2$s tagged you at %3$s" msgstr "" -#: ../../view/theme/redbasic/php/config.php:104 -msgid "Set minimum opacity of nav bar - to hide it" +#: ../../include/enotify.php:207 +#, php-format +msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." msgstr "" -#: ../../view/theme/redbasic/php/config.php:105 -msgid "Set size of conversation author photo" +#: ../../include/enotify.php:220 +#, php-format +msgid "[Red:Notify] %1$s poked you" msgstr "" -#: ../../view/theme/redbasic/php/config.php:106 -msgid "Set size of followup author photos" +#: ../../include/enotify.php:221 +#, php-format +msgid "%1$s, %2$s poked you at %3$s" msgstr "" -#: ../../view/theme/redbasic/php/config.php:107 -msgid "Sloppy photo albums" +#: ../../include/enotify.php:222 +#, php-format +msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." msgstr "" -#: ../../view/theme/redbasic/php/config.php:107 -msgid "Are you a clean desk or a messy desk person?" +#: ../../include/enotify.php:238 +#, php-format +msgid "[Red:Notify] %s tagged your post" msgstr "" -#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:95 -#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:115 -msgid "Set background image" +#: ../../include/enotify.php:239 +#, php-format +msgid "%1$s, %2$s tagged your post at %3$s" msgstr "" -#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:100 -msgid "Corner radius" +#: ../../include/enotify.php:240 +#, php-format +msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" msgstr "" -#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:100 -msgid "0-99 default: 5" +#: ../../include/enotify.php:252 +msgid "[Red:Notify] Introduction received" msgstr "" -#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:101 -msgid "Section and Aside BG color (hex without #)" +#: ../../include/enotify.php:253 +#, php-format +msgid "%1$s, you've received an introduction from '%2$s' at %3$s" msgstr "" -#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:102 -#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:118 -msgid "Section and Aside BG opacity (float: 0.80 - 1.00)" +#: ../../include/enotify.php:254 +#, php-format +msgid "%1$s, you've received [zrl=%2$s]an introduction[/zrl] from %3$s." msgstr "" -#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:103 -#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:119 -msgid "Text color in Aside and Section (hex without #)" +#: ../../include/enotify.php:258 ../../include/enotify.php:277 +#, php-format +msgid "You may visit their profile at %s" msgstr "" -#: ../../view/theme/redmatrixthemes/blogbasic/php/config.php:117 -#: ../../view/theme/redmatrixthemes/newsportal/php/config.php:78 -#: ../../view/theme/redmatrixthemes/bookbasic/php/config.php:78 -msgid "Colour of the navigation bar" +#: ../../include/enotify.php:260 +#, php-format +msgid "Please visit %s to approve or reject the introduction." msgstr "" -#: ../../boot.php:1274 -#, php-format -msgid "Update %s failed. See error logs." +#: ../../include/enotify.php:267 +msgid "[Red:Notify] Friend suggestion received" msgstr "" -#: ../../boot.php:1277 +#: ../../include/enotify.php:268 #, php-format -msgid "Update Error at %s" +msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" msgstr "" -#: ../../boot.php:1434 +#: ../../include/enotify.php:269 +#, php-format msgid "" -"Create an account to access services and applications within the Red Matrix" +"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s." msgstr "" -#: ../../boot.php:1435 ../../include/nav.php:125 ../../mod/register.php:195 -msgid "Register" +#: ../../include/enotify.php:275 +msgid "Name:" msgstr "" -#: ../../boot.php:1458 ../../include/nav.php:72 ../../include/nav.php:87 -msgid "Logout" +#: ../../include/enotify.php:276 +msgid "Photo:" msgstr "" -#: ../../boot.php:1459 ../../include/nav.php:85 -msgid "Login" +#: ../../include/enotify.php:279 +#, php-format +msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: ../../boot.php:1461 ../../include/contact_selectors.php:77 -#: ../../mod/admin.php:686 ../../mod/admin.php:695 -msgid "Email" +#: ../../include/ItemObject.php:88 ../../mod/photos.php:952 +msgid "Private Message" msgstr "" -#: ../../boot.php:1462 -msgid "Password" +#: ../../include/ItemObject.php:95 ../../include/page_widgets.php:8 +#: ../../mod/webpages.php:101 ../../mod/settings.php:713 ../../mod/menu.php:55 +#: ../../mod/layouts.php:102 ../../mod/editlayout.php:100 +#: ../../mod/editwebpage.php:119 ../../mod/blocks.php:93 +#: ../../mod/editpost.php:97 ../../mod/editblock.php:114 +msgid "Edit" msgstr "" -#: ../../boot.php:1463 -msgid "Remember me" +#: ../../include/ItemObject.php:107 ../../include/conversation.php:628 +#: ../../mod/settings.php:714 ../../mod/admin.php:690 ../../mod/group.php:182 +#: ../../mod/photos.php:1130 ../../mod/connections.php:374 +#: ../../mod/filestorage.php:82 +msgid "Delete" msgstr "" -#: ../../boot.php:1468 -msgid "Forgot your password?" +#: ../../include/ItemObject.php:113 ../../include/conversation.php:627 +msgid "Select" msgstr "" -#: ../../boot.php:1469 ../../mod/lostpass.php:85 -msgid "Password Reset" +#: ../../include/ItemObject.php:117 +msgid "save to folder" msgstr "" -#: ../../boot.php:1533 -msgid "permission denied" +#: ../../include/ItemObject.php:145 +msgid "add star" msgstr "" -#: ../../boot.php:1534 -msgid "Got Zot?" +#: ../../include/ItemObject.php:146 +msgid "remove star" msgstr "" -#: ../../boot.php:1593 -msgid "Requested channel is not available." +#: ../../include/ItemObject.php:147 +msgid "toggle star status" msgstr "" -#: ../../boot.php:1605 -msgid " Sorry, you don't have the permission to view this profile. " +#: ../../include/ItemObject.php:151 +msgid "starred" msgstr "" -#: ../../boot.php:1640 ../../mod/connect.php:13 ../../mod/blocks.php:10 -#: ../../mod/profile.php:8 ../../mod/webpages.php:8 -#: ../../mod/filestorage.php:8 ../../mod/layouts.php:8 -msgid "Requested profile is not available." +#: ../../include/ItemObject.php:160 ../../include/conversation.php:638 +msgid "Message is verified" msgstr "" -#: ../../boot.php:1741 ../../include/contact_widgets.php:23 -#: ../../include/Contact.php:87 ../../mod/directory.php:198 -#: ../../mod/suggest.php:56 ../../mod/match.php:58 -msgid "Connect" +#: ../../include/ItemObject.php:168 +msgid "add tag" msgstr "" -#: ../../boot.php:1755 ../../mod/profiles.php:624 -msgid "Change profile photo" +#: ../../include/ItemObject.php:174 ../../mod/photos.php:1058 +msgid "I like this (toggle)" msgstr "" -#: ../../boot.php:1761 -msgid "Profiles" +#: ../../include/ItemObject.php:174 ../../include/taxonomy.php:251 +msgid "like" msgstr "" -#: ../../boot.php:1761 -msgid "Manage/edit profiles" +#: ../../include/ItemObject.php:175 ../../mod/photos.php:1059 +msgid "I don't like this (toggle)" msgstr "" -#: ../../boot.php:1762 ../../mod/profiles.php:625 -msgid "Create New Profile" +#: ../../include/ItemObject.php:175 ../../include/taxonomy.php:252 +msgid "dislike" msgstr "" -#: ../../boot.php:1765 -msgid "Edit Profile" +#: ../../include/ItemObject.php:177 +msgid "Share this" msgstr "" -#: ../../boot.php:1776 ../../mod/profiles.php:636 -msgid "Profile Image" -msgstr "" - -#: ../../boot.php:1779 ../../mod/profiles.php:639 -msgid "visible to everybody" +#: ../../include/ItemObject.php:177 +msgid "share" msgstr "" -#: ../../boot.php:1780 ../../mod/profiles.php:640 -msgid "Edit visibility" +#: ../../include/ItemObject.php:201 ../../include/ItemObject.php:202 +#, php-format +msgid "View %s's profile - %s" msgstr "" -#: ../../boot.php:1791 ../../include/event.php:40 -#: ../../include/bb2diaspora.php:455 ../../mod/directory.php:173 -#: ../../mod/events.php:450 -msgid "Location:" +#: ../../include/ItemObject.php:203 +msgid "to" msgstr "" -#: ../../boot.php:1793 ../../include/profile_advanced.php:17 -#: ../../mod/directory.php:175 -msgid "Gender:" +#: ../../include/ItemObject.php:204 +msgid "via" msgstr "" -#: ../../boot.php:1794 ../../include/profile_advanced.php:37 -#: ../../mod/directory.php:177 -msgid "Status:" +#: ../../include/ItemObject.php:205 +msgid "Wall-to-Wall" msgstr "" -#: ../../boot.php:1795 ../../include/profile_advanced.php:48 -#: ../../mod/directory.php:179 -msgid "Homepage:" +#: ../../include/ItemObject.php:206 +msgid "via Wall-To-Wall:" msgstr "" -#: ../../boot.php:1858 ../../boot.php:1938 ../../mod/ping.php:230 -msgid "g A l F d" +#: ../../include/ItemObject.php:216 ../../include/conversation.php:682 +#, php-format +msgid " from %s" msgstr "" -#: ../../boot.php:1859 ../../boot.php:1939 -msgid "F d" +#: ../../include/ItemObject.php:219 ../../include/conversation.php:685 +#, php-format +msgid "last edited: %s" msgstr "" -#: ../../boot.php:1904 ../../boot.php:1979 ../../mod/ping.php:252 -msgid "[today]" +#: ../../include/ItemObject.php:246 ../../include/conversation.php:702 +#: ../../include/conversation.php:1112 ../../mod/photos.php:1061 +#: ../../mod/message.php:332 ../../mod/message.php:516 +#: ../../mod/editlayout.php:109 ../../mod/editwebpage.php:128 +#: ../../mod/editpost.php:106 ../../mod/editblock.php:123 +msgid "Please wait" msgstr "" -#: ../../boot.php:1916 -msgid "Birthday Reminders" -msgstr "" +#: ../../include/ItemObject.php:267 +#, php-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "" +msgstr[1] "" -#: ../../boot.php:1917 -msgid "Birthdays this week:" +#: ../../include/ItemObject.php:268 ../../include/js_strings.php:7 +#: ../../include/contact_widgets.php:148 +msgid "show more" msgstr "" -#: ../../boot.php:1972 -msgid "[No description]" +#: ../../include/ItemObject.php:527 ../../mod/photos.php:1077 +#: ../../mod/photos.php:1164 +msgid "This is you" msgstr "" -#: ../../boot.php:1990 -msgid "Event Reminders" +#: ../../include/ItemObject.php:529 ../../include/js_strings.php:6 +#: ../../mod/photos.php:1079 ../../mod/photos.php:1166 +msgid "Comment" msgstr "" -#: ../../boot.php:1991 -msgid "Events this week:" +#: ../../include/ItemObject.php:530 ../../mod/events.php:458 +#: ../../mod/thing.php:190 ../../mod/invite.php:154 ../../mod/setup.php:302 +#: ../../mod/setup.php:345 ../../mod/settings.php:651 +#: ../../mod/settings.php:763 ../../mod/settings.php:791 +#: ../../mod/settings.php:815 ../../mod/settings.php:886 +#: ../../mod/settings.php:1054 ../../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/photos.php:779 ../../mod/photos.php:1040 +#: ../../mod/photos.php:1080 ../../mod/photos.php:1167 +#: ../../mod/message.php:333 ../../mod/message.php:515 +#: ../../mod/connections.php:452 ../../mod/profiles.php:529 +#: ../../mod/import.php:385 ../../mod/crepair.php:166 ../../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 "" -#: ../../boot.php:2225 -msgid "Channel" +#: ../../include/ItemObject.php:531 +msgid "Bold" msgstr "" -#: ../../boot.php:2228 -msgid "Status Messages and Posts" +#: ../../include/ItemObject.php:532 +msgid "Italic" msgstr "" -#: ../../boot.php:2232 -msgid "About" +#: ../../include/ItemObject.php:533 +msgid "Underline" msgstr "" -#: ../../boot.php:2235 -msgid "Profile Details" +#: ../../include/ItemObject.php:534 +msgid "Quote" msgstr "" -#: ../../boot.php:2239 ../../include/nav.php:79 ../../mod/fbrowser.php:25 -msgid "Photos" +#: ../../include/ItemObject.php:535 +msgid "Code" msgstr "" -#: ../../boot.php:2242 ../../include/photos.php:288 -msgid "Photo Albums" +#: ../../include/ItemObject.php:536 +msgid "Image" msgstr "" -#: ../../boot.php:2250 ../../include/nav.php:174 ../../mod/events.php:348 -msgid "Events" +#: ../../include/ItemObject.php:537 +msgid "Link" msgstr "" -#: ../../boot.php:2253 -msgid "Events and Calendar" +#: ../../include/ItemObject.php:538 +msgid "Video" msgstr "" -#: ../../boot.php:2258 -msgid "Webpages" +#: ../../include/ItemObject.php:539 ../../include/conversation.php:1075 +#: ../../mod/webpages.php:105 ../../mod/photos.php:1081 +#: ../../mod/editlayout.php:129 ../../mod/editwebpage.php:150 +#: ../../mod/editpost.php:126 ../../mod/editblock.php:144 +msgid "Preview" msgstr "" -#: ../../boot.php:2261 -msgid "Manage Webpages" +#: ../../include/ItemObject.php:542 ../../include/conversation.php:1139 +#: ../../mod/message.php:338 ../../mod/message.php:521 +#: ../../mod/editpost.php:134 +msgid "Encrypt text" msgstr "" -#: ../../boot.php:2545 -msgid "toggle mobile" +#: ../../include/Contact.php:87 ../../include/contact_widgets.php:23 +#: ../../mod/match.php:58 ../../mod/suggest.php:56 ../../mod/directory.php:198 +#: ../../boot.php:1741 +msgid "Connect" msgstr "" -#: ../../index.php:178 ../../index.php:340 ../../include/items.php:3593 -#: ../../include/photos.php:15 ../../include/attach.php:102 -#: ../../include/attach.php:133 ../../include/attach.php:189 -#: ../../include/attach.php:204 ../../include/attach.php:237 -#: ../../include/attach.php:251 ../../include/attach.php:272 -#: ../../include/attach.php:464 ../../include/attach.php:539 -#: ../../mod/message.php:208 ../../mod/poke.php:128 ../../mod/viewsrc.php:12 -#: ../../mod/fsuggest.php:78 ../../mod/mood.php:114 -#: ../../mod/profile_photo.php:197 ../../mod/profile_photo.php:210 -#: ../../mod/crepair.php:115 ../../mod/blocks.php:29 ../../mod/blocks.php:44 -#: ../../mod/intro.php:50 ../../mod/new_channel.php:66 -#: ../../mod/new_channel.php:97 ../../mod/mitem.php:92 -#: ../../mod/editwebpage.php:42 ../../mod/editwebpage.php:64 -#: ../../mod/connections.php:197 ../../mod/network.php:7 -#: ../../mod/webpages.php:40 ../../mod/filestorage.php:26 -#: ../../mod/page.php:30 ../../mod/page.php:80 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/delegate.php:6 ../../mod/register.php:68 -#: ../../mod/editpost.php:13 ../../mod/invite.php:13 ../../mod/invite.php:102 -#: ../../mod/group.php:15 ../../mod/regmod.php:18 ../../mod/photos.php:74 -#: ../../mod/photos.php:654 ../../mod/editlayout.php:48 -#: ../../mod/common.php:43 ../../mod/layouts.php:27 ../../mod/layouts.php:42 -#: ../../mod/viewconnections.php:33 ../../mod/viewconnections.php:38 -#: ../../mod/suggest.php:32 ../../mod/menu.php:40 -#: ../../mod/notifications.php:66 ../../mod/editblock.php:48 -#: ../../mod/setup.php:200 ../../mod/sources.php:48 ../../mod/settings.php:628 -#: ../../mod/item.php:181 ../../mod/item.php:189 ../../mod/manage.php:6 -#: ../../mod/allfriends.php:10 ../../mod/nogroup.php:25 -#: ../../mod/channel.php:123 ../../mod/profiles.php:163 -#: ../../mod/profiles.php:476 ../../mod/events.php:134 -msgid "Permission denied." +#: ../../include/Contact.php:103 +msgid "New window" msgstr "" -#: ../../index.php:226 ../../mod/help.php:53 -msgid "Not Found" +#: ../../include/Contact.php:104 +msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../index.php:229 ../../mod/display.php:92 ../../mod/page.php:83 -#: ../../mod/help.php:56 -msgid "Page not found." +#: ../../include/Contact.php:524 ../../include/conversation.php:930 +msgid "Poke" msgstr "" -#: ../../index.php:339 ../../include/items.php:201 ../../mod/profperm.php:28 -#: ../../mod/group.php:74 ../../mod/like.php:55 -msgid "Permission denied" +#: ../../include/Contact.php:525 ../../include/conversation.php:924 +msgid "View Status" msgstr "" -#: ../../include/message.php:18 -msgid "No recipient provided." +#: ../../include/Contact.php:526 ../../include/nav.php:76 +#: ../../include/conversation.php:925 ../../mod/connections.php:327 +#: ../../mod/connections.php:441 +msgid "View Profile" msgstr "" -#: ../../include/message.php:23 -msgid "[no subject]" +#: ../../include/Contact.php:527 ../../include/conversation.php:926 +msgid "View Photos" msgstr "" -#: ../../include/message.php:42 -msgid "Unable to determine sender." +#: ../../include/Contact.php:528 +msgid "Network Posts" msgstr "" -#: ../../include/message.php:143 -msgid "Stored post could not be verified." +#: ../../include/Contact.php:529 ../../include/conversation.php:928 +msgid "Edit Contact" msgstr "" -#: ../../include/bbcode.php:94 ../../include/bbcode.php:494 -#: ../../include/bbcode.php:497 -msgid "Image/photo" +#: ../../include/Contact.php:530 ../../include/conversation.php:929 +msgid "Send PM" msgstr "" -#: ../../include/bbcode.php:126 ../../include/bbcode.php:502 -msgid "Encrypted content" +#: ../../include/contact_selectors.php:30 +msgid "Unknown | Not categorised" msgstr "" -#: ../../include/bbcode.php:173 -#, php-format -msgid "%1$s wrote the following %2$s %3$s" +#: ../../include/contact_selectors.php:31 +msgid "Block immediately" msgstr "" -#: ../../include/bbcode.php:175 -msgid "post" +#: ../../include/contact_selectors.php:32 +msgid "Shady, spammer, self-marketer" msgstr "" -#: ../../include/bbcode.php:454 ../../include/bbcode.php:474 -msgid "$1 wrote:" +#: ../../include/contact_selectors.php:33 +msgid "Known to me, but no opinion" msgstr "" -#: ../../include/dir_fns.php:15 -msgid "Sort Options" +#: ../../include/contact_selectors.php:34 +msgid "OK, probably harmless" msgstr "" -#: ../../include/dir_fns.php:16 -msgid "Alphabetic" +#: ../../include/contact_selectors.php:35 +msgid "Reputable, has my trust" msgstr "" -#: ../../include/dir_fns.php:17 -msgid "Reverse Alphabetic" +#: ../../include/contact_selectors.php:54 +msgid "Frequently" msgstr "" -#: ../../include/dir_fns.php:18 -msgid "Newest to Oldest" +#: ../../include/contact_selectors.php:55 +msgid "Hourly" msgstr "" -#: ../../include/dir_fns.php:29 -msgid "Enable Safe Search" +#: ../../include/contact_selectors.php:56 +msgid "Twice daily" msgstr "" -#: ../../include/dir_fns.php:31 -msgid "Disable Safe Search" +#: ../../include/contact_selectors.php:57 +msgid "Daily" msgstr "" -#: ../../include/dir_fns.php:33 -msgid "Safe Mode" +#: ../../include/contact_selectors.php:58 +msgid "Weekly" msgstr "" -#: ../../include/widgets.php:26 ../../include/contact_widgets.php:110 -msgid "Categories" +#: ../../include/contact_selectors.php:59 +msgid "Monthly" msgstr "" -#: ../../include/account.php:23 -msgid "Not a valid email address" +#: ../../include/contact_selectors.php:74 +msgid "Friendica" msgstr "" -#: ../../include/account.php:25 -msgid "Your email domain is not among those allowed on this site" +#: ../../include/contact_selectors.php:75 +msgid "OStatus" msgstr "" -#: ../../include/account.php:31 -msgid "Your email address is already registered at this site." +#: ../../include/contact_selectors.php:76 +msgid "RSS/Atom" msgstr "" -#: ../../include/account.php:64 -msgid "An invitation is required." +#: ../../include/contact_selectors.php:77 ../../mod/admin.php:686 +#: ../../mod/admin.php:695 ../../boot.php:1461 +msgid "Email" msgstr "" -#: ../../include/account.php:68 -msgid "Invitation could not be verified." +#: ../../include/contact_selectors.php:78 +msgid "Diaspora" msgstr "" -#: ../../include/account.php:118 -msgid "Please enter the required information." +#: ../../include/contact_selectors.php:79 +msgid "Facebook" msgstr "" -#: ../../include/account.php:186 -msgid "Failed to store account information." +#: ../../include/contact_selectors.php:80 +msgid "Zot!" msgstr "" -#: ../../include/account.php:272 -#, php-format -msgid "Registration request at %s" +#: ../../include/contact_selectors.php:81 +msgid "LinkedIn" msgstr "" -#: ../../include/account.php:274 ../../include/account.php:301 -#: ../../include/account.php:358 -msgid "Administrator" +#: ../../include/contact_selectors.php:82 +msgid "XMPP/IM" msgstr "" -#: ../../include/account.php:296 -msgid "your registration password" +#: ../../include/contact_selectors.php:83 +msgid "MySpace" msgstr "" -#: ../../include/account.php:299 ../../include/account.php:356 -#, php-format -msgid "Registration details for %s" +#: ../../include/datetime.php:43 ../../include/datetime.php:45 +msgid "Miscellaneous" msgstr "" -#: ../../include/account.php:365 -msgid "Account approved." +#: ../../include/datetime.php:152 ../../include/datetime.php:284 +msgid "year" msgstr "" -#: ../../include/account.php:399 -#, php-format -msgid "Registration revoked for %s" +#: ../../include/datetime.php:157 ../../include/datetime.php:285 +msgid "month" msgstr "" -#: ../../include/taxonomy.php:210 -msgid "Tags" +#: ../../include/datetime.php:162 ../../include/datetime.php:287 +msgid "day" msgstr "" -#: ../../include/taxonomy.php:224 -msgid "Keywords" +#: ../../include/datetime.php:275 +msgid "never" msgstr "" -#: ../../include/taxonomy.php:249 -msgid "have" +#: ../../include/datetime.php:281 +msgid "less than a second ago" 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 ../../include/ItemObject.php:174 -msgid "like" -msgstr "" - -#: ../../include/taxonomy.php:251 -msgid "likes" -msgstr "" - -#: ../../include/taxonomy.php:252 ../../include/ItemObject.php:175 -msgid "dislike" -msgstr "" - -#: ../../include/taxonomy.php:252 -msgid "dislikes" -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" +#: ../../include/datetime.php:284 +msgid "years" msgstr "" #: ../../include/datetime.php:285 @@ -752,408 +652,283 @@ msgstr "" msgid "%1$d %2$s ago" msgstr "" -#: ../../include/text.php:309 -msgid "prev" +#: ../../include/dba/dba_driver.php:50 +#, php-format +msgid "Cannot locate DNS info for database server '%s'" msgstr "" -#: ../../include/text.php:311 -msgid "first" +#: ../../include/event.php:11 ../../include/bb2diaspora.php:433 +msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../include/text.php:340 -msgid "last" +#: ../../include/event.php:20 ../../include/bb2diaspora.php:439 +msgid "Starts:" msgstr "" -#: ../../include/text.php:343 -msgid "next" +#: ../../include/event.php:30 ../../include/bb2diaspora.php:447 +msgid "Finishes:" msgstr "" -#: ../../include/text.php:355 -msgid "older" +#: ../../include/event.php:40 ../../include/bb2diaspora.php:455 +#: ../../mod/events.php:450 ../../mod/directory.php:173 ../../boot.php:1791 +msgid "Location:" msgstr "" -#: ../../include/text.php:357 -msgid "newer" +#: ../../include/features.php:21 +msgid "General Features" msgstr "" -#: ../../include/text.php:648 -msgid "No connections" +#: ../../include/features.php:23 +msgid "Content Expiration" msgstr "" -#: ../../include/text.php:659 -#, php-format -msgid "%d Connection" -msgid_plural "%d Connections" -msgstr[0] "" -msgstr[1] "" +#: ../../include/features.php:23 +msgid "Remove posts/comments and/or private messages at a future time" +msgstr "" -#: ../../include/text.php:671 -msgid "View Connections" +#: ../../include/features.php:24 +msgid "Multiple Profiles" msgstr "" -#: ../../include/text.php:730 ../../include/nav.php:135 -#: ../../mod/search.php:96 -msgid "Search" +#: ../../include/features.php:24 +msgid "Ability to create multiple profiles" msgstr "" -#: ../../include/text.php:732 ../../mod/filer.php:36 -msgid "Save" +#: ../../include/features.php:25 +msgid "Web Pages" msgstr "" -#: ../../include/text.php:770 -msgid "poke" +#: ../../include/features.php:25 +msgid "Provide managed web pages on your channel" msgstr "" -#: ../../include/text.php:770 ../../include/conversation.php:236 -msgid "poked" +#: ../../include/features.php:26 +msgid "Enhanced Photo Albums" msgstr "" -#: ../../include/text.php:771 -msgid "ping" +#: ../../include/features.php:26 +msgid "Enable photo album with enhanced features" msgstr "" -#: ../../include/text.php:771 -msgid "pinged" +#: ../../include/features.php:28 +msgid "Extended Identity Sharing" msgstr "" -#: ../../include/text.php:772 -msgid "prod" +#: ../../include/features.php:28 ../../include/js_strings.php:30 +msgid " " msgstr "" -#: ../../include/text.php:772 -msgid "prodded" +#: ../../include/features.php:29 +msgid "Expert Mode" msgstr "" -#: ../../include/text.php:773 -msgid "slap" +#: ../../include/features.php:29 +msgid "Enable Expert Mode to provide advanced configuration options" msgstr "" -#: ../../include/text.php:773 -msgid "slapped" +#: ../../include/features.php:30 +msgid "Premium Channel" msgstr "" -#: ../../include/text.php:774 -msgid "finger" +#: ../../include/features.php:30 +msgid "" +"Allows you to set restrictions and terms on those that connect with your " +"channel" msgstr "" -#: ../../include/text.php:774 -msgid "fingered" +#: ../../include/features.php:35 +msgid "Post Composition Features" msgstr "" -#: ../../include/text.php:775 -msgid "rebuff" +#: ../../include/features.php:36 +msgid "Richtext Editor" msgstr "" -#: ../../include/text.php:775 -msgid "rebuffed" +#: ../../include/features.php:36 +msgid "Enable richtext editor" msgstr "" -#: ../../include/text.php:787 -msgid "happy" +#: ../../include/features.php:37 +msgid "Post Preview" msgstr "" -#: ../../include/text.php:788 -msgid "sad" +#: ../../include/features.php:37 +msgid "Allow previewing posts and comments before publishing them" msgstr "" -#: ../../include/text.php:789 -msgid "mellow" +#: ../../include/features.php:38 ../../mod/settings.php:120 +#: ../../mod/sources.php:67 +msgid "Channel Sources" msgstr "" -#: ../../include/text.php:790 -msgid "tired" +#: ../../include/features.php:38 +msgid "Automatically import channel content from other channels or feeds" msgstr "" -#: ../../include/text.php:791 -msgid "perky" +#: ../../include/features.php:39 +msgid "Even More Encryption" msgstr "" -#: ../../include/text.php:792 -msgid "angry" +#: ../../include/features.php:39 +msgid "Allow encryption of content end-to-end with a shared secret key" msgstr "" -#: ../../include/text.php:793 -msgid "stupified" +#: ../../include/features.php:44 +msgid "Network and Stream Filtering" msgstr "" -#: ../../include/text.php:794 -msgid "puzzled" +#: ../../include/features.php:45 +msgid "Search by Date" msgstr "" -#: ../../include/text.php:795 -msgid "interested" +#: ../../include/features.php:45 +msgid "Ability to select posts by date ranges" msgstr "" -#: ../../include/text.php:796 -msgid "bitter" +#: ../../include/features.php:46 +msgid "Collections Filter" msgstr "" -#: ../../include/text.php:797 -msgid "cheerful" +#: ../../include/features.php:46 +msgid "Enable widget to display Network posts only from selected collections" msgstr "" -#: ../../include/text.php:798 -msgid "alive" +#: ../../include/features.php:47 ../../mod/search.php:17 +#: ../../mod/network.php:173 +msgid "Saved Searches" msgstr "" -#: ../../include/text.php:799 -msgid "annoyed" +#: ../../include/features.php:47 +msgid "Save search terms for re-use" msgstr "" -#: ../../include/text.php:800 -msgid "anxious" +#: ../../include/features.php:48 +msgid "Network Personal Tab" msgstr "" -#: ../../include/text.php:801 -msgid "cranky" +#: ../../include/features.php:48 +msgid "Enable tab to display only Network posts that you've interacted on" msgstr "" -#: ../../include/text.php:802 -msgid "disturbed" +#: ../../include/features.php:49 +msgid "Network New Tab" msgstr "" -#: ../../include/text.php:803 -msgid "frustrated" +#: ../../include/features.php:49 +msgid "Enable tab to display all new Network activity" msgstr "" -#: ../../include/text.php:804 -msgid "motivated" +#: ../../include/features.php:50 +msgid "Affinity Tool" msgstr "" -#: ../../include/text.php:805 -msgid "relaxed" +#: ../../include/features.php:50 +msgid "Filter stream activity by depth of relationships" msgstr "" -#: ../../include/text.php:806 -msgid "surprised" +#: ../../include/features.php:55 +msgid "Post/Comment Tools" msgstr "" -#: ../../include/text.php:970 -msgid "Monday" +#: ../../include/features.php:57 +msgid "Edit Sent Posts" msgstr "" -#: ../../include/text.php:970 -msgid "Tuesday" +#: ../../include/features.php:57 +msgid "Edit and correct posts and comments after sending" msgstr "" -#: ../../include/text.php:970 -msgid "Wednesday" +#: ../../include/features.php:58 +msgid "Tagging" msgstr "" -#: ../../include/text.php:970 -msgid "Thursday" +#: ../../include/features.php:58 +msgid "Ability to tag existing posts" msgstr "" -#: ../../include/text.php:970 -msgid "Friday" +#: ../../include/features.php:59 +msgid "Post Categories" msgstr "" -#: ../../include/text.php:970 -msgid "Saturday" +#: ../../include/features.php:59 +msgid "Add categories to your posts" msgstr "" -#: ../../include/text.php:970 -msgid "Sunday" +#: ../../include/features.php:60 ../../include/contact_widgets.php:76 +msgid "Saved Folders" msgstr "" -#: ../../include/text.php:974 -msgid "January" +#: ../../include/features.php:60 +msgid "Ability to file posts under folders" msgstr "" -#: ../../include/text.php:974 -msgid "February" +#: ../../include/features.php:61 +msgid "Dislike Posts" msgstr "" -#: ../../include/text.php:974 -msgid "March" +#: ../../include/features.php:61 +msgid "Ability to dislike posts/comments" msgstr "" -#: ../../include/text.php:974 -msgid "April" +#: ../../include/features.php:62 +msgid "Star Posts" msgstr "" -#: ../../include/text.php:974 -msgid "May" +#: ../../include/features.php:62 +msgid "Ability to mark special posts with a star indicator" msgstr "" -#: ../../include/text.php:974 -msgid "June" +#: ../../include/features.php:63 +msgid "Tag Cloud" msgstr "" -#: ../../include/text.php:974 -msgid "July" +#: ../../include/features.php:63 +msgid "Provide a personal tag cloud on your channel page" msgstr "" -#: ../../include/text.php:974 -msgid "August" +#: ../../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/text.php:974 -msgid "September" -msgstr "" - -#: ../../include/text.php:974 -msgid "October" -msgstr "" - -#: ../../include/text.php:974 -msgid "November" -msgstr "" - -#: ../../include/text.php:974 -msgid "December" -msgstr "" - -#: ../../include/text.php:1052 ../../mod/message.php:453 -msgid "unknown.???" -msgstr "" - -#: ../../include/text.php:1053 ../../mod/message.php:454 -msgid "bytes" -msgstr "" - -#: ../../include/text.php:1088 -msgid "remove category" -msgstr "" - -#: ../../include/text.php:1110 -msgid "remove from file" -msgstr "" - -#: ../../include/text.php:1164 ../../include/text.php:1176 -msgid "Click to open/close" -msgstr "" - -#: ../../include/text.php:1352 ../../mod/events.php:326 -msgid "link to source" -msgstr "" - -#: ../../include/text.php:1371 -msgid "Select a page layout: " -msgstr "" - -#: ../../include/text.php:1374 ../../include/text.php:1439 -msgid "default" -msgstr "" - -#: ../../include/text.php:1410 -msgid "Page content type: " -msgstr "" - -#: ../../include/text.php:1451 -msgid "Select an alternate language" -msgstr "" - -#: ../../include/text.php:1603 ../../include/conversation.php:117 -#: ../../mod/subthread.php:89 ../../mod/tagger.php:45 ../../mod/like.php:103 -msgid "photo" -msgstr "" - -#: ../../include/text.php:1606 ../../include/conversation.php:120 -#: ../../mod/tagger.php:49 -msgid "event" -msgstr "" - -#: ../../include/text.php:1609 ../../include/conversation.php:145 -#: ../../mod/subthread.php:89 ../../mod/tagger.php:53 ../../mod/like.php:103 -msgid "status" -msgstr "" - -#: ../../include/text.php:1611 ../../include/conversation.php:147 -#: ../../mod/tagger.php:55 -msgid "comment" -msgstr "" - -#: ../../include/text.php:1616 -msgid "activity" -msgstr "" - -#: ../../include/text.php:1878 -msgid "Design" -msgstr "" - -#: ../../include/text.php:1880 -msgid "Blocks" -msgstr "" - -#: ../../include/text.php:1881 -msgid "Menus" -msgstr "" - -#: ../../include/text.php:1882 -msgid "Layouts" -msgstr "" - -#: ../../include/text.php:1883 -msgid "Pages" -msgstr "" - -#: ../../include/dba/dba_driver.php:50 -#, php-format -msgid "Cannot locate DNS info for database server '%s'" -msgstr "" - -#: ../../include/activities.php:37 -msgid " and " -msgstr "" - -#: ../../include/activities.php:45 -msgid "public profile" -msgstr "" - -#: ../../include/activities.php:50 -#, php-format -msgid "%1$s changed %2$s to “%3$s”" -msgstr "" - -#: ../../include/activities.php:51 -#, php-format -msgid "Visit %1$s's %2$s" +#: ../../include/group.php:223 +msgid "Default privacy group for new contacts" msgstr "" -#: ../../include/activities.php:54 -#, php-format -msgid "%1$s has an updated %2$s, changing %3$s." +#: ../../include/group.php:242 ../../mod/admin.php:695 +msgid "All Channels" msgstr "" -#: ../../include/event.php:11 ../../include/bb2diaspora.php:433 -msgid "l F d, Y \\@ g:i A" +#: ../../include/group.php:264 +msgid "edit" msgstr "" -#: ../../include/event.php:20 ../../include/bb2diaspora.php:439 -msgid "Starts:" +#: ../../include/group.php:285 +msgid "Collections" msgstr "" -#: ../../include/event.php:30 ../../include/bb2diaspora.php:447 -msgid "Finishes:" +#: ../../include/group.php:286 +msgid "Edit collection" msgstr "" -#: ../../include/acl_selectors.php:235 -msgid "Visible to everybody" +#: ../../include/group.php:287 +msgid "Create a new collection" msgstr "" -#: ../../include/acl_selectors.php:236 -msgid "show" +#: ../../include/group.php:288 +msgid "Channels not in any collection" msgstr "" -#: ../../include/acl_selectors.php:237 -msgid "don't show" +#: ../../include/group.php:290 ../../mod/network.php:174 +msgid "add" msgstr "" #: ../../include/js_strings.php:5 msgid "Delete this item?" msgstr "" -#: ../../include/js_strings.php:6 ../../include/ItemObject.php:529 -#: ../../mod/photos.php:1079 ../../mod/photos.php:1166 -msgid "Comment" -msgstr "" - -#: ../../include/js_strings.php:7 ../../include/ItemObject.php:268 -#: ../../include/contact_widgets.php:148 -msgid "show more" -msgstr "" - #: ../../include/js_strings.php:8 msgid "show fewer" msgstr "" @@ -1243,840 +1018,925 @@ msgstr "" msgid "%d years" msgstr "" -#: ../../include/js_strings.php:30 ../../include/features.php:28 -msgid " " -msgstr "" - #: ../../include/js_strings.php:31 msgid "timeago.numbers" msgstr "" -#: ../../include/permissions.php:13 -msgid "Can view my \"public\" stream and posts" +#: ../../include/message.php:18 +msgid "No recipient provided." msgstr "" -#: ../../include/permissions.php:14 -msgid "Can view my \"public\" channel profile" +#: ../../include/message.php:23 +msgid "[no subject]" msgstr "" -#: ../../include/permissions.php:15 -msgid "Can view my \"public\" photo albums" +#: ../../include/message.php:42 +msgid "Unable to determine sender." msgstr "" -#: ../../include/permissions.php:16 -msgid "Can view my \"public\" address book" +#: ../../include/message.php:143 +msgid "Stored post could not be verified." msgstr "" -#: ../../include/permissions.php:17 -msgid "Can view my \"public\" file storage" +#: ../../include/network.php:1113 +msgid "view full size" msgstr "" -#: ../../include/permissions.php:18 -msgid "Can view my \"public\" pages" +#: ../../include/photo/photo_driver.php:609 ../../include/photos.php:51 +#: ../../mod/photos.php:97 ../../mod/photos.php:764 ../../mod/photos.php:786 +#: ../../mod/profile_photo.php:88 ../../mod/profile_photo.php:235 +#: ../../mod/profile_photo.php:346 +msgid "Profile Photos" msgstr "" -#: ../../include/permissions.php:21 -msgid "Can send me their channel stream and posts" +#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:118 +#: ../../mod/profperm.php:112 +msgid "Profile" msgstr "" -#: ../../include/permissions.php:22 -msgid "Can post on my channel page (\"wall\")" +#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1062 +msgid "Full Name:" msgstr "" -#: ../../include/permissions.php:23 -msgid "Can comment on my posts" +#: ../../include/profile_advanced.php:17 ../../mod/directory.php:175 +#: ../../boot.php:1793 +msgid "Gender:" msgstr "" -#: ../../include/permissions.php:24 -msgid "Can send me private mail messages" +#: ../../include/profile_advanced.php:22 +msgid "j F, Y" msgstr "" -#: ../../include/permissions.php:25 -msgid "Can post photos to my photo albums" +#: ../../include/profile_advanced.php:23 +msgid "j F" msgstr "" -#: ../../include/permissions.php:26 -msgid "Can forward to all my channel contacts via post @mentions" +#: ../../include/profile_advanced.php:30 +msgid "Birthday:" msgstr "" -#: ../../include/permissions.php:26 -msgid "Advanced - useful for creating group forum channels" +#: ../../include/profile_advanced.php:34 +msgid "Age:" msgstr "" -#: ../../include/permissions.php:27 -msgid "Can chat with me (when available)" +#: ../../include/profile_advanced.php:37 ../../mod/directory.php:177 +#: ../../boot.php:1794 +msgid "Status:" msgstr "" -#: ../../include/permissions.php:27 -msgid "Requires compatible chat plugin" +#: ../../include/profile_advanced.php:43 +#, php-format +msgid "for %1$d %2$s" msgstr "" -#: ../../include/permissions.php:28 -msgid "Can write to my \"public\" file storage" +#: ../../include/profile_advanced.php:46 ../../mod/profiles.php:549 +msgid "Sexual Preference:" msgstr "" -#: ../../include/permissions.php:29 -msgid "Can edit my \"public\" pages" +#: ../../include/profile_advanced.php:48 ../../mod/directory.php:179 +#: ../../boot.php:1795 +msgid "Homepage:" msgstr "" -#: ../../include/permissions.php:31 -msgid "Can source my \"public\" posts in derived channels" +#: ../../include/profile_advanced.php:50 ../../mod/profiles.php:551 +msgid "Hometown:" msgstr "" -#: ../../include/permissions.php:31 -msgid "Somewhat advanced - very useful in open communities" +#: ../../include/profile_advanced.php:52 +msgid "Tags:" msgstr "" -#: ../../include/permissions.php:32 -msgid "Can administer my channel resources" +#: ../../include/profile_advanced.php:54 ../../mod/profiles.php:552 +msgid "Political Views:" msgstr "" -#: ../../include/permissions.php:32 -msgid "Extremely advanced. Leave this alone unless you know what you are doing" +#: ../../include/profile_advanced.php:56 +msgid "Religion:" msgstr "" -#: ../../include/items.php:3531 ../../mod/viewsrc.php:18 -#: ../../mod/display.php:32 ../../mod/admin.php:150 ../../mod/admin.php:727 -#: ../../mod/admin.php:930 ../../mod/home.php:64 -msgid "Item not found." +#: ../../include/profile_advanced.php:58 ../../mod/directory.php:181 +msgid "About:" msgstr "" -#: ../../include/items.php:3714 -msgid "Archives" +#: ../../include/profile_advanced.php:60 +msgid "Hobbies/Interests:" msgstr "" -#: ../../include/items.php:3880 ../../mod/group.php:44 ../../mod/group.php:146 -msgid "Collection not found." +#: ../../include/profile_advanced.php:62 ../../mod/profiles.php:555 +msgid "Likes:" msgstr "" -#: ../../include/items.php:3896 ../../mod/network.php:469 -msgid "Group is empty" +#: ../../include/profile_advanced.php:64 ../../mod/profiles.php:556 +msgid "Dislikes:" msgstr "" -#: ../../include/items.php:3912 -msgid "Connection not found." +#: ../../include/profile_advanced.php:67 +msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/oembed.php:149 -msgid "Embedded content" +#: ../../include/profile_advanced.php:69 +msgid "Musical interests:" msgstr "" -#: ../../include/oembed.php:158 -msgid "Embedding disabled" +#: ../../include/profile_advanced.php:71 +msgid "Books, literature:" msgstr "" -#: ../../include/follow.php:21 -msgid "Channel is blocked on this site." +#: ../../include/profile_advanced.php:73 +msgid "Television:" msgstr "" -#: ../../include/follow.php:26 -msgid "Channel location missing." +#: ../../include/profile_advanced.php:75 +msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/follow.php:43 -msgid "Channel discovery failed. Website may be down or misconfigured." +#: ../../include/profile_advanced.php:77 +msgid "Love/Romance:" msgstr "" -#: ../../include/follow.php:51 -msgid "Response from remote channel was not understood." +#: ../../include/profile_advanced.php:79 +msgid "Work/employment:" msgstr "" -#: ../../include/follow.php:58 -msgid "Response from remote channel was incomplete." +#: ../../include/profile_advanced.php:81 +msgid "School/education:" msgstr "" -#: ../../include/follow.php:129 -msgid "local account not found." +#: ../../include/text.php:312 +msgid "prev" msgstr "" -#: ../../include/follow.php:138 -msgid "Cannot connect to yourself." +#: ../../include/text.php:314 +msgid "first" msgstr "" -#: ../../include/network.php:1113 -msgid "view full size" +#: ../../include/text.php:343 +msgid "last" msgstr "" -#: ../../include/ItemObject.php:88 ../../mod/photos.php:952 -msgid "Private Message" +#: ../../include/text.php:346 +msgid "next" msgstr "" -#: ../../include/ItemObject.php:95 ../../include/page_widgets.php:8 -#: ../../mod/blocks.php:93 ../../mod/editwebpage.php:119 -#: ../../mod/webpages.php:101 ../../mod/editpost.php:97 -#: ../../mod/editlayout.php:100 ../../mod/layouts.php:102 -#: ../../mod/menu.php:55 ../../mod/editblock.php:114 -#: ../../mod/settings.php:713 -msgid "Edit" +#: ../../include/text.php:358 +msgid "older" msgstr "" -#: ../../include/ItemObject.php:107 ../../include/conversation.php:628 -#: ../../mod/admin.php:690 ../../mod/connections.php:374 -#: ../../mod/filestorage.php:82 ../../mod/group.php:182 -#: ../../mod/photos.php:1130 ../../mod/settings.php:714 -msgid "Delete" +#: ../../include/text.php:360 +msgid "newer" msgstr "" -#: ../../include/ItemObject.php:113 ../../include/conversation.php:627 -msgid "Select" +#: ../../include/text.php:651 +msgid "No connections" msgstr "" -#: ../../include/ItemObject.php:117 -msgid "save to folder" +#: ../../include/text.php:662 +#, php-format +msgid "%d Connection" +msgid_plural "%d Connections" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/text.php:674 +msgid "View Connections" msgstr "" -#: ../../include/ItemObject.php:145 -msgid "add star" +#: ../../include/text.php:733 ../../include/nav.php:135 +#: ../../mod/search.php:96 +msgid "Search" msgstr "" -#: ../../include/ItemObject.php:146 -msgid "remove star" +#: ../../include/text.php:735 ../../mod/filer.php:36 +msgid "Save" msgstr "" -#: ../../include/ItemObject.php:147 -msgid "toggle star status" +#: ../../include/text.php:773 +msgid "poke" msgstr "" -#: ../../include/ItemObject.php:151 -msgid "starred" +#: ../../include/text.php:773 ../../include/conversation.php:236 +msgid "poked" msgstr "" -#: ../../include/ItemObject.php:160 ../../include/conversation.php:638 -msgid "Message is verified" +#: ../../include/text.php:774 +msgid "ping" msgstr "" -#: ../../include/ItemObject.php:168 -msgid "add tag" +#: ../../include/text.php:774 +msgid "pinged" msgstr "" -#: ../../include/ItemObject.php:174 ../../mod/photos.php:1058 -msgid "I like this (toggle)" +#: ../../include/text.php:775 +msgid "prod" msgstr "" -#: ../../include/ItemObject.php:175 ../../mod/photos.php:1059 -msgid "I don't like this (toggle)" +#: ../../include/text.php:775 +msgid "prodded" msgstr "" -#: ../../include/ItemObject.php:177 -msgid "Share this" +#: ../../include/text.php:776 +msgid "slap" msgstr "" -#: ../../include/ItemObject.php:177 -msgid "share" +#: ../../include/text.php:776 +msgid "slapped" msgstr "" -#: ../../include/ItemObject.php:201 ../../include/ItemObject.php:202 -#, php-format -msgid "View %s's profile - %s" +#: ../../include/text.php:777 +msgid "finger" msgstr "" -#: ../../include/ItemObject.php:203 -msgid "to" +#: ../../include/text.php:777 +msgid "fingered" msgstr "" -#: ../../include/ItemObject.php:204 -msgid "via" +#: ../../include/text.php:778 +msgid "rebuff" msgstr "" -#: ../../include/ItemObject.php:205 -msgid "Wall-to-Wall" +#: ../../include/text.php:778 +msgid "rebuffed" msgstr "" -#: ../../include/ItemObject.php:206 -msgid "via Wall-To-Wall:" +#: ../../include/text.php:790 +msgid "happy" msgstr "" -#: ../../include/ItemObject.php:216 ../../include/conversation.php:682 -#, php-format -msgid " from %s" +#: ../../include/text.php:791 +msgid "sad" msgstr "" -#: ../../include/ItemObject.php:219 ../../include/conversation.php:685 -#, php-format -msgid "last edited: %s" +#: ../../include/text.php:792 +msgid "mellow" msgstr "" -#: ../../include/ItemObject.php:246 ../../include/conversation.php:702 -#: ../../include/conversation.php:1112 ../../mod/message.php:332 -#: ../../mod/message.php:516 ../../mod/editwebpage.php:128 -#: ../../mod/editpost.php:106 ../../mod/photos.php:1061 -#: ../../mod/editlayout.php:109 ../../mod/editblock.php:123 -msgid "Please wait" +#: ../../include/text.php:793 +msgid "tired" msgstr "" -#: ../../include/ItemObject.php:267 -#, php-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "" -msgstr[1] "" +#: ../../include/text.php:794 +msgid "perky" +msgstr "" -#: ../../include/ItemObject.php:527 ../../mod/photos.php:1077 -#: ../../mod/photos.php:1164 -msgid "This is you" +#: ../../include/text.php:795 +msgid "angry" msgstr "" -#: ../../include/ItemObject.php:531 -msgid "Bold" +#: ../../include/text.php:796 +msgid "stupified" msgstr "" -#: ../../include/ItemObject.php:532 -msgid "Italic" +#: ../../include/text.php:797 +msgid "puzzled" msgstr "" -#: ../../include/ItemObject.php:533 -msgid "Underline" +#: ../../include/text.php:798 +msgid "interested" msgstr "" -#: ../../include/ItemObject.php:534 -msgid "Quote" +#: ../../include/text.php:799 +msgid "bitter" msgstr "" -#: ../../include/ItemObject.php:535 -msgid "Code" +#: ../../include/text.php:800 +msgid "cheerful" msgstr "" -#: ../../include/ItemObject.php:536 -msgid "Image" +#: ../../include/text.php:801 +msgid "alive" msgstr "" -#: ../../include/ItemObject.php:537 -msgid "Link" +#: ../../include/text.php:802 +msgid "annoyed" msgstr "" -#: ../../include/ItemObject.php:538 -msgid "Video" +#: ../../include/text.php:803 +msgid "anxious" msgstr "" -#: ../../include/ItemObject.php:539 ../../include/conversation.php:1075 -#: ../../mod/editwebpage.php:150 ../../mod/webpages.php:105 -#: ../../mod/editpost.php:126 ../../mod/photos.php:1081 -#: ../../mod/editlayout.php:129 ../../mod/editblock.php:144 -msgid "Preview" +#: ../../include/text.php:804 +msgid "cranky" msgstr "" -#: ../../include/ItemObject.php:542 ../../include/conversation.php:1139 -#: ../../mod/message.php:338 ../../mod/message.php:521 -#: ../../mod/editpost.php:134 -msgid "Encrypt text" +#: ../../include/text.php:805 +msgid "disturbed" msgstr "" -#: ../../include/notify.php:23 -msgid "created a new post" +#: ../../include/text.php:806 +msgid "frustrated" msgstr "" -#: ../../include/notify.php:24 -#, php-format -msgid "commented on %s's post" +#: ../../include/text.php:807 +msgid "motivated" msgstr "" -#: ../../include/contact_widgets.php:14 -#, php-format -msgid "You have %1$.0f of %2$.0f allowed connections." +#: ../../include/text.php:808 +msgid "relaxed" msgstr "" -#: ../../include/contact_widgets.php:20 -msgid "Add New Connection" +#: ../../include/text.php:809 +msgid "surprised" msgstr "" -#: ../../include/contact_widgets.php:21 -msgid "Enter the channel address" +#: ../../include/text.php:973 +msgid "Monday" msgstr "" -#: ../../include/contact_widgets.php:22 -msgid "Example: bob@example.com, http://example.com/barbara" +#: ../../include/text.php:973 +msgid "Tuesday" msgstr "" -#: ../../include/contact_widgets.php:38 -#, php-format -msgid "%d invitation available" -msgid_plural "%d invitations available" -msgstr[0] "" -msgstr[1] "" +#: ../../include/text.php:973 +msgid "Wednesday" +msgstr "" -#: ../../include/contact_widgets.php:44 -msgid "Find Channels" +#: ../../include/text.php:973 +msgid "Thursday" msgstr "" -#: ../../include/contact_widgets.php:45 -msgid "Enter name or interest" +#: ../../include/text.php:973 +msgid "Friday" msgstr "" -#: ../../include/contact_widgets.php:46 -msgid "Connect/Follow" +#: ../../include/text.php:973 +msgid "Saturday" msgstr "" -#: ../../include/contact_widgets.php:47 -msgid "Examples: Robert Morgenstein, Fishing" +#: ../../include/text.php:973 +msgid "Sunday" msgstr "" -#: ../../include/contact_widgets.php:48 ../../mod/connections.php:697 -#: ../../mod/directory.php:221 ../../mod/directory.php:226 -msgid "Find" +#: ../../include/text.php:977 +msgid "January" msgstr "" -#: ../../include/contact_widgets.php:49 ../../mod/suggest.php:64 -msgid "Channel Suggestions" +#: ../../include/text.php:977 +msgid "February" msgstr "" -#: ../../include/contact_widgets.php:51 -msgid "Random Profile" +#: ../../include/text.php:977 +msgid "March" msgstr "" -#: ../../include/contact_widgets.php:52 -msgid "Invite Friends" +#: ../../include/text.php:977 +msgid "April" msgstr "" -#: ../../include/contact_widgets.php:76 ../../include/features.php:60 -msgid "Saved Folders" +#: ../../include/text.php:977 +msgid "May" msgstr "" -#: ../../include/contact_widgets.php:79 ../../include/contact_widgets.php:113 -msgid "Everything" +#: ../../include/text.php:977 +msgid "June" msgstr "" -#: ../../include/contact_widgets.php:143 -#, php-format -msgid "%d connection in common" -msgid_plural "%d connections in common" -msgstr[0] "" -msgstr[1] "" +#: ../../include/text.php:977 +msgid "July" +msgstr "" -#: ../../include/page_widgets.php:6 -msgid "New Page" +#: ../../include/text.php:977 +msgid "August" msgstr "" -#: ../../include/api.php:972 -msgid "Public Timeline" +#: ../../include/text.php:977 +msgid "September" msgstr "" -#: ../../include/conversation.php:123 -msgid "channel" +#: ../../include/text.php:977 +msgid "October" msgstr "" -#: ../../include/conversation.php:161 ../../mod/like.php:134 -#, php-format -msgid "%1$s likes %2$s's %3$s" +#: ../../include/text.php:977 +msgid "November" msgstr "" -#: ../../include/conversation.php:164 ../../mod/like.php:136 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" +#: ../../include/text.php:977 +msgid "December" msgstr "" -#: ../../include/conversation.php:201 -#, php-format -msgid "%1$s is now connected with %2$s" +#: ../../include/text.php:1055 ../../mod/message.php:453 +msgid "unknown.???" msgstr "" -#: ../../include/conversation.php:232 -#, php-format -msgid "%1$s poked %2$s" +#: ../../include/text.php:1056 ../../mod/message.php:454 +msgid "bytes" msgstr "" -#: ../../include/conversation.php:254 ../../mod/mood.php:63 -#, php-format -msgid "%1$s is currently %2$s" +#: ../../include/text.php:1091 +msgid "remove category" msgstr "" -#: ../../include/conversation.php:658 -#, php-format -msgid "View %s's profile @ %s" +#: ../../include/text.php:1113 +msgid "remove from file" msgstr "" -#: ../../include/conversation.php:672 -msgid "Categories:" +#: ../../include/text.php:1167 ../../include/text.php:1179 +msgid "Click to open/close" msgstr "" -#: ../../include/conversation.php:673 -msgid "Filed under:" +#: ../../include/text.php:1355 ../../mod/events.php:326 +msgid "link to source" msgstr "" -#: ../../include/conversation.php:700 -msgid "View in context" +#: ../../include/text.php:1374 +msgid "Select a page layout: " msgstr "" -#: ../../include/conversation.php:826 -msgid "remove" +#: ../../include/text.php:1377 ../../include/text.php:1442 +msgid "default" msgstr "" -#: ../../include/conversation.php:830 -msgid "Loading..." +#: ../../include/text.php:1413 +msgid "Page content type: " msgstr "" -#: ../../include/conversation.php:831 -msgid "Delete Selected Items" +#: ../../include/text.php:1454 +msgid "Select an alternate language" msgstr "" -#: ../../include/conversation.php:922 -msgid "View Source" +#: ../../include/text.php:1606 ../../include/conversation.php:117 +#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45 +msgid "photo" msgstr "" -#: ../../include/conversation.php:923 -msgid "Follow Thread" +#: ../../include/text.php:1609 ../../include/conversation.php:120 +#: ../../mod/tagger.php:49 +msgid "event" msgstr "" -#: ../../include/conversation.php:924 ../../include/Contact.php:525 -msgid "View Status" +#: ../../include/text.php:1612 ../../include/conversation.php:145 +#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53 +msgid "status" msgstr "" -#: ../../include/conversation.php:925 ../../include/nav.php:76 -#: ../../include/Contact.php:526 ../../mod/connections.php:327 -#: ../../mod/connections.php:441 -msgid "View Profile" +#: ../../include/text.php:1614 ../../include/conversation.php:147 +#: ../../mod/tagger.php:55 +msgid "comment" msgstr "" -#: ../../include/conversation.php:926 ../../include/Contact.php:527 -msgid "View Photos" +#: ../../include/text.php:1619 +msgid "activity" msgstr "" -#: ../../include/conversation.php:927 -msgid "Matrix Activity" +#: ../../include/text.php:1881 +msgid "Design" msgstr "" -#: ../../include/conversation.php:928 ../../include/Contact.php:529 -msgid "Edit Contact" +#: ../../include/text.php:1883 +msgid "Blocks" msgstr "" -#: ../../include/conversation.php:929 ../../include/Contact.php:530 -msgid "Send PM" +#: ../../include/text.php:1884 +msgid "Menus" msgstr "" -#: ../../include/conversation.php:930 ../../include/Contact.php:524 -msgid "Poke" +#: ../../include/text.php:1885 +msgid "Layouts" msgstr "" -#: ../../include/conversation.php:992 -#, php-format -msgid "%s likes this." +#: ../../include/text.php:1886 +msgid "Pages" msgstr "" -#: ../../include/conversation.php:992 -#, php-format -msgid "%s doesn't like this." +#: ../../include/api.php:972 +msgid "Public Timeline" msgstr "" -#: ../../include/conversation.php:996 -#, php-format -msgid "%2$d people like this." -msgid_plural "%2$d people like this." -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:998 -#, 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 -msgid "and" +#: ../../include/identity.php:14 ../../mod/item.php:1148 +msgid "Unable to obtain identity information from database" msgstr "" -#: ../../include/conversation.php:1007 -#, php-format -msgid ", and %d other people" -msgid_plural ", and %d other people" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1008 -#, php-format -msgid "%s like this." +#: ../../include/identity.php:36 +msgid "Empty name" msgstr "" -#: ../../include/conversation.php:1008 -#, php-format -msgid "%s don't like this." +#: ../../include/identity.php:38 +msgid "Name too long" msgstr "" -#: ../../include/conversation.php:1058 -msgid "Visible to everybody" +#: ../../include/identity.php:80 +msgid "No account identifier" msgstr "" -#: ../../include/conversation.php:1059 ../../mod/message.php:281 -#: ../../mod/message.php:417 -msgid "Please enter a link URL:" +#: ../../include/identity.php:90 +msgid "Nickname is required." msgstr "" -#: ../../include/conversation.php:1060 -msgid "Please enter a video link/URL:" +#: ../../include/identity.php:104 +msgid "" +"Nickname has unsupported characters or is already being used on this site." msgstr "" -#: ../../include/conversation.php:1061 -msgid "Please enter an audio link/URL:" +#: ../../include/identity.php:163 +msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/conversation.php:1062 -msgid "Tag term:" +#: ../../include/identity.php:220 +msgid "Default Profile" msgstr "" -#: ../../include/conversation.php:1063 ../../mod/filer.php:35 -msgid "Save to Folder:" +#: ../../include/identity.php:245 ../../include/profile_selectors.php:42 +#: ../../mod/network.php:387 ../../mod/connections.php:407 +msgid "Friends" msgstr "" -#: ../../include/conversation.php:1064 -msgid "Where are you right now?" +#: ../../include/bbcode.php:94 ../../include/bbcode.php:494 +#: ../../include/bbcode.php:497 +msgid "Image/photo" msgstr "" -#: ../../include/conversation.php:1065 ../../mod/message.php:282 -#: ../../mod/message.php:418 ../../mod/editpost.php:52 -msgid "Expires YYYY-MM-DD HH:MM" +#: ../../include/bbcode.php:126 ../../include/bbcode.php:502 +msgid "Encrypted content" msgstr "" -#: ../../include/conversation.php:1089 ../../mod/photos.php:1060 -msgid "Share" +#: ../../include/bbcode.php:173 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: ../../include/conversation.php:1091 -msgid "Page link title" +#: ../../include/bbcode.php:175 +msgid "post" msgstr "" -#: ../../include/conversation.php:1093 ../../mod/message.php:329 -#: ../../mod/message.php:512 ../../mod/editwebpage.php:120 -#: ../../mod/editpost.php:98 ../../mod/editlayout.php:101 -#: ../../mod/editblock.php:115 -msgid "Upload photo" +#: ../../include/bbcode.php:454 ../../include/bbcode.php:474 +msgid "$1 wrote:" msgstr "" -#: ../../include/conversation.php:1094 -msgid "upload photo" +#: ../../include/oembed.php:149 +msgid "Embedded content" msgstr "" -#: ../../include/conversation.php:1095 ../../mod/message.php:330 -#: ../../mod/message.php:513 ../../mod/editwebpage.php:121 -#: ../../mod/editpost.php:99 ../../mod/editlayout.php:102 -#: ../../mod/editblock.php:116 -msgid "Attach file" +#: ../../include/oembed.php:158 +msgid "Embedding disabled" msgstr "" -#: ../../include/conversation.php:1096 -msgid "attach file" +#: ../../include/notify.php:23 +msgid "created a new post" msgstr "" -#: ../../include/conversation.php:1097 ../../mod/message.php:331 -#: ../../mod/message.php:514 ../../mod/editwebpage.php:122 -#: ../../mod/editpost.php:100 ../../mod/editlayout.php:103 -#: ../../mod/editblock.php:117 -msgid "Insert web link" +#: ../../include/notify.php:24 +#, php-format +msgid "commented on %s's post" msgstr "" -#: ../../include/conversation.php:1098 -msgid "web link" +#: ../../include/photos.php:15 ../../include/attach.php:102 +#: ../../include/attach.php:133 ../../include/attach.php:189 +#: ../../include/attach.php:204 ../../include/attach.php:237 +#: ../../include/attach.php:251 ../../include/attach.php:272 +#: ../../include/attach.php:464 ../../include/attach.php:539 +#: ../../include/items.php:3608 ../../mod/common.php:43 +#: ../../mod/events.php:134 ../../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:628 +#: ../../mod/viewconnections.php:33 ../../mod/viewconnections.php:38 +#: ../../mod/delegate.php:6 ../../mod/sources.php:48 ../../mod/mitem.php:92 +#: ../../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:7 +#: ../../mod/intro.php:50 ../../mod/connections.php:197 +#: ../../mod/profiles.php:163 ../../mod/profiles.php:476 +#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97 +#: ../../mod/filestorage.php:26 ../../mod/manage.php:6 +#: ../../mod/crepair.php:115 ../../mod/editlayout.php:48 +#: ../../mod/nogroup.php:25 ../../mod/profile_photo.php:197 +#: ../../mod/profile_photo.php:210 ../../mod/editwebpage.php:42 +#: ../../mod/editwebpage.php:64 ../../mod/notifications.php:66 +#: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/editpost.php:13 +#: ../../mod/poke.php:128 ../../mod/channel.php:123 ../../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/mood.php:114 ../../index.php:178 ../../index.php:340 +msgid "Permission denied." msgstr "" -#: ../../include/conversation.php:1099 -msgid "Insert video link" +#: ../../include/photos.php:88 +#, php-format +msgid "Image exceeds website size limit of %lu bytes" msgstr "" -#: ../../include/conversation.php:1100 -msgid "video link" +#: ../../include/photos.php:95 +msgid "Image file is empty." msgstr "" -#: ../../include/conversation.php:1101 -msgid "Insert audio link" +#: ../../include/photos.php:124 ../../mod/profile_photo.php:157 +msgid "Unable to process image" msgstr "" -#: ../../include/conversation.php:1102 -msgid "audio link" +#: ../../include/photos.php:186 +msgid "Photo storage failed." msgstr "" -#: ../../include/conversation.php:1103 ../../mod/editwebpage.php:126 -#: ../../mod/editpost.php:104 ../../mod/editlayout.php:107 -#: ../../mod/editblock.php:121 -msgid "Set your location" +#: ../../include/photos.php:288 ../../boot.php:2242 +msgid "Photo Albums" msgstr "" -#: ../../include/conversation.php:1104 -msgid "set location" +#: ../../include/photos.php:292 ../../mod/photos.php:802 +#: ../../mod/photos.php:1276 +msgid "Upload New Photos" msgstr "" -#: ../../include/conversation.php:1105 ../../mod/editwebpage.php:127 -#: ../../mod/editpost.php:105 ../../mod/editlayout.php:108 -#: ../../mod/editblock.php:122 -msgid "Clear browser location" +#: ../../include/profile_selectors.php:6 +msgid "Male" msgstr "" -#: ../../include/conversation.php:1106 -msgid "clear location" +#: ../../include/profile_selectors.php:6 +msgid "Female" msgstr "" -#: ../../include/conversation.php:1108 ../../mod/editwebpage.php:142 -#: ../../mod/editpost.php:118 ../../mod/editlayout.php:121 -#: ../../mod/editblock.php:136 -msgid "Set title" +#: ../../include/profile_selectors.php:6 +msgid "Currently Male" msgstr "" -#: ../../include/conversation.php:1111 ../../mod/editwebpage.php:144 -#: ../../mod/editpost.php:120 ../../mod/editlayout.php:123 -#: ../../mod/editblock.php:138 -msgid "Categories (comma-separated list)" +#: ../../include/profile_selectors.php:6 +msgid "Currently Female" msgstr "" -#: ../../include/conversation.php:1113 ../../mod/editwebpage.php:129 -#: ../../mod/editpost.php:107 ../../mod/editlayout.php:110 -#: ../../mod/editblock.php:124 -msgid "Permission settings" +#: ../../include/profile_selectors.php:6 +msgid "Mostly Male" msgstr "" -#: ../../include/conversation.php:1114 -msgid "permissions" +#: ../../include/profile_selectors.php:6 +msgid "Mostly Female" msgstr "" -#: ../../include/conversation.php:1122 ../../mod/editwebpage.php:137 -#: ../../mod/editpost.php:115 ../../mod/editlayout.php:118 -#: ../../mod/editblock.php:133 -msgid "Public post" +#: ../../include/profile_selectors.php:6 +msgid "Transgender" msgstr "" -#: ../../include/conversation.php:1124 ../../mod/editwebpage.php:145 -#: ../../mod/editpost.php:121 ../../mod/editlayout.php:124 -#: ../../mod/editblock.php:139 -msgid "Example: bob@example.com, mary@example.com" +#: ../../include/profile_selectors.php:6 +msgid "Intersex" msgstr "" -#: ../../include/conversation.php:1137 ../../mod/message.php:336 -#: ../../mod/message.php:519 ../../mod/editwebpage.php:155 -#: ../../mod/editpost.php:132 ../../mod/editlayout.php:134 -#: ../../mod/editblock.php:149 -msgid "Set expiration date" +#: ../../include/profile_selectors.php:6 +msgid "Transsexual" msgstr "" -#: ../../include/photo/photo_driver.php:609 ../../include/photos.php:51 -#: ../../mod/profile_photo.php:88 ../../mod/profile_photo.php:235 -#: ../../mod/profile_photo.php:346 ../../mod/photos.php:97 -#: ../../mod/photos.php:764 ../../mod/photos.php:786 -msgid "Profile Photos" +#: ../../include/profile_selectors.php:6 +msgid "Hermaphrodite" 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/profile_selectors.php:6 +msgid "Neuter" msgstr "" -#: ../../include/group.php:223 -msgid "Default privacy group for new contacts" +#: ../../include/profile_selectors.php:6 +msgid "Non-specific" msgstr "" -#: ../../include/group.php:242 ../../mod/admin.php:695 -msgid "All Channels" +#: ../../include/profile_selectors.php:6 +msgid "Other" msgstr "" -#: ../../include/group.php:264 -msgid "edit" +#: ../../include/profile_selectors.php:6 +msgid "Undecided" msgstr "" -#: ../../include/group.php:285 -msgid "Collections" +#: ../../include/profile_selectors.php:23 +msgid "Males" msgstr "" -#: ../../include/group.php:286 -msgid "Edit collection" +#: ../../include/profile_selectors.php:23 +msgid "Females" msgstr "" -#: ../../include/group.php:287 -msgid "Create a new collection" +#: ../../include/profile_selectors.php:23 +msgid "Gay" msgstr "" -#: ../../include/group.php:288 -msgid "Channels not in any collection" +#: ../../include/profile_selectors.php:23 +msgid "Lesbian" msgstr "" -#: ../../include/group.php:290 ../../mod/network.php:174 -msgid "add" +#: ../../include/profile_selectors.php:23 +msgid "No Preference" msgstr "" -#: ../../include/identity.php:14 ../../mod/item.php:1148 -msgid "Unable to obtain identity information from database" +#: ../../include/profile_selectors.php:23 +msgid "Bisexual" msgstr "" -#: ../../include/identity.php:36 -msgid "Empty name" +#: ../../include/profile_selectors.php:23 +msgid "Autosexual" msgstr "" -#: ../../include/identity.php:38 -msgid "Name too long" +#: ../../include/profile_selectors.php:23 +msgid "Abstinent" msgstr "" -#: ../../include/identity.php:80 -msgid "No account identifier" +#: ../../include/profile_selectors.php:23 +msgid "Virgin" msgstr "" -#: ../../include/identity.php:90 -msgid "Nickname is required." +#: ../../include/profile_selectors.php:23 +msgid "Deviant" msgstr "" -#: ../../include/identity.php:104 -msgid "" -"Nickname has unsupported characters or is already being used on this site." +#: ../../include/profile_selectors.php:23 +msgid "Fetish" msgstr "" -#: ../../include/identity.php:163 -msgid "Unable to retrieve created identity" +#: ../../include/profile_selectors.php:23 +msgid "Oodles" msgstr "" -#: ../../include/identity.php:220 -msgid "Default Profile" +#: ../../include/profile_selectors.php:23 +msgid "Nonsexual" msgstr "" -#: ../../include/identity.php:245 ../../include/profile_selectors.php:42 -#: ../../mod/connections.php:407 ../../mod/network.php:387 -msgid "Friends" +#: ../../include/profile_selectors.php:42 +msgid "Single" msgstr "" -#: ../../include/photos.php:88 +#: ../../include/profile_selectors.php:42 +msgid "Lonely" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Available" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Unavailable" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Has crush" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Infatuated" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Dating" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Unfaithful" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Sex Addict" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Friends/Benefits" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Casual" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Engaged" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Married" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Imaginarily married" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Partners" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Cohabiting" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Common law" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Happy" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Not looking" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Swinger" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Betrayed" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Separated" +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" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Widowed" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Uncertain" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "It's complicated" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Don't care" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Ask me" +msgstr "" + +#: ../../include/attach.php:184 ../../include/attach.php:232 +msgid "Item was not found." +msgstr "" + +#: ../../include/attach.php:285 +msgid "No source file." +msgstr "" + +#: ../../include/attach.php:302 +msgid "Cannot locate file to replace" +msgstr "" + +#: ../../include/attach.php:320 +msgid "Cannot locate file to revise/update" +msgstr "" + +#: ../../include/attach.php:331 #, php-format -msgid "Image exceeds website size limit of %lu bytes" +msgid "File exceeds size limit of %d" msgstr "" -#: ../../include/photos.php:95 -msgid "Image file is empty." +#: ../../include/attach.php:342 +#, php-format +msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "" -#: ../../include/photos.php:124 ../../mod/profile_photo.php:157 -msgid "Unable to process image" +#: ../../include/attach.php:424 +msgid "File upload failed. Possible system limit or action terminated." msgstr "" -#: ../../include/photos.php:186 -msgid "Photo storage failed." +#: ../../include/attach.php:436 +msgid "Stored file could not be verified. Upload failed." msgstr "" -#: ../../include/photos.php:292 ../../mod/photos.php:802 -#: ../../mod/photos.php:1276 -msgid "Upload New Photos" +#: ../../include/attach.php:480 ../../include/attach.php:497 +msgid "Path not available." msgstr "" -#: ../../include/security.php:49 -msgid "Welcome " +#: ../../include/attach.php:544 +msgid "Empty pathname" msgstr "" -#: ../../include/security.php:50 -msgid "Please upload a profile photo." +#: ../../include/attach.php:562 +msgid "duplicate filename or path" msgstr "" -#: ../../include/security.php:53 -msgid "Welcome back " +#: ../../include/attach.php:584 +msgid "Path not found." msgstr "" -#: ../../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." +#: ../../include/attach.php:628 +msgid "mkdir failed." msgstr "" -#: ../../include/plugin.php:440 ../../include/plugin.php:442 -msgid "Click here to upgrade." +#: ../../include/attach.php:632 +msgid "database storage failed." msgstr "" -#: ../../include/plugin.php:448 -msgid "This action exceeds the limits set by your subscription plan." +#: ../../include/zot.php:542 +msgid "Invalid data packet" msgstr "" -#: ../../include/plugin.php:453 -msgid "This action is not available under your subscription plan." +#: ../../include/zot.php:552 +msgid "Unable to verify channel signature" +msgstr "" + +#: ../../include/zot.php:697 +#, php-format +msgid "Unable to verify site signature for %s" +msgstr "" + +#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1458 +msgid "Logout" msgstr "" #: ../../include/nav.php:72 ../../include/nav.php:87 @@ -2103,10 +1963,18 @@ msgstr "" msgid "Manage/Edit Profiles" msgstr "" +#: ../../include/nav.php:79 ../../mod/fbrowser.php:25 ../../boot.php:2239 +msgid "Photos" +msgstr "" + #: ../../include/nav.php:79 msgid "Your photos" msgstr "" +#: ../../include/nav.php:85 ../../boot.php:1459 +msgid "Login" +msgstr "" + #: ../../include/nav.php:85 msgid "Sign in" msgstr "" @@ -2124,6 +1992,10 @@ msgstr "" msgid "Home Page" msgstr "" +#: ../../include/nav.php:125 ../../mod/register.php:195 ../../boot.php:1435 +msgid "Register" +msgstr "" + #: ../../include/nav.php:125 msgid "Create an account" msgstr "" @@ -2244,6 +2116,10 @@ msgstr "" msgid "New Message" msgstr "" +#: ../../include/nav.php:174 ../../mod/events.php:348 ../../boot.php:2250 +msgid "Events" +msgstr "" + #: ../../include/nav.php:174 msgid "Event Calendar" msgstr "" @@ -2264,8 +2140,8 @@ msgstr "" msgid "Manage Your Channels" msgstr "" -#: ../../include/nav.php:180 ../../mod/admin.php:782 ../../mod/admin.php:987 -#: ../../mod/settings.php:131 +#: ../../include/nav.php:180 ../../mod/settings.php:131 +#: ../../mod/admin.php:782 ../../mod/admin.php:987 msgid "Settings" msgstr "" @@ -2289,1745 +2165,1918 @@ msgstr "" msgid "Site Setup and Configuration" msgstr "" -#: ../../include/nav.php:212 +#: ../../include/nav.php:215 msgid "Nothing new here" msgstr "" -#: ../../include/nav.php:217 +#: ../../include/nav.php:220 msgid "Please wait..." msgstr "" -#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:118 -#: ../../mod/profperm.php:112 -msgid "Profile" +#: ../../include/account.php:23 +msgid "Not a valid email address" msgstr "" -#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1062 -msgid "Full Name:" +#: ../../include/account.php:25 +msgid "Your email domain is not among those allowed on this site" msgstr "" -#: ../../include/profile_advanced.php:22 -msgid "j F, Y" +#: ../../include/account.php:31 +msgid "Your email address is already registered at this site." msgstr "" -#: ../../include/profile_advanced.php:23 -msgid "j F" +#: ../../include/account.php:64 +msgid "An invitation is required." msgstr "" -#: ../../include/profile_advanced.php:30 -msgid "Birthday:" +#: ../../include/account.php:68 +msgid "Invitation could not be verified." msgstr "" -#: ../../include/profile_advanced.php:34 -msgid "Age:" +#: ../../include/account.php:118 +msgid "Please enter the required information." msgstr "" -#: ../../include/profile_advanced.php:43 -#, php-format -msgid "for %1$d %2$s" +#: ../../include/account.php:186 +msgid "Failed to store account information." msgstr "" -#: ../../include/profile_advanced.php:46 ../../mod/profiles.php:549 -msgid "Sexual Preference:" +#: ../../include/account.php:272 +#, php-format +msgid "Registration request at %s" msgstr "" -#: ../../include/profile_advanced.php:50 ../../mod/profiles.php:551 -msgid "Hometown:" +#: ../../include/account.php:274 ../../include/account.php:301 +#: ../../include/account.php:358 +msgid "Administrator" msgstr "" -#: ../../include/profile_advanced.php:52 -msgid "Tags:" +#: ../../include/account.php:296 +msgid "your registration password" msgstr "" -#: ../../include/profile_advanced.php:54 ../../mod/profiles.php:552 -msgid "Political Views:" +#: ../../include/account.php:299 ../../include/account.php:356 +#, php-format +msgid "Registration details for %s" msgstr "" -#: ../../include/profile_advanced.php:56 -msgid "Religion:" +#: ../../include/account.php:365 +msgid "Account approved." msgstr "" -#: ../../include/profile_advanced.php:58 ../../mod/directory.php:181 -msgid "About:" +#: ../../include/account.php:399 +#, php-format +msgid "Registration revoked for %s" msgstr "" -#: ../../include/profile_advanced.php:60 -msgid "Hobbies/Interests:" +#: ../../include/conversation.php:123 +msgid "channel" msgstr "" -#: ../../include/profile_advanced.php:62 ../../mod/profiles.php:555 -msgid "Likes:" +#: ../../include/conversation.php:161 ../../mod/like.php:134 +#, php-format +msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../include/profile_advanced.php:64 ../../mod/profiles.php:556 -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/profile_advanced.php:67 -msgid "Contact information and Social Networks:" +#: ../../include/conversation.php:201 +#, php-format +msgid "%1$s is now connected with %2$s" msgstr "" -#: ../../include/profile_advanced.php:69 -msgid "Musical interests:" +#: ../../include/conversation.php:232 +#, php-format +msgid "%1$s poked %2$s" msgstr "" -#: ../../include/profile_advanced.php:71 -msgid "Books, literature:" +#: ../../include/conversation.php:254 ../../mod/mood.php:63 +#, php-format +msgid "%1$s is currently %2$s" msgstr "" -#: ../../include/profile_advanced.php:73 -msgid "Television:" +#: ../../include/conversation.php:658 +#, php-format +msgid "View %s's profile @ %s" msgstr "" -#: ../../include/profile_advanced.php:75 -msgid "Film/dance/culture/entertainment:" +#: ../../include/conversation.php:672 +msgid "Categories:" msgstr "" -#: ../../include/profile_advanced.php:77 -msgid "Love/Romance:" +#: ../../include/conversation.php:673 +msgid "Filed under:" msgstr "" -#: ../../include/profile_advanced.php:79 -msgid "Work/employment:" +#: ../../include/conversation.php:700 +msgid "View in context" msgstr "" -#: ../../include/profile_advanced.php:81 -msgid "School/education:" +#: ../../include/conversation.php:826 +msgid "remove" msgstr "" -#: ../../include/zot.php:425 -msgid "Invalid data packet" +#: ../../include/conversation.php:830 +msgid "Loading..." msgstr "" -#: ../../include/zot.php:435 -msgid "Unable to verify channel signature" +#: ../../include/conversation.php:831 +msgid "Delete Selected Items" msgstr "" -#: ../../include/zot.php:581 -#, php-format -msgid "Unable to verify site signature for %s" +#: ../../include/conversation.php:922 +msgid "View Source" msgstr "" -#: ../../include/Contact.php:103 -msgid "New window" +#: ../../include/conversation.php:923 +msgid "Follow Thread" msgstr "" -#: ../../include/Contact.php:104 -msgid "Open the selected location in a different window or browser tab" +#: ../../include/conversation.php:927 +msgid "Matrix Activity" msgstr "" -#: ../../include/Contact.php:528 -msgid "Network Posts" +#: ../../include/conversation.php:992 +#, php-format +msgid "%s likes this." msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Male" +#: ../../include/conversation.php:992 +#, php-format +msgid "%s doesn't like this." msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Female" -msgstr "" +#: ../../include/conversation.php:996 +#, php-format +msgid "%2$d people like this." +msgid_plural "%2$d people like this." +msgstr[0] "" +msgstr[1] "" -#: ../../include/profile_selectors.php:6 -msgid "Currently Male" -msgstr "" +#: ../../include/conversation.php:998 +#, php-format +msgid "%2$d people don't like this." +msgid_plural "%2$d people don't like this." +msgstr[0] "" +msgstr[1] "" -#: ../../include/profile_selectors.php:6 -msgid "Currently Female" +#: ../../include/conversation.php:1004 +msgid "and" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Mostly Male" +#: ../../include/conversation.php:1007 +#, php-format +msgid ", and %d other people" +msgid_plural ", and %d other people" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1008 +#, php-format +msgid "%s like this." msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Mostly Female" +#: ../../include/conversation.php:1008 +#, php-format +msgid "%s don't like this." msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Transgender" +#: ../../include/conversation.php:1058 +msgid "Visible to everybody" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Intersex" +#: ../../include/conversation.php:1059 ../../mod/message.php:281 +#: ../../mod/message.php:417 +msgid "Please enter a link URL:" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Transsexual" +#: ../../include/conversation.php:1060 +msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Hermaphrodite" +#: ../../include/conversation.php:1061 +msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Neuter" +#: ../../include/conversation.php:1062 +msgid "Tag term:" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Non-specific" +#: ../../include/conversation.php:1063 ../../mod/filer.php:35 +msgid "Save to Folder:" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Other" +#: ../../include/conversation.php:1064 +msgid "Where are you right now?" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Undecided" +#: ../../include/conversation.php:1065 ../../mod/message.php:282 +#: ../../mod/message.php:418 ../../mod/editpost.php:52 +msgid "Expires YYYY-MM-DD HH:MM" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Males" +#: ../../include/conversation.php:1089 ../../mod/photos.php:1060 +msgid "Share" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Females" +#: ../../include/conversation.php:1091 +msgid "Page link title" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Gay" +#: ../../include/conversation.php:1093 ../../mod/message.php:329 +#: ../../mod/message.php:512 ../../mod/editlayout.php:101 +#: ../../mod/editwebpage.php:120 ../../mod/editpost.php:98 +#: ../../mod/editblock.php:115 +msgid "Upload photo" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Lesbian" +#: ../../include/conversation.php:1094 +msgid "upload photo" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "No Preference" +#: ../../include/conversation.php:1095 ../../mod/message.php:330 +#: ../../mod/message.php:513 ../../mod/editlayout.php:102 +#: ../../mod/editwebpage.php:121 ../../mod/editpost.php:99 +#: ../../mod/editblock.php:116 +msgid "Attach file" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Bisexual" +#: ../../include/conversation.php:1096 +msgid "attach file" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Autosexual" +#: ../../include/conversation.php:1097 ../../mod/message.php:331 +#: ../../mod/message.php:514 ../../mod/editlayout.php:103 +#: ../../mod/editwebpage.php:122 ../../mod/editpost.php:100 +#: ../../mod/editblock.php:117 +msgid "Insert web link" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Abstinent" +#: ../../include/conversation.php:1098 +msgid "web link" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Virgin" +#: ../../include/conversation.php:1099 +msgid "Insert video link" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Deviant" +#: ../../include/conversation.php:1100 +msgid "video link" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Fetish" +#: ../../include/conversation.php:1101 +msgid "Insert audio link" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Oodles" +#: ../../include/conversation.php:1102 +msgid "audio link" msgstr "" -#: ../../include/profile_selectors.php:23 -msgid "Nonsexual" +#: ../../include/conversation.php:1103 ../../mod/editlayout.php:107 +#: ../../mod/editwebpage.php:126 ../../mod/editpost.php:104 +#: ../../mod/editblock.php:121 +msgid "Set your location" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Single" +#: ../../include/conversation.php:1104 +msgid "set location" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Lonely" +#: ../../include/conversation.php:1105 ../../mod/editlayout.php:108 +#: ../../mod/editwebpage.php:127 ../../mod/editpost.php:105 +#: ../../mod/editblock.php:122 +msgid "Clear browser location" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Available" +#: ../../include/conversation.php:1106 +msgid "clear location" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Unavailable" +#: ../../include/conversation.php:1108 ../../mod/editlayout.php:121 +#: ../../mod/editwebpage.php:142 ../../mod/editpost.php:118 +#: ../../mod/editblock.php:136 +msgid "Set title" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Has crush" +#: ../../include/conversation.php:1111 ../../mod/editlayout.php:123 +#: ../../mod/editwebpage.php:144 ../../mod/editpost.php:120 +#: ../../mod/editblock.php:138 +msgid "Categories (comma-separated list)" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Infatuated" +#: ../../include/conversation.php:1113 ../../mod/editlayout.php:110 +#: ../../mod/editwebpage.php:129 ../../mod/editpost.php:107 +#: ../../mod/editblock.php:124 +msgid "Permission settings" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Dating" +#: ../../include/conversation.php:1114 +msgid "permissions" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Unfaithful" +#: ../../include/conversation.php:1122 ../../mod/editlayout.php:118 +#: ../../mod/editwebpage.php:137 ../../mod/editpost.php:115 +#: ../../mod/editblock.php:133 +msgid "Public post" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Sex Addict" +#: ../../include/conversation.php:1124 ../../mod/editlayout.php:124 +#: ../../mod/editwebpage.php:145 ../../mod/editpost.php:121 +#: ../../mod/editblock.php:139 +msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Friends/Benefits" +#: ../../include/conversation.php:1137 ../../mod/message.php:336 +#: ../../mod/message.php:519 ../../mod/editlayout.php:134 +#: ../../mod/editwebpage.php:155 ../../mod/editpost.php:132 +#: ../../mod/editblock.php:149 +msgid "Set expiration date" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Casual" +#: ../../include/auth.php:67 +msgid "Logged out." msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Engaged" +#: ../../include/auth.php:179 +msgid "Failed authentication" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Married" +#: ../../include/auth.php:188 +msgid "Login failed." msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Imaginarily married" +#: ../../include/contact_widgets.php:14 +#, php-format +msgid "You have %1$.0f of %2$.0f allowed connections." msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Partners" +#: ../../include/contact_widgets.php:20 +msgid "Add New Connection" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Cohabiting" +#: ../../include/contact_widgets.php:21 +msgid "Enter the channel address" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Common law" +#: ../../include/contact_widgets.php:22 +msgid "Example: bob@example.com, http://example.com/barbara" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Happy" -msgstr "" +#: ../../include/contact_widgets.php:38 +#, php-format +msgid "%d invitation available" +msgid_plural "%d invitations available" +msgstr[0] "" +msgstr[1] "" -#: ../../include/profile_selectors.php:42 -msgid "Not looking" +#: ../../include/contact_widgets.php:44 +msgid "Find Channels" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Swinger" +#: ../../include/contact_widgets.php:45 +msgid "Enter name or interest" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Betrayed" +#: ../../include/contact_widgets.php:46 +msgid "Connect/Follow" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Separated" +#: ../../include/contact_widgets.php:47 +msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Unstable" +#: ../../include/contact_widgets.php:48 ../../mod/connections.php:697 +#: ../../mod/directory.php:221 ../../mod/directory.php:226 +msgid "Find" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Divorced" +#: ../../include/contact_widgets.php:49 ../../mod/suggest.php:64 +msgid "Channel Suggestions" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Imaginarily divorced" +#: ../../include/contact_widgets.php:51 +msgid "Random Profile" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Widowed" +#: ../../include/contact_widgets.php:52 +msgid "Invite Friends" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Uncertain" +#: ../../include/contact_widgets.php:79 ../../include/contact_widgets.php:113 +msgid "Everything" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "It's complicated" +#: ../../include/contact_widgets.php:110 ../../include/widgets.php:26 +msgid "Categories" msgstr "" -#: ../../include/profile_selectors.php:42 -msgid "Don't care" -msgstr "" +#: ../../include/contact_widgets.php:143 +#, php-format +msgid "%d connection in common" +msgid_plural "%d connections in common" +msgstr[0] "" +msgstr[1] "" -#: ../../include/profile_selectors.php:42 -msgid "Ask me" +#: ../../include/page_widgets.php:6 +msgid "New Page" msgstr "" -#: ../../include/features.php:21 -msgid "General Features" +#: ../../include/follow.php:21 +msgid "Channel is blocked on this site." msgstr "" -#: ../../include/features.php:23 -msgid "Content Expiration" +#: ../../include/follow.php:26 +msgid "Channel location missing." msgstr "" -#: ../../include/features.php:23 -msgid "Remove posts/comments and/or private messages at a future time" +#: ../../include/follow.php:43 +msgid "Channel discovery failed. Website may be down or misconfigured." msgstr "" -#: ../../include/features.php:24 -msgid "Multiple Profiles" +#: ../../include/follow.php:51 +msgid "Response from remote channel was not understood." msgstr "" -#: ../../include/features.php:24 -msgid "Ability to create multiple profiles" +#: ../../include/follow.php:58 +msgid "Response from remote channel was incomplete." msgstr "" -#: ../../include/features.php:25 -msgid "Web Pages" +#: ../../include/follow.php:129 +msgid "local account not found." msgstr "" -#: ../../include/features.php:25 -msgid "Provide managed web pages on your channel" +#: ../../include/follow.php:138 +msgid "Cannot connect to yourself." msgstr "" -#: ../../include/features.php:26 -msgid "Enhanced Photo Albums" +#: ../../include/permissions.php:13 +msgid "Can view my \"public\" stream and posts" msgstr "" -#: ../../include/features.php:26 -msgid "Enable photo album with enhanced features" +#: ../../include/permissions.php:14 +msgid "Can view my \"public\" channel profile" msgstr "" -#: ../../include/features.php:28 -msgid "Extended Identity Sharing" +#: ../../include/permissions.php:15 +msgid "Can view my \"public\" photo albums" msgstr "" -#: ../../include/features.php:29 -msgid "Expert Mode" +#: ../../include/permissions.php:16 +msgid "Can view my \"public\" address book" msgstr "" -#: ../../include/features.php:29 -msgid "Enable Expert Mode to provide advanced configuration options" +#: ../../include/permissions.php:17 +msgid "Can view my \"public\" file storage" msgstr "" -#: ../../include/features.php:30 -msgid "Premium Channel" +#: ../../include/permissions.php:18 +msgid "Can view my \"public\" pages" msgstr "" -#: ../../include/features.php:30 -msgid "" -"Allows you to set restrictions and terms on those that connect with your " -"channel" +#: ../../include/permissions.php:21 +msgid "Can send me their channel stream and posts" msgstr "" -#: ../../include/features.php:35 -msgid "Post Composition Features" +#: ../../include/permissions.php:22 +msgid "Can post on my channel page (\"wall\")" msgstr "" -#: ../../include/features.php:36 -msgid "Richtext Editor" +#: ../../include/permissions.php:23 +msgid "Can comment on my posts" msgstr "" -#: ../../include/features.php:36 -msgid "Enable richtext editor" +#: ../../include/permissions.php:24 +msgid "Can send me private mail messages" msgstr "" -#: ../../include/features.php:37 -msgid "Post Preview" +#: ../../include/permissions.php:25 +msgid "Can post photos to my photo albums" msgstr "" -#: ../../include/features.php:37 -msgid "Allow previewing posts and comments before publishing them" +#: ../../include/permissions.php:26 +msgid "Can forward to all my channel contacts via post @mentions" msgstr "" -#: ../../include/features.php:38 ../../mod/sources.php:67 -#: ../../mod/settings.php:120 -msgid "Channel Sources" +#: ../../include/permissions.php:26 +msgid "Advanced - useful for creating group forum channels" msgstr "" -#: ../../include/features.php:38 -msgid "Automatically import channel content from other channels or feeds" +#: ../../include/permissions.php:27 +msgid "Can chat with me (when available)" msgstr "" -#: ../../include/features.php:39 -msgid "Even More Encryption" +#: ../../include/permissions.php:27 +msgid "Requires compatible chat plugin" msgstr "" -#: ../../include/features.php:39 -msgid "Allow encryption of content end-to-end with a shared secret key" +#: ../../include/permissions.php:28 +msgid "Can write to my \"public\" file storage" msgstr "" -#: ../../include/features.php:44 -msgid "Network and Stream Filtering" +#: ../../include/permissions.php:29 +msgid "Can edit my \"public\" pages" msgstr "" -#: ../../include/features.php:45 -msgid "Search by Date" +#: ../../include/permissions.php:31 +msgid "Can source my \"public\" posts in derived channels" msgstr "" -#: ../../include/features.php:45 -msgid "Ability to select posts by date ranges" +#: ../../include/permissions.php:31 +msgid "Somewhat advanced - very useful in open communities" msgstr "" -#: ../../include/features.php:46 -msgid "Collections Filter" +#: ../../include/permissions.php:32 +msgid "Can administer my channel resources" msgstr "" -#: ../../include/features.php:46 -msgid "Enable widget to display Network posts only from selected collections" +#: ../../include/permissions.php:32 +msgid "Extremely advanced. Leave this alone unless you know what you are doing" msgstr "" -#: ../../include/features.php:47 ../../mod/search.php:17 -#: ../../mod/network.php:173 -msgid "Saved Searches" +#: ../../include/taxonomy.php:210 +msgid "Tags" msgstr "" -#: ../../include/features.php:47 -msgid "Save search terms for re-use" +#: ../../include/taxonomy.php:224 +msgid "Keywords" msgstr "" -#: ../../include/features.php:48 -msgid "Network Personal Tab" +#: ../../include/taxonomy.php:249 +msgid "have" msgstr "" -#: ../../include/features.php:48 -msgid "Enable tab to display only Network posts that you've interacted on" +#: ../../include/taxonomy.php:249 +msgid "has" msgstr "" -#: ../../include/features.php:49 -msgid "Network New Tab" +#: ../../include/taxonomy.php:250 +msgid "want" msgstr "" -#: ../../include/features.php:49 -msgid "Enable tab to display all new Network activity" +#: ../../include/taxonomy.php:250 +msgid "wants" msgstr "" -#: ../../include/features.php:50 -msgid "Affinity Tool" +#: ../../include/taxonomy.php:251 +msgid "likes" msgstr "" -#: ../../include/features.php:50 -msgid "Filter stream activity by depth of relationships" +#: ../../include/taxonomy.php:252 +msgid "dislikes" msgstr "" -#: ../../include/features.php:55 -msgid "Post/Comment Tools" +#: ../../include/plugin.php:473 ../../include/plugin.php:475 +msgid "Click here to upgrade." msgstr "" -#: ../../include/features.php:57 -msgid "Edit Sent Posts" +#: ../../include/plugin.php:481 +msgid "This action exceeds the limits set by your subscription plan." msgstr "" -#: ../../include/features.php:57 -msgid "Edit and correct posts and comments after sending" +#: ../../include/plugin.php:486 +msgid "This action is not available under your subscription plan." msgstr "" -#: ../../include/features.php:58 -msgid "Tagging" +#: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:62 +#: ../../view/theme/apw/php/config.php:176 +msgid "Default" msgstr "" -#: ../../include/features.php:58 -msgid "Ability to tag existing posts" +#: ../../include/security.php:49 +msgid "Welcome " msgstr "" -#: ../../include/features.php:59 -msgid "Post Categories" +#: ../../include/security.php:50 +msgid "Please upload a profile photo." msgstr "" -#: ../../include/features.php:59 -msgid "Add categories to your posts" +#: ../../include/security.php:53 +msgid "Welcome back " msgstr "" -#: ../../include/features.php:60 -msgid "Ability to file posts under folders" +#: ../../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 "" -#: ../../include/features.php:61 -msgid "Dislike Posts" +#: ../../include/items.php:201 ../../mod/like.php:55 ../../mod/group.php:74 +#: ../../mod/profperm.php:28 ../../index.php:339 +msgid "Permission denied" msgstr "" -#: ../../include/features.php:61 -msgid "Ability to dislike posts/comments" +#: ../../include/items.php:3546 ../../mod/admin.php:150 +#: ../../mod/admin.php:727 ../../mod/admin.php:930 ../../mod/viewsrc.php:18 +#: ../../mod/home.php:64 ../../mod/display.php:32 +msgid "Item not found." msgstr "" -#: ../../include/features.php:62 -msgid "Star Posts" +#: ../../include/items.php:3729 +msgid "Archives" msgstr "" -#: ../../include/features.php:62 -msgid "Ability to mark special posts with a star indicator" +#: ../../include/items.php:3895 ../../mod/group.php:44 ../../mod/group.php:146 +msgid "Collection not found." msgstr "" -#: ../../include/features.php:63 -msgid "Tag Cloud" +#: ../../include/items.php:3911 ../../mod/network.php:469 +msgid "Group is empty" msgstr "" -#: ../../include/features.php:63 -msgid "Provide a personal tag cloud on your channel page" +#: ../../include/items.php:3927 +msgid "Connection not found." msgstr "" -#: ../../include/attach.php:184 ../../include/attach.php:232 -msgid "Item was not found." +#: ../../include/dir_fns.php:15 +msgid "Sort Options" msgstr "" -#: ../../include/attach.php:285 -msgid "No source file." +#: ../../include/dir_fns.php:16 +msgid "Alphabetic" msgstr "" -#: ../../include/attach.php:302 -msgid "Cannot locate file to replace" +#: ../../include/dir_fns.php:17 +msgid "Reverse Alphabetic" msgstr "" -#: ../../include/attach.php:320 -msgid "Cannot locate file to revise/update" +#: ../../include/dir_fns.php:18 +msgid "Newest to Oldest" msgstr "" -#: ../../include/attach.php:331 -#, php-format -msgid "File exceeds size limit of %d" +#: ../../include/dir_fns.php:29 +msgid "Enable Safe Search" msgstr "" -#: ../../include/attach.php:342 -#, php-format -msgid "You have reached your limit of %1$.0f Mbytes attachment storage." +#: ../../include/dir_fns.php:31 +msgid "Disable Safe Search" msgstr "" -#: ../../include/attach.php:424 -msgid "File upload failed. Possible system limit or action terminated." +#: ../../include/dir_fns.php:33 +msgid "Safe Mode" msgstr "" -#: ../../include/attach.php:436 -msgid "Stored file could not be verified. Upload failed." +#: ../../mod/common.php:10 +msgid "No channel." msgstr "" -#: ../../include/attach.php:480 ../../include/attach.php:497 -msgid "Path not available." +#: ../../mod/common.php:47 +msgid "Common connections" msgstr "" -#: ../../include/attach.php:544 -msgid "Empty pathname" +#: ../../mod/common.php:52 +msgid "No connections in common." msgstr "" -#: ../../include/attach.php:562 -msgid "duplicate filename or path" +#: ../../mod/events.php:66 +msgid "Event title and start time are required." msgstr "" -#: ../../include/attach.php:584 -msgid "Path not found." +#: ../../mod/events.php:281 +msgid "l, F j" msgstr "" -#: ../../include/attach.php:628 -msgid "mkdir failed." +#: ../../mod/events.php:303 +msgid "Edit event" msgstr "" -#: ../../include/attach.php:632 -msgid "database storage failed." +#: ../../mod/events.php:349 +msgid "Create New Event" msgstr "" -#: ../../include/auth.php:67 -msgid "Logged out." +#: ../../mod/events.php:350 +msgid "Previous" msgstr "" -#: ../../include/auth.php:179 -msgid "Failed authentication" +#: ../../mod/events.php:351 ../../mod/setup.php:256 +msgid "Next" msgstr "" -#: ../../include/auth.php:188 -msgid "Login failed." +#: ../../mod/events.php:425 +msgid "hour:minute" msgstr "" -#: ../../include/enotify.php:36 -msgid "Red Matrix Notification" +#: ../../mod/events.php:435 +msgid "Event details" msgstr "" -#: ../../include/enotify.php:37 -msgid "redmatrix" +#: ../../mod/events.php:436 +#, php-format +msgid "Format is %s %s. Starting date and Title are required." msgstr "" -#: ../../include/enotify.php:39 -msgid "Thank You," +#: ../../mod/events.php:438 +msgid "Event Starts:" msgstr "" -#: ../../include/enotify.php:41 -#, php-format -msgid "%s Administrator" +#: ../../mod/events.php:438 ../../mod/events.php:452 +msgid "Required" msgstr "" -#: ../../include/enotify.php:76 -#, php-format -msgid "%s " +#: ../../mod/events.php:441 +msgid "Finish date/time is not known or not relevant" msgstr "" -#: ../../include/enotify.php:80 -#, php-format -msgid "[Red:Notify] New mail received at %s" +#: ../../mod/events.php:443 +msgid "Event Finishes:" msgstr "" -#: ../../include/enotify.php:82 -#, php-format -msgid "%1$s, %2$s sent you a new private message at %3$s." +#: ../../mod/events.php:446 +msgid "Adjust for viewer timezone" msgstr "" -#: ../../include/enotify.php:83 -#, php-format -msgid "%1$s sent you %2$s." +#: ../../mod/events.php:448 +msgid "Description:" msgstr "" -#: ../../include/enotify.php:83 -msgid "a private message" +#: ../../mod/events.php:452 +msgid "Title:" msgstr "" -#: ../../include/enotify.php:84 -#, php-format -msgid "Please visit %s to view and/or reply to your private messages." +#: ../../mod/events.php:454 +msgid "Share this event" msgstr "" -#: ../../include/enotify.php:135 -#, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]" +#: ../../mod/thing.php:109 +msgid "Object store: failed" msgstr "" -#: ../../include/enotify.php:143 -#, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]" +#: ../../mod/thing.php:113 +msgid "thing/stuff added" msgstr "" -#: ../../include/enotify.php:152 +#: ../../mod/thing.php:129 #, php-format -msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]" +msgid "OBJ: %1$s %2$s %3$s" msgstr "" -#: ../../include/enotify.php:163 -#, php-format -msgid "[Red:Notify] Comment to conversation #%1$d by %2$s" +#: ../../mod/thing.php:175 +msgid "not yet implemented." msgstr "" -#: ../../include/enotify.php:164 -#, php-format -msgid "%1$s, %2$s commented on an item/conversation you have been following." +#: ../../mod/thing.php:181 +msgid "Add Stuff to your Profile" msgstr "" -#: ../../include/enotify.php:167 ../../include/enotify.php:186 -#: ../../include/enotify.php:212 ../../include/enotify.php:231 -#: ../../include/enotify.php:245 -#, php-format -msgid "Please visit %s to view and/or reply to the conversation." +#: ../../mod/thing.php:183 +msgid "Select a profile" msgstr "" -#: ../../include/enotify.php:174 -#, php-format -msgid "[Red:Notify] %s posted to your profile wall" +#: ../../mod/thing.php:185 +msgid "Select a category of stuff. e.g. I ______ something" msgstr "" -#: ../../include/enotify.php:176 -#, php-format -msgid "%1$s, %2$s posted to your profile wall at %3$s" +#: ../../mod/thing.php:187 +msgid "Name of thing or stuff e.g. something" msgstr "" -#: ../../include/enotify.php:178 -#, php-format -msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" +#: ../../mod/thing.php:188 +msgid "URL of thing or stuff (optional)" msgstr "" -#: ../../include/enotify.php:205 -#, php-format -msgid "[Red:Notify] %s tagged you" +#: ../../mod/thing.php:189 +msgid "URL for photo of thing or stuff (optional)" msgstr "" -#: ../../include/enotify.php:206 -#, php-format -msgid "%1$s, %2$s tagged you at %3$s" +#: ../../mod/invite.php:25 +msgid "Total invitation limit exceeded." msgstr "" -#: ../../include/enotify.php:207 +#: ../../mod/invite.php:47 #, php-format -msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." +msgid "%s : Not a valid email address." msgstr "" -#: ../../include/enotify.php:220 -#, php-format -msgid "[Red:Notify] %1$s poked you" +#: ../../mod/invite.php:74 +msgid "Please join us on Red" msgstr "" -#: ../../include/enotify.php:221 -#, php-format -msgid "%1$s, %2$s poked you at %3$s" +#: ../../mod/invite.php:85 +msgid "Invitation limit exceeded. Please contact your site administrator." msgstr "" -#: ../../include/enotify.php:222 +#: ../../mod/invite.php:90 #, php-format -msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." +msgid "%s : Message delivery failed." msgstr "" -#: ../../include/enotify.php:238 +#: ../../mod/invite.php:94 #, php-format -msgid "[Red:Notify] %s tagged your post" +msgid "%d message sent." +msgid_plural "%d messages sent." +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/invite.php:113 +msgid "You have no more invitations available" msgstr "" -#: ../../include/enotify.php:239 -#, php-format -msgid "%1$s, %2$s tagged your post at %3$s" +#: ../../mod/invite.php:139 +msgid "Send invitations" msgstr "" -#: ../../include/enotify.php:240 -#, php-format -msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" +#: ../../mod/invite.php:140 +msgid "Enter email addresses, one per line:" msgstr "" -#: ../../include/enotify.php:252 -msgid "[Red:Notify] Introduction received" +#: ../../mod/invite.php:141 ../../mod/message.php:326 +#: ../../mod/message.php:508 +msgid "Your message:" msgstr "" -#: ../../include/enotify.php:253 -#, php-format -msgid "%1$s, you've received an introduction from '%2$s' at %3$s" +#: ../../mod/invite.php:142 +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 "" -#: ../../include/enotify.php:254 -#, php-format -msgid "%1$s, you've received [zrl=%2$s]an introduction[/zrl] from %3$s." +#: ../../mod/invite.php:144 +msgid "You will need to supply this invitation code: $invite_code" msgstr "" -#: ../../include/enotify.php:258 ../../include/enotify.php:277 -#, php-format -msgid "You may visit their profile at %s" +#: ../../mod/invite.php:145 +msgid "Please visit my channel at" msgstr "" -#: ../../include/enotify.php:260 -#, php-format -msgid "Please visit %s to approve or reject the introduction." +#: ../../mod/invite.php:149 +msgid "" +"Once you have registered (on ANY Red Matrix site - they are all inter-" +"connected), please connect with my Red Matrix channel address:" msgstr "" -#: ../../include/enotify.php:267 -msgid "[Red:Notify] Friend suggestion received" +#: ../../mod/invite.php:151 +msgid "Click the [Register] link on the following page to join." msgstr "" -#: ../../include/enotify.php:268 -#, php-format -msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" +#: ../../mod/invite.php:153 +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 "" -#: ../../include/enotify.php:269 +#: ../../mod/allfriends.php:35 #, php-format -msgid "" -"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s." +msgid "Friends of %s" msgstr "" -#: ../../include/enotify.php:275 -msgid "Name:" +#: ../../mod/allfriends.php:41 +msgid "No friends to display." msgstr "" -#: ../../include/enotify.php:276 -msgid "Photo:" +#: ../../mod/webpages.php:8 ../../mod/connect.php:13 ../../mod/layouts.php:8 +#: ../../mod/filestorage.php:8 ../../mod/blocks.php:10 ../../mod/profile.php:8 +#: ../../boot.php:1640 +msgid "Requested profile is not available." msgstr "" -#: ../../include/enotify.php:279 -#, php-format -msgid "Please visit %s to approve or reject the suggestion." +#: ../../mod/webpages.php:104 ../../mod/layouts.php:105 +#: ../../mod/blocks.php:96 +msgid "View" msgstr "" -#: ../../include/contact_selectors.php:30 -msgid "Unknown | Not categorised" +#: ../../mod/api.php:76 ../../mod/api.php:102 +msgid "Authorize application connection" msgstr "" -#: ../../include/contact_selectors.php:31 -msgid "Block immediately" +#: ../../mod/api.php:77 +msgid "Return to your app and insert this Securty Code:" msgstr "" -#: ../../include/contact_selectors.php:32 -msgid "Shady, spammer, self-marketer" +#: ../../mod/api.php:89 +msgid "Please login to continue." msgstr "" -#: ../../include/contact_selectors.php:33 -msgid "Known to me, but no opinion" +#: ../../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 "" -#: ../../include/contact_selectors.php:34 -msgid "OK, probably harmless" +#: ../../mod/api.php:105 ../../mod/settings.php:1009 +#: ../../mod/settings.php:1014 ../../mod/settings.php:1037 +#: ../../mod/settings.php:1039 ../../mod/settings.php:1040 +#: ../../mod/settings.php:1041 ../../mod/profiles.php:506 +msgid "Yes" msgstr "" -#: ../../include/contact_selectors.php:35 -msgid "Reputable, has my trust" +#: ../../mod/api.php:106 ../../mod/settings.php:1009 +#: ../../mod/settings.php:1014 ../../mod/settings.php:1037 +#: ../../mod/settings.php:1039 ../../mod/settings.php:1040 +#: ../../mod/settings.php:1041 ../../mod/profiles.php:507 +msgid "No" msgstr "" -#: ../../include/contact_selectors.php:54 -msgid "Frequently" +#: ../../mod/lastpost.php:16 ../../mod/channel.php:16 +msgid "You must be logged in to see this page." msgstr "" -#: ../../include/contact_selectors.php:55 -msgid "Hourly" +#: ../../mod/apps.php:8 +msgid "No installed applications." msgstr "" -#: ../../include/contact_selectors.php:56 -msgid "Twice daily" +#: ../../mod/apps.php:13 +msgid "Applications" msgstr "" -#: ../../include/contact_selectors.php:57 -msgid "Daily" +#: ../../mod/page.php:35 +msgid "Invalid item." msgstr "" -#: ../../include/contact_selectors.php:58 -msgid "Weekly" +#: ../../mod/page.php:47 ../../mod/chanview.php:78 ../../mod/home.php:51 +#: ../../mod/magic.php:95 ../../mod/wall_upload.php:35 +msgid "Channel not found." msgstr "" -#: ../../include/contact_selectors.php:59 -msgid "Monthly" +#: ../../mod/page.php:83 ../../mod/help.php:56 ../../mod/display.php:92 +#: ../../index.php:229 +msgid "Page not found." msgstr "" -#: ../../include/contact_selectors.php:74 -msgid "Friendica" +#: ../../mod/attach.php:9 +msgid "Item not available." msgstr "" -#: ../../include/contact_selectors.php:75 -msgid "OStatus" +#: ../../mod/setup.php:161 +msgid "Red Matrix Server - Setup" msgstr "" -#: ../../include/contact_selectors.php:76 -msgid "RSS/Atom" +#: ../../mod/setup.php:167 +msgid "Could not connect to database." msgstr "" -#: ../../include/contact_selectors.php:78 -msgid "Diaspora" +#: ../../mod/setup.php:171 +msgid "" +"Could not connect to specified site URL. Possible SSL certificate or DNS " +"issue." msgstr "" -#: ../../include/contact_selectors.php:79 -msgid "Facebook" +#: ../../mod/setup.php:176 +msgid "Could not create table." msgstr "" -#: ../../include/contact_selectors.php:80 -msgid "Zot!" +#: ../../mod/setup.php:182 +msgid "Your site database has been installed." msgstr "" -#: ../../include/contact_selectors.php:81 -msgid "LinkedIn" +#: ../../mod/setup.php:187 +msgid "" +"You may need to import the file \"install/database.sql\" manually using " +"phpmyadmin or mysql." msgstr "" -#: ../../include/contact_selectors.php:82 -msgid "XMPP/IM" +#: ../../mod/setup.php:188 ../../mod/setup.php:255 ../../mod/setup.php:584 +msgid "Please see the file \"install/INSTALL.txt\"." msgstr "" -#: ../../include/contact_selectors.php:83 -msgid "MySpace" +#: ../../mod/setup.php:252 +msgid "System check" msgstr "" -#: ../../mod/ping.php:160 -msgid "sent you a private message" +#: ../../mod/setup.php:257 +msgid "Check again" msgstr "" -#: ../../mod/ping.php:218 -msgid "added your channel" +#: ../../mod/setup.php:279 +msgid "Database connection" msgstr "" -#: ../../mod/ping.php:262 -msgid "posted an event" +#: ../../mod/setup.php:280 +msgid "" +"In order to install Red Matrix we need to know how to connect to your " +"database." msgstr "" -#: ../../mod/update_search.php:46 ../../mod/update_display.php:25 -#: ../../mod/update_community.php:18 ../../mod/update_network.php:23 -#: ../../mod/update_channel.php:43 -msgid "[Embedded content - reload page to view]" +#: ../../mod/setup.php:281 +msgid "" +"Please contact your hosting provider or site administrator if you have " +"questions about these settings." msgstr "" -#: ../../mod/message.php:19 -msgid "Check Mail" +#: ../../mod/setup.php:282 +msgid "" +"The database you specify below should already exist. If it does not, please " +"create it before continuing." msgstr "" -#: ../../mod/message.php:56 -msgid "Unable to lookup recipient." +#: ../../mod/setup.php:286 +msgid "Database Server Name" msgstr "" -#: ../../mod/message.php:64 -msgid "Unable to communicate with requested channel." +#: ../../mod/setup.php:286 +msgid "Default is localhost" msgstr "" -#: ../../mod/message.php:71 -msgid "Cannot verify requested channel." +#: ../../mod/setup.php:287 +msgid "Database Port" msgstr "" -#: ../../mod/message.php:97 -msgid "Selected channel has private message restrictions. Send failed." +#: ../../mod/setup.php:287 +msgid "Communication port number - use 0 for default" msgstr "" -#: ../../mod/message.php:223 ../../mod/notifications.php:101 -msgid "Messages" +#: ../../mod/setup.php:288 +msgid "Database Login Name" msgstr "" -#: ../../mod/message.php:234 -msgid "Message deleted." +#: ../../mod/setup.php:289 +msgid "Database Login Password" msgstr "" -#: ../../mod/message.php:241 -msgid "Conversation removed." +#: ../../mod/setup.php:290 +msgid "Database Name" msgstr "" -#: ../../mod/message.php:258 -msgid "Message recalled." +#: ../../mod/setup.php:292 ../../mod/setup.php:334 +msgid "Site administrator email address" msgstr "" -#: ../../mod/message.php:316 -msgid "Send Private Message" +#: ../../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/message.php:317 ../../mod/message.php:503 -msgid "To:" +#: ../../mod/setup.php:293 ../../mod/setup.php:336 +msgid "Website URL" msgstr "" -#: ../../mod/message.php:322 ../../mod/message.php:505 -msgid "Subject:" +#: ../../mod/setup.php:293 ../../mod/setup.php:336 +msgid "Please use SSL (https) URL if available." msgstr "" -#: ../../mod/message.php:326 ../../mod/message.php:508 -#: ../../mod/invite.php:141 -msgid "Your message:" -msgstr "" - -#: ../../mod/message.php:359 -msgid "No messages." +#: ../../mod/setup.php:296 ../../mod/setup.php:339 +msgid "Please select a default timezone for your website" msgstr "" -#: ../../mod/message.php:375 ../../mod/message.php:472 -msgid "Delete message" +#: ../../mod/setup.php:323 +msgid "Site settings" msgstr "" -#: ../../mod/message.php:377 -msgid "D, d M Y - g:i A" +#: ../../mod/setup.php:379 +msgid "Could not find a command line version of PHP in the web server PATH." msgstr "" -#: ../../mod/message.php:396 -msgid "Message not found." +#: ../../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/message.php:473 -msgid "Recall message" +#: ../../mod/setup.php:384 +msgid "PHP executable path" msgstr "" -#: ../../mod/message.php:475 -msgid "Message has been recalled." +#: ../../mod/setup.php:384 +msgid "" +"Enter full path to php executable. You can leave this blank to continue the " +"installation." msgstr "" -#: ../../mod/message.php:492 -msgid "Private Conversation" +#: ../../mod/setup.php:389 +msgid "Command line PHP" msgstr "" -#: ../../mod/message.php:496 -msgid "Delete conversation" +#: ../../mod/setup.php:398 +msgid "" +"The command line version of PHP on your system does not have " +"\"register_argc_argv\" enabled." msgstr "" -#: ../../mod/message.php:498 -msgid "" -"No secure communications available. You may be able to " -"respond from the sender's profile page." +#: ../../mod/setup.php:399 +msgid "This is required for message delivery to work." msgstr "" -#: ../../mod/message.php:502 -msgid "Send Reply" +#: ../../mod/setup.php:401 +msgid "PHP register_argc_argv" msgstr "" -#: ../../mod/chanview.php:78 ../../mod/wall_upload.php:35 -#: ../../mod/magic.php:95 ../../mod/page.php:47 ../../mod/home.php:51 -msgid "Channel not found." +#: ../../mod/setup.php:422 +msgid "" +"Error: the \"openssl_pkey_new\" function on this system is not able to " +"generate encryption keys" msgstr "" -#: ../../mod/chanview.php:98 -msgid "toggle full screen mode" +#: ../../mod/setup.php:423 +msgid "" +"If running under Windows, please see \"http://www.php.net/manual/en/openssl." +"installation.php\"." msgstr "" -#: ../../mod/xchan.php:25 ../../mod/mitem.php:97 ../../mod/menu.php:113 -msgid "Not found." +#: ../../mod/setup.php:425 +msgid "Generate encryption keys" msgstr "" -#: ../../mod/poke.php:159 -msgid "Poke/Prod" +#: ../../mod/setup.php:432 +msgid "libCurl PHP module" msgstr "" -#: ../../mod/poke.php:160 -msgid "poke, prod or do other things to somebody" +#: ../../mod/setup.php:433 +msgid "GD graphics PHP module" msgstr "" -#: ../../mod/poke.php:161 -msgid "Recipient" +#: ../../mod/setup.php:434 +msgid "OpenSSL PHP module" msgstr "" -#: ../../mod/poke.php:162 -msgid "Choose what you wish to do to recipient" +#: ../../mod/setup.php:435 +msgid "mysqli PHP module" msgstr "" -#: ../../mod/poke.php:165 -msgid "Make this post private" +#: ../../mod/setup.php:436 +msgid "mb_string PHP module" msgstr "" -#: ../../mod/rpost.php:84 ../../mod/editpost.php:42 -msgid "Edit post" +#: ../../mod/setup.php:437 +msgid "mcrypt PHP module" msgstr "" -#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92 -#: ../../mod/crepair.php:129 -msgid "Contact not found." +#: ../../mod/setup.php:442 ../../mod/setup.php:444 +msgid "Apache mod_rewrite module" msgstr "" -#: ../../mod/fsuggest.php:63 -msgid "Friend suggestion sent." +#: ../../mod/setup.php:442 +msgid "" +"Error: Apache webserver mod-rewrite module is required but not installed." msgstr "" -#: ../../mod/fsuggest.php:97 -msgid "Suggest Friends" +#: ../../mod/setup.php:448 ../../mod/setup.php:451 +msgid "proc_open" msgstr "" -#: ../../mod/fsuggest.php:99 -#, php-format -msgid "Suggest a friend for %s" +#: ../../mod/setup.php:448 +msgid "" +"Error: proc_open is required but is either not installed or has been " +"disabled in php.ini" msgstr "" -#: ../../mod/pubsites.php:22 -msgid "Public Sites" +#: ../../mod/setup.php:456 +msgid "Error: libCURL PHP module required but not installed." msgstr "" -#: ../../mod/pubsites.php:25 +#: ../../mod/setup.php:460 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." +"Error: GD graphics PHP module with JPEG support required but not installed." msgstr "" -#: ../../mod/pubsites.php:31 -msgid "Site URL" +#: ../../mod/setup.php:464 +msgid "Error: openssl PHP module required but not installed." msgstr "" -#: ../../mod/pubsites.php:31 -msgid "Access Type" +#: ../../mod/setup.php:468 +msgid "Error: mysqli PHP module required but not installed." msgstr "" -#: ../../mod/pubsites.php:31 -msgid "Registration Policy" +#: ../../mod/setup.php:472 +msgid "Error: mb_string PHP module required but not installed." msgstr "" -#: ../../mod/pubsites.php:31 ../../mod/profiles.php:367 -msgid "Location" +#: ../../mod/setup.php:476 +msgid "Error: mcrypt PHP module required but not installed." msgstr "" -#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 -#: ../../mod/tagrm.php:94 ../../mod/settings.php:652 -#: ../../mod/settings.php:678 -msgid "Cancel" +#: ../../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/fbrowser.php:114 -msgid "Files" +#: ../../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/mood.php:133 -msgid "Mood" +#: ../../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/mood.php:134 -msgid "Set your current mood and tell your friends" +#: ../../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/profile_photo.php:54 -msgid "Image uploaded but image cropping failed." +#: ../../mod/setup.php:498 +msgid ".htconfig.php is writable" msgstr "" -#: ../../mod/profile_photo.php:107 -msgid "Image resize failed." +#: ../../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/profile_photo.php:151 +#: ../../mod/setup.php:509 msgid "" -"Shift-reload the page or clear browser cache if the new photo does not " -"display immediately." +"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/profile_photo.php:173 -#, php-format -msgid "Image exceeds size limit of %d" +#: ../../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/profile_photo.php:182 -msgid "Unable to process image." +#: ../../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/profile_photo.php:224 ../../mod/profile_photo.php:272 -msgid "Photo not available." +#: ../../mod/setup.php:514 +msgid "view/tpl/smarty3 is writable" msgstr "" -#: ../../mod/profile_photo.php:291 -msgid "Upload File:" +#: ../../mod/setup.php:528 +msgid "SSL certificate validation" msgstr "" -#: ../../mod/profile_photo.php:292 -msgid "Select a profile:" +#: ../../mod/setup.php:528 +msgid "" +"SSL certificate cannot be validated. Fix certificate or disable https access " +"to this site." msgstr "" -#: ../../mod/profile_photo.php:293 -msgid "Upload Profile Photo" +#: ../../mod/setup.php:535 +msgid "" +"Url rewrite in .htaccess is not working. Check your server configuration." msgstr "" -#: ../../mod/profile_photo.php:294 -msgid "Upload" +#: ../../mod/setup.php:537 +msgid "Url rewrite is working" msgstr "" -#: ../../mod/profile_photo.php:298 ../../mod/settings.php:1018 -msgid "or" +#: ../../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/profile_photo.php:298 -msgid "skip this step" +#: ../../mod/setup.php:571 +msgid "Errors encountered creating database tables." msgstr "" -#: ../../mod/profile_photo.php:298 -msgid "select a photo from your photo albums" +#: ../../mod/setup.php:582 +msgid "

      What next

      " msgstr "" -#: ../../mod/profile_photo.php:312 -msgid "Crop Image" +#: ../../mod/setup.php:583 +msgid "" +"IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" -#: ../../mod/profile_photo.php:313 -msgid "Please adjust the image cropping for optimum viewing." +#: ../../mod/rpost.php:84 ../../mod/editpost.php:42 +msgid "Edit post" msgstr "" -#: ../../mod/profile_photo.php:315 -msgid "Done Editing" +#: ../../mod/subthread.php:105 +#, php-format +msgid "%1$s is following %2$s's %3$s" msgstr "" -#: ../../mod/profile_photo.php:350 -msgid "Image uploaded successfully." +#: ../../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/profile_photo.php:352 -msgid "Image upload failed." +#: ../../mod/chanview.php:98 +msgid "toggle full screen mode" msgstr "" -#: ../../mod/profile_photo.php:361 +#: ../../mod/tagger.php:98 #, php-format -msgid "Image size reduction [%s] failed." +msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" -#: ../../mod/wall_upload.php:41 ../../mod/item.php:1074 -msgid "Wall Photos" +#: ../../mod/settings.php:53 +msgid "Account settings" msgstr "" -#: ../../mod/crepair.php:102 -msgid "Contact settings applied." +#: ../../mod/settings.php:59 +msgid "Channel settings" msgstr "" -#: ../../mod/crepair.php:104 -msgid "Contact update failed." +#: ../../mod/settings.php:65 +msgid "Additional features" msgstr "" -#: ../../mod/crepair.php:135 -msgid "Repair Contact Settings" +#: ../../mod/settings.php:71 +msgid "Feature 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." +#: ../../mod/settings.php:77 +msgid "Display settings" msgstr "" -#: ../../mod/crepair.php:138 -msgid "" -"Please use your browser 'Back' button now if you are " -"uncertain what to do on this page." +#: ../../mod/settings.php:83 +msgid "Connected apps" msgstr "" -#: ../../mod/crepair.php:144 -msgid "Return to contact editor" +#: ../../mod/settings.php:89 +msgid "Export channel" msgstr "" -#: ../../mod/crepair.php:148 ../../mod/admin.php:686 -#: ../../mod/settings.php:653 ../../mod/settings.php:679 -msgid "Name" +#: ../../mod/settings.php:101 +msgid "Automatic Permissions (Advanced)" msgstr "" -#: ../../mod/crepair.php:149 -msgid "Account Nickname" +#: ../../mod/settings.php:111 +msgid "Premium Channel Settings" msgstr "" -#: ../../mod/crepair.php:150 -msgid "@Tagname - overrides Name/Nickname" +#: ../../mod/settings.php:171 +msgid "Name is required" msgstr "" -#: ../../mod/crepair.php:151 -msgid "Account URL" +#: ../../mod/settings.php:175 +msgid "Key and Secret are required" msgstr "" -#: ../../mod/crepair.php:152 -msgid "Friend Request URL" +#: ../../mod/settings.php:179 ../../mod/settings.php:677 +msgid "Update" msgstr "" -#: ../../mod/crepair.php:153 -msgid "Friend Confirm URL" +#: ../../mod/settings.php:292 +msgid "Passwords do not match. Password unchanged." msgstr "" -#: ../../mod/crepair.php:154 -msgid "Notification Endpoint URL" +#: ../../mod/settings.php:296 +msgid "Empty passwords are not allowed. Password unchanged." msgstr "" -#: ../../mod/crepair.php:155 -msgid "Poll/Feed URL" +#: ../../mod/settings.php:309 +msgid "Password changed." msgstr "" -#: ../../mod/crepair.php:156 -msgid "New photo from this URL" +#: ../../mod/settings.php:311 +msgid "Password update failed. Please try again." msgstr "" -#: ../../mod/connect.php:59 ../../mod/connect.php:107 -msgid "Continue" +#: ../../mod/settings.php:325 +msgid "Not valid email." msgstr "" -#: ../../mod/connect.php:88 -msgid "Premium Channel Setup" +#: ../../mod/settings.php:328 +msgid "Protected email address. Cannot change to that email." msgstr "" -#: ../../mod/connect.php:90 -msgid "Enable premium channel connection restrictions" +#: ../../mod/settings.php:337 +msgid "System failure storing new email. Please try again." msgstr "" -#: ../../mod/connect.php:91 -msgid "" -"Please enter your restrictions or conditions, such as paypal receipt, usage " -"guidelines, etc." +#: ../../mod/settings.php:579 +msgid "Settings updated." msgstr "" -#: ../../mod/connect.php:93 ../../mod/connect.php:113 -msgid "" -"This channel may require additional steps or acknowledgement of the " -"following conditions prior to connecting:" +#: ../../mod/settings.php:650 ../../mod/settings.php:676 +#: ../../mod/settings.php:712 +msgid "Add application" msgstr "" -#: ../../mod/connect.php:94 -msgid "" -"Potential connections will then see the following text before proceeding:" +#: ../../mod/settings.php:652 ../../mod/settings.php:678 +#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/fbrowser.php:82 +#: ../../mod/fbrowser.php:117 +msgid "Cancel" msgstr "" -#: ../../mod/connect.php:95 ../../mod/connect.php:116 -msgid "" -"By continuing, I certify that I have complied with any instructions provided " -"on this page." +#: ../../mod/settings.php:653 ../../mod/settings.php:679 +#: ../../mod/admin.php:686 ../../mod/crepair.php:148 +msgid "Name" msgstr "" -#: ../../mod/connect.php:104 -msgid "(No specific instructions have been provided by the channel owner.)" +#: ../../mod/settings.php:653 +msgid "Name of application" msgstr "" -#: ../../mod/connect.php:112 -msgid "Restricted or Premium Channel" +#: ../../mod/settings.php:654 ../../mod/settings.php:680 +msgid "Consumer Key" msgstr "" -#: ../../mod/lockview.php:34 -msgid "Remote privacy information not available." +#: ../../mod/settings.php:654 ../../mod/settings.php:655 +msgid "Automatically generated - change if desired. Max length 20" msgstr "" -#: ../../mod/lockview.php:43 -msgid "Visible to:" +#: ../../mod/settings.php:655 ../../mod/settings.php:681 +msgid "Consumer Secret" msgstr "" -#: ../../mod/blocks.php:65 -msgid "Block Name" +#: ../../mod/settings.php:656 ../../mod/settings.php:682 +msgid "Redirect" msgstr "" -#: ../../mod/blocks.php:96 ../../mod/webpages.php:104 -#: ../../mod/layouts.php:105 -msgid "View" +#: ../../mod/settings.php:656 +msgid "" +"Redirect URI - leave blank unless your application specifically requires this" msgstr "" -#: ../../mod/intro.php:11 ../../mod/intro.php:98 ../../mod/admin.php:688 -#: ../../mod/notifications.php:159 ../../mod/notifications.php:206 -msgid "Approve" +#: ../../mod/settings.php:657 ../../mod/settings.php:683 +msgid "Icon url" msgstr "" -#: ../../mod/intro.php:14 ../../mod/intro.php:99 ../../mod/admin.php:691 -#: ../../mod/connections.php:348 ../../mod/connections.php:490 -msgid "Block" +#: ../../mod/settings.php:657 +msgid "Optional" 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" +#: ../../mod/settings.php:668 +msgid "You can't edit this application." msgstr "" -#: ../../mod/intro.php:29 ../../mod/connections.php:122 -msgid "Connection updated." +#: ../../mod/settings.php:711 +msgid "Connected Apps" msgstr "" -#: ../../mod/intro.php:31 -msgid "Connection update failed." +#: ../../mod/settings.php:715 +msgid "Client key starts with" msgstr "" -#: ../../mod/intro.php:56 -msgid "Introductions and Connection Requests" +#: ../../mod/settings.php:716 +msgid "No name" msgstr "" -#: ../../mod/intro.php:67 -msgid "No pending introductions." +#: ../../mod/settings.php:717 +msgid "Remove authorization" msgstr "" -#: ../../mod/intro.php:72 -msgid "System error. Please try again later." +#: ../../mod/settings.php:728 +msgid "No feature settings configured" msgstr "" -#: ../../mod/intro.php:95 ../../mod/connections.php:496 -#: ../../mod/notifications.php:155 ../../mod/notifications.php:202 -msgid "Hide this contact from others" +#: ../../mod/settings.php:736 +msgid "Feature Settings" msgstr "" -#: ../../mod/intro.php:96 ../../mod/notifications.php:156 -#: ../../mod/notifications.php:203 -msgid "Post a new friend activity" +#: ../../mod/settings.php:759 +msgid "Account Settings" msgstr "" -#: ../../mod/intro.php:96 ../../mod/notifications.php:156 -#: ../../mod/notifications.php:203 -msgid "if applicable" +#: ../../mod/settings.php:760 +msgid "Password Settings" msgstr "" -#: ../../mod/intro.php:101 ../../mod/notifications.php:35 -#: ../../mod/notifications.php:163 ../../mod/notifications.php:209 -msgid "Discard" +#: ../../mod/settings.php:761 +msgid "New Password:" msgstr "" -#: ../../mod/community.php:18 ../../mod/search.php:80 ../../mod/display.php:9 -#: ../../mod/directory.php:32 ../../mod/photos.php:576 -#: ../../mod/viewconnections.php:28 -msgid "Public access denied." +#: ../../mod/settings.php:762 +msgid "Confirm:" msgstr "" -#: ../../mod/community.php:23 -msgid "Not available." +#: ../../mod/settings.php:762 +msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/community.php:32 -msgid "Community" +#: ../../mod/settings.php:764 ../../mod/settings.php:1063 +msgid "Email Address:" msgstr "" -#: ../../mod/community.php:63 ../../mod/community.php:88 -msgid "No results." +#: ../../mod/settings.php:765 +msgid "Remove Account" msgstr "" -#: ../../mod/oexchange.php:23 -msgid "Unable to find your hub." +#: ../../mod/settings.php:766 +msgid "Warning: This action is permanent and cannot be reversed." msgstr "" -#: ../../mod/oexchange.php:37 -msgid "Post successful." +#: ../../mod/settings.php:782 +msgid "Off" msgstr "" -#: ../../mod/search.php:20 ../../mod/network.php:164 -msgid "Remove term" +#: ../../mod/settings.php:782 +msgid "On" msgstr "" -#: ../../mod/profperm.php:34 ../../mod/profperm.php:64 -msgid "Invalid profile identifier." +#: ../../mod/settings.php:789 +msgid "Additional Features" msgstr "" -#: ../../mod/profperm.php:110 -msgid "Profile Visibility Editor" +#: ../../mod/settings.php:814 +msgid "Connector Settings" msgstr "" -#: ../../mod/profperm.php:114 -msgid "Click on a contact to add or remove." +#: ../../mod/settings.php:844 ../../mod/admin.php:369 +msgid "No special theme for mobile devices" msgstr "" -#: ../../mod/profperm.php:123 -msgid "Visible To" +#: ../../mod/settings.php:884 +msgid "Display Settings" msgstr "" -#: ../../mod/profperm.php:139 -msgid "All Contacts (with secure profile access)" +#: ../../mod/settings.php:890 +msgid "Display Theme:" msgstr "" -#: ../../mod/new_channel.php:107 -msgid "Add a Channel" +#: ../../mod/settings.php:891 +msgid "Mobile Theme:" 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:892 +msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/new_channel.php:110 ../../mod/sources.php:82 -#: ../../mod/sources.php:109 -msgid "Channel Name" +#: ../../mod/settings.php:892 +msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/new_channel.php:111 -msgid "" -"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " -"Group\" " +#: ../../mod/settings.php:893 +msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../mod/new_channel.php:112 -msgid "Choose a short nickname" +#: ../../mod/settings.php:893 +msgid "Maximum of 100 items" 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:894 +msgid "Don't show emoticons" msgstr "" -#: ../../mod/new_channel.php:114 -msgid "" -"Or import an existing channel from another location" +#: ../../mod/settings.php:930 +msgid "Nobody except yourself" msgstr "" -#: ../../mod/new_channel.php:117 ../../mod/mitem.php:149 ../../mod/menu.php:79 -msgid "Create" +#: ../../mod/settings.php:931 +msgid "Only those you specifically allow" msgstr "" -#: ../../mod/mitem.php:13 ../../mod/menu.php:87 -msgid "Menu not found." +#: ../../mod/settings.php:932 +msgid "Anybody in your address book" msgstr "" -#: ../../mod/mitem.php:66 -msgid "Menu element updated." +#: ../../mod/settings.php:933 +msgid "Anybody on this website" msgstr "" -#: ../../mod/mitem.php:70 -msgid "Unable to update menu element." +#: ../../mod/settings.php:934 +msgid "Anybody in this network" msgstr "" -#: ../../mod/mitem.php:76 -msgid "Menu element added." +#: ../../mod/settings.php:935 +msgid "Anybody on the internet" msgstr "" -#: ../../mod/mitem.php:80 -msgid "Unable to add menu element." +#: ../../mod/settings.php:1009 +msgid "Publish your default profile in the network directory" msgstr "" -#: ../../mod/mitem.php:116 -msgid "Manage Menu Elements" +#: ../../mod/settings.php:1014 +msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/mitem.php:119 -msgid "Edit menu" +#: ../../mod/settings.php:1018 ../../mod/profile_photo.php:298 +msgid "or" msgstr "" -#: ../../mod/mitem.php:122 -msgid "Edit element" +#: ../../mod/settings.php:1023 +msgid "Your channel address is" msgstr "" -#: ../../mod/mitem.php:123 -msgid "Drop element" +#: ../../mod/settings.php:1034 +msgid "Automatically expire posts after this many days:" msgstr "" -#: ../../mod/mitem.php:124 -msgid "New element" +#: ../../mod/settings.php:1034 +msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: ../../mod/mitem.php:125 -msgid "Edit this menu container" +#: ../../mod/settings.php:1035 +msgid "Advanced expiration settings" msgstr "" -#: ../../mod/mitem.php:126 -msgid "Add menu element" +#: ../../mod/settings.php:1036 +msgid "Advanced Expiration" msgstr "" -#: ../../mod/mitem.php:127 -msgid "Delete this menu item" +#: ../../mod/settings.php:1037 +msgid "Expire posts:" msgstr "" -#: ../../mod/mitem.php:128 -msgid "Edit this menu item" +#: ../../mod/settings.php:1039 +msgid "Expire starred posts:" msgstr "" -#: ../../mod/mitem.php:141 -msgid "New Menu Element" +#: ../../mod/settings.php:1040 +msgid "Expire photos:" msgstr "" -#: ../../mod/mitem.php:143 ../../mod/mitem.php:184 -msgid "Link text" +#: ../../mod/settings.php:1041 +msgid "Only expire posts by others:" msgstr "" -#: ../../mod/mitem.php:144 ../../mod/mitem.php:185 -msgid "URL of link" +#: ../../mod/settings.php:1052 +msgid "Channel Settings" msgstr "" -#: ../../mod/mitem.php:145 ../../mod/mitem.php:186 -msgid "Use Red magic-auth if available" +#: ../../mod/settings.php:1061 +msgid "Basic Settings" msgstr "" -#: ../../mod/mitem.php:146 ../../mod/mitem.php:187 -msgid "Open link in new window" +#: ../../mod/settings.php:1064 +msgid "Your Timezone:" msgstr "" -#: ../../mod/mitem.php:148 ../../mod/mitem.php:189 -msgid "Order in list" +#: ../../mod/settings.php:1065 +msgid "Default Post Location:" msgstr "" -#: ../../mod/mitem.php:148 ../../mod/mitem.php:189 -msgid "Higher numbers will sink to bottom of listing" +#: ../../mod/settings.php:1066 +msgid "Use Browser Location:" msgstr "" -#: ../../mod/mitem.php:161 -msgid "Menu item not found." +#: ../../mod/settings.php:1068 +msgid "Adult Content" msgstr "" -#: ../../mod/mitem.php:170 -msgid "Menu item deleted." +#: ../../mod/settings.php:1068 +msgid "This channel publishes adult content." msgstr "" -#: ../../mod/mitem.php:172 -msgid "Menu item could not be deleted." +#: ../../mod/settings.php:1070 +msgid "Security and Privacy Settings" msgstr "" -#: ../../mod/mitem.php:181 -msgid "Edit Menu Element" +#: ../../mod/settings.php:1072 +msgid "Quick Privacy Settings:" msgstr "" -#: ../../mod/mitem.php:190 ../../mod/menu.php:107 -msgid "Modify" +#: ../../mod/settings.php:1073 +msgid "Very Public - extremely permissive" msgstr "" -#: ../../mod/editwebpage.php:30 ../../mod/editpost.php:20 -#: ../../mod/editlayout.php:36 ../../mod/editblock.php:36 -msgid "Item not found" +#: ../../mod/settings.php:1074 +msgid "Typical - default public, privacy when desired" msgstr "" -#: ../../mod/editwebpage.php:87 -msgid "Edit Webpage" +#: ../../mod/settings.php:1075 +msgid "Private - default private, rarely open or public" msgstr "" -#: ../../mod/editwebpage.php:123 ../../mod/editpost.php:101 -#: ../../mod/editlayout.php:104 ../../mod/editblock.php:118 -msgid "Insert YouTube video" +#: ../../mod/settings.php:1076 +msgid "Blocked - default blocked to/from everybody" msgstr "" -#: ../../mod/editwebpage.php:124 ../../mod/editpost.php:102 -#: ../../mod/editlayout.php:105 ../../mod/editblock.php:119 -msgid "Insert Vorbis [.ogg] video" +#: ../../mod/settings.php:1079 +msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/editwebpage.php:125 ../../mod/editpost.php:103 -#: ../../mod/editlayout.php:106 ../../mod/editblock.php:120 -msgid "Insert Vorbis [.ogg] audio" +#: ../../mod/settings.php:1079 +msgid "May reduce spam activity" msgstr "" -#: ../../mod/editwebpage.php:162 -msgid "Delete Webpage" +#: ../../mod/settings.php:1080 +msgid "Default Post Permissions" msgstr "" -#: ../../mod/profile.php:111 -msgid "Access to this profile has been restricted." +#: ../../mod/settings.php:1081 +msgid "(click to open/close)" msgstr "" -#: ../../mod/removeme.php:49 -msgid "Remove This Channel" +#: ../../mod/settings.php:1094 +msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../mod/removeme.php:50 -msgid "" -"This will completely remove this channel from the network. Once this has " -"been done it is not recoverable." +#: ../../mod/settings.php:1094 +msgid "Useful to reduce spamming" msgstr "" -#: ../../mod/removeme.php:51 -msgid "Please enter your password for verification:" +#: ../../mod/settings.php:1097 +msgid "Notification Settings" msgstr "" -#: ../../mod/removeme.php:52 -msgid "Remove this channel and all its clones from the network" +#: ../../mod/settings.php:1098 +msgid "By default post a status message when:" msgstr "" -#: ../../mod/removeme.php:52 -msgid "" -"By default only the instance of the channel located on this hub will be " -"removed from the network" +#: ../../mod/settings.php:1099 +msgid "accepting a friend request" msgstr "" -#: ../../mod/removeme.php:53 -msgid "Remove My Account" +#: ../../mod/settings.php:1100 +msgid "joining a forum/community" msgstr "" -#: ../../mod/tagrm.php:41 -msgid "Tag removed" +#: ../../mod/settings.php:1101 +msgid "making an interesting profile change" msgstr "" -#: ../../mod/tagrm.php:79 -msgid "Remove Item Tag" +#: ../../mod/settings.php:1102 +msgid "Send a notification email when:" msgstr "" -#: ../../mod/tagrm.php:81 -msgid "Select a tag to remove: " +#: ../../mod/settings.php:1103 +msgid "You receive an introduction" msgstr "" -#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130 -msgid "Remove" +#: ../../mod/settings.php:1104 +msgid "Your introductions are confirmed" msgstr "" -#: ../../mod/rmagic.php:56 -msgid "Remote Authentication" +#: ../../mod/settings.php:1105 +msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/rmagic.php:57 -msgid "Enter your channel address (e.g. channel@example.com)" +#: ../../mod/settings.php:1106 +msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/rmagic.php:58 -msgid "Authenticate" +#: ../../mod/settings.php:1107 +msgid "You receive a private message" msgstr "" -#: ../../mod/lostpass.php:15 -msgid "No valid account found." +#: ../../mod/settings.php:1108 +msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/lostpass.php:29 -msgid "Password reset request issued. Check your email." +#: ../../mod/settings.php:1109 +msgid "You are tagged in a post" msgstr "" -#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102 -#, php-format -msgid "Site Member (%s)" +#: ../../mod/settings.php:1110 +msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../mod/lostpass.php:40 -#, php-format -msgid "Password reset requested at %s" +#: ../../mod/settings.php:1113 +msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../mod/lostpass.php:63 -msgid "" -"Request could not be verified. (You may have previously submitted it.) " -"Password reset failed." +#: ../../mod/settings.php:1114 +msgid "Change the behaviour of this account for special situations" msgstr "" -#: ../../mod/lostpass.php:86 -msgid "Your password has been reset as requested." +#: ../../mod/viewconnections.php:28 ../../mod/search.php:80 +#: ../../mod/photos.php:576 ../../mod/display.php:9 ../../mod/community.php:18 +#: ../../mod/directory.php:32 +msgid "Public access denied." msgstr "" -#: ../../mod/lostpass.php:87 -msgid "Your new password is" +#: ../../mod/viewconnections.php:57 +msgid "No connections." msgstr "" -#: ../../mod/lostpass.php:88 -msgid "Save or copy your new password - and then" +#: ../../mod/viewconnections.php:69 ../../mod/nogroup.php:40 +#, php-format +msgid "Visit %s's profile [%s]" msgstr "" -#: ../../mod/lostpass.php:89 -msgid "click here to login" +#: ../../mod/viewconnections.php:84 +msgid "View Connnections" msgstr "" -#: ../../mod/lostpass.php:90 -msgid "" -"Your password may be changed from the Settings page after " -"successful login." +#: ../../mod/tagrm.php:41 +msgid "Tag removed" msgstr "" -#: ../../mod/lostpass.php:107 -#, php-format -msgid "Your password has changed at %s" +#: ../../mod/tagrm.php:79 +msgid "Remove Item Tag" msgstr "" -#: ../../mod/lostpass.php:122 -msgid "Forgot your Password?" +#: ../../mod/tagrm.php:81 +msgid "Select a tag to remove: " 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/tagrm.php:93 ../../mod/delegate.php:130 +msgid "Remove" msgstr "" -#: ../../mod/lostpass.php:124 -msgid "Email Address" +#: ../../mod/connect.php:59 ../../mod/connect.php:107 +msgid "Continue" msgstr "" -#: ../../mod/lostpass.php:125 -msgid "Reset" +#: ../../mod/connect.php:88 +msgid "Premium Channel Setup" +msgstr "" + +#: ../../mod/connect.php:90 +msgid "Enable premium channel connection restrictions" +msgstr "" + +#: ../../mod/connect.php:91 +msgid "" +"Please enter your restrictions or conditions, such as paypal receipt, usage " +"guidelines, etc." +msgstr "" + +#: ../../mod/connect.php:93 ../../mod/connect.php:113 +msgid "" +"This channel may require additional steps or acknowledgement of the " +"following conditions prior to connecting:" +msgstr "" + +#: ../../mod/connect.php:94 +msgid "" +"Potential connections will then see the following text before proceeding:" +msgstr "" + +#: ../../mod/connect.php:95 ../../mod/connect.php:116 +msgid "" +"By continuing, I certify that I have complied with any instructions provided " +"on this page." +msgstr "" + +#: ../../mod/connect.php:104 +msgid "(No specific instructions have been provided by the channel owner.)" +msgstr "" + +#: ../../mod/connect.php:112 +msgid "Restricted or Premium Channel" +msgstr "" + +#: ../../mod/delegate.php:95 +msgid "No potential page delegates located." +msgstr "" + +#: ../../mod/delegate.php:121 +msgid "Delegate Page Management" +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." +msgstr "" + +#: ../../mod/delegate.php:124 +msgid "Existing Page Managers" +msgstr "" + +#: ../../mod/delegate.php:126 +msgid "Existing Page Delegates" +msgstr "" + +#: ../../mod/delegate.php:128 +msgid "Potential Delegates" +msgstr "" + +#: ../../mod/delegate.php:131 +msgid "Add" +msgstr "" + +#: ../../mod/delegate.php:132 +msgid "No entries." +msgstr "" + +#: ../../mod/sources.php:27 +msgid "Source created." +msgstr "" + +#: ../../mod/sources.php:39 +msgid "Source updated." +msgstr "" + +#: ../../mod/sources.php:68 +msgid "Manage remote sources of content for your channel." +msgstr "" + +#: ../../mod/sources.php:69 ../../mod/sources.php:79 +msgid "New Source" +msgstr "" + +#: ../../mod/sources.php:80 ../../mod/sources.php:106 +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 +msgid "Only import content with these words (one per line)" +msgstr "" + +#: ../../mod/sources.php:81 ../../mod/sources.php:107 +msgid "Leave blank to import all public content" +msgstr "" + +#: ../../mod/sources.php:82 ../../mod/sources.php:109 +#: ../../mod/new_channel.php:110 +msgid "Channel Name" +msgstr "" + +#: ../../mod/sources.php:96 ../../mod/sources.php:122 +msgid "Source not found." +msgstr "" + +#: ../../mod/sources.php:103 +msgid "Edit Source" +msgstr "" + +#: ../../mod/sources.php:104 +msgid "Delete Source" +msgstr "" + +#: ../../mod/sources.php:130 +msgid "Source removed" +msgstr "" + +#: ../../mod/sources.php:132 +msgid "Unable to remove source." msgstr "" #: ../../mod/admin.php:48 @@ -4104,10 +4153,6 @@ msgstr "" msgid "Site settings updated." msgstr "" -#: ../../mod/admin.php:369 ../../mod/settings.php:844 -msgid "No special theme for mobile devices" -msgstr "" - #: ../../mod/admin.php:371 msgid "No special theme for accessibility" msgstr "" @@ -4434,10 +4479,20 @@ msgstr "" msgid "No registrations." msgstr "" +#: ../../mod/admin.php:688 ../../mod/intro.php:11 ../../mod/intro.php:98 +#: ../../mod/notifications.php:159 ../../mod/notifications.php:206 +msgid "Approve" +msgstr "" + #: ../../mod/admin.php:689 msgid "Deny" msgstr "" +#: ../../mod/admin.php:691 ../../mod/intro.php:14 ../../mod/intro.php:99 +#: ../../mod/connections.php:348 ../../mod/connections.php:490 +msgid "Block" +msgstr "" + #: ../../mod/admin.php:692 ../../mod/connections.php:348 #: ../../mod/connections.php:490 msgid "Unblock" @@ -4542,2634 +4597,2612 @@ msgstr "" msgid "Log level" msgstr "" -#: ../../mod/follow.php:25 -msgid "Channel added." +#: ../../mod/mitem.php:13 ../../mod/menu.php:87 +msgid "Menu not found." msgstr "" -#: ../../mod/zfinger.php:23 -msgid "invalid target signature" +#: ../../mod/mitem.php:66 +msgid "Menu element updated." msgstr "" -#: ../../mod/connections.php:67 -msgid "Could not access contact record." +#: ../../mod/mitem.php:70 +msgid "Unable to update menu element." msgstr "" -#: ../../mod/connections.php:81 -msgid "Could not locate selected profile." +#: ../../mod/mitem.php:76 +msgid "Menu element added." msgstr "" -#: ../../mod/connections.php:124 -msgid "Failed to update connection record." +#: ../../mod/mitem.php:80 +msgid "Unable to add menu element." msgstr "" -#: ../../mod/connections.php:219 -msgid "Could not access address book record." +#: ../../mod/mitem.php:97 ../../mod/xchan.php:25 ../../mod/menu.php:113 +msgid "Not found." msgstr "" -#: ../../mod/connections.php:233 -msgid "Refresh failed - channel is currently unavailable." +#: ../../mod/mitem.php:116 +msgid "Manage Menu Elements" msgstr "" -#: ../../mod/connections.php:240 -msgid "Channel has been unblocked" +#: ../../mod/mitem.php:119 +msgid "Edit menu" msgstr "" -#: ../../mod/connections.php:241 -msgid "Channel has been blocked" +#: ../../mod/mitem.php:122 +msgid "Edit element" msgstr "" -#: ../../mod/connections.php:245 ../../mod/connections.php:257 -#: ../../mod/connections.php:269 ../../mod/connections.php:281 -#: ../../mod/connections.php:296 -msgid "Unable to set address book parameters." +#: ../../mod/mitem.php:123 +msgid "Drop element" msgstr "" -#: ../../mod/connections.php:252 -msgid "Channel has been unignored" +#: ../../mod/mitem.php:124 +msgid "New element" msgstr "" -#: ../../mod/connections.php:253 -msgid "Channel has been ignored" +#: ../../mod/mitem.php:125 +msgid "Edit this menu container" msgstr "" -#: ../../mod/connections.php:264 -msgid "Channel has been unarchived" +#: ../../mod/mitem.php:126 +msgid "Add menu element" msgstr "" -#: ../../mod/connections.php:265 -msgid "Channel has been archived" +#: ../../mod/mitem.php:127 +msgid "Delete this menu item" msgstr "" -#: ../../mod/connections.php:276 -msgid "Channel has been unhidden" +#: ../../mod/mitem.php:128 +msgid "Edit this menu item" msgstr "" -#: ../../mod/connections.php:277 -msgid "Channel has been hidden" +#: ../../mod/mitem.php:141 +msgid "New Menu Element" msgstr "" -#: ../../mod/connections.php:291 -msgid "Channel has been approved" +#: ../../mod/mitem.php:143 ../../mod/mitem.php:184 +msgid "Link text" msgstr "" -#: ../../mod/connections.php:292 -msgid "Channel has been unapproved" +#: ../../mod/mitem.php:144 ../../mod/mitem.php:185 +msgid "URL of link" msgstr "" -#: ../../mod/connections.php:310 -msgid "Contact has been removed." +#: ../../mod/mitem.php:145 ../../mod/mitem.php:186 +msgid "Use Red magic-auth if available" msgstr "" -#: ../../mod/connections.php:330 -#, php-format -msgid "View %s's profile" +#: ../../mod/mitem.php:146 ../../mod/mitem.php:187 +msgid "Open link in new window" msgstr "" -#: ../../mod/connections.php:334 -msgid "Refresh Permissions" +#: ../../mod/mitem.php:148 ../../mod/mitem.php:189 +msgid "Order in list" msgstr "" -#: ../../mod/connections.php:337 -msgid "Fetch updated permissions" +#: ../../mod/mitem.php:148 ../../mod/mitem.php:189 +msgid "Higher numbers will sink to bottom of listing" msgstr "" -#: ../../mod/connections.php:341 -msgid "Recent Activity" +#: ../../mod/mitem.php:149 ../../mod/menu.php:79 ../../mod/new_channel.php:117 +msgid "Create" msgstr "" -#: ../../mod/connections.php:344 -msgid "View recent posts and comments" +#: ../../mod/mitem.php:161 +msgid "Menu item not found." msgstr "" -#: ../../mod/connections.php:351 -msgid "Block or Unblock this connection" +#: ../../mod/mitem.php:170 +msgid "Menu item deleted." msgstr "" -#: ../../mod/connections.php:355 ../../mod/connections.php:491 -msgid "Unignore" +#: ../../mod/mitem.php:172 +msgid "Menu item could not be deleted." msgstr "" -#: ../../mod/connections.php:358 -msgid "Ignore or Unignore this connection" +#: ../../mod/mitem.php:181 +msgid "Edit Menu Element" msgstr "" -#: ../../mod/connections.php:361 -msgid "Unarchive" +#: ../../mod/mitem.php:190 ../../mod/menu.php:107 +msgid "Modify" msgstr "" -#: ../../mod/connections.php:361 -msgid "Archive" +#: ../../mod/group.php:26 +msgid "Collection created." msgstr "" -#: ../../mod/connections.php:364 -msgid "Archive or Unarchive this connection" -msgstr "" +#: ../../mod/group.php:32 +msgid "Could not create collection." +msgstr "" -#: ../../mod/connections.php:367 -msgid "Unhide" +#: ../../mod/group.php:60 +msgid "Collection name changed." msgstr "" -#: ../../mod/connections.php:367 -msgid "Hide" +#: ../../mod/group.php:92 +msgid "Create a collection of channels." msgstr "" -#: ../../mod/connections.php:370 -msgid "Hide or Unhide this connection" +#: ../../mod/group.php:93 ../../mod/group.php:189 +msgid "Collection Name: " msgstr "" -#: ../../mod/connections.php:377 -msgid "Delete this connection" +#: ../../mod/group.php:95 ../../mod/group.php:192 +msgid "Members are visible to other channels" msgstr "" -#: ../../mod/connections.php:404 ../../mod/network.php:385 -msgid "Me" +#: ../../mod/group.php:113 +msgid "Collection removed." msgstr "" -#: ../../mod/connections.php:406 ../../mod/network.php:386 -msgid "Best Friends" +#: ../../mod/group.php:115 +msgid "Unable to remove collection." msgstr "" -#: ../../mod/connections.php:408 ../../mod/network.php:389 -msgid "Former Friends" +#: ../../mod/group.php:188 +msgid "Collection Editor" msgstr "" -#: ../../mod/connections.php:409 ../../mod/network.php:390 -msgid "Acquaintances" +#: ../../mod/group.php:202 +msgid "Members" msgstr "" -#: ../../mod/connections.php:410 -msgid "Unknown" +#: ../../mod/group.php:204 +msgid "All Connected Channels" msgstr "" -#: ../../mod/connections.php:420 ../../mod/connections.php:449 -msgid "Approve this connection" +#: ../../mod/group.php:237 +msgid "Click on a channel to add or remove." msgstr "" -#: ../../mod/connections.php:420 -msgid "Accept connection to allow communication" +#: ../../mod/search.php:20 ../../mod/network.php:164 +msgid "Remove term" msgstr "" -#: ../../mod/connections.php:436 -msgid "Automatic Permissions Settings" +#: ../../mod/photos.php:83 +msgid "Page owner information could not be retrieved." msgstr "" -#: ../../mod/connections.php:436 -#, php-format -msgid "Connections: settings for %s" +#: ../../mod/photos.php:103 +msgid "Album not found." msgstr "" -#: ../../mod/connections.php:440 -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/photos.php:125 ../../mod/photos.php:780 +msgid "Delete Album" msgstr "" -#: ../../mod/connections.php:442 -msgid "Slide to adjust your degree of friendship" +#: ../../mod/photos.php:165 ../../mod/photos.php:1041 +msgid "Delete Photo" msgstr "" -#: ../../mod/connections.php:448 -msgid "inherited" +#: ../../mod/photos.php:510 +#, php-format +msgid "%1$s was tagged in %2$s by %3$s" msgstr "" -#: ../../mod/connections.php:450 -msgid "Connection has no individual permissions!" +#: ../../mod/photos.php:510 +msgid "a photo" msgstr "" -#: ../../mod/connections.php:451 -msgid "" -"This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"." +#: ../../mod/photos.php:586 +msgid "No photos selected" msgstr "" -#: ../../mod/connections.php:453 -msgid "Profile Visibility" +#: ../../mod/photos.php:631 +msgid "Access to this item is restricted." msgstr "" -#: ../../mod/connections.php:454 +#: ../../mod/photos.php:696 #, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." +msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "" -#: ../../mod/connections.php:455 -msgid "Contact Information / Notes" +#: ../../mod/photos.php:699 +#, php-format +msgid "You have used %1$.2f Mbytes of photo storage." msgstr "" -#: ../../mod/connections.php:456 -msgid "Edit contact notes" +#: ../../mod/photos.php:707 +msgid "Upload Photos" msgstr "" -#: ../../mod/connections.php:458 -msgid "Their Settings" +#: ../../mod/photos.php:711 ../../mod/photos.php:775 +msgid "New album name: " msgstr "" -#: ../../mod/connections.php:459 -msgid "My Settings" +#: ../../mod/photos.php:712 +msgid "or existing album name: " msgstr "" -#: ../../mod/connections.php:461 -msgid "Forum Members" +#: ../../mod/photos.php:713 +msgid "Do not show a status post for this upload" msgstr "" -#: ../../mod/connections.php:462 -msgid "Soapbox" +#: ../../mod/photos.php:715 ../../mod/photos.php:1036 +msgid "Permissions" msgstr "" -#: ../../mod/connections.php:463 -msgid "Full Sharing" +#: ../../mod/photos.php:764 ../../mod/photos.php:786 ../../mod/photos.php:1212 +#: ../../mod/photos.php:1227 +msgid "Contact Photos" msgstr "" -#: ../../mod/connections.php:464 -msgid "Cautious Sharing" +#: ../../mod/photos.php:790 +msgid "Edit Album" msgstr "" -#: ../../mod/connections.php:465 -msgid "Follow Only" +#: ../../mod/photos.php:796 +msgid "Show Newest First" msgstr "" -#: ../../mod/connections.php:466 -msgid "Individual Permissions" +#: ../../mod/photos.php:798 +msgid "Show Oldest First" msgstr "" -#: ../../mod/connections.php:467 -msgid "" -"Some permissions may be inherited from your privacy " -"settings, which have higher priority. Changing those on this page will " -"have no effect." +#: ../../mod/photos.php:842 ../../mod/photos.php:1259 +msgid "View Photo" msgstr "" -#: ../../mod/connections.php:468 -msgid "Advanced Permissions" +#: ../../mod/photos.php:886 +msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/connections.php:469 -msgid "Quick Links" +#: ../../mod/photos.php:888 +msgid "Photo not available" msgstr "" -#: ../../mod/connections.php:473 -#, php-format -msgid "Visit %s's profile - %s" +#: ../../mod/photos.php:946 +msgid "Use as profile photo" msgstr "" -#: ../../mod/connections.php:474 -msgid "Block/Unblock contact" +#: ../../mod/photos.php:970 +msgid "View Full Size" msgstr "" -#: ../../mod/connections.php:475 -msgid "Ignore contact" +#: ../../mod/photos.php:1024 +msgid "Edit photo" msgstr "" -#: ../../mod/connections.php:476 -msgid "Repair URL settings" +#: ../../mod/photos.php:1026 +msgid "Rotate CW (right)" msgstr "" -#: ../../mod/connections.php:477 -msgid "View conversations" +#: ../../mod/photos.php:1027 +msgid "Rotate CCW (left)" msgstr "" -#: ../../mod/connections.php:479 -msgid "Delete contact" +#: ../../mod/photos.php:1029 +msgid "New album name" msgstr "" -#: ../../mod/connections.php:482 -msgid "Last update:" +#: ../../mod/photos.php:1032 +msgid "Caption" msgstr "" -#: ../../mod/connections.php:484 -msgid "Update public posts" +#: ../../mod/photos.php:1034 +msgid "Add a Tag" msgstr "" -#: ../../mod/connections.php:486 -msgid "Update now" +#: ../../mod/photos.php:1038 +msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/connections.php:492 -msgid "Currently blocked" +#: ../../mod/photos.php:1265 +msgid "View Album" msgstr "" -#: ../../mod/connections.php:493 -msgid "Currently ignored" +#: ../../mod/photos.php:1274 +msgid "Recent Photos" msgstr "" -#: ../../mod/connections.php:494 -msgid "Currently archived" +#: ../../mod/ping.php:160 +msgid "sent you a private message" msgstr "" -#: ../../mod/connections.php:495 -msgid "Currently pending" +#: ../../mod/ping.php:218 +msgid "added your channel" msgstr "" -#: ../../mod/connections.php:496 -msgid "" -"Replies/likes to your public posts may still be visible" +#: ../../mod/ping.php:230 ../../boot.php:1858 ../../boot.php:1938 +msgid "g A l F d" msgstr "" -#: ../../mod/connections.php:532 ../../mod/connections.php:604 -msgid "Blocked" +#: ../../mod/ping.php:252 ../../boot.php:1904 ../../boot.php:1979 +msgid "[today]" msgstr "" -#: ../../mod/connections.php:537 ../../mod/connections.php:611 -msgid "Ignored" +#: ../../mod/ping.php:262 +msgid "posted an event" msgstr "" -#: ../../mod/connections.php:542 ../../mod/connections.php:625 -msgid "Hidden" +#: ../../mod/filer.php:35 +msgid "- select -" msgstr "" -#: ../../mod/connections.php:547 ../../mod/connections.php:618 -msgid "Archived" +#: ../../mod/menu.php:17 +msgid "Menu updated." msgstr "" -#: ../../mod/connections.php:552 ../../mod/network.php:321 -#: ../../mod/menu.php:57 -msgid "New" +#: ../../mod/menu.php:21 +msgid "Unable to update menu." msgstr "" -#: ../../mod/connections.php:558 -msgid "All" +#: ../../mod/menu.php:26 +msgid "Menu created." msgstr "" -#: ../../mod/connections.php:579 -msgid "Suggestions" +#: ../../mod/menu.php:30 +msgid "Unable to create menu." msgstr "" -#: ../../mod/connections.php:582 -msgid "Suggest new connections" +#: ../../mod/menu.php:53 +msgid "Manage Menus" msgstr "" -#: ../../mod/connections.php:588 -msgid "Show pending (new) connections" +#: ../../mod/menu.php:56 +msgid "Drop" msgstr "" -#: ../../mod/connections.php:591 -msgid "All Connections" +#: ../../mod/menu.php:57 ../../mod/network.php:321 +#: ../../mod/connections.php:552 +msgid "New" msgstr "" -#: ../../mod/connections.php:594 -msgid "Show all connections" +#: ../../mod/menu.php:58 +msgid "Create a new menu" msgstr "" -#: ../../mod/connections.php:597 -msgid "Unblocked" +#: ../../mod/menu.php:59 +msgid "Delete this menu" msgstr "" -#: ../../mod/connections.php:600 -msgid "Only show unblocked connections" +#: ../../mod/menu.php:60 ../../mod/menu.php:104 +msgid "Edit menu contents" msgstr "" -#: ../../mod/connections.php:607 -msgid "Only show blocked connections" +#: ../../mod/menu.php:61 +msgid "Edit this menu" msgstr "" -#: ../../mod/connections.php:614 -msgid "Only show ignored connections" +#: ../../mod/menu.php:76 +msgid "New Menu" msgstr "" -#: ../../mod/connections.php:621 -msgid "Only show archived connections" +#: ../../mod/menu.php:77 ../../mod/menu.php:105 +msgid "Menu name" msgstr "" -#: ../../mod/connections.php:628 -msgid "Only show hidden connections" +#: ../../mod/menu.php:77 ../../mod/menu.php:105 +msgid "Must be unique, only seen by you" msgstr "" -#: ../../mod/connections.php:670 -#, php-format -msgid "%1$s [%2$s]" +#: ../../mod/menu.php:78 ../../mod/menu.php:106 +msgid "Menu title" msgstr "" -#: ../../mod/connections.php:671 ../../mod/nogroup.php:41 -msgid "Edit contact" +#: ../../mod/menu.php:78 ../../mod/menu.php:106 +msgid "Menu title as seen by others" msgstr "" -#: ../../mod/connections.php:695 -msgid "Search your connections" +#: ../../mod/menu.php:93 +msgid "Menu deleted." msgstr "" -#: ../../mod/connections.php:696 -msgid "Finding: " +#: ../../mod/menu.php:95 +msgid "Menu could not be deleted." msgstr "" -#: ../../mod/network.php:302 -msgid "Commented Order" +#: ../../mod/menu.php:101 +msgid "Edit Menu" msgstr "" -#: ../../mod/network.php:305 -msgid "Sort by Comment Date" +#: ../../mod/menu.php:103 +msgid "Add or remove entries to this menu" msgstr "" -#: ../../mod/network.php:308 -msgid "Posted Order" +#: ../../mod/home.php:76 +#, php-format +msgid "Welcome to %s" msgstr "" -#: ../../mod/network.php:311 -msgid "Sort by Post Date" +#: ../../mod/message.php:19 +msgid "Check Mail" msgstr "" -#: ../../mod/network.php:315 ../../mod/notifications.php:86 -msgid "Personal" +#: ../../mod/message.php:56 +msgid "Unable to lookup recipient." msgstr "" -#: ../../mod/network.php:318 -msgid "Posts that mention or involve you" +#: ../../mod/message.php:64 +msgid "Unable to communicate with requested channel." msgstr "" -#: ../../mod/network.php:324 -msgid "Activity Stream - by date" +#: ../../mod/message.php:71 +msgid "Cannot verify requested channel." msgstr "" -#: ../../mod/network.php:331 -msgid "Starred" +#: ../../mod/message.php:97 +msgid "Selected channel has private message restrictions. Send failed." msgstr "" -#: ../../mod/network.php:334 -msgid "Favourite Posts" +#: ../../mod/message.php:223 ../../mod/notifications.php:101 +msgid "Messages" msgstr "" -#: ../../mod/network.php:341 -msgid "Spam" +#: ../../mod/message.php:234 +msgid "Message deleted." msgstr "" -#: ../../mod/network.php:344 -msgid "Posts flagged as SPAM" +#: ../../mod/message.php:241 +msgid "Conversation removed." msgstr "" -#: ../../mod/network.php:384 -msgid "Refresh" +#: ../../mod/message.php:258 +msgid "Message recalled." msgstr "" -#: ../../mod/network.php:388 -msgid "Co-workers" +#: ../../mod/message.php:316 +msgid "Send Private Message" msgstr "" -#: ../../mod/network.php:391 -msgid "Everybody" +#: ../../mod/message.php:317 ../../mod/message.php:503 +msgid "To:" msgstr "" -#: ../../mod/network.php:408 -msgid "Search Results For:" +#: ../../mod/message.php:322 ../../mod/message.php:505 +msgid "Subject:" msgstr "" -#: ../../mod/network.php:453 -msgid "No such group" +#: ../../mod/message.php:359 +msgid "No messages." msgstr "" -#: ../../mod/network.php:484 -msgid "Connection: " +#: ../../mod/message.php:375 ../../mod/message.php:472 +msgid "Delete message" msgstr "" -#: ../../mod/network.php:487 -msgid "Invalid connection." +#: ../../mod/message.php:377 +msgid "D, d M Y - g:i A" msgstr "" -#: ../../mod/filestorage.php:35 -msgid "Permission Denied." +#: ../../mod/message.php:396 +msgid "Message not found." msgstr "" -#: ../../mod/filestorage.php:42 -msgid "Permission denied. VS." +#: ../../mod/message.php:473 +msgid "Recall message" msgstr "" -#: ../../mod/filestorage.php:79 -msgid "Download" +#: ../../mod/message.php:475 +msgid "Message has been recalled." msgstr "" -#: ../../mod/filestorage.php:84 -msgid "Used: " +#: ../../mod/message.php:492 +msgid "Private Conversation" msgstr "" -#: ../../mod/filestorage.php:86 -msgid "Limit: " +#: ../../mod/message.php:496 +msgid "Delete conversation" msgstr "" -#: ../../mod/page.php:35 -msgid "Invalid item." +#: ../../mod/message.php:498 +msgid "" +"No secure communications available. You may be able to " +"respond from the sender's profile page." msgstr "" -#: ../../mod/import.php:36 -msgid "Nothing to import." +#: ../../mod/message.php:502 +msgid "Send Reply" msgstr "" -#: ../../mod/import.php:58 -msgid "Unable to download data from old server" +#: ../../mod/hcard.php:10 +msgid "No profile" msgstr "" -#: ../../mod/import.php:64 -msgid "Imported file is empty." +#: ../../mod/layouts.php:52 +msgid "Layout Help" msgstr "" -#: ../../mod/import.php:88 -msgid "" -"Cannot create a duplicate channel identifier on this system. Import failed." +#: ../../mod/layouts.php:55 +msgid "Help with this feature" msgstr "" -#: ../../mod/import.php:106 -msgid "Channel clone failed. Import failed." +#: ../../mod/layouts.php:74 +msgid "Layout Name" msgstr "" -#: ../../mod/import.php:116 -msgid "Cloned channel not found. Import failed." +#: ../../mod/help.php:41 +msgid "Help:" msgstr "" -#: ../../mod/import.php:356 -msgid "Import completed." +#: ../../mod/help.php:53 ../../index.php:226 +msgid "Not Found" msgstr "" -#: ../../mod/import.php:369 -msgid "You must be logged in to use this feature." +#: ../../mod/rmagic.php:56 +msgid "Remote Authentication" msgstr "" -#: ../../mod/import.php:374 -msgid "Import Channel" +#: ../../mod/rmagic.php:57 +msgid "Enter your channel address (e.g. channel@example.com)" msgstr "" -#: ../../mod/import.php:375 -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/rmagic.php:58 +msgid "Authenticate" msgstr "" -#: ../../mod/import.php:376 -msgid "File to Upload" +#: ../../mod/network.php:302 +msgid "Commented Order" msgstr "" -#: ../../mod/import.php:377 -msgid "Or provide the old server/hub details" +#: ../../mod/network.php:305 +msgid "Sort by Comment Date" msgstr "" -#: ../../mod/import.php:378 -msgid "Your old identity address (xyz@example.com)" +#: ../../mod/network.php:308 +msgid "Posted Order" msgstr "" -#: ../../mod/import.php:379 -msgid "Your old login email address" +#: ../../mod/network.php:311 +msgid "Sort by Post Date" msgstr "" -#: ../../mod/import.php:380 -msgid "Your old login password" +#: ../../mod/network.php:315 ../../mod/notifications.php:86 +msgid "Personal" msgstr "" -#: ../../mod/import.php:381 -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/network.php:318 +msgid "Posts that mention or involve you" msgstr "" -#: ../../mod/import.php:382 -msgid "Make this hub my primary location" +#: ../../mod/network.php:324 +msgid "Activity Stream - by date" msgstr "" -#: ../../mod/notify.php:54 ../../mod/notifications.php:332 -msgid "No more system notifications." +#: ../../mod/network.php:331 +msgid "Starred" msgstr "" -#: ../../mod/notify.php:58 ../../mod/notifications.php:336 -msgid "System Notifications" +#: ../../mod/network.php:334 +msgid "Favourite Posts" msgstr "" -#: ../../mod/api.php:76 ../../mod/api.php:102 -msgid "Authorize application connection" +#: ../../mod/network.php:341 +msgid "Spam" msgstr "" -#: ../../mod/api.php:77 -msgid "Return to your app and insert this Securty Code:" +#: ../../mod/network.php:344 +msgid "Posts flagged as SPAM" msgstr "" -#: ../../mod/api.php:89 -msgid "Please login to continue." +#: ../../mod/network.php:384 +msgid "Refresh" 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/network.php:385 ../../mod/connections.php:404 +msgid "Me" msgstr "" -#: ../../mod/api.php:105 ../../mod/settings.php:1009 -#: ../../mod/settings.php:1014 ../../mod/settings.php:1037 -#: ../../mod/settings.php:1039 ../../mod/settings.php:1040 -#: ../../mod/settings.php:1041 ../../mod/profiles.php:506 -msgid "Yes" +#: ../../mod/network.php:386 ../../mod/connections.php:406 +msgid "Best Friends" msgstr "" -#: ../../mod/api.php:106 ../../mod/settings.php:1009 -#: ../../mod/settings.php:1014 ../../mod/settings.php:1037 -#: ../../mod/settings.php:1039 ../../mod/settings.php:1040 -#: ../../mod/settings.php:1041 ../../mod/profiles.php:507 -msgid "No" +#: ../../mod/network.php:388 +msgid "Co-workers" msgstr "" -#: ../../mod/directory.php:160 ../../mod/profiles.php:584 -msgid "Age: " +#: ../../mod/network.php:389 ../../mod/connections.php:408 +msgid "Former Friends" msgstr "" -#: ../../mod/directory.php:163 -msgid "Gender: " +#: ../../mod/network.php:390 ../../mod/connections.php:409 +msgid "Acquaintances" msgstr "" -#: ../../mod/directory.php:222 -msgid "Finding:" +#: ../../mod/network.php:391 +msgid "Everybody" msgstr "" -#: ../../mod/directory.php:230 -msgid "next page" +#: ../../mod/network.php:408 +msgid "Search Results For:" msgstr "" -#: ../../mod/directory.php:230 -msgid "previous page" +#: ../../mod/network.php:453 +msgid "No such group" msgstr "" -#: ../../mod/directory.php:237 -msgid "No entries (some entries may be hidden)." -msgstr "" - -#: ../../mod/home.php:76 -#, php-format -msgid "Welcome to %s" -msgstr "" - -#: ../../mod/delegate.php:95 -msgid "No potential page delegates located." +#: ../../mod/network.php:484 +msgid "Connection: " msgstr "" -#: ../../mod/delegate.php:121 -msgid "Delegate Page Management" +#: ../../mod/network.php:487 +msgid "Invalid connection." 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/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/delegate.php:124 -msgid "Existing Page Managers" +#: ../../mod/intro.php:29 ../../mod/connections.php:122 +msgid "Connection updated." msgstr "" -#: ../../mod/delegate.php:126 -msgid "Existing Page Delegates" +#: ../../mod/intro.php:31 +msgid "Connection update failed." msgstr "" -#: ../../mod/delegate.php:128 -msgid "Potential Delegates" +#: ../../mod/intro.php:56 +msgid "Introductions and Connection Requests" msgstr "" -#: ../../mod/delegate.php:131 -msgid "Add" +#: ../../mod/intro.php:67 +msgid "No pending introductions." msgstr "" -#: ../../mod/delegate.php:132 -msgid "No entries." +#: ../../mod/intro.php:72 +msgid "System error. Please try again later." msgstr "" -#: ../../mod/register.php:43 -msgid "Maximum daily site registrations exceeded. Please try again tomorrow." +#: ../../mod/intro.php:95 ../../mod/connections.php:496 +#: ../../mod/notifications.php:155 ../../mod/notifications.php:202 +msgid "Hide this contact from others" msgstr "" -#: ../../mod/register.php:49 -msgid "" -"Please indicate acceptance of the Terms of Service. Registration failed." +#: ../../mod/intro.php:96 ../../mod/notifications.php:156 +#: ../../mod/notifications.php:203 +msgid "Post a new friend activity" msgstr "" -#: ../../mod/register.php:77 -msgid "Passwords do not match." +#: ../../mod/intro.php:96 ../../mod/notifications.php:156 +#: ../../mod/notifications.php:203 +msgid "if applicable" msgstr "" -#: ../../mod/register.php:105 -msgid "" -"Registration successful. Please check your email for validation instructions." +#: ../../mod/intro.php:101 ../../mod/notifications.php:35 +#: ../../mod/notifications.php:163 ../../mod/notifications.php:209 +msgid "Discard" msgstr "" -#: ../../mod/register.php:111 -msgid "Your registration is pending approval by the site owner." +#: ../../mod/connections.php:67 +msgid "Could not access contact record." msgstr "" -#: ../../mod/register.php:114 -msgid "Your registration can not be processed." +#: ../../mod/connections.php:81 +msgid "Could not locate selected profile." msgstr "" -#: ../../mod/register.php:149 -msgid "" -"This site has exceeded the number of allowed daily account registrations. " -"Please try again tomorrow." +#: ../../mod/connections.php:124 +msgid "Failed to update connection record." msgstr "" -#: ../../mod/register.php:160 -msgid "Terms of Service" +#: ../../mod/connections.php:219 +msgid "Could not access address book record." msgstr "" -#: ../../mod/register.php:166 -#, php-format -msgid "I accept the %s for this website" +#: ../../mod/connections.php:233 +msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../mod/register.php:168 -#, php-format -msgid "I am over 13 years of age and accept the %s for this website" +#: ../../mod/connections.php:240 +msgid "Channel has been unblocked" msgstr "" -#: ../../mod/register.php:183 -msgid "Membership on this site is by invitation only." +#: ../../mod/connections.php:241 +msgid "Channel has been blocked" msgstr "" -#: ../../mod/register.php:184 -msgid "Please enter your invitation code" +#: ../../mod/connections.php:245 ../../mod/connections.php:257 +#: ../../mod/connections.php:269 ../../mod/connections.php:281 +#: ../../mod/connections.php:296 +msgid "Unable to set address book parameters." msgstr "" -#: ../../mod/register.php:187 -msgid "Your email address" +#: ../../mod/connections.php:252 +msgid "Channel has been unignored" msgstr "" -#: ../../mod/register.php:188 -msgid "Choose a password" +#: ../../mod/connections.php:253 +msgid "Channel has been ignored" msgstr "" -#: ../../mod/register.php:189 -msgid "Please re-enter your password" +#: ../../mod/connections.php:264 +msgid "Channel has been unarchived" msgstr "" -#: ../../mod/hcard.php:10 -msgid "No profile" +#: ../../mod/connections.php:265 +msgid "Channel has been archived" msgstr "" -#: ../../mod/editpost.php:31 -msgid "Item is not editable" +#: ../../mod/connections.php:276 +msgid "Channel has been unhidden" msgstr "" -#: ../../mod/invite.php:25 -msgid "Total invitation limit exceeded." +#: ../../mod/connections.php:277 +msgid "Channel has been hidden" msgstr "" -#: ../../mod/invite.php:47 -#, php-format -msgid "%s : Not a valid email address." +#: ../../mod/connections.php:291 +msgid "Channel has been approved" msgstr "" -#: ../../mod/invite.php:74 -msgid "Please join us on Red" +#: ../../mod/connections.php:292 +msgid "Channel has been unapproved" msgstr "" -#: ../../mod/invite.php:85 -msgid "Invitation limit exceeded. Please contact your site administrator." +#: ../../mod/connections.php:310 +msgid "Contact has been removed." msgstr "" -#: ../../mod/invite.php:90 +#: ../../mod/connections.php:330 #, php-format -msgid "%s : Message delivery failed." +msgid "View %s's profile" msgstr "" -#: ../../mod/invite.php:94 -#, php-format -msgid "%d message sent." -msgid_plural "%d messages sent." -msgstr[0] "" -msgstr[1] "" - -#: ../../mod/invite.php:113 -msgid "You have no more invitations available" +#: ../../mod/connections.php:334 +msgid "Refresh Permissions" msgstr "" -#: ../../mod/invite.php:139 -msgid "Send invitations" +#: ../../mod/connections.php:337 +msgid "Fetch updated permissions" msgstr "" -#: ../../mod/invite.php:140 -msgid "Enter email addresses, one per line:" +#: ../../mod/connections.php:341 +msgid "Recent Activity" msgstr "" -#: ../../mod/invite.php:142 -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." +#: ../../mod/connections.php:344 +msgid "View recent posts and comments" msgstr "" -#: ../../mod/invite.php:144 -msgid "You will need to supply this invitation code: $invite_code" +#: ../../mod/connections.php:351 +msgid "Block or Unblock this connection" msgstr "" -#: ../../mod/invite.php:145 -msgid "Please visit my channel at" +#: ../../mod/connections.php:355 ../../mod/connections.php:491 +msgid "Unignore" msgstr "" -#: ../../mod/invite.php:149 -msgid "" -"Once you have registered (on ANY Red Matrix site - they are all inter-" -"connected), please connect with my Red Matrix channel address:" +#: ../../mod/connections.php:358 +msgid "Ignore or Unignore this connection" msgstr "" -#: ../../mod/invite.php:151 -msgid "Click the [Register] link on the following page to join." +#: ../../mod/connections.php:361 +msgid "Unarchive" msgstr "" -#: ../../mod/invite.php:153 -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" +#: ../../mod/connections.php:361 +msgid "Archive" msgstr "" -#: ../../mod/group.php:26 -msgid "Collection created." +#: ../../mod/connections.php:364 +msgid "Archive or Unarchive this connection" msgstr "" -#: ../../mod/group.php:32 -msgid "Could not create collection." +#: ../../mod/connections.php:367 +msgid "Unhide" msgstr "" -#: ../../mod/group.php:60 -msgid "Collection name changed." +#: ../../mod/connections.php:367 +msgid "Hide" msgstr "" -#: ../../mod/group.php:92 -msgid "Create a collection of channels." +#: ../../mod/connections.php:370 +msgid "Hide or Unhide this connection" msgstr "" -#: ../../mod/group.php:93 ../../mod/group.php:189 -msgid "Collection Name: " +#: ../../mod/connections.php:377 +msgid "Delete this connection" msgstr "" -#: ../../mod/group.php:95 ../../mod/group.php:192 -msgid "Members are visible to other channels" +#: ../../mod/connections.php:410 +msgid "Unknown" msgstr "" -#: ../../mod/group.php:113 -msgid "Collection removed." +#: ../../mod/connections.php:420 ../../mod/connections.php:449 +msgid "Approve this connection" msgstr "" -#: ../../mod/group.php:115 -msgid "Unable to remove collection." +#: ../../mod/connections.php:420 +msgid "Accept connection to allow communication" msgstr "" -#: ../../mod/group.php:188 -msgid "Collection Editor" +#: ../../mod/connections.php:436 +msgid "Automatic Permissions Settings" msgstr "" -#: ../../mod/group.php:202 -msgid "Members" +#: ../../mod/connections.php:436 +#, php-format +msgid "Connections: settings for %s" msgstr "" -#: ../../mod/group.php:204 -msgid "All Connected Channels" +#: ../../mod/connections.php:440 +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/group.php:237 -msgid "Click on a channel to add or remove." +#: ../../mod/connections.php:442 +msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../mod/regmod.php:12 -msgid "Please login." +#: ../../mod/connections.php:448 +msgid "inherited" msgstr "" -#: ../../mod/photos.php:83 -msgid "Page owner information could not be retrieved." +#: ../../mod/connections.php:450 +msgid "Connection has no individual permissions!" msgstr "" -#: ../../mod/photos.php:103 -msgid "Album not found." +#: ../../mod/connections.php:451 +msgid "" +"This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"." msgstr "" -#: ../../mod/photos.php:125 ../../mod/photos.php:780 -msgid "Delete Album" +#: ../../mod/connections.php:453 +msgid "Profile Visibility" msgstr "" -#: ../../mod/photos.php:165 ../../mod/photos.php:1041 -msgid "Delete Photo" +#: ../../mod/connections.php:454 +#, php-format +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." msgstr "" -#: ../../mod/photos.php:510 -#, php-format -msgid "%1$s was tagged in %2$s by %3$s" +#: ../../mod/connections.php:455 +msgid "Contact Information / Notes" msgstr "" -#: ../../mod/photos.php:510 -msgid "a photo" +#: ../../mod/connections.php:456 +msgid "Edit contact notes" msgstr "" -#: ../../mod/photos.php:586 -msgid "No photos selected" +#: ../../mod/connections.php:458 +msgid "Their Settings" msgstr "" -#: ../../mod/photos.php:631 -msgid "Access to this item is restricted." +#: ../../mod/connections.php:459 +msgid "My Settings" msgstr "" -#: ../../mod/photos.php:696 -#, php-format -msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." +#: ../../mod/connections.php:461 +msgid "Forum Members" msgstr "" -#: ../../mod/photos.php:699 -#, php-format -msgid "You have used %1$.2f Mbytes of photo storage." +#: ../../mod/connections.php:462 +msgid "Soapbox" msgstr "" -#: ../../mod/photos.php:707 -msgid "Upload Photos" +#: ../../mod/connections.php:463 +msgid "Full Sharing" msgstr "" -#: ../../mod/photos.php:711 ../../mod/photos.php:775 -msgid "New album name: " +#: ../../mod/connections.php:464 +msgid "Cautious Sharing" msgstr "" -#: ../../mod/photos.php:712 -msgid "or existing album name: " +#: ../../mod/connections.php:465 +msgid "Follow Only" msgstr "" -#: ../../mod/photos.php:713 -msgid "Do not show a status post for this upload" +#: ../../mod/connections.php:466 +msgid "Individual Permissions" msgstr "" -#: ../../mod/photos.php:715 ../../mod/photos.php:1036 -msgid "Permissions" +#: ../../mod/connections.php:467 +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/photos.php:764 ../../mod/photos.php:786 ../../mod/photos.php:1212 -#: ../../mod/photos.php:1227 -msgid "Contact Photos" +#: ../../mod/connections.php:468 +msgid "Advanced Permissions" msgstr "" -#: ../../mod/photos.php:790 -msgid "Edit Album" +#: ../../mod/connections.php:469 +msgid "Quick Links" msgstr "" -#: ../../mod/photos.php:796 -msgid "Show Newest First" +#: ../../mod/connections.php:473 +#, php-format +msgid "Visit %s's profile - %s" msgstr "" -#: ../../mod/photos.php:798 -msgid "Show Oldest First" +#: ../../mod/connections.php:474 +msgid "Block/Unblock contact" msgstr "" -#: ../../mod/photos.php:842 ../../mod/photos.php:1259 -msgid "View Photo" +#: ../../mod/connections.php:475 +msgid "Ignore contact" msgstr "" -#: ../../mod/photos.php:886 -msgid "Permission denied. Access to this item may be restricted." +#: ../../mod/connections.php:476 +msgid "Repair URL settings" msgstr "" -#: ../../mod/photos.php:888 -msgid "Photo not available" +#: ../../mod/connections.php:477 +msgid "View conversations" msgstr "" -#: ../../mod/photos.php:946 -msgid "Use as profile photo" +#: ../../mod/connections.php:479 +msgid "Delete contact" msgstr "" -#: ../../mod/photos.php:970 -msgid "View Full Size" +#: ../../mod/connections.php:482 +msgid "Last update:" msgstr "" -#: ../../mod/photos.php:1024 -msgid "Edit photo" +#: ../../mod/connections.php:484 +msgid "Update public posts" msgstr "" -#: ../../mod/photos.php:1026 -msgid "Rotate CW (right)" +#: ../../mod/connections.php:486 +msgid "Update now" msgstr "" -#: ../../mod/photos.php:1027 -msgid "Rotate CCW (left)" +#: ../../mod/connections.php:492 +msgid "Currently blocked" msgstr "" -#: ../../mod/photos.php:1029 -msgid "New album name" +#: ../../mod/connections.php:493 +msgid "Currently ignored" msgstr "" -#: ../../mod/photos.php:1032 -msgid "Caption" +#: ../../mod/connections.php:494 +msgid "Currently archived" msgstr "" -#: ../../mod/photos.php:1034 -msgid "Add a Tag" +#: ../../mod/connections.php:495 +msgid "Currently pending" msgstr "" -#: ../../mod/photos.php:1038 -msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" +#: ../../mod/connections.php:496 +msgid "" +"Replies/likes to your public posts may still be visible" msgstr "" -#: ../../mod/photos.php:1265 -msgid "View Album" +#: ../../mod/connections.php:532 ../../mod/connections.php:604 +msgid "Blocked" msgstr "" -#: ../../mod/photos.php:1274 -msgid "Recent Photos" +#: ../../mod/connections.php:537 ../../mod/connections.php:611 +msgid "Ignored" msgstr "" -#: ../../mod/editlayout.php:68 -msgid "Edit Layout" +#: ../../mod/connections.php:542 ../../mod/connections.php:625 +msgid "Hidden" msgstr "" -#: ../../mod/editlayout.php:140 -msgid "Delete Layout" +#: ../../mod/connections.php:547 ../../mod/connections.php:618 +msgid "Archived" msgstr "" -#: ../../mod/common.php:10 -msgid "No channel." +#: ../../mod/connections.php:558 +msgid "All" msgstr "" -#: ../../mod/common.php:47 -msgid "Common connections" +#: ../../mod/connections.php:579 +msgid "Suggestions" msgstr "" -#: ../../mod/common.php:52 -msgid "No connections in common." +#: ../../mod/connections.php:582 +msgid "Suggest new connections" msgstr "" -#: ../../mod/layouts.php:52 -msgid "Layout Help" +#: ../../mod/connections.php:588 +msgid "Show pending (new) connections" msgstr "" -#: ../../mod/layouts.php:55 -msgid "Help with this feature" +#: ../../mod/connections.php:591 +msgid "All Connections" msgstr "" -#: ../../mod/layouts.php:74 -msgid "Layout Name" +#: ../../mod/connections.php:594 +msgid "Show all connections" msgstr "" -#: ../../mod/filer.php:35 -msgid "- select -" +#: ../../mod/connections.php:597 +msgid "Unblocked" msgstr "" -#: ../../mod/viewconnections.php:57 -msgid "No connections." +#: ../../mod/connections.php:600 +msgid "Only show unblocked connections" msgstr "" -#: ../../mod/viewconnections.php:69 ../../mod/nogroup.php:40 -#, php-format -msgid "Visit %s's profile [%s]" +#: ../../mod/connections.php:607 +msgid "Only show blocked connections" msgstr "" -#: ../../mod/viewconnections.php:84 -msgid "View Connnections" +#: ../../mod/connections.php:614 +msgid "Only show ignored connections" msgstr "" -#: ../../mod/subthread.php:105 -#, php-format -msgid "%1$s is following %2$s's %3$s" +#: ../../mod/connections.php:621 +msgid "Only show archived connections" msgstr "" -#: ../../mod/apps.php:8 -msgid "No installed applications." +#: ../../mod/connections.php:628 +msgid "Only show hidden connections" msgstr "" -#: ../../mod/apps.php:13 -msgid "Applications" +#: ../../mod/connections.php:670 +#, php-format +msgid "%1$s [%2$s]" msgstr "" -#: ../../mod/suggest.php:41 -msgid "" -"No suggestions available. If this is a new site, please try again in 24 " -"hours." +#: ../../mod/connections.php:671 ../../mod/nogroup.php:41 +msgid "Edit contact" msgstr "" -#: ../../mod/suggest.php:58 -msgid "Ignore/Hide" +#: ../../mod/connections.php:695 +msgid "Search your connections" msgstr "" -#: ../../mod/match.php:12 -msgid "Profile Match" +#: ../../mod/connections.php:696 +msgid "Finding: " msgstr "" -#: ../../mod/match.php:20 -msgid "No keywords to match. Please add keywords to your default profile." +#: ../../mod/dirsearch.php:21 +msgid "This site is not a directory server" msgstr "" -#: ../../mod/match.php:57 -msgid "is interested in:" +#: ../../mod/lockview.php:34 +msgid "Remote privacy information not available." msgstr "" -#: ../../mod/match.php:65 -msgid "No matches" +#: ../../mod/lockview.php:43 +msgid "Visible to:" msgstr "" -#: ../../mod/dirsearch.php:21 -msgid "This site is not a directory server" +#: ../../mod/profiles.php:18 ../../mod/profiles.php:138 +#: ../../mod/profiles.php:179 ../../mod/profiles.php:486 +msgid "Profile not found." msgstr "" -#: ../../mod/siteinfo.php:51 -#, php-format -msgid "Version %s" +#: ../../mod/profiles.php:38 +msgid "Profile deleted." msgstr "" -#: ../../mod/siteinfo.php:65 -msgid "Installed plugins/addons/apps:" +#: ../../mod/profiles.php:56 ../../mod/profiles.php:92 +msgid "Profile-" msgstr "" -#: ../../mod/siteinfo.php:78 -msgid "No installed plugins/addons/apps" +#: ../../mod/profiles.php:77 ../../mod/profiles.php:120 +msgid "New profile created." msgstr "" -#: ../../mod/siteinfo.php:81 -msgid "Red" +#: ../../mod/profiles.php:98 +msgid "Profile unavailable to clone." msgstr "" -#: ../../mod/siteinfo.php:82 -msgid "" -"This is a hub of the Red Matrix - a global cooperative network of " -"decentralised privacy enhanced websites." +#: ../../mod/profiles.php:189 +msgid "Profile Name is required." msgstr "" -#: ../../mod/siteinfo.php:84 -msgid "Running at web location" +#: ../../mod/profiles.php:317 +msgid "Marital Status" msgstr "" -#: ../../mod/siteinfo.php:85 -msgid "" -"Please visit GetZot.com to learn more " -"about the Red Matrix." +#: ../../mod/profiles.php:321 +msgid "Romantic Partner" msgstr "" -#: ../../mod/siteinfo.php:86 -msgid "Bug reports and issues: please visit" +#: ../../mod/profiles.php:325 +msgid "Likes" msgstr "" -#: ../../mod/siteinfo.php:89 -msgid "" -"Suggestions, praise, donations, etc. - please email \"redmatrix\" at " -"librelist - dot com" +#: ../../mod/profiles.php:329 +msgid "Dislikes" msgstr "" -#: ../../mod/menu.php:17 -msgid "Menu updated." +#: ../../mod/profiles.php:333 +msgid "Work/Employment" msgstr "" -#: ../../mod/menu.php:21 -msgid "Unable to update menu." +#: ../../mod/profiles.php:336 +msgid "Religion" msgstr "" -#: ../../mod/menu.php:26 -msgid "Menu created." +#: ../../mod/profiles.php:340 +msgid "Political Views" msgstr "" -#: ../../mod/menu.php:30 -msgid "Unable to create menu." +#: ../../mod/profiles.php:344 +msgid "Gender" msgstr "" -#: ../../mod/menu.php:53 -msgid "Manage Menus" +#: ../../mod/profiles.php:348 +msgid "Sexual Preference" msgstr "" -#: ../../mod/menu.php:56 -msgid "Drop" +#: ../../mod/profiles.php:352 +msgid "Homepage" msgstr "" -#: ../../mod/menu.php:58 -msgid "Create a new menu" +#: ../../mod/profiles.php:356 +msgid "Interests" msgstr "" -#: ../../mod/menu.php:59 -msgid "Delete this menu" +#: ../../mod/profiles.php:360 +msgid "Address" msgstr "" -#: ../../mod/menu.php:60 ../../mod/menu.php:104 -msgid "Edit menu contents" +#: ../../mod/profiles.php:367 ../../mod/pubsites.php:31 +msgid "Location" msgstr "" -#: ../../mod/menu.php:61 -msgid "Edit this menu" +#: ../../mod/profiles.php:450 +msgid "Profile updated." msgstr "" -#: ../../mod/menu.php:76 -msgid "New Menu" +#: ../../mod/profiles.php:505 +msgid "Hide your contact/friend list from viewers of this profile?" msgstr "" -#: ../../mod/menu.php:77 ../../mod/menu.php:105 -msgid "Menu name" +#: ../../mod/profiles.php:528 +msgid "Edit Profile Details" msgstr "" -#: ../../mod/menu.php:77 ../../mod/menu.php:105 -msgid "Must be unique, only seen by you" +#: ../../mod/profiles.php:530 +msgid "View this profile" msgstr "" -#: ../../mod/menu.php:78 ../../mod/menu.php:106 -msgid "Menu title" +#: ../../mod/profiles.php:531 +msgid "Change Profile Photo" msgstr "" -#: ../../mod/menu.php:78 ../../mod/menu.php:106 -msgid "Menu title as seen by others" +#: ../../mod/profiles.php:532 +msgid "Create a new profile using these settings" msgstr "" -#: ../../mod/menu.php:93 -msgid "Menu deleted." +#: ../../mod/profiles.php:533 +msgid "Clone this profile" msgstr "" -#: ../../mod/menu.php:95 -msgid "Menu could not be deleted." +#: ../../mod/profiles.php:534 +msgid "Delete this profile" msgstr "" -#: ../../mod/menu.php:101 -msgid "Edit Menu" +#: ../../mod/profiles.php:535 +msgid "Profile Name:" msgstr "" -#: ../../mod/menu.php:103 -msgid "Add or remove entries to this menu" +#: ../../mod/profiles.php:536 +msgid "Your Full Name:" msgstr "" -#: ../../mod/thing.php:109 -msgid "Object store: failed" +#: ../../mod/profiles.php:537 +msgid "Title/Description:" msgstr "" -#: ../../mod/thing.php:113 -msgid "thing/stuff added" +#: ../../mod/profiles.php:538 +msgid "Your Gender:" msgstr "" -#: ../../mod/thing.php:129 +#: ../../mod/profiles.php:539 #, php-format -msgid "OBJ: %1$s %2$s %3$s" +msgid "Birthday (%s):" msgstr "" -#: ../../mod/thing.php:175 -msgid "not yet implemented." +#: ../../mod/profiles.php:540 +msgid "Street Address:" msgstr "" -#: ../../mod/thing.php:181 -msgid "Add Stuff to your Profile" +#: ../../mod/profiles.php:541 +msgid "Locality/City:" msgstr "" -#: ../../mod/thing.php:183 -msgid "Select a profile" +#: ../../mod/profiles.php:542 +msgid "Postal/Zip Code:" msgstr "" -#: ../../mod/thing.php:185 -msgid "Select a category of stuff. e.g. I ______ something" +#: ../../mod/profiles.php:543 +msgid "Country:" msgstr "" -#: ../../mod/thing.php:187 -msgid "Name of thing or stuff e.g. something" +#: ../../mod/profiles.php:544 +msgid "Region/State:" msgstr "" -#: ../../mod/thing.php:188 -msgid "URL of thing or stuff (optional)" +#: ../../mod/profiles.php:545 +msgid "♥ Marital Status:" msgstr "" -#: ../../mod/thing.php:189 -msgid "URL for photo of thing or stuff (optional)" +#: ../../mod/profiles.php:546 +msgid "Who: (if applicable)" msgstr "" -#: ../../mod/notifications.php:26 -msgid "Invalid request identifier." +#: ../../mod/profiles.php:547 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/notifications.php:76 -msgid "System" +#: ../../mod/profiles.php:548 +msgid "Since [date]:" msgstr "" -#: ../../mod/notifications.php:96 -msgid "Introductions" +#: ../../mod/profiles.php:550 +msgid "Homepage URL:" msgstr "" -#: ../../mod/notifications.php:121 -msgid "Show Ignored Requests" +#: ../../mod/profiles.php:553 +msgid "Religious Views:" msgstr "" -#: ../../mod/notifications.php:121 -msgid "Hide Ignored Requests" +#: ../../mod/profiles.php:554 +msgid "Keywords:" msgstr "" -#: ../../mod/notifications.php:147 ../../mod/notifications.php:193 -msgid "Notification type: " +#: ../../mod/profiles.php:557 +msgid "Example: fishing photography software" msgstr "" -#: ../../mod/notifications.php:148 -msgid "Friend Suggestion" +#: ../../mod/profiles.php:558 +msgid "Used in directory listings" msgstr "" -#: ../../mod/notifications.php:150 -#, php-format -msgid "suggested by %s" +#: ../../mod/profiles.php:559 +msgid "Tell us about yourself..." msgstr "" -#: ../../mod/notifications.php:179 -msgid "Claims to be known to you: " +#: ../../mod/profiles.php:560 +msgid "Hobbies/Interests" msgstr "" -#: ../../mod/notifications.php:179 -msgid "yes" +#: ../../mod/profiles.php:561 +msgid "Contact information and Social Networks" msgstr "" -#: ../../mod/notifications.php:179 -msgid "no" +#: ../../mod/profiles.php:562 +msgid "My other channels" msgstr "" -#: ../../mod/notifications.php:186 -msgid "Approve as: " +#: ../../mod/profiles.php:563 +msgid "Musical interests" msgstr "" -#: ../../mod/notifications.php:187 -msgid "Friend" +#: ../../mod/profiles.php:564 +msgid "Books, literature" msgstr "" -#: ../../mod/notifications.php:188 -msgid "Sharer" +#: ../../mod/profiles.php:565 +msgid "Television" msgstr "" -#: ../../mod/notifications.php:188 -msgid "Fan/Admirer" +#: ../../mod/profiles.php:566 +msgid "Film/dance/culture/entertainment" msgstr "" -#: ../../mod/notifications.php:194 -msgid "Friend/Connect Request" +#: ../../mod/profiles.php:567 +msgid "Love/romance" msgstr "" -#: ../../mod/notifications.php:194 -msgid "New Follower" +#: ../../mod/profiles.php:568 +msgid "Work/employment" msgstr "" -#: ../../mod/notifications.php:215 -msgid "No introductions." +#: ../../mod/profiles.php:569 +msgid "School/education" msgstr "" -#: ../../mod/notifications.php:257 ../../mod/notifications.php:382 -#: ../../mod/notifications.php:465 -#, php-format -msgid "%s liked %s's post" +#: ../../mod/profiles.php:574 +msgid "" +"This is your public profile.
      It may " +"be visible to anybody using the internet." msgstr "" -#: ../../mod/notifications.php:266 ../../mod/notifications.php:391 -#: ../../mod/notifications.php:474 -#, php-format -msgid "%s disliked %s's post" +#: ../../mod/profiles.php:584 ../../mod/directory.php:160 +msgid "Age: " msgstr "" -#: ../../mod/notifications.php:280 ../../mod/notifications.php:405 -#: ../../mod/notifications.php:488 -#, php-format -msgid "%s is now friends with %s" +#: ../../mod/profiles.php:623 +msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/notifications.php:287 ../../mod/notifications.php:412 -#, php-format -msgid "%s created a new post" +#: ../../mod/profiles.php:624 ../../boot.php:1755 +msgid "Change profile photo" msgstr "" -#: ../../mod/notifications.php:288 ../../mod/notifications.php:413 -#: ../../mod/notifications.php:497 -#, php-format -msgid "%s commented on %s's post" +#: ../../mod/profiles.php:625 ../../boot.php:1762 +msgid "Create New Profile" msgstr "" -#: ../../mod/notifications.php:302 -msgid "No more network notifications." +#: ../../mod/profiles.php:636 ../../boot.php:1776 +msgid "Profile Image" msgstr "" -#: ../../mod/notifications.php:306 -msgid "Network Notifications" +#: ../../mod/profiles.php:639 ../../boot.php:1779 +msgid "visible to everybody" msgstr "" -#: ../../mod/notifications.php:427 -msgid "No more personal notifications." +#: ../../mod/profiles.php:640 ../../boot.php:1780 +msgid "Edit visibility" msgstr "" -#: ../../mod/notifications.php:431 -msgid "Personal Notifications" +#: ../../mod/new_channel.php:107 +msgid "Add a Channel" msgstr "" -#: ../../mod/notifications.php:504 -msgid "No more home notifications." +#: ../../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/notifications.php:508 -msgid "Home Notifications" +#: ../../mod/new_channel.php:111 +msgid "" +"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " +"Group\" " msgstr "" -#: ../../mod/editblock.php:82 -msgid "Edit Block" +#: ../../mod/new_channel.php:112 +msgid "Choose a short nickname" msgstr "" -#: ../../mod/editblock.php:156 -msgid "Delete Block" +#: ../../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/tagger.php:98 -#, php-format -msgid "%1$s tagged %2$s's %3$s with %4$s" +#: ../../mod/new_channel.php:114 +msgid "" +"Or import an existing channel from another location" msgstr "" -#: ../../mod/help.php:41 -msgid "Help:" +#: ../../mod/filestorage.php:35 +msgid "Permission Denied." msgstr "" -#: ../../mod/setup.php:161 -msgid "Red Matrix Server - Setup" +#: ../../mod/filestorage.php:42 +msgid "Permission denied. VS." msgstr "" -#: ../../mod/setup.php:167 -msgid "Could not connect to database." +#: ../../mod/filestorage.php:79 +msgid "Download" msgstr "" -#: ../../mod/setup.php:171 -msgid "" -"Could not connect to specified site URL. Possible SSL certificate or DNS " -"issue." +#: ../../mod/filestorage.php:84 +msgid "Used: " msgstr "" -#: ../../mod/setup.php:176 -msgid "Could not create table." +#: ../../mod/filestorage.php:86 +msgid "Limit: " msgstr "" -#: ../../mod/setup.php:182 -msgid "Your site database has been installed." +#: ../../mod/lostpass.php:15 +msgid "No valid account found." msgstr "" -#: ../../mod/setup.php:187 -msgid "" -"You may need to import the file \"install/database.sql\" manually using " -"phpmyadmin or mysql." +#: ../../mod/lostpass.php:29 +msgid "Password reset request issued. Check your email." msgstr "" -#: ../../mod/setup.php:188 ../../mod/setup.php:255 ../../mod/setup.php:584 -msgid "Please see the file \"install/INSTALL.txt\"." +#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102 +#, php-format +msgid "Site Member (%s)" msgstr "" -#: ../../mod/setup.php:252 -msgid "System check" +#: ../../mod/lostpass.php:40 +#, php-format +msgid "Password reset requested at %s" msgstr "" -#: ../../mod/setup.php:256 ../../mod/events.php:351 -msgid "Next" +#: ../../mod/lostpass.php:63 +msgid "" +"Request could not be verified. (You may have previously submitted it.) " +"Password reset failed." msgstr "" -#: ../../mod/setup.php:257 -msgid "Check again" +#: ../../mod/lostpass.php:85 ../../boot.php:1469 +msgid "Password Reset" msgstr "" -#: ../../mod/setup.php:279 -msgid "Database connection" +#: ../../mod/lostpass.php:86 +msgid "Your password has been reset as requested." msgstr "" -#: ../../mod/setup.php:280 -msgid "" -"In order to install Red Matrix we need to know how to connect to your " -"database." +#: ../../mod/lostpass.php:87 +msgid "Your new password is" msgstr "" -#: ../../mod/setup.php:281 -msgid "" -"Please contact your hosting provider or site administrator if you have " -"questions about these settings." +#: ../../mod/lostpass.php:88 +msgid "Save or copy your new password - and then" msgstr "" -#: ../../mod/setup.php:282 +#: ../../mod/lostpass.php:89 +msgid "click here to login" +msgstr "" + +#: ../../mod/lostpass.php:90 msgid "" -"The database you specify below should already exist. If it does not, please " -"create it before continuing." +"Your password may be changed from the Settings page after " +"successful login." msgstr "" -#: ../../mod/setup.php:286 -msgid "Database Server Name" +#: ../../mod/lostpass.php:107 +#, php-format +msgid "Your password has changed at %s" msgstr "" -#: ../../mod/setup.php:286 -msgid "Default is localhost" +#: ../../mod/lostpass.php:122 +msgid "Forgot your Password?" msgstr "" -#: ../../mod/setup.php:287 -msgid "Database Port" +#: ../../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/setup.php:287 -msgid "Communication port number - use 0 for default" +#: ../../mod/lostpass.php:124 +msgid "Email Address" msgstr "" -#: ../../mod/setup.php:288 -msgid "Database Login Name" +#: ../../mod/lostpass.php:125 +msgid "Reset" msgstr "" -#: ../../mod/setup.php:289 -msgid "Database Login Password" +#: ../../mod/import.php:36 +msgid "Nothing to import." msgstr "" -#: ../../mod/setup.php:290 -msgid "Database Name" +#: ../../mod/import.php:58 +msgid "Unable to download data from old server" msgstr "" -#: ../../mod/setup.php:292 ../../mod/setup.php:334 -msgid "Site administrator email address" +#: ../../mod/import.php:64 +msgid "Imported file is empty." msgstr "" -#: ../../mod/setup.php:292 ../../mod/setup.php:334 +#: ../../mod/import.php:88 msgid "" -"Your account email address must match this in order to use the web admin " -"panel." +"Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../mod/setup.php:293 ../../mod/setup.php:336 -msgid "Website URL" +#: ../../mod/import.php:106 +msgid "Channel clone failed. Import failed." msgstr "" -#: ../../mod/setup.php:293 ../../mod/setup.php:336 -msgid "Please use SSL (https) URL if available." +#: ../../mod/import.php:116 +msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../mod/setup.php:296 ../../mod/setup.php:339 -msgid "Please select a default timezone for your website" +#: ../../mod/import.php:356 +msgid "Import completed." msgstr "" -#: ../../mod/setup.php:323 -msgid "Site settings" +#: ../../mod/import.php:369 +msgid "You must be logged in to use this feature." msgstr "" -#: ../../mod/setup.php:379 -msgid "Could not find a command line version of PHP in the web server PATH." +#: ../../mod/import.php:374 +msgid "Import Channel" msgstr "" -#: ../../mod/setup.php:380 +#: ../../mod/import.php:375 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/setup.php:384 -msgid "PHP executable path" +"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/setup.php:384 -msgid "" -"Enter full path to php executable. You can leave this blank to continue the " -"installation." +#: ../../mod/import.php:376 +msgid "File to Upload" msgstr "" -#: ../../mod/setup.php:389 -msgid "Command line PHP" +#: ../../mod/import.php:377 +msgid "Or provide the old server/hub details" msgstr "" -#: ../../mod/setup.php:398 -msgid "" -"The command line version of PHP on your system does not have " -"\"register_argc_argv\" enabled." +#: ../../mod/import.php:378 +msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../mod/setup.php:399 -msgid "This is required for message delivery to work." +#: ../../mod/import.php:379 +msgid "Your old login email address" msgstr "" -#: ../../mod/setup.php:401 -msgid "PHP register_argc_argv" +#: ../../mod/import.php:380 +msgid "Your old login password" msgstr "" -#: ../../mod/setup.php:422 +#: ../../mod/import.php:381 msgid "" -"Error: the \"openssl_pkey_new\" function on this system is not able to " -"generate encryption keys" +"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/setup.php:423 -msgid "" -"If running under Windows, please see \"http://www.php.net/manual/en/openssl." -"installation.php\"." +#: ../../mod/import.php:382 +msgid "Make this hub my primary location" msgstr "" -#: ../../mod/setup.php:425 -msgid "Generate encryption keys" +#: ../../mod/manage.php:63 +#, php-format +msgid "You have created %1$.0f of %2$.0f allowed channels." msgstr "" -#: ../../mod/setup.php:432 -msgid "libCurl PHP module" +#: ../../mod/manage.php:71 +msgid "Create a new channel" msgstr "" -#: ../../mod/setup.php:433 -msgid "GD graphics PHP module" +#: ../../mod/manage.php:76 +msgid "Channel Manager" msgstr "" -#: ../../mod/setup.php:434 -msgid "OpenSSL PHP module" +#: ../../mod/manage.php:77 +msgid "Current Channel" msgstr "" -#: ../../mod/setup.php:435 -msgid "mysqli PHP module" +#: ../../mod/manage.php:79 +msgid "Attach to one of your channels by selecting it." msgstr "" -#: ../../mod/setup.php:436 -msgid "mb_string PHP module" +#: ../../mod/manage.php:80 +msgid "Default Channel" msgstr "" -#: ../../mod/setup.php:437 -msgid "mcrypt PHP module" +#: ../../mod/manage.php:81 +msgid "Make Default" msgstr "" -#: ../../mod/setup.php:442 ../../mod/setup.php:444 -msgid "Apache mod_rewrite module" +#: ../../mod/vote.php:97 +msgid "Total votes" msgstr "" -#: ../../mod/setup.php:442 -msgid "" -"Error: Apache webserver mod-rewrite module is required but not installed." +#: ../../mod/vote.php:98 +msgid "Average Rating" msgstr "" -#: ../../mod/setup.php:448 ../../mod/setup.php:451 -msgid "proc_open" +#: ../../mod/match.php:12 +msgid "Profile Match" msgstr "" -#: ../../mod/setup.php:448 -msgid "" -"Error: proc_open is required but is either not installed or has been " -"disabled in php.ini" +#: ../../mod/match.php:20 +msgid "No keywords to match. Please add keywords to your default profile." msgstr "" -#: ../../mod/setup.php:456 -msgid "Error: libCURL PHP module required but not installed." +#: ../../mod/match.php:57 +msgid "is interested in:" msgstr "" -#: ../../mod/setup.php:460 -msgid "" -"Error: GD graphics PHP module with JPEG support required but not installed." +#: ../../mod/match.php:65 +msgid "No matches" msgstr "" -#: ../../mod/setup.php:464 -msgid "Error: openssl PHP module required but not installed." +#: ../../mod/crepair.php:102 +msgid "Contact settings applied." msgstr "" -#: ../../mod/setup.php:468 -msgid "Error: mysqli PHP module required but not installed." +#: ../../mod/crepair.php:104 +msgid "Contact update failed." msgstr "" -#: ../../mod/setup.php:472 -msgid "Error: mb_string PHP module required but not installed." +#: ../../mod/crepair.php:129 ../../mod/fsuggest.php:20 +#: ../../mod/fsuggest.php:92 +msgid "Contact not found." msgstr "" -#: ../../mod/setup.php:476 -msgid "Error: mcrypt PHP module required but not installed." +#: ../../mod/crepair.php:135 +msgid "Repair Contact Settings" msgstr "" -#: ../../mod/setup.php:492 +#: ../../mod/crepair.php:137 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." +"WARNING: This is highly advanced and if you enter incorrect " +"information your communications with this contact may stop working." msgstr "" -#: ../../mod/setup.php:493 +#: ../../mod/crepair.php:138 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." +"Please use your browser 'Back' button now if you are " +"uncertain what to do on this page." 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/crepair.php:144 +msgid "Return to contact editor" 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/crepair.php:149 +msgid "Account Nickname" msgstr "" -#: ../../mod/setup.php:498 -msgid ".htconfig.php is writable" +#: ../../mod/crepair.php:150 +msgid "@Tagname - overrides Name/Nickname" 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/crepair.php:151 +msgid "Account URL" 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/crepair.php:152 +msgid "Friend Request URL" 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/crepair.php:153 +msgid "Friend Confirm URL" 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/crepair.php:154 +msgid "Notification Endpoint URL" msgstr "" -#: ../../mod/setup.php:514 -msgid "view/tpl/smarty3 is writable" +#: ../../mod/crepair.php:155 +msgid "Poll/Feed URL" msgstr "" -#: ../../mod/setup.php:528 -msgid "SSL certificate validation" +#: ../../mod/crepair.php:156 +msgid "New photo from this URL" msgstr "" -#: ../../mod/setup.php:528 -msgid "" -"SSL certificate cannot be validated. Fix certificate or disable https access " -"to this site." +#: ../../mod/zfinger.php:23 +msgid "invalid target signature" msgstr "" -#: ../../mod/setup.php:535 -msgid "" -"Url rewrite in .htaccess is not working. Check your server configuration." +#: ../../mod/follow.php:25 +msgid "Channel added." msgstr "" -#: ../../mod/setup.php:537 -msgid "Url rewrite is working" +#: ../../mod/editlayout.php:36 ../../mod/editwebpage.php:30 +#: ../../mod/editpost.php:20 ../../mod/editblock.php:36 +msgid "Item not found" 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/editlayout.php:68 +msgid "Edit Layout" msgstr "" -#: ../../mod/setup.php:571 -msgid "Errors encountered creating database tables." +#: ../../mod/editlayout.php:104 ../../mod/editwebpage.php:123 +#: ../../mod/editpost.php:101 ../../mod/editblock.php:118 +msgid "Insert YouTube video" msgstr "" -#: ../../mod/setup.php:582 -msgid "

      What next

      " +#: ../../mod/editlayout.php:105 ../../mod/editwebpage.php:124 +#: ../../mod/editpost.php:102 ../../mod/editblock.php:119 +msgid "Insert Vorbis [.ogg] video" msgstr "" -#: ../../mod/setup.php:583 -msgid "" -"IMPORTANT: You will need to [manually] setup a scheduled task for the poller." +#: ../../mod/editlayout.php:106 ../../mod/editwebpage.php:125 +#: ../../mod/editpost.php:103 ../../mod/editblock.php:120 +msgid "Insert Vorbis [.ogg] audio" msgstr "" -#: ../../mod/sources.php:27 -msgid "Source created." +#: ../../mod/editlayout.php:140 +msgid "Delete Layout" msgstr "" -#: ../../mod/sources.php:39 -msgid "Source updated." +#: ../../mod/nogroup.php:58 +msgid "Contacts who are not members of a group" msgstr "" -#: ../../mod/sources.php:68 -msgid "Manage remote sources of content for your channel." +#: ../../mod/profile_photo.php:54 +msgid "Image uploaded but image cropping failed." msgstr "" -#: ../../mod/sources.php:69 ../../mod/sources.php:79 -msgid "New Source" +#: ../../mod/profile_photo.php:107 +msgid "Image resize failed." msgstr "" -#: ../../mod/sources.php:80 ../../mod/sources.php:106 +#: ../../mod/profile_photo.php:151 msgid "" -"Import all or selected content from the following channel into this channel " -"and distribute it according to your channel settings." +"Shift-reload the page or clear browser cache if the new photo does not " +"display immediately." msgstr "" -#: ../../mod/sources.php:81 ../../mod/sources.php:107 -msgid "Only import content with these words (one per line)" +#: ../../mod/profile_photo.php:173 +#, php-format +msgid "Image exceeds size limit of %d" msgstr "" -#: ../../mod/sources.php:81 ../../mod/sources.php:107 -msgid "Leave blank to import all public content" +#: ../../mod/profile_photo.php:182 +msgid "Unable to process image." msgstr "" -#: ../../mod/sources.php:96 ../../mod/sources.php:122 -msgid "Source not found." +#: ../../mod/profile_photo.php:224 ../../mod/profile_photo.php:272 +msgid "Photo not available." msgstr "" -#: ../../mod/sources.php:103 -msgid "Edit Source" +#: ../../mod/profile_photo.php:291 +msgid "Upload File:" msgstr "" -#: ../../mod/sources.php:104 -msgid "Delete Source" +#: ../../mod/profile_photo.php:292 +msgid "Select a profile:" msgstr "" -#: ../../mod/sources.php:130 -msgid "Source removed" +#: ../../mod/profile_photo.php:293 +msgid "Upload Profile Photo" msgstr "" -#: ../../mod/sources.php:132 -msgid "Unable to remove source." +#: ../../mod/profile_photo.php:294 +msgid "Upload" msgstr "" -#: ../../mod/settings.php:53 -msgid "Account settings" +#: ../../mod/profile_photo.php:298 +msgid "skip this step" msgstr "" -#: ../../mod/settings.php:59 -msgid "Channel settings" +#: ../../mod/profile_photo.php:298 +msgid "select a photo from your photo albums" msgstr "" -#: ../../mod/settings.php:65 -msgid "Additional features" +#: ../../mod/profile_photo.php:312 +msgid "Crop Image" msgstr "" -#: ../../mod/settings.php:71 -msgid "Feature settings" +#: ../../mod/profile_photo.php:313 +msgid "Please adjust the image cropping for optimum viewing." msgstr "" -#: ../../mod/settings.php:77 -msgid "Display settings" +#: ../../mod/profile_photo.php:315 +msgid "Done Editing" msgstr "" -#: ../../mod/settings.php:83 -msgid "Connected apps" +#: ../../mod/profile_photo.php:350 +msgid "Image uploaded successfully." msgstr "" -#: ../../mod/settings.php:89 -msgid "Export channel" +#: ../../mod/profile_photo.php:352 +msgid "Image upload failed." msgstr "" -#: ../../mod/settings.php:101 -msgid "Automatic Permissions (Advanced)" +#: ../../mod/profile_photo.php:361 +#, php-format +msgid "Image size reduction [%s] failed." +msgstr "" + +#: ../../mod/editwebpage.php:87 +msgid "Edit Webpage" +msgstr "" + +#: ../../mod/editwebpage.php:162 +msgid "Delete Webpage" +msgstr "" + +#: ../../mod/notifications.php:26 +msgid "Invalid request identifier." msgstr "" -#: ../../mod/settings.php:111 -msgid "Premium Channel Settings" +#: ../../mod/notifications.php:76 +msgid "System" msgstr "" -#: ../../mod/settings.php:171 -msgid "Name is required" +#: ../../mod/notifications.php:96 +msgid "Introductions" msgstr "" -#: ../../mod/settings.php:175 -msgid "Key and Secret are required" +#: ../../mod/notifications.php:121 +msgid "Show Ignored Requests" msgstr "" -#: ../../mod/settings.php:179 ../../mod/settings.php:677 -msgid "Update" +#: ../../mod/notifications.php:121 +msgid "Hide Ignored Requests" msgstr "" -#: ../../mod/settings.php:292 -msgid "Passwords do not match. Password unchanged." +#: ../../mod/notifications.php:147 ../../mod/notifications.php:193 +msgid "Notification type: " msgstr "" -#: ../../mod/settings.php:296 -msgid "Empty passwords are not allowed. Password unchanged." +#: ../../mod/notifications.php:148 +msgid "Friend Suggestion" msgstr "" -#: ../../mod/settings.php:309 -msgid "Password changed." +#: ../../mod/notifications.php:150 +#, php-format +msgid "suggested by %s" msgstr "" -#: ../../mod/settings.php:311 -msgid "Password update failed. Please try again." +#: ../../mod/notifications.php:179 +msgid "Claims to be known to you: " msgstr "" -#: ../../mod/settings.php:325 -msgid "Not valid email." +#: ../../mod/notifications.php:179 +msgid "yes" msgstr "" -#: ../../mod/settings.php:328 -msgid "Protected email address. Cannot change to that email." +#: ../../mod/notifications.php:179 +msgid "no" msgstr "" -#: ../../mod/settings.php:337 -msgid "System failure storing new email. Please try again." +#: ../../mod/notifications.php:186 +msgid "Approve as: " msgstr "" -#: ../../mod/settings.php:579 -msgid "Settings updated." +#: ../../mod/notifications.php:187 +msgid "Friend" msgstr "" -#: ../../mod/settings.php:650 ../../mod/settings.php:676 -#: ../../mod/settings.php:712 -msgid "Add application" +#: ../../mod/notifications.php:188 +msgid "Sharer" msgstr "" -#: ../../mod/settings.php:653 -msgid "Name of application" +#: ../../mod/notifications.php:188 +msgid "Fan/Admirer" msgstr "" -#: ../../mod/settings.php:654 ../../mod/settings.php:680 -msgid "Consumer Key" +#: ../../mod/notifications.php:194 +msgid "Friend/Connect Request" msgstr "" -#: ../../mod/settings.php:654 ../../mod/settings.php:655 -msgid "Automatically generated - change if desired. Max length 20" +#: ../../mod/notifications.php:194 +msgid "New Follower" msgstr "" -#: ../../mod/settings.php:655 ../../mod/settings.php:681 -msgid "Consumer Secret" +#: ../../mod/notifications.php:215 +msgid "No introductions." msgstr "" -#: ../../mod/settings.php:656 ../../mod/settings.php:682 -msgid "Redirect" +#: ../../mod/notifications.php:257 ../../mod/notifications.php:382 +#: ../../mod/notifications.php:465 +#, php-format +msgid "%s liked %s's post" msgstr "" -#: ../../mod/settings.php:656 -msgid "" -"Redirect URI - leave blank unless your application specifically requires this" +#: ../../mod/notifications.php:266 ../../mod/notifications.php:391 +#: ../../mod/notifications.php:474 +#, php-format +msgid "%s disliked %s's post" msgstr "" -#: ../../mod/settings.php:657 ../../mod/settings.php:683 -msgid "Icon url" +#: ../../mod/notifications.php:280 ../../mod/notifications.php:405 +#: ../../mod/notifications.php:488 +#, php-format +msgid "%s is now friends with %s" msgstr "" -#: ../../mod/settings.php:657 -msgid "Optional" +#: ../../mod/notifications.php:287 ../../mod/notifications.php:412 +#, php-format +msgid "%s created a new post" msgstr "" -#: ../../mod/settings.php:668 -msgid "You can't edit this application." +#: ../../mod/notifications.php:288 ../../mod/notifications.php:413 +#: ../../mod/notifications.php:497 +#, php-format +msgid "%s commented on %s's post" msgstr "" -#: ../../mod/settings.php:711 -msgid "Connected Apps" +#: ../../mod/notifications.php:302 +msgid "No more network notifications." msgstr "" -#: ../../mod/settings.php:715 -msgid "Client key starts with" +#: ../../mod/notifications.php:306 +msgid "Network Notifications" msgstr "" -#: ../../mod/settings.php:716 -msgid "No name" +#: ../../mod/notifications.php:332 ../../mod/notify.php:54 +msgid "No more system notifications." msgstr "" -#: ../../mod/settings.php:717 -msgid "Remove authorization" +#: ../../mod/notifications.php:336 ../../mod/notify.php:58 +msgid "System Notifications" msgstr "" -#: ../../mod/settings.php:728 -msgid "No feature settings configured" +#: ../../mod/notifications.php:427 +msgid "No more personal notifications." msgstr "" -#: ../../mod/settings.php:736 -msgid "Feature Settings" +#: ../../mod/notifications.php:431 +msgid "Personal Notifications" msgstr "" -#: ../../mod/settings.php:759 -msgid "Account Settings" +#: ../../mod/notifications.php:504 +msgid "No more home notifications." msgstr "" -#: ../../mod/settings.php:760 -msgid "Password Settings" +#: ../../mod/notifications.php:508 +msgid "Home Notifications" msgstr "" -#: ../../mod/settings.php:761 -msgid "New Password:" +#: ../../mod/blocks.php:65 +msgid "Block Name" msgstr "" -#: ../../mod/settings.php:762 -msgid "Confirm:" +#: ../../mod/oexchange.php:23 +msgid "Unable to find your hub." msgstr "" -#: ../../mod/settings.php:762 -msgid "Leave password fields blank unless changing" +#: ../../mod/oexchange.php:37 +msgid "Post successful." msgstr "" -#: ../../mod/settings.php:764 ../../mod/settings.php:1063 -msgid "Email Address:" +#: ../../mod/editpost.php:31 +msgid "Item is not editable" msgstr "" -#: ../../mod/settings.php:765 -msgid "Remove Account" +#: ../../mod/profile.php:111 +msgid "Access to this profile has been restricted." msgstr "" -#: ../../mod/settings.php:766 -msgid "Warning: This action is permanent and cannot be reversed." +#: ../../mod/poke.php:159 +msgid "Poke/Prod" msgstr "" -#: ../../mod/settings.php:782 -msgid "Off" +#: ../../mod/poke.php:160 +msgid "poke, prod or do other things to somebody" msgstr "" -#: ../../mod/settings.php:782 -msgid "On" +#: ../../mod/poke.php:161 +msgid "Recipient" msgstr "" -#: ../../mod/settings.php:789 -msgid "Additional Features" +#: ../../mod/poke.php:162 +msgid "Choose what you wish to do to recipient" msgstr "" -#: ../../mod/settings.php:814 -msgid "Connector Settings" +#: ../../mod/poke.php:165 +msgid "Make this post private" msgstr "" -#: ../../mod/settings.php:884 -msgid "Display Settings" +#: ../../mod/wall_upload.php:41 ../../mod/item.php:1074 +msgid "Wall Photos" msgstr "" -#: ../../mod/settings.php:890 -msgid "Display Theme:" +#: ../../mod/channel.php:120 +msgid "Insufficient permissions. Request redirected to profile page." msgstr "" -#: ../../mod/settings.php:891 -msgid "Mobile Theme:" +#: ../../mod/community.php:23 +msgid "Not available." msgstr "" -#: ../../mod/settings.php:892 -msgid "Update browser every xx seconds" +#: ../../mod/community.php:32 +msgid "Community" msgstr "" -#: ../../mod/settings.php:892 -msgid "Minimum of 10 seconds, no maximum" +#: ../../mod/community.php:63 ../../mod/community.php:88 +msgid "No results." msgstr "" -#: ../../mod/settings.php:893 -msgid "Maximum number of conversations to load at any time:" +#: ../../mod/fbrowser.php:114 +msgid "Files" msgstr "" -#: ../../mod/settings.php:893 -msgid "Maximum of 100 items" +#: ../../mod/fsuggest.php:63 +msgid "Friend suggestion sent." msgstr "" -#: ../../mod/settings.php:894 -msgid "Don't show emoticons" +#: ../../mod/fsuggest.php:97 +msgid "Suggest Friends" msgstr "" -#: ../../mod/settings.php:930 -msgid "Nobody except yourself" +#: ../../mod/fsuggest.php:99 +#, php-format +msgid "Suggest a friend for %s" msgstr "" -#: ../../mod/settings.php:931 -msgid "Only those you specifically allow" +#: ../../mod/editblock.php:82 +msgid "Edit Block" msgstr "" -#: ../../mod/settings.php:932 -msgid "Anybody in your address book" +#: ../../mod/editblock.php:156 +msgid "Delete Block" msgstr "" -#: ../../mod/settings.php:933 -msgid "Anybody on this website" +#: ../../mod/profperm.php:34 ../../mod/profperm.php:64 +msgid "Invalid profile identifier." msgstr "" -#: ../../mod/settings.php:934 -msgid "Anybody in this network" +#: ../../mod/profperm.php:110 +msgid "Profile Visibility Editor" msgstr "" -#: ../../mod/settings.php:935 -msgid "Anybody on the internet" +#: ../../mod/profperm.php:114 +msgid "Click on a contact to add or remove." msgstr "" -#: ../../mod/settings.php:1009 -msgid "Publish your default profile in the network directory" +#: ../../mod/profperm.php:123 +msgid "Visible To" msgstr "" -#: ../../mod/settings.php:1014 -msgid "Allow us to suggest you as a potential friend to new members?" +#: ../../mod/profperm.php:139 +msgid "All Contacts (with secure profile access)" msgstr "" -#: ../../mod/settings.php:1023 -msgid "Your channel address is" +#: ../../mod/item.php:144 +msgid "Unable to locate original post." msgstr "" -#: ../../mod/settings.php:1034 -msgid "Automatically expire posts after this many days:" +#: ../../mod/item.php:341 +msgid "Empty post discarded." msgstr "" -#: ../../mod/settings.php:1034 -msgid "If empty, posts will not expire. Expired posts will be deleted" +#: ../../mod/item.php:383 +msgid "Executable content type not permitted to this channel." msgstr "" -#: ../../mod/settings.php:1035 -msgid "Advanced expiration settings" +#: ../../mod/item.php:793 +msgid "System error. Post not saved." msgstr "" -#: ../../mod/settings.php:1036 -msgid "Advanced Expiration" +#: ../../mod/item.php:1153 +#, php-format +msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../mod/settings.php:1037 -msgid "Expire posts:" +#: ../../mod/item.php:1159 +#, php-format +msgid "You have reached your limit of %1$.0f webpages." msgstr "" -#: ../../mod/settings.php:1039 -msgid "Expire starred posts:" +#: ../../mod/siteinfo.php:51 +#, php-format +msgid "Version %s" msgstr "" -#: ../../mod/settings.php:1040 -msgid "Expire photos:" +#: ../../mod/siteinfo.php:65 +msgid "Installed plugins/addons/apps:" msgstr "" -#: ../../mod/settings.php:1041 -msgid "Only expire posts by others:" +#: ../../mod/siteinfo.php:78 +msgid "No installed plugins/addons/apps" msgstr "" -#: ../../mod/settings.php:1052 -msgid "Channel Settings" +#: ../../mod/siteinfo.php:81 +msgid "Red" msgstr "" -#: ../../mod/settings.php:1061 -msgid "Basic Settings" +#: ../../mod/siteinfo.php:82 +msgid "" +"This is a hub of the Red Matrix - a global cooperative network of " +"decentralised privacy enhanced websites." msgstr "" -#: ../../mod/settings.php:1064 -msgid "Your Timezone:" +#: ../../mod/siteinfo.php:84 +msgid "Running at web location" msgstr "" -#: ../../mod/settings.php:1065 -msgid "Default Post Location:" +#: ../../mod/siteinfo.php:85 +msgid "" +"Please visit GetZot.com to learn more " +"about the Red Matrix." msgstr "" -#: ../../mod/settings.php:1066 -msgid "Use Browser Location:" +#: ../../mod/siteinfo.php:86 +msgid "Bug reports and issues: please visit" msgstr "" -#: ../../mod/settings.php:1068 -msgid "Adult Content" +#: ../../mod/siteinfo.php:89 +msgid "" +"Suggestions, praise, donations, etc. - please email \"redmatrix\" at " +"librelist - dot com" msgstr "" -#: ../../mod/settings.php:1068 -msgid "This channel publishes adult content." +#: ../../mod/suggest.php:41 +msgid "" +"No suggestions available. If this is a new site, please try again in 24 " +"hours." msgstr "" -#: ../../mod/settings.php:1070 -msgid "Security and Privacy Settings" +#: ../../mod/suggest.php:58 +msgid "Ignore/Hide" msgstr "" -#: ../../mod/settings.php:1072 -msgid "Quick Privacy Settings:" +#: ../../mod/pubsites.php:22 +msgid "Public Sites" msgstr "" -#: ../../mod/settings.php:1073 -msgid "Very Public - extremely permissive" +#: ../../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 "" -#: ../../mod/settings.php:1074 -msgid "Typical - default public, privacy when desired" +#: ../../mod/pubsites.php:31 +msgid "Site URL" msgstr "" -#: ../../mod/settings.php:1075 -msgid "Private - default private, rarely open or public" +#: ../../mod/pubsites.php:31 +msgid "Access Type" msgstr "" -#: ../../mod/settings.php:1076 -msgid "Blocked - default blocked to/from everybody" +#: ../../mod/pubsites.php:31 +msgid "Registration Policy" msgstr "" -#: ../../mod/settings.php:1079 -msgid "Maximum Friend Requests/Day:" +#: ../../mod/register.php:43 +msgid "Maximum daily site registrations exceeded. Please try again tomorrow." msgstr "" -#: ../../mod/settings.php:1079 -msgid "May reduce spam activity" +#: ../../mod/register.php:49 +msgid "" +"Please indicate acceptance of the Terms of Service. Registration failed." msgstr "" -#: ../../mod/settings.php:1080 -msgid "Default Post Permissions" +#: ../../mod/register.php:77 +msgid "Passwords do not match." msgstr "" -#: ../../mod/settings.php:1081 -msgid "(click to open/close)" +#: ../../mod/register.php:105 +msgid "" +"Registration successful. Please check your email for validation instructions." msgstr "" -#: ../../mod/settings.php:1094 -msgid "Maximum private messages per day from unknown people:" +#: ../../mod/register.php:111 +msgid "Your registration is pending approval by the site owner." msgstr "" -#: ../../mod/settings.php:1094 -msgid "Useful to reduce spamming" +#: ../../mod/register.php:114 +msgid "Your registration can not be processed." msgstr "" -#: ../../mod/settings.php:1097 -msgid "Notification Settings" +#: ../../mod/register.php:149 +msgid "" +"This site has exceeded the number of allowed daily account registrations. " +"Please try again tomorrow." msgstr "" -#: ../../mod/settings.php:1098 -msgid "By default post a status message when:" +#: ../../mod/register.php:160 +msgid "Terms of Service" msgstr "" -#: ../../mod/settings.php:1099 -msgid "accepting a friend request" +#: ../../mod/register.php:166 +#, php-format +msgid "I accept the %s for this website" msgstr "" -#: ../../mod/settings.php:1100 -msgid "joining a forum/community" +#: ../../mod/register.php:168 +#, php-format +msgid "I am over 13 years of age and accept the %s for this website" msgstr "" -#: ../../mod/settings.php:1101 -msgid "making an interesting profile change" +#: ../../mod/register.php:183 +msgid "Membership on this site is by invitation only." msgstr "" -#: ../../mod/settings.php:1102 -msgid "Send a notification email when:" +#: ../../mod/register.php:184 +msgid "Please enter your invitation code" msgstr "" -#: ../../mod/settings.php:1103 -msgid "You receive an introduction" +#: ../../mod/register.php:187 +msgid "Your email address" msgstr "" -#: ../../mod/settings.php:1104 -msgid "Your introductions are confirmed" +#: ../../mod/register.php:188 +msgid "Choose a password" msgstr "" -#: ../../mod/settings.php:1105 -msgid "Someone writes on your profile wall" +#: ../../mod/register.php:189 +msgid "Please re-enter your password" msgstr "" -#: ../../mod/settings.php:1106 -msgid "Someone writes a followup comment" +#: ../../mod/regmod.php:12 +msgid "Please login." msgstr "" -#: ../../mod/settings.php:1107 -msgid "You receive a private message" +#: ../../mod/post.php:119 +msgid "" +"Remote authentication blocked. You are logged into this site locally. Please " +"logout and retry." msgstr "" -#: ../../mod/settings.php:1108 -msgid "You receive a friend suggestion" +#: ../../mod/post.php:132 +#, php-format +msgid "Welcome %s. Remote authentication successful." msgstr "" -#: ../../mod/settings.php:1109 -msgid "You are tagged in a post" +#: ../../mod/removeme.php:49 +msgid "Remove This Channel" msgstr "" -#: ../../mod/settings.php:1110 -msgid "You are poked/prodded/etc. in a post" +#: ../../mod/removeme.php:50 +msgid "" +"This will completely remove this channel from the network. Once this has " +"been done it is not recoverable." msgstr "" -#: ../../mod/settings.php:1113 -msgid "Advanced Account/Page Type Settings" +#: ../../mod/removeme.php:51 +msgid "Please enter your password for verification:" msgstr "" -#: ../../mod/settings.php:1114 -msgid "Change the behaviour of this account for special situations" +#: ../../mod/removeme.php:52 +msgid "Remove this channel and all its clones from the network" msgstr "" -#: ../../mod/item.php:144 -msgid "Unable to locate original post." +#: ../../mod/removeme.php:52 +msgid "" +"By default only the instance of the channel located on this hub will be " +"removed from the network" msgstr "" -#: ../../mod/item.php:341 -msgid "Empty post discarded." +#: ../../mod/removeme.php:53 +msgid "Remove My Account" msgstr "" -#: ../../mod/item.php:383 -msgid "Executable content type not permitted to this channel." +#: ../../mod/directory.php:163 +msgid "Gender: " msgstr "" -#: ../../mod/item.php:793 -msgid "System error. Post not saved." +#: ../../mod/directory.php:222 +msgid "Finding:" msgstr "" -#: ../../mod/item.php:1153 -#, php-format -msgid "You have reached your limit of %1$.0f top level posts." +#: ../../mod/directory.php:230 +msgid "next page" msgstr "" -#: ../../mod/item.php:1159 -#, php-format -msgid "You have reached your limit of %1$.0f webpages." +#: ../../mod/directory.php:230 +msgid "previous page" msgstr "" -#: ../../mod/attach.php:9 -msgid "Item not available." +#: ../../mod/directory.php:237 +msgid "No entries (some entries may be hidden)." msgstr "" -#: ../../mod/manage.php:63 -#, php-format -msgid "You have created %1$.0f of %2$.0f allowed channels." +#: ../../mod/mood.php:133 +msgid "Mood" msgstr "" -#: ../../mod/manage.php:71 -msgid "Create a new channel" +#: ../../mod/mood.php:134 +msgid "Set your current mood and tell your friends" msgstr "" -#: ../../mod/manage.php:76 -msgid "Channel Manager" +#: ../../view/theme/redbasic/php/config.php:74 +msgid "Scheme Default" msgstr "" -#: ../../mod/manage.php:77 -msgid "Current Channel" +#: ../../view/theme/redbasic/php/config.php:75 +msgid "red" msgstr "" -#: ../../mod/manage.php:79 -msgid "Attach to one of your channels by selecting it." +#: ../../view/theme/redbasic/php/config.php:76 +msgid "black" msgstr "" -#: ../../mod/manage.php:80 -msgid "Default Channel" +#: ../../view/theme/redbasic/php/config.php:77 +msgid "silver" msgstr "" -#: ../../mod/manage.php:81 -msgid "Make Default" +#: ../../view/theme/redbasic/php/config.php:88 +#: ../../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 "" -#: ../../mod/allfriends.php:35 -#, php-format -msgid "Friends of %s" +#: ../../view/theme/redbasic/php/config.php:89 +#: ../../view/theme/apw/php/config.php:235 +msgid "Set scheme" msgstr "" -#: ../../mod/allfriends.php:41 -msgid "No friends to display." +#: ../../view/theme/redbasic/php/config.php:90 +msgid "Navigation bar colour" msgstr "" -#: ../../mod/nogroup.php:58 -msgid "Contacts who are not members of a group" +#: ../../view/theme/redbasic/php/config.php:91 +msgid "Set font-colour for banner" msgstr "" -#: ../../mod/channel.php:16 -msgid "You must be logged in to see this page." +#: ../../view/theme/redbasic/php/config.php:92 +msgid "Set the background colour" msgstr "" -#: ../../mod/channel.php:120 -msgid "Insufficient permissions. Request redirected to profile page." +#: ../../view/theme/redbasic/php/config.php:93 +msgid "Set the background image" msgstr "" -#: ../../mod/post.php:119 -msgid "" -"Remote authentication blocked. You are logged into this site locally. Please " -"logout and retry." +#: ../../view/theme/redbasic/php/config.php:94 +msgid "Set the background colour of items" msgstr "" -#: ../../mod/post.php:132 -#, php-format -msgid "Welcome %s. Remote authentication successful." +#: ../../view/theme/redbasic/php/config.php:95 +msgid "Set the opacity of items" msgstr "" -#: ../../mod/profiles.php:18 ../../mod/profiles.php:138 -#: ../../mod/profiles.php:179 ../../mod/profiles.php:486 -msgid "Profile not found." +#: ../../view/theme/redbasic/php/config.php:96 +msgid "Set the basic colour for item icons" msgstr "" -#: ../../mod/profiles.php:38 -msgid "Profile deleted." +#: ../../view/theme/redbasic/php/config.php:97 +msgid "Set the hover colour for item icons" msgstr "" -#: ../../mod/profiles.php:56 ../../mod/profiles.php:92 -msgid "Profile-" +#: ../../view/theme/redbasic/php/config.php:98 +msgid "Set font-size for the entire application" msgstr "" -#: ../../mod/profiles.php:77 ../../mod/profiles.php:120 -msgid "New profile created." +#: ../../view/theme/redbasic/php/config.php:99 +#: ../../view/theme/apw/php/config.php:236 +msgid "Set font-size for posts and comments" msgstr "" -#: ../../mod/profiles.php:98 -msgid "Profile unavailable to clone." +#: ../../view/theme/redbasic/php/config.php:100 +msgid "Set font-colour for posts and comments" msgstr "" -#: ../../mod/profiles.php:189 -msgid "Profile Name is required." +#: ../../view/theme/redbasic/php/config.php:101 +msgid "Set radius of corners" msgstr "" -#: ../../mod/profiles.php:317 -msgid "Marital Status" +#: ../../view/theme/redbasic/php/config.php:102 +msgid "Set shadow depth of photos" msgstr "" -#: ../../mod/profiles.php:321 -msgid "Romantic Partner" +#: ../../view/theme/redbasic/php/config.php:103 +msgid "Set maximum width of conversation regions" msgstr "" -#: ../../mod/profiles.php:325 -msgid "Likes" +#: ../../view/theme/redbasic/php/config.php:104 +msgid "Set minimum opacity of nav bar - to hide it" msgstr "" -#: ../../mod/profiles.php:329 -msgid "Dislikes" +#: ../../view/theme/redbasic/php/config.php:105 +msgid "Set size of conversation author photo" msgstr "" -#: ../../mod/profiles.php:333 -msgid "Work/Employment" +#: ../../view/theme/redbasic/php/config.php:106 +msgid "Set size of followup author photos" msgstr "" -#: ../../mod/profiles.php:336 -msgid "Religion" +#: ../../view/theme/redbasic/php/config.php:107 +msgid "Sloppy photo albums" msgstr "" -#: ../../mod/profiles.php:340 -msgid "Political Views" +#: ../../view/theme/redbasic/php/config.php:107 +msgid "Are you a clean desk or a messy desk person?" msgstr "" -#: ../../mod/profiles.php:344 -msgid "Gender" +#: ../../view/theme/apw/php/config.php:193 +#: ../../view/theme/apw/php/config.php:211 +msgid "Schema Default" msgstr "" -#: ../../mod/profiles.php:348 -msgid "Sexual Preference" +#: ../../view/theme/apw/php/config.php:194 +msgid "Sans-Serif" msgstr "" -#: ../../mod/profiles.php:352 -msgid "Homepage" +#: ../../view/theme/apw/php/config.php:195 +msgid "Monospace" msgstr "" -#: ../../mod/profiles.php:356 -msgid "Interests" +#: ../../view/theme/apw/php/config.php:237 +msgid "Set font face" msgstr "" -#: ../../mod/profiles.php:360 -msgid "Address" +#: ../../view/theme/apw/php/config.php:238 +msgid "Set iconset" msgstr "" -#: ../../mod/profiles.php:450 -msgid "Profile updated." +#: ../../view/theme/apw/php/config.php:239 +msgid "Set big shadow size, default 15px 15px 15px" msgstr "" -#: ../../mod/profiles.php:505 -msgid "Hide your contact/friend list from viewers of this profile?" +#: ../../view/theme/apw/php/config.php:240 +msgid "Set small shadow size, default 5px 5px 5px" msgstr "" -#: ../../mod/profiles.php:528 -msgid "Edit Profile Details" +#: ../../view/theme/apw/php/config.php:241 +msgid "Set shadow colour, default #000" msgstr "" -#: ../../mod/profiles.php:530 -msgid "View this profile" +#: ../../view/theme/apw/php/config.php:242 +msgid "Set radius size, default 5px" msgstr "" -#: ../../mod/profiles.php:531 -msgid "Change Profile Photo" +#: ../../view/theme/apw/php/config.php:243 +msgid "Set line-height for posts and comments" msgstr "" -#: ../../mod/profiles.php:532 -msgid "Create a new profile using these settings" +#: ../../view/theme/apw/php/config.php:244 +msgid "Set background image" msgstr "" -#: ../../mod/profiles.php:533 -msgid "Clone this profile" +#: ../../view/theme/apw/php/config.php:245 +msgid "Set background colour" msgstr "" -#: ../../mod/profiles.php:534 -msgid "Delete this profile" +#: ../../view/theme/apw/php/config.php:246 +msgid "Set section background image" msgstr "" -#: ../../mod/profiles.php:535 -msgid "Profile Name:" +#: ../../view/theme/apw/php/config.php:247 +msgid "Set section background colour" msgstr "" -#: ../../mod/profiles.php:536 -msgid "Your Full Name:" +#: ../../view/theme/apw/php/config.php:248 +msgid "Set colour of items - use hex" msgstr "" -#: ../../mod/profiles.php:537 -msgid "Title/Description:" +#: ../../view/theme/apw/php/config.php:249 +msgid "Set colour of links - use hex" msgstr "" -#: ../../mod/profiles.php:538 -msgid "Your Gender:" +#: ../../view/theme/apw/php/config.php:250 +msgid "Set max-width for items. Default 400px" msgstr "" -#: ../../mod/profiles.php:539 -#, php-format -msgid "Birthday (%s):" +#: ../../view/theme/apw/php/config.php:251 +msgid "Set min-width for items. Default 240px" msgstr "" -#: ../../mod/profiles.php:540 -msgid "Street Address:" +#: ../../view/theme/apw/php/config.php:252 +msgid "Set the generic content wrapper width. Default 48%" msgstr "" -#: ../../mod/profiles.php:541 -msgid "Locality/City:" +#: ../../view/theme/apw/php/config.php:253 +msgid "Set colour of fonts - use hex" msgstr "" -#: ../../mod/profiles.php:542 -msgid "Postal/Zip Code:" +#: ../../view/theme/apw/php/config.php:254 +msgid "Set background-size element" msgstr "" -#: ../../mod/profiles.php:543 -msgid "Country:" +#: ../../view/theme/apw/php/config.php:255 +msgid "Item opacity" msgstr "" -#: ../../mod/profiles.php:544 -msgid "Region/State:" +#: ../../view/theme/apw/php/config.php:256 +msgid "Display post previews only" msgstr "" -#: ../../mod/profiles.php:545 -msgid "♥ Marital Status:" +#: ../../view/theme/apw/php/config.php:257 +msgid "Display side bar on channel page" msgstr "" -#: ../../mod/profiles.php:546 -msgid "Who: (if applicable)" +#: ../../view/theme/apw/php/config.php:258 +msgid "Colour of the navigation bar" msgstr "" -#: ../../mod/profiles.php:547 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +#: ../../view/theme/apw/php/config.php:259 +msgid "Item float" msgstr "" -#: ../../mod/profiles.php:548 -msgid "Since [date]:" +#: ../../view/theme/apw/php/config.php:260 +msgid "Left offset of the section element" msgstr "" -#: ../../mod/profiles.php:550 -msgid "Homepage URL:" +#: ../../view/theme/apw/php/config.php:261 +msgid "Right offset of the section element" msgstr "" -#: ../../mod/profiles.php:553 -msgid "Religious Views:" +#: ../../view/theme/apw/php/config.php:262 +msgid "Section width" msgstr "" -#: ../../mod/profiles.php:554 -msgid "Keywords:" +#: ../../view/theme/apw/php/config.php:263 +msgid "Left offset of the aside" msgstr "" -#: ../../mod/profiles.php:557 -msgid "Example: fishing photography software" +#: ../../view/theme/apw/php/config.php:264 +msgid "Right offset of the aside element" msgstr "" -#: ../../mod/profiles.php:558 -msgid "Used in directory listings" +#: ../../view/theme/blogga/view/theme/blog/config.php:47 +#: ../../view/theme/blogga/php/config.php:47 +msgid "None" msgstr "" -#: ../../mod/profiles.php:559 -msgid "Tell us about yourself..." +#: ../../view/theme/blogga/view/theme/blog/config.php:70 +#: ../../view/theme/blogga/php/config.php:70 +msgid "Header image" msgstr "" -#: ../../mod/profiles.php:560 -msgid "Hobbies/Interests" +#: ../../view/theme/blogga/view/theme/blog/config.php:71 +#: ../../view/theme/blogga/php/config.php:71 +msgid "Header image only on profile pages" msgstr "" -#: ../../mod/profiles.php:561 -msgid "Contact information and Social Networks" +#: ../../boot.php:1274 +#, php-format +msgid "Update %s failed. See error logs." msgstr "" -#: ../../mod/profiles.php:562 -msgid "My other channels" +#: ../../boot.php:1277 +#, php-format +msgid "Update Error at %s" msgstr "" -#: ../../mod/profiles.php:563 -msgid "Musical interests" +#: ../../boot.php:1434 +msgid "" +"Create an account to access services and applications within the Red Matrix" msgstr "" -#: ../../mod/profiles.php:564 -msgid "Books, literature" +#: ../../boot.php:1462 +msgid "Password" msgstr "" -#: ../../mod/profiles.php:565 -msgid "Television" +#: ../../boot.php:1463 +msgid "Remember me" msgstr "" -#: ../../mod/profiles.php:566 -msgid "Film/dance/culture/entertainment" +#: ../../boot.php:1468 +msgid "Forgot your password?" msgstr "" -#: ../../mod/profiles.php:567 -msgid "Love/romance" +#: ../../boot.php:1533 +msgid "permission denied" msgstr "" -#: ../../mod/profiles.php:568 -msgid "Work/employment" +#: ../../boot.php:1534 +msgid "Got Zot?" msgstr "" -#: ../../mod/profiles.php:569 -msgid "School/education" +#: ../../boot.php:1593 +msgid "Requested channel is not available." msgstr "" -#: ../../mod/profiles.php:574 -msgid "" -"This is your public profile.
      It may " -"be visible to anybody using the internet." +#: ../../boot.php:1605 +msgid " Sorry, you don't have the permission to view this profile. " msgstr "" -#: ../../mod/profiles.php:623 -msgid "Edit/Manage Profiles" +#: ../../boot.php:1761 +msgid "Profiles" msgstr "" -#: ../../mod/events.php:66 -msgid "Event title and start time are required." +#: ../../boot.php:1761 +msgid "Manage/edit profiles" msgstr "" -#: ../../mod/events.php:281 -msgid "l, F j" +#: ../../boot.php:1765 +msgid "Edit Profile" msgstr "" -#: ../../mod/events.php:303 -msgid "Edit event" +#: ../../boot.php:1859 ../../boot.php:1939 +msgid "F d" msgstr "" -#: ../../mod/events.php:349 -msgid "Create New Event" +#: ../../boot.php:1916 +msgid "Birthday Reminders" msgstr "" -#: ../../mod/events.php:350 -msgid "Previous" +#: ../../boot.php:1917 +msgid "Birthdays this week:" msgstr "" -#: ../../mod/events.php:425 -msgid "hour:minute" +#: ../../boot.php:1972 +msgid "[No description]" msgstr "" -#: ../../mod/events.php:435 -msgid "Event details" +#: ../../boot.php:1990 +msgid "Event Reminders" msgstr "" -#: ../../mod/events.php:436 -#, php-format -msgid "Format is %s %s. Starting date and Title are required." +#: ../../boot.php:1991 +msgid "Events this week:" msgstr "" -#: ../../mod/events.php:438 -msgid "Event Starts:" +#: ../../boot.php:2225 +msgid "Channel" msgstr "" -#: ../../mod/events.php:438 ../../mod/events.php:452 -msgid "Required" +#: ../../boot.php:2228 +msgid "Status Messages and Posts" msgstr "" -#: ../../mod/events.php:441 -msgid "Finish date/time is not known or not relevant" +#: ../../boot.php:2232 +msgid "About" msgstr "" -#: ../../mod/events.php:443 -msgid "Event Finishes:" +#: ../../boot.php:2235 +msgid "Profile Details" msgstr "" -#: ../../mod/events.php:446 -msgid "Adjust for viewer timezone" +#: ../../boot.php:2253 +msgid "Events and Calendar" msgstr "" -#: ../../mod/events.php:448 -msgid "Description:" +#: ../../boot.php:2258 +msgid "Webpages" msgstr "" -#: ../../mod/events.php:452 -msgid "Title:" +#: ../../boot.php:2261 +msgid "Manage Webpages" msgstr "" -#: ../../mod/events.php:454 -msgid "Share this event" +#: ../../boot.php:2546 +msgid "toggle mobile" msgstr "" diff --git a/version.inc b/version.inc index 5a612c8d2..60aa5ecb2 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-11-28.511 +2013-11-29.512 diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 4b7925ba9..eaa3140c9 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1131,10 +1131,9 @@ footer { margin-left: 50px; } -#profile-jot-plugin-wrapper, #profile-jot-submit-wrapper { margin-top: 10px; - width:92%; + width: 90%; } #profile-upload-wrapper { -- cgit v1.2.3 From b707495b5072d6f15e801155b2ce54854224b33c Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 29 Nov 2013 03:10:15 -0800 Subject: channel wasn't getting saved --- util/wp/post_to_red/post_to_red.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/util/wp/post_to_red/post_to_red.php b/util/wp/post_to_red/post_to_red.php index 7eb8697ad..81ae9b3ed 100644 --- a/util/wp/post_to_red/post_to_red.php +++ b/util/wp/post_to_red/post_to_red.php @@ -259,6 +259,8 @@ function post_to_red_display_admin_page() { $password = $_REQUEST["post_to_red_password"]; $red_url = $_REQUEST["post_to_red_url"]; + $channelname = $_REQUEST['post_to_red_channel']; + update_option('post_to_red_acct_name', $_REQUEST["post_to_red_acct_name"]); update_option('post_to_red_channel_name', $channelname); -- cgit v1.2.3 From 1c5f98440da1b4713d0f5b9f8f6a2d3ca39e23af Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 29 Nov 2013 14:08:37 -0800 Subject: quite a bit of work on default acl permissions and various acl quirks --- include/acl_selectors.php | 22 +++++++++++----------- mod/channel.php | 9 ++++++++- mod/display.php | 10 +++++++++- mod/network.php | 40 +++++++++++++++++++++++----------------- mod/photos.php | 13 ++++++++++++- mod/settings.php | 19 ++++++++++++++++--- view/js/mod_settings.js | 5 +++++ view/tpl/settings.tpl | 4 ++-- 8 files changed, 86 insertions(+), 36 deletions(-) diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 033186151..930f9967a 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -208,22 +208,22 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p function fixacl(&$item) { - $item = intval(str_replace(array('<','>'),array('',''),$item)); + $item = str_replace(array('<','>'),array('',''),$item); } -function populate_acl($user = null,$celeb = false) { +function populate_acl($defaults = null,$unused = false) { $allow_cid = $allow_gid = $deny_cid = $deny_gid = false; - if(is_array($user)) { - $allow_cid = ((strlen($user['allow_cid'])) - ? explode('><', $user['allow_cid']) : array() ); - $allow_gid = ((strlen($user['allow_gid'])) - ? explode('><', $user['allow_gid']) : array() ); - $deny_cid = ((strlen($user['deny_cid'])) - ? explode('><', $user['deny_cid']) : array() ); - $deny_gid = ((strlen($user['deny_gid'])) - ? explode('><', $user['deny_gid']) : array() ); + if(is_array($defaults)) { + $allow_cid = ((strlen($defaults['allow_cid'])) + ? explode('><', $defaults['allow_cid']) : array() ); + $allow_gid = ((strlen($defaults['allow_gid'])) + ? explode('><', $defaults['allow_gid']) : array() ); + $deny_cid = ((strlen($defaults['deny_cid'])) + ? explode('><', $defaults['deny_cid']) : array() ); + $deny_gid = ((strlen($defaults['deny_gid'])) + ? explode('><', $defaults['deny_gid']) : array() ); array_walk($allow_cid,'fixacl'); array_walk($allow_gid,'fixacl'); array_walk($deny_cid,'fixacl'); diff --git a/mod/channel.php b/mod/channel.php index e5af91b53..f36636023 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -131,6 +131,13 @@ function channel_content(&$a, $update = 0, $load = false) { $o .= common_friends_visitor_widget($a->profile['profile_uid']); + $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'] + ); + if($perms['post_wall']) { @@ -140,7 +147,7 @@ function channel_content(&$a, $update = 0, $load = false) { 'default_location' => (($is_owner) ? $a->profile['channel_location'] : ''), 'nickname' => $a->profile['channel_address'], 'lockstate' => (((strlen($a->profile['channel_allow_cid'])) || (strlen($a->profile['channel_allow_gid'])) || (strlen($a->profile['channel_deny_cid'])) || (strlen($a->profile['channel_deny_gid']))) ? 'lock' : 'unlock'), - 'acl' => (($is_owner) ? populate_acl($channel, false) : ''), + 'acl' => (($is_owner) ? populate_acl($channel_acl) : ''), 'showacl' => (($is_owner) ? 'yes' : ''), 'bang' => '', 'visitor' => (($is_owner || $observer) ? 'block' : 'none'), diff --git a/mod/display.php b/mod/display.php index e95a038ea..9aafec8c3 100644 --- a/mod/display.php +++ b/mod/display.php @@ -40,6 +40,14 @@ function display_content(&$a, $update = 0, $load = false) { $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'] + ); + $x = array( 'is_owner' => true, 'allow_location' => ((intval(get_pconfig($channel['channel_id'],'system','use_browser_location'))) ? '1' : ''), @@ -47,7 +55,7 @@ function display_content(&$a, $update = 0, $load = false) { 'nickname' => $channel['channel_address'], 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), - 'acl' => populate_acl($channel, false), + 'acl' => populate_acl($channel_acl, false), 'bang' => '', 'visitor' => 'block', 'profile_uid' => local_user(), diff --git a/mod/network.php b/mod/network.php index 9ee21dc05..6c0b84873 100644 --- a/mod/network.php +++ b/mod/network.php @@ -278,8 +278,21 @@ function network_content(&$a, $update = 0, $load = false) { $_GET['order'] = 'post'; if($gid) { + $r = q("SELECT * FROM `group` WHERE id = %d AND uid = %d LIMIT 1", + intval($gid), + intval(local_user()) + ); + if(! $r) { + if($update) + killme(); + notice( t('No such group') . EOL ); + goaway($a->get_baseurl(true) . '/network'); + // NOTREACHED + } + $group = $gid; - $def_acl = array('allow_gid' => '<' . $group . '>'); + $group_hash = $r[0]['hash']; + $def_acl = array('allow_gid' => '<' . $r[0]['hash'] . '>'); } $o = ''; @@ -409,7 +422,13 @@ function network_content(&$a, $update = 0, $load = false) { nav_set_selected('network'); - $celeb = false; + $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'] + ); + $x = array( 'is_owner' => true, @@ -417,8 +436,7 @@ function network_content(&$a, $update = 0, $load = false) { 'default_location' => $channel['channel_location'], 'nickname' => $channel['channel_address'], 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), -// FIXME - 'acl' => populate_acl((($group || $cid || $nets) ? $def_acl : $channel), $celeb), + 'acl' => populate_acl((($group || $cid) ? $def_acl : $channel_acl)), 'bang' => (($group || $cid) ? '!' : ''), 'visitor' => 'block', 'profile_uid' => local_user() @@ -443,18 +461,6 @@ function network_content(&$a, $update = 0, $load = false) { $sql_extra = " AND `item`.`parent` IN ( SELECT `parent` FROM `item` WHERE (item_flags & " . intval(ITEM_THREAD_TOP) . ") $sql_options ) "; if($group) { - $r = q("SELECT * FROM `group` WHERE id = %d AND uid = %d LIMIT 1", - intval($group), - intval(local_user()) - ); - if(! $r) { - if($update) - killme(); - notice( t('No such group') . EOL ); - goaway($a->get_baseurl(true) . '/network'); - // NOTREACHED - } - $contact_str = ''; $contacts = group_get_members($group); if($contacts) { @@ -469,7 +475,7 @@ function network_content(&$a, $update = 0, $load = false) { info( t('Group is empty')); } - $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND (( author_xchan IN ( $contact_str ) OR owner_xchan in ( $contact_str)) or allow_gid like '" . protect_sprintf('%<' . dbesc($r[0]['hash']) . '>%') . "' ) and id = parent and item_restrict = 0 ) "; + $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND (( author_xchan IN ( $contact_str ) OR owner_xchan in ( $contact_str )) or allow_gid like '" . protect_sprintf('%<' . dbesc($group_hash) . '>%') . "' ) and id = parent and item_restrict = 0 ) "; } diff --git a/mod/photos.php b/mod/photos.php index 43c74851a..64ca86941 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -699,8 +699,19 @@ function photos_content(&$a) { $usage_message = sprintf( t('You have used %1$.2f Mbytes of photo storage.'), $r[0]['total'] / 1024000 ); } + if($_is_owner) { + $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'] + ); + } + $albumselect_e = $albumselect; - $aclselect_e = (($_is_owner) ? populate_acl($a->get_channel(), false) : ''); + $aclselect_e = (($_is_owner) ? populate_acl($channel_acl) : ''); $tpl = get_markup_template('photos_upload.tpl'); $o .= replace_macros($tpl,array( diff --git a/mod/settings.php b/mod/settings.php index af9113202..35210eaba 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -141,6 +141,8 @@ function settings_post(&$a) { if(! local_user()) return; +// logger('mod_settings: ' . print_r($_REQUEST,true)); + if(x($_SESSION,'submanage') && intval($_SESSION['submanage'])) return; @@ -502,6 +504,8 @@ function settings_post(&$a) { set_pconfig(local_user(),'system','blocktags',$blocktags); + + /* if($page_flags == PAGE_PRVGROUP) { $hidewall = 1; @@ -545,7 +549,7 @@ function settings_post(&$a) { ); */ - $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 where channel_id = %d limit 1", + $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", dbesc($username), intval($pageflags), dbesc($timezone), @@ -572,6 +576,10 @@ function settings_post(&$a) { intval($arr['channel_r_pages']), intval($arr['channel_w_pages']), intval($arr['channel_a_republish']), + dbesc($str_contact_allow), + dbesc($str_group_allow), + dbesc($str_contact_deny), + dbesc($str_group_deny), intval(local_user()) ); @@ -1042,7 +1050,12 @@ function settings_content(&$a) { ); - + $perm_defaults = 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/group.php'); @@ -1079,7 +1092,7 @@ function settings_content(&$a) { '$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"), - '$aclselect' => populate_acl($a->user,$celeb), + '$aclselect' => populate_acl($perm_defaults), '$suggestme' => $suggestme, '$group_select' => $group_select, diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js index e749cd761..7f9a9e960 100644 --- a/view/js/mod_settings.js +++ b/view/js/mod_settings.js @@ -3,6 +3,11 @@ 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/settings.tpl b/view/tpl/settings.tpl index 10378e599..8781304c1 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -4,7 +4,7 @@ {{$nickname_block}}
      - +

      {{$h_basic}}

      @@ -73,7 +73,7 @@ {{/if}}
      - {{$permissions}} {{$permdesc}} + {{$permissions}} {{$permdesc}}
      - - - - - - - - - - - - - - - - - - - - - - -
      contacts_not_grouped ( $uid,
       $start = 0,
       $count = 0 
      )
      -
      - -

      Referenced by nogroup_content().

      - -
      - - -
      -
      - - - + @@ -429,7 +392,7 @@ Functions
      if (!function_exists('mark_for_death')) if (!function_exists('unmark_for_death')) if (!function_exists('contact_photo_menu')) random_profile if (!function_exists('mark_for_death')) if (!function_exists('unmark_for_death')) random_profile ( )
      -

      Referenced by profile_sidebar().

      +

      Referenced by profile_sidebar().

      diff --git a/doc/html/Contact_8php.js b/doc/html/Contact_8php.js index e6b927b3a..1de72ccc5 100644 --- a/doc/html/Contact_8php.js +++ b/doc/html/Contact_8php.js @@ -9,8 +9,7 @@ var Contact_8php = [ "channelx_by_n", "Contact_8php.html#a3a0844dac1e86d523de5d2f432cfeebc", null ], [ "channelx_by_nick", "Contact_8php.html#a87e699f74a1102b25e8aa0432d86a91e", null ], [ "contact_remove", "Contact_8php.html#a28e062c884331dbb5dfa713228c25ad6", null ], - [ "contacts_not_grouped", "Contact_8php.html#a228fc01f90ae9bfdde4c2ad0772bd7dc", null ], - [ "random_profile", "Contact_8php.html#a91281b5d4bbbb2ed468e27ec82ca083c", null ], + [ "random_profile", "Contact_8php.html#a852fa476f0c70bde10a4f2533aec5f71", null ], [ "rconnect_url", "Contact_8php.html#a2f4f495d53f2a334ab75292af79d3c91", null ], [ "remove_all_xchan_resources", "Contact_8php.html#acc12cda999c88c4d6185cca967c15125", null ], [ "terminate_friendship", "Contact_8php.html#a38daa1c210b78385307123450ca9a1fc", null ], diff --git a/doc/html/acl__selectors_8php.html b/doc/html/acl__selectors_8php.html index d16051349..337a2fc68 100644 --- a/doc/html/acl__selectors_8php.html +++ b/doc/html/acl__selectors_8php.html @@ -124,8 +124,8 @@ Functions
       
       fixacl (&$item)
       
       populate_acl ($user=null, $celeb=false)
       
       populate_acl ($defaults=null, $unused=false)
       

      Function Documentation

      @@ -246,7 +246,7 @@ Functions
      @@ -254,13 +254,13 @@ Functions - + - + diff --git a/doc/html/acl__selectors_8php.js b/doc/html/acl__selectors_8php.js index 1958789d9..e236669d3 100644 --- a/doc/html/acl__selectors_8php.js +++ b/doc/html/acl__selectors_8php.js @@ -3,5 +3,5 @@ var acl__selectors_8php = [ "contact_select", "acl__selectors_8php.html#a9476997d2968a5794f3723878ed89c91", null ], [ "fixacl", "acl__selectors_8php.html#ad6664fb8330308e23f2645cd6624727e", null ], [ "group_select", "acl__selectors_8php.html#aa1e3bc344ca2b29f97eb9860216d21a0", null ], - [ "populate_acl", "acl__selectors_8php.html#a51f2ec7a143d5a5b38e35efd5f3d6e2c", null ] + [ "populate_acl", "acl__selectors_8php.html#a7b5446e999636ceceea65c154d865a31", null ] ]; \ No newline at end of file diff --git a/doc/html/apw_2php_2style_8php.html b/doc/html/apw_2php_2style_8php.html index baa2cfdec..59038c4ab 100644 --- a/doc/html/apw_2php_2style_8php.html +++ b/doc/html/apw_2php_2style_8php.html @@ -112,7 +112,7 @@ $(document).ready(function(){initNavTree('apw_2php_2style_8php.html','');});
      populate_acl (  $user = null, $defaults = null,
       $celeb = false $unused = false 
      - + @@ -123,12 +123,12 @@ Variables

      Variables

       $uid = get_theme_uid()
       $uid = get_theme_uid()
       
       if ($uid) load_pconfig($uid
       
      - +
      $uid = get_theme_uid()$uid = get_theme_uid()
      -

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

      diff --git a/doc/html/bbcode_8php.html b/doc/html/bbcode_8php.html index 77c5e873b..455cfac95 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(), 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 ee8487d93..0146399a4 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -159,38 +159,16 @@ Functions
       
       get_max_import_size ()
       
       profile_load (&$a, $nickname, $profile= '')
       
       profile_create_sidebar (&$a, $connect=true)
       
       profile_sidebar ($profile, $block=0, $show_connect=true)
       
       get_birthdays ()
       
       get_events ()
       
       proc_run ($cmd)
       
       current_theme ()
       
       current_theme_url ($installing=false)
       
       z_birthday ($dob, $tz, $format="Y-m-d H:i:s")
       
       is_site_admin ()
       
       load_contact_links ($uid)
       
       profile_tabs ($a, $is_owner=False, $nickname=Null)
       
       get_my_url ()
       
       get_my_address ()
       
       zid_init (&$a)
       
       zid ($s, $address= '')
       
       build_querystring ($params, $name=null)
       
       argc ()
       
       head_get_icon ()
       
       get_theme_uid ()
       
      @@ -722,7 +698,7 @@ Variables

      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(), notify_init(), oembed_init(), oexchange_content(), oexchange_init(), page_content(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), post_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(), 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().

      @@ -740,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(), notify_init(), oembed_init(), oexchange_content(), oexchange_init(), page_content(), page_init(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), post_init(), profile_init(), profile_photo_post(), profile_tabs(), 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(), 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().

      @@ -776,8 +752,6 @@ 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(), dfrn_deliver(), drop_item(), event_store(), fetch_url(), 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(), lrdd(), 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(), post_url(), 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().

      - -
      - - -
      -
      - - - - - - - -
      get_birthdays ()
      -
      +

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

      @@ -1007,21 +966,6 @@ Variables
      - - - - - - -
      get_events ()
      -
      -
      @@ -1039,40 +983,6 @@ Variables
      - - - - - - -
      get_my_address ()
      -
      - -

      Referenced by App\build_pagehead(), rmagic_init(), zid(), and zid_init().

      - -
      - - -
      -
      - - - - - - - -
      get_my_url ()
      -
      - -

      Referenced by nav(), and zid().

      -
      @@ -1088,22 +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(), get_public_feed(), item_permissions_sql(), 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().

      - -
      - - -
      -
      - - - - - - - -
      get_theme_uid ()
      -
      +

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

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

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

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

      +

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

      @@ -1258,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(), nogroup_content(), nogroup_init(), notifications_content(), notifications_post(), notify_content(), notify_init(), oexchange_content(), permissions_sql(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poke_content(), poke_init(), post_init(), prepare_body(), private_messages_list(), profile_activity(), profile_content(), profile_create_sidebar(), profile_init(), profile_load(), profile_photo_aside(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profile_tabs(), profiles_aside(), profiles_content(), profiles_init(), profiles_post(), profperm_aside(), profperm_content(), profperm_init(), 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(), 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().

      @@ -1310,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(), nogroup_content(), notifications_content(), notifications_post(), oexchange_content(), page_content(), photos_content(), photos_post(), poke_content(), post_init(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), register_content(), register_post(), regmod_content(), 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(), 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().

      @@ -1332,146 +1227,7 @@ Variables
      - - - - - - - - - - - - - - - - - -
      profile_create_sidebar (& $a,
       $connect = true 
      )
      -
      - -

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

      - -
      - - -
      -
      - - - - - - - - - - - - - - - - - - - - - - - - -
      profile_load (& $a,
       $nickname,
       $profile = '' 
      )
      -
      -

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

      -

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

      -

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

      -

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

      -

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

      - -
      -
      - -
      -
      - - - - - - - - - - - - - - - - - - - - - - - - -
      profile_sidebar ( $profile,
       $block = 0,
       $show_connect = true 
      )
      -
      -

      Function: profile_sidebar

      -

      Formats a profile for display in the sidebar. It is very difficult to templatise the HTML completely because of all the conditional logic.

      -

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

      - -
      -
      - -
      -
      - - - - - - - - - - - - - - - - - - - - - - - - -
      profile_tabs ( $a,
       $is_owner = False,
       $nickname = Null 
      )
      -
      - -

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

      +

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

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

      @@ -1549,41 +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_max_import_size(), 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(), lrdd(), magic_init(), mail_store(), message_content(), message_post(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), network_init(), network_query_get_sel_tab(), new_channel_content(), nogroup_init(), notice(), notifications_content(), oexchange_content(), parse_url_content(), photo_upload(), photos_content(), photos_post(), ping_init(), poco_init(), poco_load(), poke_content(), poke_init(), post_activity_item(), printable(), probe_content(), proc_run(), process_delivery(), profile_photo_post(), profile_sidebar(), profile_tabs(), 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().

      - -
      - - -
      -
      - - - - - - - - - - - - - - - - - - - - - - - - -
      z_birthday ( $dob,
       $tz,
       $format = "Y-m-d H:i:s" 
      )
      -
      - -

      Referenced by 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_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().

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

      - -
      - - -
      -
      - - - - - - - - - - - - - - - - - - -
      zid ( $s,
       $address = '' 
      )
      -
      -

      zid($s,$address = '') Adds a zid parameter to a url

      -
      Parameters
      - - - -
      string$sThe url to accept the zid
      boolean$address$address to use instead of session environment
      -
      -
      -
      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(), get_plink(), intro_content(), like_puller(), localize_item(), match_content(), menu_render(), new_contact(), notifications_content(), and viewconnections_content().

      - -
      -
      - -
      -
      - - - - - - - - -
      zid_init (& $a)
      -
      -

      zid_init(&$a) If somebody arrives at our site using a zid, add their xchan to our DB if we don't have it already. And if they aren't already authenticated here, attempt reverse magic auth.

      -

      'zid_init' string 'zid' - their zid string 'url' - the destination url

      +

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

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

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

      +

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

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

      Referenced by acl_init(), collect_recipients(), connections_content(), connections_post(), get_all_perms(), group_content(), group_get_members(), intro_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(), intro_content(), notifications_content(), onepoll_run(), perm_is_allowed(), ping_init(), and zot_refresh().

      @@ -2403,8 +2069,6 @@ Variables
      -

      Referenced by dfrn_deliver().

      -
      @@ -2526,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(), nogroup_content(), notifications_content(), notifications_post(), oexchange_content(), page_content(), photos_content(), photos_post(), poke_content(), post_init(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), 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(), 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().

      @@ -2593,7 +2257,7 @@ Variables
      -

      Referenced by create_identity(), import_author_xchan(), import_post(), import_xchan(), magic_init(), 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().

      @@ -3083,7 +2747,7 @@ Variables
      -

      Referenced by admin_page_logs(), advanced_profile(), build_sync_packet(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), detect_language(), dfrn_deliver(), directory_content(), fetch_xrd_links(), fix_private_photos(), import_xchan(), item_store(), item_store_update(), lrdd(), 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(), 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().

      @@ -3097,7 +2761,7 @@ Variables
      -

      Referenced by Item\add_child(), Conversation\add_thread(), admin_page_logs(), api_login(), api_statuses_user_timeline(), authenticate_success(), avatar_img(), consume_feed(), conversation(), delete_imported_item(), deliver_run(), dfrn_deliver(), directory_content(), directory_run(), expire_run(), fix_private_photos(), Conversation\get_template_data(), group_content(), guess_image_type(), import_author_xchan(), import_channel_photo(), import_directory_profile(), import_profile_photo(), import_xchan(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), FKOAuth1\loginUser(), lrdd(), 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(), 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().

      @@ -3479,7 +3143,7 @@ Variables
      -

      Referenced by network_to_name(), and notifications_content().

      +

      Referenced by network_to_name().

      @@ -3601,7 +3265,7 @@ Variables
      -

      Referenced by network_to_name(), and notifications_content().

      +

      Referenced by network_to_name().

      @@ -3889,7 +3553,7 @@ Variables
      -

      Referenced by connect_content(), connect_post(), profile_sidebar(), and zfinger_init().

      +

      Referenced by connect_content(), connect_post(), profile_sidebar(), and zfinger_init().

      @@ -3903,7 +3567,7 @@ Variables
      -

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

      +

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

      @@ -4424,8 +4088,6 @@ Variables
      -

      Referenced by fix_contact_ssl_policy().

      -
      @@ -4451,8 +4113,6 @@ Variables
      -

      Referenced by fix_contact_ssl_policy().

      -
      @@ -4598,7 +4258,7 @@ Variables
      -

      Referenced by advanced_profile(), and thing_init().

      +

      Referenced by advanced_profile(), and thing_init().

      diff --git a/doc/html/boot_8php.js b/doc/html/boot_8php.js index bbb5596e5..04dc56157 100644 --- a/doc/html/boot_8php.js +++ b/doc/html/boot_8php.js @@ -16,14 +16,9 @@ var boot_8php = [ "fix_system_urls", "boot_8php.html#aca5e42678e178c6b9034610d66666fd7", null ], [ "get_account_id", "boot_8php.html#afe88b920aa285982edb817a0dd44eb37", null ], [ "get_app", "boot_8php.html#a0e6db7e365f2b041a828b93786f694bc", null ], - [ "get_birthdays", "boot_8php.html#ad2c97627a313d53df1a1c7b4215ddb51", null ], [ "get_custom_nav", "boot_8php.html#a899d24fd074594ceebbf72e1feff335f", null ], - [ "get_events", "boot_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312", null ], [ "get_max_import_size", "boot_8php.html#a97769915c9f14adc4f8ab1ea2cecfd90", null ], - [ "get_my_address", "boot_8php.html#a490972c02fdb638c52ec0e012a30bfd2", null ], - [ "get_my_url", "boot_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec", null ], [ "get_observer_hash", "boot_8php.html#a623e49c79943f3e7bdb770d021683cf7", null ], - [ "get_theme_uid", "boot_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3", null ], [ "goaway", "boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1", null ], [ "head_get_icon", "boot_8php.html#a24a7a70afedd5d85fe0eadc85afa9f77", null ], [ "head_set_icon", "boot_8php.html#a0e4701c9742c3ef88f02ac450a042a84", null ], @@ -36,19 +31,12 @@ var boot_8php = [ "login", "boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4", null ], [ "notice", "boot_8php.html#a9255af5ae9c887520091ea04763c1a88", null ], [ "proc_run", "boot_8php.html#ab346a2ece14993861f3e4206befa94f0", null ], - [ "profile_create_sidebar", "boot_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620", null ], - [ "profile_load", "boot_8php.html#a4751b522ea913d0e7ed43e03d22e9e68", null ], - [ "profile_sidebar", "boot_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc", null ], - [ "profile_tabs", "boot_8php.html#a1dfcb5146e9d1eca4528bc580ad5d273", null ], [ "remote_user", "boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209", null ], [ "startup", "boot_8php.html#aca47505b8732177f52bb2d647eb2741c", null ], [ "system_unavailable", "boot_8php.html#ac608a34f3bc180e7724192e0fd31f9b0", null ], [ "x", "boot_8php.html#a01353c9abebc3544ea080ac161729632", null ], - [ "z_birthday", "boot_8php.html#ab55e545b72ec8c097e052ea7d373491f", null ], [ "z_path", "boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda", null ], [ "z_root", "boot_8php.html#add517a0958ac684792c62142a3877f81", null ], - [ "zid", "boot_8php.html#a5b815330f3d177ab383af37a6c12e532", null ], - [ "zid_init", "boot_8php.html#a680fbafc2db023c5b1309e0180e81315", null ], [ "ABOOK_FLAG_ARCHIVED", "boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5", null ], [ "ABOOK_FLAG_BLOCKED", "boot_8php.html#a52b599cd13e152ebc80d7e4413683195", null ], [ "ABOOK_FLAG_HIDDEN", "boot_8php.html#a34c756469ebed32e2fc987bcde62d382", null ], diff --git a/doc/html/classApp-members.html b/doc/html/classApp-members.html index 577a14559..d13d7f14c 100644 --- a/doc/html/classApp-members.html +++ b/doc/html/classApp-members.html @@ -176,8 +176,6 @@ $(document).ready(function(){initNavTree('classApp.html','');});
      get_apps()App
      get_baseurl($ssl=false)App
      get_channel()App
      get_curl_code()App
      get_curl_headers()App
      get_groups()App
      get_hostname()App
      get_observer()App
      set_apps($arr)App
      set_baseurl($url)App
      set_channel($channel)App
      set_curl_code($code)App
      set_curl_headers($headers)App
      set_groups($g)App
      set_hostname($h)App
      set_observer($xchan)App
       
       build_pagehead ()
       
       set_curl_code ($code)
       
       get_curl_code ()
       
       set_curl_headers ($headers)
       
       get_curl_headers ()
       
       register_template_engine ($class, $name= '')
       
       template_engine ($name= '')
      -
      - - -
      -
      - - - - - - - -
      App::get_curl_code ()
      -
      - -
      -
      - -
      -
      - - - - - - - -
      App::get_curl_headers ()
      -
      -
      @@ -717,38 +679,6 @@ Private Attributes
      -
      - - -
      -
      - - - - - - - - -
      App::set_curl_code ( $code)
      -
      - -
      -
      - -
      -
      - - - - - - - - -
      App::set_curl_headers ( $headers)
      -
      -
      @@ -1186,8 +1116,6 @@ Private Attributes
      -

      Referenced by get_curl_code().

      -
      @@ -1208,8 +1136,6 @@ Private Attributes
      -

      Referenced by get_curl_headers().

      -
      diff --git a/doc/html/classApp.js b/doc/html/classApp.js index 599db1c69..51d9daba4 100644 --- a/doc/html/classApp.js +++ b/doc/html/classApp.js @@ -6,8 +6,6 @@ var classApp = [ "get_apps", "classApp.html#a5c63eabdc7fdd8b6e3348980ec16a3ad", null ], [ "get_baseurl", "classApp.html#a604d659d6977a99de42a160343e5289a", null ], [ "get_channel", "classApp.html#a084e03c77686d8c13390fef3f7428a2b", null ], - [ "get_curl_code", "classApp.html#ab410451f132910773d0a02e35d0dced9", null ], - [ "get_curl_headers", "classApp.html#abaf2173711e861ae4aebf43a7f70157e", null ], [ "get_groups", "classApp.html#a4659785d13e4bac0bed50dbb1b0d4299", null ], [ "get_hostname", "classApp.html#a622eace13f8fc9f4b5672a68e2bc4396", null ], [ "get_observer", "classApp.html#a1ad3bb1b68439b3b7cbe630918e618d2", null ], @@ -24,8 +22,6 @@ var classApp = [ "set_apps", "classApp.html#abea5a4f77dcd53c928dc4eed86616637", null ], [ "set_baseurl", "classApp.html#a78788f6e9d8b713b138f81e457c5cd08", null ], [ "set_channel", "classApp.html#a89e9feb2bfb5253883a9720beaffe876", null ], - [ "set_curl_code", "classApp.html#a5e6a6bd641e4d9909df56f0283c03821", null ], - [ "set_curl_headers", "classApp.html#a9632092d9e8fdaa82a9fc4586433fd31", null ], [ "set_groups", "classApp.html#a3d84af5e42082098672531cd1a618853", null ], [ "set_hostname", "classApp.html#a344d2b7dc2f276648d521aee4da1731c", null ], [ "set_observer", "classApp.html#a4776d9322edea17fae56afa5d01a323e", null ], diff --git a/doc/html/comanche_8php.html b/doc/html/comanche_8php.html index c35379c37..4b6a86ba4 100644 --- a/doc/html/comanche_8php.html +++ b/doc/html/comanche_8php.html @@ -144,7 +144,7 @@ Functions
      -

      Referenced by comanche_region(), and profile_sidebar().

      +

      Referenced by comanche_region(), and profile_sidebar().

      diff --git a/doc/html/contact__selectors_8php.html b/doc/html/contact__selectors_8php.html index af2061db0..e7dcf48f7 100644 --- a/doc/html/contact__selectors_8php.html +++ b/doc/html/contact__selectors_8php.html @@ -198,7 +198,7 @@ Functions
      -

      Referenced by connections_content(), and nogroup_content().

      +

      Referenced by connections_content().

      diff --git a/doc/html/conversation_8php.html b/doc/html/conversation_8php.html index 063e41c95..bc9198ee2 100644 --- a/doc/html/conversation_8php.html +++ b/doc/html/conversation_8php.html @@ -156,6 +156,10 @@ Functions
       
       prepare_page ($item)
       
       network_tabs ()
       
       profile_tabs ($a, $is_owner=False, $nickname=Null)
       

      Function Documentation

      @@ -537,6 +541,23 @@ Functions
      + + + + + + +
      network_tabs ()
      +
      + +

      Referenced by network_content().

      +
      @@ -555,6 +576,40 @@ Functions
      + + + + + + + + + + + + + + + + + + + + + + + +
      profile_tabs ( $a,
       $is_owner = False,
       $nickname = Null 
      )
      +
      + +

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

      +
      diff --git a/doc/html/conversation_8php.js b/doc/html/conversation_8php.js index 4dd039449..589c73bda 100644 --- a/doc/html/conversation_8php.js +++ b/doc/html/conversation_8php.js @@ -14,7 +14,9 @@ var conversation_8php = [ "item_redir_and_replace_images", "conversation_8php.html#adda79b75bf1ccf6ce9503aa310953533", null ], [ "like_puller", "conversation_8php.html#afe5b2f38d8b803edb0d7ec5fa2868db0", null ], [ "localize_item", "conversation_8php.html#a9bd7f9fb6678736c581bcba3b17f471c", null ], + [ "network_tabs", "conversation_8php.html#a96b34b9d64d13c543e8163e52f5ce8c4", null ], [ "prepare_page", "conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c", null ], + [ "profile_tabs", "conversation_8php.html#a1dfcb5146e9d1eca4528bc580ad5d273", null ], [ "render_location_default", "conversation_8php.html#a40b9b5e7825bc73932a32e667f05e6f2", null ], [ "sort_item_children", "conversation_8php.html#ae996eb116d397a2c6396c312d7b98664", null ], [ "sort_thr_commented", "conversation_8php.html#a9f909b8885259b79c6ac8da93afd8f11", null ], diff --git a/doc/html/datetime_8php.html b/doc/html/datetime_8php.html index 3909d9f6d..fa92b651f 100644 --- a/doc/html/datetime_8php.html +++ b/doc/html/datetime_8php.html @@ -138,6 +138,8 @@ Functions
       
       cal ($y=0, $m=0, $links=false, $class='')
       
       z_birthday ($dob, $tz, $format="Y-m-d H:i:s")
       

      Function Documentation

      @@ -170,7 +172,7 @@ Functions
      -

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

      +

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

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

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

      @@ -474,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(), conversation(), format_notification(), Item\get_template_data(), notifications_content(), notify_content(), and ping_init().

      @@ -554,6 +556,40 @@ Functions
      +
      + + +
      +
      + + + + + + + + + + + + + + + + + + + + + + + + +
      z_birthday ( $dob,
       $tz,
       $format = "Y-m-d H:i:s" 
      )
      +
      + +

      Referenced by zfinger_init().

      +
      diff --git a/doc/html/datetime_8php.js b/doc/html/datetime_8php.js index 4a9260091..004a03a3e 100644 --- a/doc/html/datetime_8php.js +++ b/doc/html/datetime_8php.js @@ -12,5 +12,6 @@ var datetime_8php = [ "relative_date", "datetime_8php.html#a8ae8dc95ace7ac27fa5a1ecf42b78c82", null ], [ "select_timezone", "datetime_8php.html#a633dadba426fa2f60b25fabdb19ebc1f", null ], [ "timesel", "datetime_8php.html#a36d3d6dff8d76b5f295bb3d9c535a5b1", null ], - [ "timezone_cmp", "datetime_8php.html#aa51b5a7ea4f931b23acbdfcea46e9865", null ] + [ "timezone_cmp", "datetime_8php.html#aa51b5a7ea4f931b23acbdfcea46e9865", null ], + [ "z_birthday", "datetime_8php.html#ab55e545b72ec8c097e052ea7d373491f", null ] ]; \ No newline at end of file diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html index 968aa1722..da6e5eb43 100644 --- a/doc/html/dba__driver_8php.html +++ b/doc/html/dba__driver_8php.html @@ -202,7 +202,7 @@ Functions
      -

      Referenced by account_verify_password(), acl_init(), add_fcontact(), 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(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), filerm_content(), filestorage_content(), fix_attached_photo_permissions(), fix_contact_ssl_policy(), fix_private_photos(), fix_system_urls(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config_from_storage(), get_events(), 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_xchan(), 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(), 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().

      @@ -320,7 +320,7 @@ Functions
       
      file  new_channel.php
       
      file  nogroup.php
       
      file  notifications.php
       
      file  notify.php
       
      file  poller.php
       
      file  profile_advanced.php
       
      file  profile_selectors.php
       
      file  ProtoDriver.php
      -

      Referenced by check_keys(), dfrn_deliver(), event_store(), fix_private_photos(), get_atom_elements(), get_bb_tag_pos(), hostxrd_init(), invite_post(), lostpass_content(), lostpass_post(), photo_init(), photos_post(), probe_content(), profile_activity(), register_post(), enotify\send(), send_reg_approval_email(), send_verification_email(), user_allow(), and webfinger_content().

      +

      Referenced by check_keys(), event_store(), fix_private_photos(), get_atom_elements(), get_bb_tag_pos(), hostxrd_init(), invite_post(), lostpass_content(), lostpass_post(), photo_init(), photos_post(), probe_content(), profile_activity(), register_post(), enotify\send(), send_reg_approval_email(), send_verification_email(), user_allow(), and webfinger_content().

      diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html index 29b7e390c..0958db030 100644 --- a/doc/html/extract_8php.html +++ b/doc/html/extract_8php.html @@ -132,7 +132,7 @@ Variables
      -

      Referenced by activity_sanitise(), add_fcontact(), api_rss_extra(), array_sanitise(), attach_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(), fetch_xrd_links(), find_xchan_in_array(), format_like(), get_all_perms(), get_atom_elements(), get_features(), get_item_elements(), get_mail_elements(), get_mood_verbs(), get_poke_verbs(), get_profile_elements(), Item\get_template_data(), get_terms_oftype(), App\get_widgets(), group_select(), identity_basic_import(), ids_to_querystr(), import_directory_profile(), import_post(), import_site(), import_xchan(), item_getfeedattach(), item_store(), item_store_update(), items_fetch(), like_content(), like_puller(), load_database(), lrdd(), 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(), profile_tabs(), 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(), 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().

      @@ -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(), fetch_url(), 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(), post_url(), 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(), 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 58537417c..437f5cf41 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(), profile_tabs(), 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(), 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().

      diff --git a/doc/html/files.html b/doc/html/files.html index 5649062c8..5ab85789e 100644 --- a/doc/html/files.html +++ b/doc/html/files.html @@ -174,21 +174,20 @@ $(document).ready(function(){initNavTree('files.html','');});
      o+mod
      o+util
       
       identity_basic_export ($channel_id)
       
       identity_basic_import ($arr, $seize_primary=false)
       
       profile_load (&$a, $nickname, $profile= '')
       
       profile_create_sidebar (&$a, $connect=true)
       
       profile_sidebar ($profile, $block=0, $show_connect=true)
       
       get_birthdays ()
       
       get_events ()
       
       advanced_profile (&$a)
       
       get_my_url ()
       
       get_my_address ()
       
       zid_init (&$a)
       
       zid ($s, $address= '')
       
       get_theme_uid ()
       

      Function Documentation

      + +
      +
      + + + + + + + + +
      advanced_profile (& $a)
      +
      + +

      Referenced by profile_content().

      + +
      +
      @@ -142,6 +180,8 @@ Functions
      +

      () Return the total number of channels on this site. No filtering is performed.

      +
      Returns
      int on error returns boolean false

      Referenced by zfinger_init().

      @@ -159,6 +199,8 @@ Functions
      +

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

      +

      Currently unused.

      @@ -175,9 +217,96 @@ Functions
      +

      create_identity($arr) Create a new channel Also creates the related xchan, hubloc, profile, and "self" abook records, and an empty "Friends" group/collection for the new channel

      +
      Parameters
      + + +
      array$arr'name' => full name of channel 'nickname' => "email/url-compliant" nickname 'account_id' => account_id to attach with this channel [other identity fields as desired]
      +
      +
      +
      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().

      +
      + + +
      +
      + + + + + + + +
      get_birthdays ()
      +
      + +
      +
      + +
      +
      + + + + + + + +
      get_events ()
      +
      + +
      +
      + +
      +
      + + + + + + + +
      get_my_address ()
      +
      + +

      Referenced by App\build_pagehead(), rmagic_init(), zid(), and zid_init().

      + +
      +
      + +
      +
      + + + + + + + +
      get_my_url ()
      +
      + +

      Referenced by nav(), and zid().

      + +
      +
      + +
      +
      + + + + + + + +
      get_theme_uid ()
      +
      +
      @@ -193,26 +322,94 @@ Functions
      +

      identity_basic_export($channel_id) Create an array representing the important channel information which would be necessary to create a nomadic identity clone. This includes most channel resources and connection information with the exception of content.

      +
      Parameters
      + + +
      int$channel_idChannel_id to export
      +
      +
      +
      Returns
      array See function for details

      Referenced by api_export_basic(), and uexport_init().

      - + +
      +
      + + + + + + + + +
      identity_check_service_class ( $account_id)
      +
      +

      identity_check_service_class($account_id) Called when creating a new channel. Checks the account's service class and number of current channels to determine whether creating a new channel is within the current service class constraints.

      +
      Parameters
      + + +
      int$account_idAccount_id used for this request
      +
      +
      +
      Returns
      array 'success' => boolean true if creating a new channel is allowed for this account 'message' => if success is false, optional error text
      + +

      Referenced by create_identity().

      + +
      +
      +
      - + + + + + + + - + + + + + + + +
      identity_basic_import profile_create_sidebar (& $a,
       $arr, $connect = true 
      )
      +
      + +

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

      + +
      +
      + +
      +
      + + + + + + + + + + + + - + @@ -221,24 +418,59 @@ Functions
      profile_load (& $a,
       $nickname,
       $seize_primary = false $profile = '' 
      +

      : profile_load(&$a, $nickname, $profile) Generate

      +
      Parameters
      + + + + +
      App$a
      string$nickname
      string$profileSummary: Loads a profile into the App structure. The function requires a writeable copy of the main App structure, and the nickname of a valid channel.
      +
      +
      +

      Permissions of the current observer are checked. If a restricted profile is available to the current observer, that will be loaded instead of the channel default profile.

      +

      The channel owner can set $profile to a valid profile_guid to preview that profile.

      +

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

      - +
      - + - + + + + + + + + + + + + + + + + +
      identity_check_service_class profile_sidebar (  $account_id)$profile,
       $block = 0,
       $show_connect = true 
      )
      +

      Function: profile_sidebar

      +

      Formats a profile for display in the sidebar. It is very difficult to templatise the HTML completely because of all the conditional logic.

      +

      : array $profile

      +

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

      -

      Referenced by create_identity().

      +

      Referenced by profile_create_sidebar(), and widget_profile().

      @@ -271,6 +503,16 @@ Functions
      +

      set_default_login_identity($account_id, $channel_id, $force = true) Set default channel to be used on login

      +
      Parameters
      + + + + +
      int$account_idlogin account
      int$channel_idchannel id to set as default for this account
      booleanforce if true, set this default unconditionally if $force is false only do this if there is no existing default
      +
      +
      +
      Returns
      nil

      Referenced by create_identity(), and import_post().

      @@ -289,9 +531,74 @@ Functions
      +

      validate_channelname($name) Determine if the channel name is allowed when creating a new channel. This action is pluggable.

      +
      Parameters
      + + +
      string$name
      +
      +
      +
      Returns
      nil return if name is valid, or string describing the error state.
      +

      We're currently only checking for an empty name or one that exceeds our storage limit (255 chars). 255 chars is probably going to create a mess on some pages. Plugins can set additional policies such as full name requirements, character sets, multi-byte length, etc.

      Referenced by create_identity(), and settings_post().

      +
      + + +
      +
      + + + + + + + + + + + + + + + + + + +
      zid ( $s,
       $address = '' 
      )
      +
      +

      zid($s,$address = '') Adds a zid parameter to a url

      +
      Parameters
      + + + +
      string$sThe url to accept the zid
      boolean$address$address to use instead of session environment
      +
      +
      +
      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().

      + +
      +
      + +
      +
      + + + + + + + + +
      zid_init (& $a)
      +
      +

      zid_init(&$a) If somebody arrives at our site using a zid, add their xchan to our DB if we don't have it already. And if they aren't already authenticated here, attempt reverse magic auth.

      +

      'zid_init' string 'zid' - their zid string 'url' - the destination url

      +
      diff --git a/doc/html/identity_8php.js b/doc/html/identity_8php.js index 44a63851e..a7710c10f 100644 --- a/doc/html/identity_8php.js +++ b/doc/html/identity_8php.js @@ -1,11 +1,21 @@ 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 ], + [ "get_birthdays", "identity_8php.html#ad2c97627a313d53df1a1c7b4215ddb51", 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_theme_uid", "identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3", null ], [ "identity_basic_export", "identity_8php.html#a3570a4eb77332b292d394c4132cb8f03", null ], - [ "identity_basic_import", "identity_8php.html#a77ee7d66eb0758f7e7882f70ad0f9485", null ], [ "identity_check_service_class", "identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633", null ], + [ "profile_create_sidebar", "identity_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620", null ], + [ "profile_load", "identity_8php.html#a4751b522ea913d0e7ed43e03d22e9e68", null ], + [ "profile_sidebar", "identity_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc", null ], [ "set_default_login_identity", "identity_8php.html#a78151baf4407a8482d2681a91a9c486b", null ], - [ "validate_channelname", "identity_8php.html#af2802bc13a00a17b867bba7978ba8f58", null ] + [ "validate_channelname", "identity_8php.html#af2802bc13a00a17b867bba7978ba8f58", null ], + [ "zid", "identity_8php.html#a5b815330f3d177ab383af37a6c12e532", null ], + [ "zid_init", "identity_8php.html#a680fbafc2db023c5b1309e0180e81315", null ] ]; \ No newline at end of file diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html index bc38d8da0..bb9e9d40f 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(), dfrn_deliver(), 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(), fetch_url(), fetch_xrd_links(), find_upstream_directory(), findpeople_widget(), Item\get_comment_box(), get_item_elements(), get_mail_elements(), 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(), match_content(), 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(), post_url(), 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(), 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().

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

      diff --git a/doc/html/include_2group_8php.html b/doc/html/include_2group_8php.html index ba0123d14..21bff3376 100644 --- a/doc/html/include_2group_8php.html +++ b/doc/html/include_2group_8php.html @@ -300,7 +300,7 @@ Functions
      -

      Referenced by connections_post(), and new_contact().

      +

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

      @@ -408,7 +408,7 @@ Functions
      -

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

      +

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

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

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

      +

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

      @@ -422,7 +422,7 @@ Functions
      -

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

      +

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

      diff --git a/doc/html/include_2network_8php.html b/doc/html/include_2network_8php.html index 3655d207a..5f9f69ea0 100644 --- a/doc/html/include_2network_8php.html +++ b/doc/html/include_2network_8php.html @@ -114,10 +114,6 @@ $(document).ready(function(){initNavTree('include_2network_8php.html','');}); Functions
       get_capath ()
       
       fetch_url ($url, $binary=false, &$redirects=0, $timeout=0, $accept_content=Null)
       
       post_url ($url, $params, $headers=null, &$redirects=0, $timeout=0)
       
       z_fetch_url ($url, $binary=false, $redirects=0, $opts=array())
       
       z_post_url ($url, $params, $redirects=0, $opts=array())
       
       webfinger ($s, $debug=false)
       
       lrdd ($uri, $debug=false)
       
       fetch_lrdd_template ($host)
       
       fetch_xrd_links ($url)
       
       validate_url (&$url)
       
       validate_email ($addr)
       
       parse_xml_string ($s, $strict=true)
       
       add_fcontact ($arr, $update=false)
       
       scale_external_images ($s, $include_link=true, $scale_replace=false)
       
       fix_contact_ssl_policy (&$contact, $new_policy)
       
       xml2array ($contents, $namespaces=true, $get_attributes=1, $priority= 'attribute')
       
       email_header_encode ($in_str, $charset= 'UTF-8')
       

      Function Documentation

      - -
      -
      - - - - - - - - - - - - - - - - - - -
      add_fcontact ( $arr,
       $update = false 
      )
      -
      - -
      -
      @@ -268,8 +230,6 @@ Functions
      -

      Referenced by lrdd().

      -
      @@ -354,97 +314,6 @@ Functions
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      fetch_url ( $url,
       $binary = false,
      & $redirects = 0,
       $timeout = 0,
       $accept_content = Null 
      )
      -
      -

      fetch_url is deprecated and being replaced by the more capable z_fetch_url please use that function instead. Once all occurrences of fetch_url are removed from the codebase we will remove this function and perhaps rename z_fetch_url back to fetch_url

      - -

      Referenced by dfrn_deliver(), fetch_xrd_links(), lrdd(), oembed_fetch_url(), post_url(), and scale_external_images().

      - -
      - - -
      -
      - - - - - - - - -
      fetch_xrd_links ( $url)
      -
      - -

      Referenced by fetch_lrdd_template(), lrdd(), and webfinger().

      - -
      -
      - -
      -
      - - - - - - - - - - - - - - - - - - -
      fix_contact_ssl_policy (& $contact,
       $new_policy 
      )
      -
      -
      @@ -460,7 +329,7 @@ Functions
      -

      Referenced by fetch_url(), post_url(), z_fetch_url(), and z_post_url().

      +

      Referenced by z_fetch_url(), and z_post_url().

      @@ -516,35 +385,7 @@ Functions
      -

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

      - -
      - - -
      -
      - - - - - - - - - - - - - - - - - - -
      lrdd ( $uri,
       $debug = false 
      )
      -
      - -

      Referenced by handle_tag(), photos_post(), profiles_post(), and webfinger_content().

      +

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

      @@ -572,53 +413,7 @@ Functions
      -

      Referenced by consume_feed(), dfrn_deliver(), lrdd(), and notifications_content().

      - -
      - - -
      -
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      post_url ( $url,
       $params,
       $headers = null,
      & $redirects = 0,
       $timeout = 0 
      )
      -
      - -

      Referenced by dfrn_deliver(), and match_content().

      +

      Referenced by consume_feed(), and notifications_content().

      @@ -670,7 +465,7 @@ Functions
      -

      Referenced by check_account_email(), and zid_init().

      +

      Referenced by check_account_email(), and zid_init().

      @@ -714,7 +509,7 @@ Functions
      -

      Referenced by lrdd(), webfinger_content(), and webfinger_dfrn().

      +

      Referenced by webfinger_content(), and webfinger_dfrn().

      @@ -781,8 +576,6 @@ Functions
       
       mail_store ($arr)
       
       dfrn_deliver ($owner, $contact, $atom, $dissolve=false)
       
       consume_feed ($xml, $importer, &$contact, &$hub, $datedir=0, $pass=0)
       
       atom_author ($tag, $name, $uri, $h, $w, $type, $photo)
      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      dfrn_deliver ( $owner,
       $contact,
       $atom,
       $dissolve = false 
      )
      -
      - -

      Referenced by terminate_friendship().

      -
      diff --git a/doc/html/items_8php.js b/doc/html/items_8php.js index 2e800bca3..9a224b548 100644 --- a/doc/html/items_8php.js +++ b/doc/html/items_8php.js @@ -14,7 +14,6 @@ var items_8php = [ "consume_feed", "items_8php.html#a8794863cdf8ce1333040933d3a3f66bd", null ], [ "decode_tags", "items_8php.html#a56b2a4abcadfac71175cd50555528cc3", null ], [ "delete_item_lowlevel", "items_8php.html#a2b56a4c01bd22a648d52ec9af1a04259", null ], - [ "dfrn_deliver", "items_8php.html#a8395d189a36abfa0dfff81a2b0e70669", null ], [ "drop_item", "items_8php.html#afa1db13c2a8b73b5b17b97f17e5a19d1", null ], [ "drop_items", "items_8php.html#a668ece2c37f05cc3abe538eb0dabfe55", null ], [ "encode_item", "items_8php.html#a82955cc578f0fa600acec84475026194", null ], diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html index 30260aaaa..ed8674731 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(), nogroup_content(), 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(), profile_tabs(), 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(), 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().

      diff --git a/doc/html/mod_2network_8php.html b/doc/html/mod_2network_8php.html index df2ec7124..fa143845a 100644 --- a/doc/html/mod_2network_8php.html +++ b/doc/html/mod_2network_8php.html @@ -116,8 +116,6 @@ Functions
       
       saved_searches ($search)
       
       network_query_get_sel_tab ($a)
       
       network_content (&$a, $update=0, $load=false)
       
      @@ -170,27 +168,6 @@ Functions
      -
      - - -
      -
      - - - - - - - - -
      network_query_get_sel_tab ( $a)
      -
      -

      Return selected tab from query

      -

      urls -> returns '/network' => $no_active = 'active' '/network?f=&order=comment' => $comment_active = 'active' '/network?f=&order=post' => $postord_active = 'active' '/network?f=&conv=1', => $conv_active = 'active' '/network/new', => $new_active = 'active' '/network?f=&star=1', => $starred_active = 'active' '/network?f=&spam=1', => $spam_active = 'active'

      -
      Returns
      Array ( $no_active, $comment_active, $postord_active, $conv_active, $new_active, $starred_active, $spam_active );
      - -

      Referenced by network_content(), and network_init().

      -
      diff --git a/doc/html/mod_2network_8php.js b/doc/html/mod_2network_8php.js index 4bc180c33..f076a234a 100644 --- a/doc/html/mod_2network_8php.js +++ b/doc/html/mod_2network_8php.js @@ -2,6 +2,5 @@ var mod_2network_8php = [ [ "network_content", "mod_2network_8php.html#a43f2f29b90c5e29072c561934bc8f8b4", null ], [ "network_init", "mod_2network_8php.html#a180fce90ad11d7e0e45be094da7149ec", null ], - [ "network_query_get_sel_tab", "mod_2network_8php.html#aeaa518c1a317516a3da337b88d358666", null ], [ "saved_searches", "mod_2network_8php.html#a36e03af6f2efe62ecaa247509365bfad", null ] ]; \ No newline at end of file diff --git a/doc/html/navtree.js b/doc/html/navtree.js index a49ef1909..4557e049a 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#a8663f32171568489dbb2a01dd00371f8", -"classConversation.html#a87a0d704d5f2b1a008cc2e9ce06a1bcd", -"connections_8php.html", -"globals.html", -"include_2network_8php.html#adf6008b38c555e98e7ed10da9ede2335", -"permissions_8php.html", -"socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586", -"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03" +"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" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js index 24bb4d1ae..caa304721 100644 --- a/doc/html/navtreeindex0.js +++ b/doc/html/navtreeindex0.js @@ -4,24 +4,23 @@ var NAVTREEINDEX0 = "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#a228fc01f90ae9bfdde4c2ad0772bd7dc":[5,0,0,17,9], "Contact_8php.html#a28e062c884331dbb5dfa713228c25ad6":[5,0,0,17,8], -"Contact_8php.html#a2f4f495d53f2a334ab75292af79d3c91":[5,0,0,17,11], -"Contact_8php.html#a2fc191067dd571a79603c66b04b1ca15":[5,0,0,17,14], -"Contact_8php.html#a38daa1c210b78385307123450ca9a1fc":[5,0,0,17,13], +"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,15], +"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#a91281b5d4bbbb2ed468e27ec82ca083c":[5,0,0,17,10], -"Contact_8php.html#acc12cda999c88c4d6185cca967c15125":[5,0,0,17,12], +"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,60], +"ProtoDriver_8php.html":[5,0,0,59], "__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], @@ -39,7 +38,7 @@ var NAVTREEINDEX0 = "acl_8php.html#a57dceff370d4a0e7ae673d50fbfda61f":[5,0,1,1,1], "acl_8php.html#ac6776dba871806ecdb5d1659bc2eb07a":[5,0,1,1,0], "acl__selectors_8php.html":[5,0,0,3], -"acl__selectors_8php.html#a51f2ec7a143d5a5b38e35efd5f3d6e2c":[5,0,0,3,3], +"acl__selectors_8php.html#a7b5446e999636ceceea65c154d865a31":[5,0,0,3,3], "acl__selectors_8php.html#a9476997d2968a5794f3723878ed89c91":[5,0,0,3,0], "acl__selectors_8php.html#aa1e3bc344ca2b29f97eb9860216d21a0":[5,0,0,3,2], "acl__selectors_8php.html#ad6664fb8330308e23f2645cd6624727e":[5,0,0,3,1], @@ -107,147 +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,140], -"boot_8php.html#a01353c9abebc3544ea080ac161729632":[5,0,4,43], -"boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[5,0,4,154], -"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[5,0,4,248], -"boot_8php.html#a032bbd6d0321e99e9117332c9ed2b1b8":[5,0,4,62], -"boot_8php.html#a03d19251c245587de7ed959300b87bdf":[5,0,4,170], -"boot_8php.html#a0450389f24c632906fbc24347700a543":[5,0,4,54], -"boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b":[5,0,4,110], +"boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[5,0,4,128], +"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#a032bbd6d0321e99e9117332c9ed2b1b8":[5,0,4,50], +"boot_8php.html#a03d19251c245587de7ed959300b87bdf":[5,0,4,158], +"boot_8php.html#a0450389f24c632906fbc24347700a543":[5,0,4,42], +"boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b":[5,0,4,98], "boot_8php.html#a081307d681d7d04f17b9ced2076e7c85":[5,0,4,1], -"boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[5,0,4,209], -"boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[5,0,4,75], -"boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[5,0,4,174], -"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[5,0,4,265], -"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[5,0,4,261], -"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[5,0,4,264], -"boot_8php.html#a0e4701c9742c3ef88f02ac450a042a84":[5,0,4,26], -"boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[5,0,4,67], +"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#a0e4701c9742c3ef88f02ac450a042a84":[5,0,4,21], +"boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[5,0,4,55], "boot_8php.html#a0e6db7e365f2b041a828b93786f694bc":[5,0,4,15], -"boot_8php.html#a0fb63e51c2a9814941842ae8f2f4dff8":[5,0,4,85], -"boot_8php.html#a12c781cefc20167231e2e3fd5866b1b5":[5,0,4,89], -"boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd":[5,0,4,86], -"boot_8php.html#a14d44d4a00223dc3db4ea962325db192":[5,0,4,200], -"boot_8php.html#a176664e78dcb9132e16be69418223eb2":[5,0,4,70], -"boot_8php.html#a17b4ea23d9ecf628d9c8f53b7abcb805":[5,0,4,153], -"boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[5,0,4,149], -"boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[5,0,4,173], -"boot_8php.html#a18a400fa45e5632811b33041d8c048bf":[5,0,4,143], -"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[5,0,4,272], -"boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc":[5,0,4,242], -"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[5,0,4,273], -"boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[5,0,4,177], -"boot_8php.html#a1da180f961f49a11573cac4ff6c62c05":[5,0,4,84], -"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[5,0,4,221], -"boot_8php.html#a1dfcb5146e9d1eca4528bc580ad5d273":[5,0,4,39], -"boot_8php.html#a1f5906598e90b5ea2b4245f682be4348":[5,0,4,112], -"boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[5,0,4,160], -"boot_8php.html#a20f0eed431d25870b624b8937a07a59f":[5,0,4,193], -"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[5,0,4,244], -"boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5":[5,0,4,49], -"boot_8php.html#a24a7a70afedd5d85fe0eadc85afa9f77":[5,0,4,25], -"boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8":[5,0,4,108], -"boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f":[5,0,4,100], -"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[5,0,4,254], -"boot_8php.html#a285732e7889fa7f333cbe431111e1029":[5,0,4,196], -"boot_8php.html#a29528a2544373cc19a378f350040c6a1":[5,0,4,91], -"boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[5,0,4,135], -"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[5,0,4,219], -"boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3":[5,0,4,113], -"boot_8php.html#a2b525996e4426bdddbcec277778bde08":[5,0,4,240], -"boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[5,0,4,192], -"boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d":[5,0,4,132], -"boot_8php.html#a2e90096fede6acce16abf0da8cb2febe":[5,0,4,76], -"boot_8php.html#a2f8f25b13480c37a5f22511f53da8bab":[5,0,4,81], -"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[5,0,4,226], -"boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[5,0,4,147], -"boot_8php.html#a34c756469ebed32e2fc987bcde62d382":[5,0,4,51], -"boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[5,0,4,125], -"boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[5,0,4,162], -"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[5,0,4,276], -"boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[5,0,4,181], -"boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[5,0,4,115], -"boot_8php.html#a3b56bfc6a0dd159070e316ddac3b7456":[5,0,4,120], -"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[5,0,4,275], -"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[5,0,4,217], +"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#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#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#a3e0930933fb2c0bf8211cc7ab4e1c3b4":[5,0,4,12], -"boot_8php.html#a3e2ea123d29a72012db1241f96280b0e":[5,0,4,68], -"boot_8php.html#a3f40aa5bafff8c4eebdc62e5121daf77":[5,0,4,98], -"boot_8php.html#a400519fa181591cd6fdbb8f25fbcba0a":[5,0,4,60], -"boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb":[5,0,4,136], -"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[5,0,4,212], -"boot_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc":[5,0,4,38], -"boot_8php.html#a43296b1b4398aacbf92a4b2d56bab91e":[5,0,4,191], -"boot_8php.html#a43c6c7d84d880e9500bd4f8f8ecc5731":[5,0,4,97], -"boot_8php.html#a444ce608ce34efb82ee11852f36e825f":[5,0,4,167], -"boot_8php.html#a44ae1542a805ffd7f826fb511db07374":[5,0,4,157], -"boot_8php.html#a44d069c8a1cfcc6d2007c506a17ff28f":[5,0,4,79], -"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[5,0,4,262], -"boot_8php.html#a4751b522ea913d0e7ed43e03d22e9e68":[5,0,4,37], -"boot_8php.html#a490972c02fdb638c52ec0e012a30bfd2":[5,0,4,20], -"boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[5,0,4,179], -"boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[5,0,4,111], -"boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4":[5,0,4,234], -"boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[5,0,4,178], +"boot_8php.html#a3e2ea123d29a72012db1241f96280b0e":[5,0,4,56], +"boot_8php.html#a3f40aa5bafff8c4eebdc62e5121daf77":[5,0,4,86], +"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#a4c02d88e66852a01bd5a1feecb7c3ce3":[5,0,4,6], -"boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[5,0,4,211], -"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[5,0,4,230], -"boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[5,0,4,203], -"boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[5,0,4,161], -"boot_8php.html#a52b599cd13e152ebc80d7e4413683195":[5,0,4,50], -"boot_8php.html#a53e4bdb6f225da55115acb9277f75e53":[5,0,4,90], -"boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209":[5,0,4,40], -"boot_8php.html#a56fd673eaa7014150297ce1162502db5":[5,0,4,195], -"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[5,0,4,229], -"boot_8php.html#a5a681a672e007cdc22b43345d71f07c6":[5,0,4,274], -"boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1":[5,0,4,24], -"boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[5,0,4,69], -"boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[5,0,4,185], -"boot_8php.html#a5b815330f3d177ab383af37a6c12e532":[5,0,4,47], -"boot_8php.html#a5b8484922918946d041e5e0515dbe718":[5,0,4,207], -"boot_8php.html#a5c3747e0f505f0d5271dc4c54e3feaf4":[5,0,4,87], -"boot_8php.html#a5df5359090d1f8e898c36d7cf8878ad2":[5,0,4,165], -"boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640":[5,0,4,208], -"boot_8php.html#a623e49c79943f3e7bdb770d021683cf7":[5,0,4,22], -"boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5":[5,0,4,83], -"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[5,0,4,258], -"boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[5,0,4,171], -"boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[5,0,4,145], -"boot_8php.html#a680fbafc2db023c5b1309e0180e81315":[5,0,4,48], -"boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11":[5,0,4,148], -"boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155":[5,0,4,53], -"boot_8php.html#a6969947145a139ec374ce098224d8e81":[5,0,4,151], -"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[5,0,4,246], -"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[5,0,4,233], -"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[5,0,4,227], -"boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd":[5,0,4,109], -"boot_8php.html#a6c5e9e293c8242dcb9bc2c3ea2fee2c9":[5,0,4,101], -"boot_8php.html#a6df1102664f64b274810db85197c2755":[5,0,4,215], -"boot_8php.html#a6e57d913634d033b4d5ad72d99fd3e9d":[5,0,4,134], -"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[5,0,4,245], -"boot_8php.html#a719c7f3972d5f9268f37a41c76cd4ef6":[5,0,4,31], -"boot_8php.html#a7236b2cdcf59f02a42302e893a99013b":[5,0,4,186], -"boot_8php.html#a749144d8dd9c1366596a0213c277d050":[5,0,4,138], -"boot_8php.html#a74bf27f7564c9a37975e7b37d973dcab":[5,0,4,80], +"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#a52b599cd13e152ebc80d7e4413683195":[5,0,4,38], +"boot_8php.html#a53e4bdb6f225da55115acb9277f75e53":[5,0,4,78], +"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#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#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#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#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#a75a90b0eadd0df510f7e63210733634d":[5,0,4,2], -"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[5,0,4,266], +"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[5,0,4,254], "boot_8php.html#a768f00b7d66be0daf7ef4eea2e862006":[5,0,4,4], -"boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966":[5,0,4,82], -"boot_8php.html#a781916f83fcc8ff1035649afa45f0292":[5,0,4,95], -"boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383":[5,0,4,236], -"boot_8php.html#a7a8ba64d089cc0412c59a2eefc6d655c":[5,0,4,121], -"boot_8php.html#a7aa57438db03834aaa0b468bdce773a6":[5,0,4,73], -"boot_8php.html#a7af107fab8d62b9a73801713b774ed30":[5,0,4,137], -"boot_8php.html#a7b8f8ad9dbe82711257d23891ef6b133":[5,0,4,166], -"boot_8php.html#a7bff2278e68a71e524afd1c7c951e1e3":[5,0,4,77], -"boot_8php.html#a7c286add8961fd2d79216314cd4aadd8":[5,0,4,114], -"boot_8php.html#a7ed4581ab66ebcde97f6b3730856b028":[5,0,4,168], -"boot_8php.html#a7f3474fec541e261fc8dff47313c4017":[5,0,4,57], -"boot_8php.html#a7f4264232dbb6c3b41f2617deecb1866":[5,0,4,92], -"boot_8php.html#a7fc4b291a7cdaa48b38e27344ea183cf":[5,0,4,123], -"boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed":[5,0,4,205], -"boot_8php.html#a84057c5bfa1bca5fba8497fe005ee4d8":[5,0,4,61], -"boot_8php.html#a845891f82bf6edd7fa2d578b66703112":[5,0,4,118], -"boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688":[5,0,4,65] +"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#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#a84057c5bfa1bca5fba8497fe005ee4d8":[5,0,4,49], +"boot_8php.html#a845891f82bf6edd7fa2d578b66703112":[5,0,4,106], +"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#a899d24fd074594ceebbf72e1feff335f":[5,0,4,16], +"boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[5,0,4,94], +"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[5,0,4,219] }; diff --git a/doc/html/navtreeindex1.js b/doc/html/navtreeindex1.js index 42a958d4b..28b238093 100644 --- a/doc/html/navtreeindex1.js +++ b/doc/html/navtreeindex1.js @@ -1,138 +1,125 @@ var NAVTREEINDEX1 = { -"boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[5,0,4,130], -"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[5,0,4,257], -"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[5,0,4,256], -"boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[5,0,4,184], -"boot_8php.html#a899d24fd074594ceebbf72e1feff335f":[5,0,4,17], -"boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[5,0,4,106], -"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[5,0,4,231], -"boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[5,0,4,133], -"boot_8php.html#a8da836617174eed9fc2ac8054125354b":[5,0,4,127], -"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[5,0,4,238], -"boot_8php.html#a9255af5ae9c887520091ea04763c1a88":[5,0,4,34], +"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#a9255af5ae9c887520091ea04763c1a88":[5,0,4,29], "boot_8php.html#a926cad0b3d8b9d9ee5da1898fc063ba3":[5,0,4,11], -"boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[5,0,4,152], -"boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[5,0,4,131], -"boot_8php.html#a949116d9a295b214293006c060ca4848":[5,0,4,129], -"boot_8php.html#a9690d73434125ce594a1f5e7c2a4f7c0":[5,0,4,268], -"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[5,0,4,243], -"boot_8php.html#a97769915c9f14adc4f8ab1ea2cecfd90":[5,0,4,19], -"boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[5,0,4,198], -"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[5,0,4,232], -"boot_8php.html#a9c80420e5a063a4a87ce4831f086134d":[5,0,4,56], +"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#a97769915c9f14adc4f8ab1ea2cecfd90":[5,0,4,17], +"boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[5,0,4,186], +"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[5,0,4,220], +"boot_8php.html#a9c80420e5a063a4a87ce4831f086134d":[5,0,4,44], "boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e":[5,0,4,5], -"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[5,0,4,224], -"boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[5,0,4,199], -"boot_8php.html#a9ea1290e00c6d40684892047f2c778a9":[5,0,4,271], -"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[5,0,4,259], -"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[5,0,4,223], -"boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[5,0,4,187], -"boot_8php.html#aa1e828bbbcba170265eb2668d8daf42e":[5,0,4,29], -"boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[5,0,4,206], -"boot_8php.html#aa3425e2de85b08f7041656d3a8502cb6":[5,0,4,52], -"boot_8php.html#aa3679df31c8dad1b71816b0322d5baff":[5,0,4,159], +"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#aa1e828bbbcba170265eb2668d8daf42e":[5,0,4,24], +"boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[5,0,4,194], +"boot_8php.html#aa3425e2de85b08f7041656d3a8502cb6":[5,0,4,40], +"boot_8php.html#aa3679df31c8dad1b71816b0322d5baff":[5,0,4,147], "boot_8php.html#aa4221641e5c21db69fa52c426b9017f5":[5,0,4,9], -"boot_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec":[5,0,4,21], -"boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2":[5,0,4,156], -"boot_8php.html#aa589421267f0c2f0d643f727792cce35":[5,0,4,117], -"boot_8php.html#aa74438cf71e48e37bf7b440b94243985":[5,0,4,94], -"boot_8php.html#aa8a2b61e70900139d1ca28e46f1da49d":[5,0,4,103], -"boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[5,0,4,228], -"boot_8php.html#aad33b494084f729b6ee3b0bc457718a1":[5,0,4,142], -"boot_8php.html#aae6c941bde5fd6fce07e51dba7326ead":[5,0,4,213], -"boot_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3":[5,0,4,23], -"boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14":[5,0,4,74], -"boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[5,0,4,190], -"boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[5,0,4,122], -"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[5,0,4,214], -"boot_8php.html#ab346a2ece14993861f3e4206befa94f0":[5,0,4,35], -"boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8":[5,0,4,210], -"boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0":[5,0,4,235], -"boot_8php.html#ab4bddb41a0cf407178ec5278b950c393":[5,0,4,183], -"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[5,0,4,218], -"boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764":[5,0,4,116], -"boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[5,0,4,144], -"boot_8php.html#ab55e545b72ec8c097e052ea7d373491f":[5,0,4,44], -"boot_8php.html#ab5ddbe69d3d03acd06e1fb281488cb78":[5,0,4,63], -"boot_8php.html#ab724491497ab2618b23a01d5da60aec0":[5,0,4,201], +"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#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#ab5ddbe69d3d03acd06e1fb281488cb78":[5,0,4,51], +"boot_8php.html#ab724491497ab2618b23a01d5da60aec0":[5,0,4,189], "boot_8php.html#ab79b8b4555cae20d03f8200666d89d63":[5,0,4,7], -"boot_8php.html#ab7d65a7e7417825a4db62906bb600729":[5,0,4,105], -"boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda":[5,0,4,45], -"boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86":[5,0,4,239], +"boot_8php.html#ab7d65a7e7417825a4db62906bb600729":[5,0,4,93], +"boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda":[5,0,4,35], +"boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86":[5,0,4,227], "boot_8php.html#abc0a90a1a77f5b668aa7e4b57d1776a7":[5,0,4,3], -"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[5,0,4,263], -"boot_8php.html#abdcdfc873ace4e0902177bad934de0c0":[5,0,4,72], -"boot_8php.html#abeb4d86e17cefa8584f1244e2183b0e1":[5,0,4,119], -"boot_8php.html#abedd940e664017c61b48c6efa31d0cb8":[5,0,4,104], -"boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450":[5,0,4,128], -"boot_8php.html#ac17fc8a416ea79e9d5cb4dc9a8ff8c5c":[5,0,4,28], -"boot_8php.html#ac195fc9003298923ea81f144388e24b1":[5,0,4,169], -"boot_8php.html#ac43182e0d8bae7576a30b603774974f8":[5,0,4,237], -"boot_8php.html#ac59a18a4838710d6c2de37aed6b21f03":[5,0,4,102], -"boot_8php.html#ac608a34f3bc180e7724192e0fd31f9b0":[5,0,4,42], -"boot_8php.html#ac8400313df2c831653f9036f71ebd86d":[5,0,4,64], -"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[5,0,4,269], -"boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20":[5,0,4,124], -"boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[5,0,4,126], -"boot_8php.html#aca08bc4f1554ba877500f6abcc99e1e8":[5,0,4,197], -"boot_8php.html#aca47505b8732177f52bb2d647eb2741c":[5,0,4,41], +"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#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#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#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,172], -"boot_8php.html#accd6f36cc9f40225cbd720e4d12a7c6e":[5,0,4,270], -"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[5,0,4,225], -"boot_8php.html#ace83842dbeb84f7ed9ac59a9f57a7c32":[5,0,4,204], -"boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3":[5,0,4,71], -"boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8":[5,0,4,155], -"boot_8php.html#ad11f30a6590d3d77f0c5e1e3909af8f5":[5,0,4,163], +"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#ad206598b909e8eb67eb0e0bb5ef69c13":[5,0,4,10], -"boot_8php.html#ad2c97627a313d53df1a1c7b4215ddb51":[5,0,4,16], -"boot_8php.html#ad302cb26b838898d475f57f61b0fcc9f":[5,0,4,78], -"boot_8php.html#ad34c1547020a305915bcc39707744690":[5,0,4,93], -"boot_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620":[5,0,4,36], -"boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44":[5,0,4,32], -"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[5,0,4,220], -"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[5,0,4,247], -"boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5":[5,0,4,241], -"boot_8php.html#ada72d88ae39a7e3b45baea201cb49a29":[5,0,4,99], -"boot_8php.html#adaeb4f590c56326b2dca3b19f31b6272":[5,0,4,139], -"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[5,0,4,250], -"boot_8php.html#add517a0958ac684792c62142a3877f81":[5,0,4,46], -"boot_8php.html#adfb2fc7be5a4226c0a8e24131da9d498":[5,0,4,27], -"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[5,0,4,255], -"boot_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312":[5,0,4,18], -"boot_8php.html#ae3cef7b63e25e7bafea3fcf6b99fad0e":[5,0,4,180], -"boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[5,0,4,158], -"boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[5,0,4,188], -"boot_8php.html#aea392cb26ed617f3a8cde648385b5df0":[5,0,4,267], -"boot_8php.html#aea7fc57a4d8e9dcb42f2601b0b9b761c":[5,0,4,30], -"boot_8php.html#aead84fa27d7516b855220fe004964a45":[5,0,4,260], -"boot_8php.html#aeb1039302affcbe7e8872c01c08c88f8":[5,0,4,58], -"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[5,0,4,222], -"boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6":[5,0,4,251], -"boot_8php.html#aed0dfb35f7dd00dc9e4f868ea7f7ff53":[5,0,4,164], -"boot_8php.html#aedfb9501ed408278667995524e0d15cf":[5,0,4,107], -"boot_8php.html#aee324eca9de4e0fedf01ab5f92e27c67":[5,0,4,175], -"boot_8php.html#aef4b6c558c68c88c10f13c5a00c20e3d":[5,0,4,189], -"boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[5,0,4,141], -"boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4":[5,0,4,33], -"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[5,0,4,252], -"boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[5,0,4,182], -"boot_8php.html#af3a4271630aabd8be592213f925d6a36":[5,0,4,66], -"boot_8php.html#af3bdfc20979c16f15bb9c60446a480f9":[5,0,4,59], -"boot_8php.html#af489d0c3166551b93e63a79ff2c9be35":[5,0,4,146], -"boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461":[5,0,4,202], -"boot_8php.html#af6f6f6f40139f12fc09ec47373b30919":[5,0,4,96], -"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[5,0,4,249], -"boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d":[5,0,4,194], -"boot_8php.html#afaf93b7026f784b113b4f8921745891e":[5,0,4,176], -"boot_8php.html#afb97615e985a013799839b68b99018d7":[5,0,4,253], -"boot_8php.html#afbb1fe1b2c8c730ec8e08da93b6512c4":[5,0,4,55], -"boot_8php.html#afe084c30a1810c10442edb4fbcbc0086":[5,0,4,88], -"boot_8php.html#afe63ae69ba55299f813766e54df06ede":[5,0,4,150], +"boot_8php.html#ad302cb26b838898d475f57f61b0fcc9f":[5,0,4,66], +"boot_8php.html#ad34c1547020a305915bcc39707744690":[5,0,4,81], +"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#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#aea7fc57a4d8e9dcb42f2601b0b9b761c":[5,0,4,25], +"boot_8php.html#aead84fa27d7516b855220fe004964a45":[5,0,4,248], +"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#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#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#afbb1fe1b2c8c730ec8e08da93b6512c4":[5,0,4,43], +"boot_8php.html#afe084c30a1810c10442edb4fbcbc0086":[5,0,4,76], +"boot_8php.html#afe63ae69ba55299f813766e54df06ede":[5,0,4,138], "boot_8php.html#afe88b920aa285982edb817a0dd44eb37":[5,0,4,14], -"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[5,0,4,216], +"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], @@ -141,99 +128,95 @@ var NAVTREEINDEX1 = "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,60], -"classApp.html#a050b0696118da47e8b30859ad1a2c149":[4,0,5,44], +"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,77], +"classApp.html#a08c24d6a6fc52fcc784b0f765f13b820":[4,0,5,73], "classApp.html#a08f0537964d98958d218066364cff785":[4,0,5,1], -"classApp.html#a0ce85be198e46570366cb3344f3c55b8":[4,0,5,54], -"classApp.html#a11e24b3ed9b33ffee7dd41d110b4366d":[4,0,5,63], -"classApp.html#a123b903dfe5d3488cc68db3471d36fd2":[4,0,5,34], -"classApp.html#a13710907ef62554a0b4dd8a5eaa2eb11":[4,0,5,81], -"classApp.html#a14bd4b1c29f3aff371fe5d4cb11aeea3":[4,0,5,36], -"classApp.html#a1a297e70b3667b83f4460aa7ed9f5d6f":[4,0,5,64], -"classApp.html#a1ad3bb1b68439b3b7cbe630918e618d2":[4,0,5,10], -"classApp.html#a20d1890cc16b22ba79eeb0cbf2f719f7":[4,0,5,33], -"classApp.html#a230e975296cf164da2fee35ef720964f":[4,0,5,37], -"classApp.html#a244b2d53b21be269aad2269d23192f95":[4,0,5,79], -"classApp.html#a256360c9184fed6d7556e0bc0a835d7f":[4,0,5,52], -"classApp.html#a2e82da4aecfc2017a8d1d332ca501f9f":[4,0,5,78], -"classApp.html#a2eb832a8577dee7d40b93abdf6d1d35a":[4,0,5,14], -"classApp.html#a330410a288f3393d53772f5e98f857ea":[4,0,5,55], -"classApp.html#a33a8e90b60ec4438f6fbf299d0f6839c":[4,0,5,69], -"classApp.html#a344d2b7dc2f276648d521aee4da1731c":[4,0,5,27], -"classApp.html#a3694aa1907aa103a2adbc71f926f0fa0":[4,0,5,59], -"classApp.html#a3d84af5e42082098672531cd1a618853":[4,0,5,26], -"classApp.html#a4659785d13e4bac0bed50dbb1b0d4299":[4,0,5,8], -"classApp.html#a4776d9322edea17fae56afa5d01a323e":[4,0,5,28], -"classApp.html#a4833bee2eae4ad1691a04fa19e11a766":[4,0,5,92], -"classApp.html#a487332f8de40414ca1a54a4265570b70":[4,0,5,87], -"classApp.html#a495ec082c2719314e536070ca1ce073d":[4,0,5,46], -"classApp.html#a4b67935096f66d1f14b657399a8461ac":[4,0,5,71], -"classApp.html#a4bdd7bfed62f50515fce652127bf481b":[4,0,5,29], -"classApp.html#a4c7cfc62d39508086cf300dc2e39c4df":[4,0,5,62], -"classApp.html#a4ffe529fb14389f7fedf5fdc5f722e7f":[4,0,5,70], -"classApp.html#a5293a8543ba338dcf38cd4ff3bc5d4be":[4,0,5,11], -"classApp.html#a557d7b779d8259027f4724ebf7b248dc":[4,0,5,32], -"classApp.html#a560189f048d3db2f526841963cc43e97":[4,0,5,30], -"classApp.html#a56b1a432c96aef8b1971f779c9d93c8c":[4,0,5,90], -"classApp.html#a57d041fcc003d08c127dfa99a02bc192":[4,0,5,76], -"classApp.html#a58ac598544892ff7c32890291b72635e":[4,0,5,65], -"classApp.html#a59dd4b665c70e7dbd80682c014ff7145":[4,0,5,66], +"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#a14bd4b1c29f3aff371fe5d4cb11aeea3":[4,0,5,32], +"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#a256360c9184fed6d7556e0bc0a835d7f":[4,0,5,48], +"classApp.html#a2e82da4aecfc2017a8d1d332ca501f9f":[4,0,5,74], +"classApp.html#a2eb832a8577dee7d40b93abdf6d1d35a":[4,0,5,12], +"classApp.html#a330410a288f3393d53772f5e98f857ea":[4,0,5,51], +"classApp.html#a33a8e90b60ec4438f6fbf299d0f6839c":[4,0,5,65], +"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,88], +"classApp.html#a487332f8de40414ca1a54a4265570b70":[4,0,5,83], +"classApp.html#a495ec082c2719314e536070ca1ce073d":[4,0,5,42], +"classApp.html#a4b67935096f66d1f14b657399a8461ac":[4,0,5,67], +"classApp.html#a4bdd7bfed62f50515fce652127bf481b":[4,0,5,25], +"classApp.html#a4c7cfc62d39508086cf300dc2e39c4df":[4,0,5,58], +"classApp.html#a4ffe529fb14389f7fedf5fdc5f722e7f":[4,0,5,66], +"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#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,43], -"classApp.html#a5e6a6bd641e4d9909df56f0283c03821":[4,0,5,24], -"classApp.html#a5f64620473a9727a48ebe9cf6f335a98":[4,0,5,82], +"classApp.html#a5cfc098c061b7d765add58fd2ca97445":[4,0,5,39], +"classApp.html#a5f64620473a9727a48ebe9cf6f335a98":[4,0,5,78], "classApp.html#a604d659d6977a99de42a160343e5289a":[4,0,5,4], -"classApp.html#a61ca6e3af82071ea25ff2fd5dbcddae2":[4,0,5,49], -"classApp.html#a622eace13f8fc9f4b5672a68e2bc4396":[4,0,5,9], -"classApp.html#a6844aedad10e201b8c3d80cfc9e876d3":[4,0,5,83], -"classApp.html#a6859a4848a5c0049b4134cc4b34228b6":[4,0,5,84], -"classApp.html#a6bcb19cdc4907077da72864686d5a780":[4,0,5,72], -"classApp.html#a6e4f0fbfa3cf6c11baebe22a03db6165":[4,0,5,68], -"classApp.html#a6f55d087e1ff4710132c1b0863faa2ee":[4,0,5,51], -"classApp.html#a764cc6cd7578132c21d2b4545de9301c":[4,0,5,85], -"classApp.html#a78788f6e9d8b713b138f81e457c5cd08":[4,0,5,22], -"classApp.html#a7954862f44f606b0ff83d4c74d15e792":[4,0,5,61], -"classApp.html#a871898becd0697d778f36d9336253ae8":[4,0,5,16], -"classApp.html#a8863703a0305eaa45eb970dbd2046291":[4,0,5,18], -"classApp.html#a89e9feb2bfb5253883a9720beaffe876":[4,0,5,23], -"classApp.html#a91fd3c8b89016113b05f3be24805ccff":[4,0,5,89], -"classApp.html#a94a1ed2dc493c58612d17035b74ae736":[4,0,5,35], -"classApp.html#a9632092d9e8fdaa82a9fc4586433fd31":[4,0,5,25], -"classApp.html#a98ef4cfd36693a3457c879b76bc6d694":[4,0,5,48], -"classApp.html#a9bf62f8e39585c0aa48fcffc3bf3484d":[4,0,5,67], -"classApp.html#aa5a87c46ab3fee21362c466bf78042ef":[4,0,5,93], -"classApp.html#aab23c59172310fd30f2d60dc039d3eea":[4,0,5,15], -"classApp.html#aab4a685d15a363bb1d7edbbc20bfb94e":[4,0,5,42], -"classApp.html#ab35b01a366a2ea95725e97af278f87ab":[4,0,5,88], -"classApp.html#ab3da757abe5cb45bf88f07cc51a73b58":[4,0,5,39], -"classApp.html#ab410451f132910773d0a02e35d0dced9":[4,0,5,6], -"classApp.html#ab47de68fa39806d1fb0976407e188b77":[4,0,5,74], -"classApp.html#abaf2173711e861ae4aebf43a7f70157e":[4,0,5,7], -"classApp.html#abe0e4fa91097f7a6588e1213a834121c":[4,0,5,41], -"classApp.html#abea5a4f77dcd53c928dc4eed86616637":[4,0,5,21], -"classApp.html#abf46a653d8499e7c253cc1be894a6d83":[4,0,5,19], -"classApp.html#ac1a8b2cd40609b231a560201a08852ba":[4,0,5,56], -"classApp.html#ac1d80a14492acc932715d54567d8a589":[4,0,5,50], -"classApp.html#ac6e6b1c7d6df408580ff79977fcfa656":[4,0,5,58], -"classApp.html#ac73dc90e4764497e2f1b7e6612c8fb88":[4,0,5,47], -"classApp.html#acad5896b7a79ae31433ad8f89606c728":[4,0,5,73], -"classApp.html#acb27e607fe4c82603444676e25c36b70":[4,0,5,13], -"classApp.html#ad082d63acc078e5bf23825a03bdd6a76":[4,0,5,80], -"classApp.html#ad1c8eb91a6fd470b94f34b7fdad3a2d0":[4,0,5,45], -"classApp.html#ad5175536561021548ae8188e24c7b80c":[4,0,5,40], -"classApp.html#adb060d5c7f35a521ec7ec0effbe08097":[4,0,5,31], -"classApp.html#adb5a4bb657881e553978ff390babd01f":[4,0,5,12], -"classApp.html#adf2aaf95b062736a6fd5fc70fadf80e8":[4,0,5,91], -"classApp.html#ae3f47830543d0d902f66913def8db66b":[4,0,5,57], -"classApp.html#ae9f96338f32187d308b67b980eea0008":[4,0,5,75], -"classApp.html#aeb1fe1c8ad9aa639909bd183ce578536":[4,0,5,20], -"classApp.html#aeca29fd4f7192ca07369b3c598c36e67":[4,0,5,86], -"classApp.html#af17df107f2216ddf5ad2a7e0f2ba2166":[4,0,5,17], -"classApp.html#af5007c42a693afd9c4899c243b2e1363":[4,0,5,53], -"classApp.html#af58db526040829b1c8bd95561b329262":[4,0,5,38], +"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#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#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#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#aab23c59172310fd30f2d60dc039d3eea":[4,0,5,13], +"classApp.html#aab4a685d15a363bb1d7edbbc20bfb94e":[4,0,5,38], +"classApp.html#ab35b01a366a2ea95725e97af278f87ab":[4,0,5,84], +"classApp.html#ab3da757abe5cb45bf88f07cc51a73b58":[4,0,5,35], +"classApp.html#ab47de68fa39806d1fb0976407e188b77":[4,0,5,70], +"classApp.html#abe0e4fa91097f7a6588e1213a834121c":[4,0,5,37], +"classApp.html#abea5a4f77dcd53c928dc4eed86616637":[4,0,5,19], +"classApp.html#abf46a653d8499e7c253cc1be894a6d83":[4,0,5,17], +"classApp.html#ac1a8b2cd40609b231a560201a08852ba":[4,0,5,52], +"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#acb27e607fe4c82603444676e25c36b70":[4,0,5,11], +"classApp.html#ad082d63acc078e5bf23825a03bdd6a76":[4,0,5,76], +"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#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#af17df107f2216ddf5ad2a7e0f2ba2166":[4,0,5,15], +"classApp.html#af5007c42a693afd9c4899c243b2e1363":[4,0,5,49], +"classApp.html#af58db526040829b1c8bd95561b329262":[4,0,5,34], "classApp.html#af6d39f63fb7116bbeb04e51696f99474":[4,0,5,0], "classBaseObject.html":[4,0,6], "classBaseObject.html#ac43f10e69ce80c78e4870636250fc8a2":[4,0,6,0], @@ -249,5 +232,22 @@ var NAVTREEINDEX1 = "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#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#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], +"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] }; diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js index 7b35ecfb0..9fc916d75 100644 --- a/doc/html/navtreeindex2.js +++ b/doc/html/navtreeindex2.js @@ -1,22 +1,5 @@ var NAVTREEINDEX2 = { -"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#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], -"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], "classFKOAuthDataStore.html#a96f76387c3a93b0abe27a98013804bab":[4,0,14,3], @@ -249,5 +232,22 @@ var NAVTREEINDEX2 = "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] +"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], +"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], +"contact__widgets_8php.html#af24e693532a045954caab515942cfc6f":[5,0,0,19,4] }; diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js index 3ce92948a..d333cde66 100644 --- a/doc/html/navtreeindex3.js +++ b/doc/html/navtreeindex3.js @@ -1,45 +1,30 @@ var NAVTREEINDEX3 = { -"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], -"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], -"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], "conversation_8php.html#a0891aaa4492cba2b51eda12fe01957f3":[5,0,0,20,7], "conversation_8php.html#a0ee05f15255fb1cc3d89f30bc378a654":[5,0,0,20,9], -"conversation_8php.html#a2a7d541854bba755eb8ada59af7dcb1a":[5,0,0,20,20], +"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,15], -"conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c":[5,0,0,20,14], -"conversation_8php.html#a7eeaaf44506815576f3bd80053ef52c3":[5,0,0,20,21], +"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,19], -"conversation_8php.html#a9f909b8885259b79c6ac8da93afd8f11":[5,0,0,20,17], +"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,18], +"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,16], +"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], @@ -73,6 +58,7 @@ var NAVTREEINDEX3 = "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], @@ -229,8 +215,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], @@ -249,5 +235,19 @@ var NAVTREEINDEX3 = "functions_func_0x73.html":[4,3,1,16], "functions_func_0x74.html":[4,3,1,17], "functions_func_0x76.html":[4,3,1,18], -"functions_vars.html":[4,3,2] +"functions_vars.html":[4,3,2], +"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], +"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] }; diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js index 981a152e7..507a865e8 100644 --- a/doc/html/navtreeindex4.js +++ b/doc/html/navtreeindex4.js @@ -1,19 +1,5 @@ var NAVTREEINDEX4 = { -"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], -"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_0x6d.html":[5,1,0,14], "globals_0x6e.html":[5,1,0,15], @@ -102,14 +88,24 @@ 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,2], -"identity_8php.html#a3570a4eb77332b292d394c4132cb8f03":[5,0,0,38,3], -"identity_8php.html#a77d2237f1846964634b1c99089c27c7d":[5,0,0,38,0], -"identity_8php.html#a77ee7d66eb0758f7e7882f70ad0f9485":[5,0,0,38,4], -"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[5,0,0,38,6], -"identity_8php.html#abf6a9c6ed92d594f1d4513c4e22a7abd":[5,0,0,38,1], -"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[5,0,0,38,5], -"identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[5,0,0,38,7], +"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#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#aa870d2c1f558cfd52bef05bc124e8fa4":[5,0,0,38,0], +"identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3":[5,0,0,38,8], +"identity_8php.html#abf6a9c6ed92d594f1d4513c4e22a7abd":[5,0,0,38,2], +"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[5,0,0,38,10], +"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], "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], @@ -227,27 +223,31 @@ var NAVTREEINDEX4 = "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#a0bdc4b0bfc54797c249dc4eca25aeda4":[5,0,0,46,0], -"include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0":[5,0,0,46,6], -"include_2network_8php.html#a2729d012410e470c527a62a3f777ded8":[5,0,0,46,10], -"include_2network_8php.html#a27a951b59d8d622c0b3e7b0673ba74c6":[5,0,0,46,15], -"include_2network_8php.html#a37ddeb88a3fd1dee9e8339723f9edf9a":[5,0,0,46,8], -"include_2network_8php.html#a469b9bd700269cd07d954f1a16c5899b":[5,0,0,46,5], -"include_2network_8php.html#a4c5d50079e089168d9248427018fffd4":[5,0,0,46,13], -"include_2network_8php.html#a4cfb2c05a1c295317283d762440ce0b2":[5,0,0,46,12], -"include_2network_8php.html#a5caa264fab6d2b2344e6bd5b298b08f2":[5,0,0,46,19], -"include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7":[5,0,0,46,11], -"include_2network_8php.html#a8122356933bcd6b0a8567e8e15ae5cc5":[5,0,0,46,20], -"include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d":[5,0,0,46,9], -"include_2network_8php.html#a897e7112d86eb95526cbd0bff9375f02":[5,0,0,46,18], -"include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0":[5,0,0,46,7], -"include_2network_8php.html#a9129fd55e7fc175b4ea9a195cccc16bc":[5,0,0,46,25], -"include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff":[5,0,0,46,22], -"include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6":[5,0,0,46,23], -"include_2network_8php.html#aa44d9e33a579d930e9e79c4ebb3d6b5e":[5,0,0,46,16], -"include_2network_8php.html#aafd06c0a75402aefb06cfb9f9740fa37":[5,0,0,46,24], -"include_2network_8php.html#ab07ce9d75eae559865ed90aad2154bd7":[5,0,0,46,3], -"include_2network_8php.html#aba38458a2ff2d92d3536488dbb119694":[5,0,0,46,1], -"include_2network_8php.html#ad4056d3ce69988f5c1a997a79f503246":[5,0,0,46,4], -"include_2network_8php.html#adbc7fe45cc7fd9cd78f6b2f425ee9041":[5,0,0,46,14] +"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] }; diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js index 05598c353..ab423c32c 100644 --- a/doc/html/navtreeindex5.js +++ b/doc/html/navtreeindex5.js @@ -1,15 +1,5 @@ var NAVTREEINDEX5 = { -"include_2network_8php.html#adf6008b38c555e98e7ed10da9ede2335":[5,0,0,46,21], -"include_2network_8php.html#ae8d9c41a11000fb8667039fc71b4f73f":[5,0,0,46,17], -"include_2network_8php.html#aee35d9ad6b3f872bfb39ba3598936aa7":[5,0,0,46,2], -"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], @@ -42,61 +32,60 @@ var NAVTREEINDEX5 = "item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[5,0,1,42,1], "item_8php.html#abd0e603a6696051af16476eb968d52e7":[5,0,1,42,2], "items_8php.html":[5,0,0,41], -"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[5,0,0,41,54], +"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[5,0,0,41,53], "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,28], +"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,33], -"items_8php.html#a09d425596b9f8663472cf7474ad36d96":[5,0,0,41,37], -"items_8php.html#a0cf98bb619f07dd18f602683a55a5f59":[5,0,0,41,25], +"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,32], -"items_8php.html#a2541e6861a56d145c9281877cc501615":[5,0,0,41,39], +"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#a2d840c74ed23d1b6c7daee05cf89dda7":[5,0,0,41,21], +"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,45], -"items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b":[5,0,0,41,48], -"items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361":[5,0,0,41,30], -"items_8php.html#a566c601726697e044e75284af7fb6f17":[5,0,0,41,20], +"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,18], -"items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7":[5,0,0,41,38], -"items_8php.html#a668ece2c37f05cc3abe538eb0dabfe55":[5,0,0,41,16], -"items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc":[5,0,0,41,36], -"items_8php.html#a756738301f2ed96be50232500677d58a":[5,0,0,41,41], -"items_8php.html#a77051724d1784074ff187e73a4db93fe":[5,0,0,41,34], -"items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[5,0,0,41,43], -"items_8php.html#a82955cc578f0fa600acec84475026194":[5,0,0,41,17], -"items_8php.html#a8395d189a36abfa0dfff81a2b0e70669":[5,0,0,41,14], +"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,52], -"items_8php.html#a896c1809d58f2d7a42cfe14577958ddf":[5,0,0,41,27], +"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,31], -"items_8php.html#aa371905f0a211b307cb3f7188c6cba04":[5,0,0,41,53], +"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,22], +"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,29], -"items_8php.html#aab9e0c58247427126de0699c729c3b6c":[5,0,0,41,49], -"items_8php.html#ab1bce4261bcf75ad62753b498a144d17":[5,0,0,41,50], -"items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87":[5,0,0,41,26], -"items_8php.html#abe695dd89e1e10ed042c26b80114f0ed":[5,0,0,41,46], +"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,44], -"items_8php.html#ac6673627d289ee4f547de0fe3b7acd0a":[5,0,0,41,19], -"items_8php.html#acf0bf7c9d21ac84f32effb754f7ad484":[5,0,0,41,40], -"items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0":[5,0,0,41,47], -"items_8php.html#ad34827ed330898456783fb14c7b46154":[5,0,0,41,51], -"items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9":[5,0,0,41,24], -"items_8php.html#ae73794179b62d39bb597ff670ab1c1e5":[5,0,0,41,35], -"items_8php.html#af94c281016c6c912d06e064113336c5c":[5,0,0,41,42], -"items_8php.html#afa1db13c2a8b73b5b17b97f17e5a19d1":[5,0,0,41,15], -"items_8php.html#afbcf26dfcf8a83fff952aa858c1b7b67":[5,0,0,41,23], +"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], @@ -170,18 +159,17 @@ var NAVTREEINDEX5 = "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,3], +"mod_2network_8php.html#a36e03af6f2efe62ecaa247509365bfad":[5,0,1,57,2], "mod_2network_8php.html#a43f2f29b90c5e29072c561934bc8f8b4":[5,0,1,57,0], -"mod_2network_8php.html#aeaa518c1a317516a3da337b88d358666":[5,0,1,57,2], -"mod_2notify_8php.html":[5,0,1,61], -"mod_2notify_8php.html#a94f9a6a9d4b5fd704baafff0c34f41ae":[5,0,1,61,1], -"mod_2notify_8php.html#acdf3851688ebd6d6a575eb84ef9febe3":[5,0,1,61,0], -"mod_2oembed_8php.html":[5,0,1,62], -"mod_2oembed_8php.html#a9145025aaf057fb5d3f9f7011e5e1014":[5,0,1,62,0], -"mod_2photos_8php.html":[5,0,1,68], -"mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080":[5,0,1,68,2], -"mod_2photos_8php.html#aa87382611a66ec5effdb2d78f13f5812":[5,0,1,68,0], -"mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014":[5,0,1,68,1], +"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], "mod__new__channel_8php.html":[5,0,3,0,4], @@ -195,8 +183,8 @@ var NAVTREEINDEX5 = "msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[5,0,1,56,0], "namespaceFriendica.html":[3,0,1], "namespaceFriendica.html":[4,0,1], -"namespaceacl__selectors.html":[4,0,0], "namespaceacl__selectors.html":[3,0,0], +"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], @@ -214,40 +202,52 @@ var NAVTREEINDEX5 = "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], -"nogroup_8php.html":[5,0,1,59], -"nogroup_8php.html#a099cb353bf62e8453069ce107b763212":[5,0,1,59,1], -"nogroup_8php.html#a52085b183f97c552f1db5c4926e8ec30":[5,0,1,59,0], "none_8php.html":[5,0,3,0,6], -"notifications_8php.html":[5,0,1,60], -"notifications_8php.html#a5baffec7b2e625c9f9cefbc097550d33":[5,0,1,60,1], -"notifications_8php.html#aadd0b5525bd8c283a5d8a37982bbfe62":[5,0,1,60,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,63], -"oexchange_8php.html#a2d8b785cd7d041a4e6274f5af370cf26":[5,0,1,63,0], -"oexchange_8php.html#ac8e2e469ddc3db984b0c1b44558aca59":[5,0,1,63,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,64], -"opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9":[5,0,1,64,0], -"page_8php.html":[5,0,1,65], -"page_8php.html#a4d89800c0366a239191b1692c09635cf":[5,0,1,65,1], -"page_8php.html#a91a5f649f68406149108bded1dc90b22":[5,0,1,65,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,66], -"parse__url_8php.html#a05a9e8944380ba3cf6bbf5893dd4b74b":[5,0,1,66,2], -"parse__url_8php.html#a25635549f2c22955d72465f4d2e58993":[5,0,1,66,3], -"parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a":[5,0,1,66,1], -"parse__url_8php.html#aa7dd8f961bea042d62726ed909e4a868":[5,0,1,66,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] +"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], +"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] }; diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index 74cc22d87..12b23d172 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -1,20 +1,5 @@ var NAVTREEINDEX6 = { -"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,67], -"photo_8php.html#a582779d24882b0d31ee909a91d70a448":[5,0,1,67,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#a32e2817faa25d7f11f60a8abff565035":[5,0,0,1,0,4], -"photo__driver_8php.html#a7273b82b017fd96d29b2c57bab03aea6":[5,0,0,1,0,1], -"photo__gd_8php.html":[5,0,0,1,1], -"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], @@ -28,11 +13,11 @@ var NAVTREEINDEX6 = "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,69], -"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[5,0,1,69,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,70], -"ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[5,0,1,70,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,18], "plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76":[5,0,0,56,21], @@ -63,16 +48,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,71], -"poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498":[5,0,1,71,0], -"poke_8php.html":[5,0,1,72], -"poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b":[5,0,1,72,1], -"poke_8php.html#ac9190563a8da9c07a16f9dcd71cf6993":[5,0,1,72,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,73], -"post_8php.html#af4b48181ce773ef0cdfc972441445c34":[5,0,1,73,0], -"post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[5,0,1,73,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], @@ -98,44 +83,42 @@ 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,74], -"pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[5,0,1,74,0], -"probe_8php.html":[5,0,1,75], -"probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[5,0,1,75,0], -"profile_8php.html":[5,0,1,76], -"profile_8php.html#a1a2482b775476f2f64ea5e8f4fc3fd1e":[5,0,1,76,0], -"profile_8php.html#a3775cf6eef6587e5143133356a7b76c0":[5,0,1,76,1], -"profile_8php.html#ab5d0246be0552e2182a585c1206d22a5":[5,0,1,76,2], -"profile__advanced_8php.html":[5,0,0,58], -"profile__advanced_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4":[5,0,0,58,0], -"profile__photo_8php.html":[5,0,1,77], -"profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02":[5,0,1,77,1], -"profile__photo_8php.html#a4b80234074bd603221aa5364f330e479":[5,0,1,77,2], -"profile__photo_8php.html#ac9cd968a767e2ae1b88383b6cdd6dbe3":[5,0,1,77,0], -"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,78], -"profiles_8php.html#a2a3ac90f51941ff78b85e9389304969c":[5,0,1,78,0], -"profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e":[5,0,1,78,2], -"profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00":[5,0,1,78,1], -"profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04":[5,0,1,78,3], -"profperm_8php.html":[5,0,1,79], -"profperm_8php.html#a17fb64ec05edee1dc94d95438807d6c6":[5,0,1,79,2], -"profperm_8php.html#a77fd398ae7c25142e1d9ad724ec347cc":[5,0,1,79,0], -"profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023":[5,0,1,79,1], -"pubsites_8php.html":[5,0,1,80], -"pubsites_8php.html#af614e279aab54065345bda6b03eafdf0":[5,0,1,80,0], -"qsearch_8php.html":[5,0,1,81], -"qsearch_8php.html#a0501887b95bd8fa21018b2936a668894":[5,0,1,81,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,82], -"randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[5,0,1,82,0], +"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], +"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], +"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], "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], @@ -167,87 +150,104 @@ var NAVTREEINDEX6 = "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,63], -"redir_8php.html":[5,0,1,83], -"redir_8php.html#a9ac266c3f5cf0d94ef63e6d0f2edf1f5":[5,0,1,83,0], -"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#a230ec9681ddee3b5b8b40c8d550f32f7":[5,0,1,90,2], -"search_8php.html#aa911f7c7f0cdb0284e35d0ed610f19c6":[5,0,1,90,3], -"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,2], -"settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586":[5,0,1,92,3], -"settings_8php.html#ae5aebccb006bee1300078576baaf5582":[5,0,1,92,1], -"setup_8php.html":[5,0,1,93], -"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[5,0,1,93,2], -"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[5,0,1,93,13], -"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[5,0,1,93,5], -"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[5,0,1,93,12], -"setup_8php.html#a2b375ddc555140236fc500135de99371":[5,0,1,93,9], -"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,7], -"setup_8php.html#a88247384a96e14516f474d7af6a465c1":[5,0,1,93,11], -"setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76":[5,0,1,93,4], -"setup_8php.html#abe405d227ba7232971964a706d4f3bce":[5,0,1,93,10], -"setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a":[5,0,1,93,8], -"setup_8php.html#addb24714bc2542aa4f4215e98fe48432":[5,0,1,93,15], -"setup_8php.html#ae8e4d9279a61de74d5f39962cb7b6ca1":[5,0,1,93,0], -"setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58":[5,0,1,93,14], -"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] +"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], +"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,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], +"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,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] }; diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js index dbb305484..34efe688e 100644 --- a/doc/html/navtreeindex7.js +++ b/doc/html/navtreeindex7.js @@ -1,140 +1,123 @@ var NAVTREEINDEX7 = { -"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], -"starred_8php.html":[5,0,1,99], -"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[5,0,1,99,0], -"subthread_8php.html":[5,0,1,100], -"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[5,0,1,100,0], -"suggest_8php.html":[5,0,1,101], -"suggest_8php.html#a4df91c84594d51ba56b5918de414230d":[5,0,1,101,0], -"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[5,0,1,101,1], -"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[5,0,1,101,2], -"system__unavailable_8php.html":[5,0,0,67], -"system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa":[5,0,0,67,0], -"tagger_8php.html":[5,0,1,102], -"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[5,0,1,102,0], -"tagrm_8php.html":[5,0,1,103], -"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[5,0,1,103,1], -"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[5,0,1,103,0], -"taxonomy_8php.html":[5,0,0,68], -"taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce":[5,0,0,68,8], -"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,9], -"taxonomy_8php.html#a599ee71dd3194c8127b00dabec77abc1":[5,0,0,68,1], -"taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c":[5,0,0,68,13], -"taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43":[5,0,0,68,12], -"taxonomy_8php.html#aaf90ba8b839d6459065f39a4f1109b8a":[5,0,0,68,10], -"taxonomy_8php.html#ac12a651a42ed77f8dc7072c6168811a2":[5,0,0,68,7], -"taxonomy_8php.html#ac21d1dff16d569e7d110167aea4e63c2":[5,0,0,68,11], -"taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1":[5,0,0,68,5], -"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,77], -"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,85], -"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[5,0,0,70,74], -"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,87], -"text_8php.html#a3054189cff173977f4216c9a3dd29e1b":[5,0,0,70,23], -"text_8php.html#a324c58f37f6acdf9cd1922aa76077d9f":[5,0,0,70,82], -"text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f":[5,0,0,70,80], -"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#a3ef8c0cf31f35f77462067de8712fa34":[5,0,0,70,28], -"text_8php.html#a405afe814a23f3bd94d826101aa168ab":[5,0,0,70,83], -"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,79], -"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,78], -"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,75], -"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,76], -"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,72], -"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#aad557c054cf2ed915633701018fc7e3f":[5,0,0,70,86], -"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[5,0,0,70,81], -"text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4":[5,0,0,70,84], -"text_8php.html#ac19d2b33a58372a357a43d51eed19162":[5,0,0,70,56], -"text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e":[5,0,0,70,37], -"text_8php.html#aca0f589be74fab1a460c57e88dad9779":[5,0,0,70,69], -"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,73], -"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], +"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], +"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], +"taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1":[5,0,0,67,5], +"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,77], +"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,85], +"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[5,0,0,69,74], +"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#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#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#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#a436a8de00c942364c2d0fcfc7e1f4b5a":[5,0,0,69,33], +"text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6":[5,0,0,69,70], +"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#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#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#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#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#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#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#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#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,73], +"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], @@ -145,13 +128,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,104], -"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[5,0,1,104,0], -"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[5,0,1,104,1], -"toggle__mobile_8php.html":[5,0,1,105], -"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[5,0,1,105,0], -"toggle__safesearch_8php.html":[5,0,1,106], -"toggle__safesearch_8php.html#a23d5cfb2727a266e44993ffbf5595a79":[5,0,1,106,0], +"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], "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], @@ -165,18 +148,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,107], -"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[5,0,1,107,0], -"update__channel_8php.html":[5,0,1,108], -"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[5,0,1,108,0], -"update__community_8php.html":[5,0,1,109], -"update__community_8php.html#abdcc5c4ecebbe0b5fcba2755c69cb3b1":[5,0,1,109,0], -"update__display_8php.html":[5,0,1,110], -"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[5,0,1,110,0], -"update__network_8php.html":[5,0,1,111], -"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[5,0,1,111,0], -"update__search_8php.html":[5,0,1,112], -"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[5,0,1,112,0], +"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], "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], @@ -204,50 +187,67 @@ 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,113], -"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[5,0,1,113,0], -"viewconnections_8php.html":[5,0,1,114], -"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[5,0,1,114,2], -"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[5,0,1,114,1], -"viewconnections_8php.html#ae330cea4cddd091559659f8b469617b6":[5,0,1,114,0], -"viewsrc_8php.html":[5,0,1,115], -"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[5,0,1,115,0], -"vote_8php.html":[5,0,1,116], -"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[5,0,1,116,2], -"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[5,0,1,116,0], -"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[5,0,1,116,1], -"wall__attach_8php.html":[5,0,1,117], -"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[5,0,1,117,0], -"wall__upload_8php.html":[5,0,1,118], -"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[5,0,1,118,0], -"webfinger_8php.html":[5,0,1,119], -"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[5,0,1,119,0], -"webpages_8php.html":[5,0,1,120], -"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[5,0,1,120,0], -"wfinger_8php.html":[5,0,1,121], -"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[5,0,1,121,0], +"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], "widedarkness_8php.html":[5,0,3,1,0,1,10], -"widgets_8php.html":[5,0,0,71], -"widgets_8php.html#a6dbc227aac750774284ee39c45f0a200":[5,0,0,71,1], -"widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923":[5,0,0,71,0], -"xchan_8php.html":[5,0,1,122], -"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[5,0,1,122,0], -"xrd_8php.html":[5,0,1,123], -"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[5,0,1,123,0], -"zfinger_8php.html":[5,0,1,124], -"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[5,0,1,124,0], -"zot_8php.html":[5,0,0,72], -"zot_8php.html#a083aec6c900d244e1bfc1406f9461465":[5,0,0,72,12], -"zot_8php.html#a2657e141d62d5f67ad3c87651b585299":[5,0,0,72,6], -"zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df":[5,0,0,72,14], -"zot_8php.html#a37ec13b18057634eadb071f05297f5e1":[5,0,0,72,9], -"zot_8php.html#a3862b3161b2c8557dc1a95020179bd81":[5,0,0,72,16], -"zot_8php.html#a3bf11286c2619b4ca28e49d5b5ab374a":[5,0,0,72,4], -"zot_8php.html#a55056e863a7860bc0cf922e78fcce073":[5,0,0,72,20], -"zot_8php.html#a56f3f65514e4e7f0cd117d01735aebd1":[5,0,0,72,7], -"zot_8php.html#a5bcdfef419b16075a0eca990956223dc":[5,0,0,72,25], -"zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea":[5,0,0,72,17], -"zot_8php.html#a703f528ade8382cf374e4119bd6f7859":[5,0,0,72,0], -"zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d":[5,0,0,72,24], -"zot_8php.html#a8e22dbc6f884be3644a892a876cbd972":[5,0,0,72,3] +"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], +"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] }; diff --git a/doc/html/navtreeindex8.js b/doc/html/navtreeindex8.js index 76a6a2a1e..1747bda19 100644 --- a/doc/html/navtreeindex8.js +++ b/doc/html/navtreeindex8.js @@ -1,21 +1,5 @@ var NAVTREEINDEX8 = { -"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[5,0,0,72,23], -"zot_8php.html#a95528377d7303131958c9f0b7158fdce":[5,0,0,72,18], -"zot_8php.html#a9a57b40669351c9791126b925cb7ef3b":[5,0,0,72,11], -"zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc":[5,0,0,72,10], -"zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10":[5,0,0,72,13], -"zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7":[5,0,0,72,22], -"zot_8php.html#ab319d1d9fff9c7775d9daef42d1f33dd":[5,0,0,72,15], -"zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142":[5,0,0,72,26], -"zot_8php.html#ac301c67864917c35922257950ae0f95c":[5,0,0,72,8], -"zot_8php.html#ac34e479d27f32b82dd6b33542f81a6a7":[5,0,0,72,1], -"zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72":[5,0,0,72,2], -"zot_8php.html#ae7cec2b417b5858fd4a41070f843d1d7":[5,0,0,72,19], -"zot_8php.html#aeea071f17e306fe3d0c488551906bfab":[5,0,0,72,21], -"zot_8php.html#aeec89da5b6ff090c63a79de4de884a35":[5,0,0,72,5], -"zotfeed_8php.html":[5,0,1,125], -"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,125,0], -"zping_8php.html":[5,0,1,126], -"zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75":[5,0,1,126,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 82914d970..9ab1d6ef2 100644 --- a/doc/html/permissions_8php.html +++ b/doc/html/permissions_8php.html @@ -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(), 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().

      diff --git a/doc/html/photo__driver_8php.html b/doc/html/photo__driver_8php.html index 88ced8259..b30d3e156 100644 --- a/doc/html/photo__driver_8php.html +++ b/doc/html/photo__driver_8php.html @@ -120,15 +120,15 @@ Classes
       photo_factory ($data, $type=null)
       
       guess_image_type ($filename, $fromcurl=false)
       
       guess_image_type ($filename, $headers= '')
       
       import_profile_photo ($photo, $xchan)
       
       import_channel_photo ($photo, $type, $aid, $uid)
       

      Function Documentation

      - +
      @@ -142,7 +142,7 @@ Functions - + @@ -198,7 +198,7 @@ Functions
       $fromcurl = false $headers = '' 
      -

      Referenced by import_post().

      +

      Referenced by import_post(), and import_xchan().

      @@ -254,7 +254,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 b32bfb2be..8ac064d4e 100644 --- a/doc/html/photo__driver_8php.js +++ b/doc/html/photo__driver_8php.js @@ -1,7 +1,7 @@ var photo__driver_8php = [ [ "photo_driver", "classphoto__driver.html", "classphoto__driver" ], - [ "guess_image_type", "photo__driver_8php.html#a7273b82b017fd96d29b2c57bab03aea6", null ], + [ "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 ], [ "photo_factory", "photo__driver_8php.html#a32e2817faa25d7f11f60a8abff565035", null ] diff --git a/doc/html/php2po_8php.html b/doc/html/php2po_8php.html index 3aad42e67..c89fdac58 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(), network_init(), new_contact(), FKOAuthDataStore\new_request_token(), obj_verb_selector(), photos_albums_list(), po2php_run(), poco_init(), poke_content(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), 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_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().

      diff --git a/doc/html/php_2theme__init_8php.html b/doc/html/php_2theme__init_8php.html index e4336a025..666aede97 100644 --- a/doc/html/php_2theme__init_8php.html +++ b/doc/html/php_2theme__init_8php.html @@ -127,7 +127,7 @@ Variables
      -

      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_directory_profile(), 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(), profile_tabs(), profiles_content(), profiles_post(), replace_macros(), settings_post(), sexpref_selector(), siteinfo_content(), smilies(), subthread_content(), validate_channelname(), wfinger_init(), xrd_init(), zid(), and zid_init().

      +

      Referenced by api_login(), atom_author(), atom_entry(), authenticate_success(), avatar_img(), bb2diaspora(), bbcode(), channel_remove(), check_account_email(), check_account_invite(), check_account_password(), 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().

      @@ -284,7 +284,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(), nogroup_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(), profile_tabs(), 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(), 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().

      diff --git a/doc/html/post_8php.html b/doc/html/post_8php.html index a16d5872c..518ca703d 100644 --- a/doc/html/post_8php.html +++ b/doc/html/post_8php.html @@ -132,6 +132,17 @@ Functions

      Zot endpoint

      +

      Magic Auth

      +

      So-called "magic auth" takes place by a special exchange. On the site where the "channel to be authenticated" lives (e.g. $mysite), a redirection is made via $mysite/magic to the zot endpoint of the remote site ($remotesite) with special GET parameters.

      +

      The endpoint is typically https://$remotesite/post - or whatever was specified as the callback url in prior communications (we will bootstrap an address and fetch a zot info packet if possible where no prior communications exist)

      +

      Four GET parameters are supplied:

      +

      auth => the urlencoded webbie (chann.nosp@m.el@h.nosp@m.ost.d.nosp@m.omai.nosp@m.n) of the channel requesting access dest => the desired destination URL (urlencoded) sec => a random string which is also stored on $mysite for use during the verification phase. version => the zot revision

      +

      When this packet is received, an "auth-check" zot message is sent to $mysite. (e.g. if $_GET['auth'] is fooba.nosp@m.r@po.nosp@m.dunk..nosp@m.edu, a zot packet is sent to the podunk.edu zot endpoint, which is typically /post) If no information has been recorded about the requesting identity a zot information packet will be retrieved before continuing.

      +

      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) }

      +

      '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".

      @@ -148,6 +159,26 @@ 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)

      +

      { "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

      +

      { "type":"pickup", "url":"http:\/\/example.com", "callback":"http:\/\/example.com\/post", "callback_sig":"teE1_fLI...", "secret":"1eaa...", "secret_sig":"O7nB4_..." }

      +

      In the pickup packet, the sig fields correspond to the respective data element signed with this site's system private key and then base64url encoded. The "secret" is the same as the original secret from the notify packet.

      +

      If verification is successful, a json structure is returned containing a success indicator and an array of type 'pickup'. Each pickup element contains the original notify request and a message field whose contents are dependent on the message type

      +

      This JSON array is AES encapsulated using the site public key of the site that sent the initial zot pickup packet. Using the above example, this would be example.com.

      +

      { "success":1, "pickup":{ "notify":{ "type":"notify", "sender":{ "guid":"kgVFf_...", "guid_sig":"PT9-TApz...", "url":"http:\/\/z.podunk.edu", "url_sig":"T8Bp7j5D..." }, "callback":"\/post", "version":1, "secret":"1eaa661..." }, "message":{ "type":"activity", "message_id":"10b049ce384cbb2da9467319bc98169ab36290b8bbb403aa0c0accd9cb072e76@podunk.edu", "message_top":"10b049ce384cbb2da9467319bc98169ab36290b8bbb403aa0c0accd9cb072e76@podunk.edu", "message_parent":"10b049ce384cbb2da9467319bc98169ab36290b8bbb403aa0c0accd9cb072e76@podunk.edu", "created":"2012-11-20 04:04:16", "edited":"2012-11-20 04:04:16", "title":"", "body":"Hi Nickordo", "app":"", "verb":"post", "object_type":"", "target_type":"", "permalink":"", "location":"", "longlat":"", "owner":{ "name":"Indigo", "address":"indigo@podunk.edu", "url":"http:\/\/podunk.edu", "photo":{ "mimetype":"image\/jpeg", "src":"http:\/\/podunk.edu\/photo\/profile\/m\/5" }, "guid":"kgVFf_...", "guid_sig":"PT9-TAp...", }, "author":{ "name":"Indigo", "address":"indigo@podunk.edu", "url":"http:\/\/podunk.edu", "photo":{ "mimetype":"image\/jpeg", "src":"http:\/\/podunk.edu\/photo\/profile\/m\/5" }, "guid":"kgVFf_...", "guid_sig":"PT9-TAp..." } } } }

      +

      Currently defined message types are 'activity', 'mail', 'profile' and 'channel_sync', which each have different content schemas.

      +

      Ping packet: A ping packet does not require any parameters except the type. It may or may not be encrypted.

      +

      { "type": "ping" }

      +

      On receipt of a ping packet a ping response will be returned:

      +

      { "success" : 1, "site" { "url":"http:\/\/podunk.edu", "url_sig":"T8Bp7j5...", "sitekey": "&ndash;&mdash;BEGIN PUBLIC KEY&ndash;&mdash; + MIICIjANBgkqhkiG9w0BAQE..." } }

      +

      The ping packet can be used to verify that a site has not been re-installed, and to initiate corrective action if it has. The url_sig is signed with the site private key and base64url encoded - and this should verify with the enclosed sitekey. Failure to verify indicates the site is corrupt or otherwise unable to communicate using zot. This return packet is not otherwise verified, so should be compared with other results obtained from this site which were verified prior to taking action. For instance if you have one verified result with this signature and key, and other records for this url which have different signatures and keys, it indicates that the site was re-installed and corrective action may commence (remove or mark invalid any entries with different signatures). If you have no records which match this url_sig and key - no corrective action should be taken as this packet may have been returned by an imposter.

      Many message packets will arrive encrypted. The existence of an 'iv' element tells us we need to unencapsulate the AES-256-CBC content using the site private key

      The 'pickup' message arrives with a tracking ID which is associated with a particular outq_hash First verify that that the returned signatures verify, then check that we have an outbound queue item with the correct hash. If everything verifies, find any/all outbound messages in the queue for this hubloc and send them back

      If we made it to here, the signatures verify, but we still don't know if the tracking ID is valid. It wouldn't be an error if the tracking ID isn't found, because we may have sent this particular queue item with another pickup (after the tracking ID for the other pickup was verified).

      @@ -157,6 +188,10 @@ Functions
      - + @@ -461,7 +461,7 @@ Variables

      Variables

       $uid = get_theme_uid()
       $uid = get_theme_uid()
       
       if ($uid) load_pconfig($uid
       
      - +
      $uid = get_theme_uid()$uid = get_theme_uid()
      diff --git a/doc/html/search/all_61.js b/doc/html/search/all_61.js index db26f737d..e89337e96 100644 --- a/doc/html/search/all_61.js +++ b/doc/html/search/all_61.js @@ -63,7 +63,6 @@ var searchData= ['activity_5fupdate',['ACTIVITY_UPDATE',['../boot_8php.html#a7f4264232dbb6c3b41f2617deecb1866',1,'boot.php']]], ['add_5fchild',['add_child',['../classItem.html#a80dcd9d0f548c3ad550abe7e6981fb51',1,'Item']]], ['add_5fchildren_5fto_5flist',['add_children_to_list',['../conversation_8php.html#ad3e1d4b15e7d6d026ee182edd58f692b',1,'conversation.php']]], - ['add_5ffcontact',['add_fcontact',['../include_2network_8php.html#a0bdc4b0bfc54797c249dc4eca25aeda4',1,'network.php']]], ['add_5fthread',['add_thread',['../classConversation.html#a8335cdd43f1836e3c255638e61a09e16',1,'Conversation']]], ['admin_2ephp',['admin.php',['../admin_8php.html',1,'']]], ['admin_5fcontent',['admin_content',['../admin_8php.html#afef415e4011607fbb665610441595015',1,'admin.php']]], @@ -80,7 +79,7 @@ var searchData= ['admin_5fpage_5fusers',['admin_page_users',['../admin_8php.html#a62f10f90c47686c9c3c37c4c03a108d2',1,'admin.php']]], ['admin_5fpage_5fusers_5fpost',['admin_page_users_post',['../admin_8php.html#a5a696706a3869800e65fb365214241b7',1,'admin.php']]], ['admin_5fpost',['admin_post',['../admin_8php.html#acf51f5837a7427832144c2bf7308ada3',1,'admin.php']]], - ['advanced_5fprofile',['advanced_profile',['../profile__advanced_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4',1,'profile_advanced.php']]], + ['advanced_5fprofile',['advanced_profile',['../identity_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4',1,'identity.php']]], ['aes256cbc_5fdecrypt',['AES256CBC_decrypt',['../crypto_8php.html#ac852ee41392d1358c3a54d54935e0bf9',1,'crypto.php']]], ['aes256cbc_5fencrypt',['AES256CBC_encrypt',['../crypto_8php.html#a5c61821d205f95f127114159cbffa764',1,'crypto.php']]], ['aes_5fencapsulate',['aes_encapsulate',['../crypto_8php.html#a2148d7aac7b30c720f7ebda7e9790286',1,'crypto.php']]], diff --git a/doc/html/search/all_63.js b/doc/html/search/all_63.js index c12c927e3..0ac1b9a56 100644 --- a/doc/html/search/all_63.js +++ b/doc/html/search/all_63.js @@ -119,7 +119,6 @@ var searchData= ['contact_5fwidgets_2ephp',['contact_widgets.php',['../contact__widgets_8php.html',1,'']]], ['contactgroup_2ephp',['contactgroup.php',['../contactgroup_8php.html',1,'']]], ['contactgroup_5fcontent',['contactgroup_content',['../contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3',1,'contactgroup.php']]], - ['contacts_5fnot_5fgrouped',['contacts_not_grouped',['../Contact_8php.html#a228fc01f90ae9bfdde4c2ad0772bd7dc',1,'Contact.php']]], ['conv_5fsort',['conv_sort',['../conversation_8php.html#abed85a41f1160598de880b84021c9cf7',1,'conversation.php']]], ['conversation',['Conversation',['../classConversation.html',1,'Conversation'],['../conversation_8php.html#affea1afb3f32ca41e966c8ddb4204d81',1,'conversation(&$a, $items, $mode, $update, $page_mode= 'traditional', $prepared_item= ''): conversation.php']]], ['conversation_2ephp',['conversation.php',['../conversation_8php.html',1,'']]], diff --git a/doc/html/search/all_64.js b/doc/html/search/all_64.js index 261686a29..5a666fcdc 100644 --- a/doc/html/search/all_64.js +++ b/doc/html/search/all_64.js @@ -45,7 +45,6 @@ var searchData= ['design_5ftools',['design_tools',['../text_8php.html#a87a3cefc603302c78982f1d8e1245265',1,'text.php']]], ['destroy',['destroy',['../classphoto__driver.html#ae1a9edaf846983780dc65ea77d99e813',1,'photo_driver\destroy()'],['../classphoto__gd.html#a724703ecf71b1f1d04a80e86c76db6b1',1,'photo_gd\destroy()'],['../classphoto__imagick.html#afd49d64751ee3a298eac0c0ce0ba0207',1,'photo_imagick\destroy()']]], ['detect_5flanguage',['detect_language',['../language_8php.html#a632da17c7ac0d2dc1a00a4706870194b',1,'language.php']]], - ['dfrn_5fdeliver',['dfrn_deliver',['../items_8php.html#a8395d189a36abfa0dfff81a2b0e70669',1,'items.php']]], ['diaspora2bb',['diaspora2bb',['../bb2diaspora_8php.html#a26c09c218413610e62e60754c579f6c6',1,'bb2diaspora.php']]], ['diaspora_5fol',['diaspora_ol',['../bb2diaspora_8php.html#a8b96bd45884fa1c40b942939354197d4',1,'bb2diaspora.php']]], ['diaspora_5ful',['diaspora_ul',['../bb2diaspora_8php.html#adc92ccda5f85ed27e64fcc17712c89cc',1,'bb2diaspora.php']]], diff --git a/doc/html/search/all_66.js b/doc/html/search/all_66.js index 1937023b2..3f5c1a2d9 100644 --- a/doc/html/search/all_66.js +++ b/doc/html/search/all_66.js @@ -11,8 +11,6 @@ var searchData= ['feed_5fsalmonlinks',['feed_salmonlinks',['../text_8php.html#a89929fa6f70a8ba54d5273fcf622b665',1,'text.php']]], ['fetch_5flrdd_5ftemplate',['fetch_lrdd_template',['../include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0',1,'network.php']]], ['fetch_5fpost_5ftags',['fetch_post_tags',['../items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9',1,'items.php']]], - ['fetch_5furl',['fetch_url',['../include_2network_8php.html#a37ddeb88a3fd1dee9e8339723f9edf9a',1,'network.php']]], - ['fetch_5fxrd_5flinks',['fetch_xrd_links',['../include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d',1,'network.php']]], ['field_5ftimezone',['field_timezone',['../datetime_8php.html#a03900dcf0f9e3c58793a031673a70326',1,'datetime.php']]], ['file_5ftag_5fdecode',['file_tag_decode',['../taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6',1,'taxonomy.php']]], ['file_5ftag_5fencode',['file_tag_encode',['../taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37',1,'taxonomy.php']]], @@ -33,7 +31,6 @@ var searchData= ['first_5fpost_5fdate',['first_post_date',['../items_8php.html#a0cf98bb619f07dd18f602683a55a5f59',1,'items.php']]], ['fix_5fattached_5ffile_5fpermissions',['fix_attached_file_permissions',['../item_8php.html#a3daae7944f737bd30412a0d042207c0f',1,'item.php']]], ['fix_5fattached_5fphoto_5fpermissions',['fix_attached_photo_permissions',['../item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10',1,'item.php']]], - ['fix_5fcontact_5fssl_5fpolicy',['fix_contact_ssl_policy',['../include_2network_8php.html#a2729d012410e470c527a62a3f777ded8',1,'network.php']]], ['fix_5felement',['fix_element',['../namespacefriendica-to-smarty-tpl.html#a3719dd46e286a57d315e6adae1845854',1,'friendica-to-smarty-tpl']]], ['fix_5fmce_5flf',['fix_mce_lf',['../text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28',1,'text.php']]], ['fix_5fprivate_5fphotos',['fix_private_photos',['../items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87',1,'items.php']]], diff --git a/doc/html/search/all_67.js b/doc/html/search/all_67.js index 252a0dda3..4aabc9746 100644 --- a/doc/html/search/all_67.js +++ b/doc/html/search/all_67.js @@ -13,7 +13,7 @@ var searchData= ['get_5fbaseurl',['get_baseurl',['../classApp.html#a604d659d6977a99de42a160343e5289a',1,'App']]], ['get_5fbb_5ftag_5fpos',['get_bb_tag_pos',['../bb2diaspora_8php.html#a4c2f8f11b29a06809d9b07782215b1b2',1,'bb2diaspora.php']]], ['get_5fbest_5flanguage',['get_best_language',['../language_8php.html#a980dee1d8715a98ab02e36b59facf8ed',1,'language.php']]], - ['get_5fbirthdays',['get_birthdays',['../boot_8php.html#ad2c97627a313d53df1a1c7b4215ddb51',1,'boot.php']]], + ['get_5fbirthdays',['get_birthdays',['../identity_8php.html#ad2c97627a313d53df1a1c7b4215ddb51',1,'identity.php']]], ['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']]], @@ -25,14 +25,12 @@ var searchData= ['get_5fconfig',['get_config',['../include_2config_8php.html#af02c96e6b37335774b548914ede1d22e',1,'config.php']]], ['get_5fconfig_5ffrom_5fstorage',['get_config_from_storage',['../include_2config_8php.html#af08b7adb63adfb2eda7c466fba0cce74',1,'config.php']]], ['get_5fconversation',['get_conversation',['../classItem.html#a0c301aaed2b7d682728d18db3a22afa3',1,'Item']]], - ['get_5fcurl_5fcode',['get_curl_code',['../classApp.html#ab410451f132910773d0a02e35d0dced9',1,'App']]], - ['get_5fcurl_5fheaders',['get_curl_headers',['../classApp.html#abaf2173711e861ae4aebf43a7f70157e',1,'App']]], ['get_5fcustom_5fnav',['get_custom_nav',['../boot_8php.html#a899d24fd074594ceebbf72e1feff335f',1,'boot.php']]], ['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_5fdim',['get_dim',['../datetime_8php.html#a7df24d72ea05922d3127363e2295174c',1,'datetime.php']]], - ['get_5fevents',['get_events',['../boot_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312',1,'boot.php']]], + ['get_5fevents',['get_events',['../identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312',1,'identity.php']]], ['get_5ffeatures',['get_features',['../features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c',1,'features.php']]], ['get_5ffeed_5ffor',['get_feed_for',['../items_8php.html#a04a35b610acfe54434df08adec39c0c7',1,'items.php']]], ['get_5ffirst_5fdim',['get_first_dim',['../datetime_8php.html#aba971b67f17fecf050813f1eba72367f',1,'datetime.php']]], @@ -51,8 +49,8 @@ var searchData= ['get_5fmentions',['get_mentions',['../text_8php.html#a76d1b3435c067978d7b484c45f56472b',1,'text.php']]], ['get_5fmode',['get_mode',['../classConversation.html#a87a0d704d5f2b1a008cc2e9ce06a1bcd',1,'Conversation']]], ['get_5fmood_5fverbs',['get_mood_verbs',['../text_8php.html#a736db13a966b8abaf8c9198faa35911a',1,'text.php']]], - ['get_5fmy_5faddress',['get_my_address',['../boot_8php.html#a490972c02fdb638c52ec0e012a30bfd2',1,'boot.php']]], - ['get_5fmy_5furl',['get_my_url',['../boot_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec',1,'boot.php']]], + ['get_5fmy_5faddress',['get_my_address',['../identity_8php.html#a490972c02fdb638c52ec0e012a30bfd2',1,'identity.php']]], + ['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_5fowner_5fname',['get_owner_name',['../classItem.html#a67892aa23d19f4431bb2e5f43c74000e',1,'Item']]], @@ -81,7 +79,7 @@ var searchData= ['get_5ftheme_5fconfig_5ffile',['get_theme_config_file',['../settings_8php.html#a39abc76ff5459c57e3b957664f273f18',1,'settings.php']]], ['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',['../boot_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3',1,'boot.php']]], + ['get_5ftheme_5fuid',['get_theme_uid',['../identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3',1,'identity.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']]], @@ -119,5 +117,5 @@ var searchData= ['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']]], ['groups_5fcontaining',['groups_containing',['../include_2group_8php.html#afb802ae2ce73aae4bc36d157f7b6a92f',1,'group.php']]], - ['guess_5fimage_5ftype',['guess_image_type',['../photo__driver_8php.html#a7273b82b017fd96d29b2c57bab03aea6',1,'photo_driver.php']]] + ['guess_5fimage_5ftype',['guess_image_type',['../photo__driver_8php.html#a243cee492ce443afb6a7d77d54b6c4aa',1,'photo_driver.php']]] ]; diff --git a/doc/html/search/all_69.js b/doc/html/search/all_69.js index 4b778b719..075a6789e 100644 --- a/doc/html/search/all_69.js +++ b/doc/html/search/all_69.js @@ -2,13 +2,13 @@ var searchData= [ ['identity_2ephp',['identity.php',['../identity_8php.html',1,'']]], ['identity_5fbasic_5fexport',['identity_basic_export',['../identity_8php.html#a3570a4eb77332b292d394c4132cb8f03',1,'identity.php']]], - ['identity_5fbasic_5fimport',['identity_basic_import',['../identity_8php.html#a77ee7d66eb0758f7e7882f70ad0f9485',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']]], ['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']]], + ['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']]], ['import_5fcontent',['import_content',['../import_8php.html#afdf25ed70096d5dbf4f6d0ca79fea184',1,'import.php']]], ['import_5fdirectory_5fkeywords',['import_directory_keywords',['../zot_8php.html#a3bf11286c2619b4ca28e49d5b5ab374a',1,'zot.php']]], diff --git a/doc/html/search/all_6c.js b/doc/html/search/all_6c.js index 357e87efc..d286ba28a 100644 --- a/doc/html/search/all_6c.js +++ b/doc/html/search/all_6c.js @@ -49,6 +49,5 @@ var searchData= ['lookup_5ftoken',['lookup_token',['../classFKOAuthDataStore.html#a96f76387c3a93b0abe27a98013804bab',1,'FKOAuthDataStore']]], ['lostpass_2ephp',['lostpass.php',['../lostpass_8php.html',1,'']]], ['lostpass_5fcontent',['lostpass_content',['../lostpass_8php.html#a0314d94e48c789b1b3a201d740c9eab3',1,'lostpass.php']]], - ['lostpass_5fpost',['lostpass_post',['../lostpass_8php.html#a8ed35ba71a4404eaf4903da61d0321cc',1,'lostpass.php']]], - ['lrdd',['lrdd',['../include_2network_8php.html#adbc7fe45cc7fd9cd78f6b2f425ee9041',1,'network.php']]] + ['lostpass_5fpost',['lostpass_post',['../lostpass_8php.html#a8ed35ba71a4404eaf4903da61d0321cc',1,'lostpass.php']]] ]; diff --git a/doc/html/search/all_6e.js b/doc/html/search/all_6e.js index ae1398cd5..9c8d326de 100644 --- a/doc/html/search/all_6e.js +++ b/doc/html/search/all_6e.js @@ -37,7 +37,7 @@ var searchData= ['network_5fmyspace',['NETWORK_MYSPACE',['../boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95',1,'boot.php']]], ['network_5fostatus',['NETWORK_OSTATUS',['../boot_8php.html#aef4b6c558c68c88c10f13c5a00c20e3d',1,'boot.php']]], ['network_5fphantom',['NETWORK_PHANTOM',['../boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f',1,'boot.php']]], - ['network_5fquery_5fget_5fsel_5ftab',['network_query_get_sel_tab',['../mod_2network_8php.html#aeaa518c1a317516a3da337b88d358666',1,'network.php']]], + ['network_5ftabs',['network_tabs',['../conversation_8php.html#a96b34b9d64d13c543e8163e52f5ce8c4',1,'conversation.php']]], ['network_5fto_5fname',['network_to_name',['../contact__selectors_8php.html#ad472e4716426dd1a9dd77b62962454be',1,'contact_selectors.php']]], ['network_5fxmpp',['NETWORK_XMPP',['../boot_8php.html#a43296b1b4398aacbf92a4b2d56bab91e',1,'boot.php']]], ['network_5fzot',['NETWORK_ZOT',['../boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0',1,'boot.php']]], @@ -53,9 +53,6 @@ var searchData= ['newfilename',['newfilename',['../namespacefriendica-to-smarty-tpl.html#ad9ef87ccb2c9960501f5e02424a22d80',1,'friendica-to-smarty-tpl']]], ['node2bbcode',['node2bbcode',['../html2bbcode_8php.html#ad174afe0ccbd8c475e48f8a6ee2f27d8',1,'html2bbcode.php']]], ['node2bbcodesub',['node2bbcodesub',['../html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7',1,'html2bbcode.php']]], - ['nogroup_2ephp',['nogroup.php',['../nogroup_8php.html',1,'']]], - ['nogroup_5fcontent',['nogroup_content',['../nogroup_8php.html#a52085b183f97c552f1db5c4926e8ec30',1,'nogroup.php']]], - ['nogroup_5finit',['nogroup_init',['../nogroup_8php.html#a099cb353bf62e8453069ce107b763212',1,'nogroup.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']]], @@ -67,8 +64,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',['../include_2notify_8php.html',1,'']]], ['notify_2ephp',['notify.php',['../mod_2notify_8php.html',1,'']]], + ['notify_2ephp',['notify.php',['../include_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 560505c46..db470676e 100644 --- a/doc/html/search/all_70.js +++ b/doc/html/search/all_70.js @@ -103,7 +103,7 @@ var searchData= ['poller_2ephp',['poller.php',['../poller_8php.html',1,'']]], ['poller_5frun',['poller_run',['../poller_8php.html#a5f12df3a4738124b6c039971e87e76da',1,'poller.php']]], ['pop_5flang',['pop_lang',['../language_8php.html#a78bd204955ec4cc3a9ac651285a1689d',1,'language.php']]], - ['populate_5facl',['populate_acl',['../acl__selectors_8php.html#a51f2ec7a143d5a5b38e35efd5f3d6e2c',1,'acl_selectors.php']]], + ['populate_5facl',['populate_acl',['../acl__selectors_8php.html#a7b5446e999636ceceea65c154d865a31',1,'acl_selectors.php']]], ['post_2ephp',['post.php',['../post_8php.html',1,'']]], ['post_5factivity_5fitem',['post_activity_item',['../items_8php.html#a410f9c743877c125ca06312373346903',1,'items.php']]], ['post_5finit',['post_init',['../post_8php.html#af4b48181ce773ef0cdfc972441445c34',1,'post.php']]], @@ -128,7 +128,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']]], - ['post_5furl',['post_url',['../include_2network_8php.html#aa44d9e33a579d930e9e79c4ebb3d6b5e',1,'network.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']]], @@ -153,19 +152,18 @@ 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_5fadvanced_2ephp',['profile_advanced.php',['../profile__advanced_8php.html',1,'']]], ['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',['../boot_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620',1,'boot.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',['../boot_8php.html#a4751b522ea913d0e7ed43e03d22e9e68',1,'boot.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,'']]], - ['profile_5fsidebar',['profile_sidebar',['../boot_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc',1,'boot.php']]], - ['profile_5ftabs',['profile_tabs',['../boot_8php.html#a1dfcb5146e9d1eca4528bc580ad5d273',1,'boot.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_2ephp',['profiles.php',['../profiles_8php.html',1,'']]], ['profiles_5faside',['profiles_aside',['../profiles_8php.html#a2a3ac90f51941ff78b85e9389304969c',1,'profiles.php']]], diff --git a/doc/html/search/all_72.js b/doc/html/search/all_72.js index 229e73743..356f98561 100644 --- a/doc/html/search/all_72.js +++ b/doc/html/search/all_72.js @@ -1,6 +1,6 @@ var searchData= [ - ['random_5fprofile',['random_profile',['../Contact_8php.html#a91281b5d4bbbb2ed468e27ec82ca083c',1,'Contact.php']]], + ['random_5fprofile',['random_profile',['../Contact_8php.html#a852fa476f0c70bde10a4f2533aec5f71',1,'Contact.php']]], ['random_5fstring',['random_string',['../text_8php.html#a9d6a5ee1290de7a8b483fe78585daade',1,'text.php']]], ['random_5fstring_5fhex',['RANDOM_STRING_HEX',['../text_8php.html#aad557c054cf2ed915633701018fc7e3f',1,'text.php']]], ['random_5fstring_5ftext',['RANDOM_STRING_TEXT',['../text_8php.html#a2ffd79c60cc87cec24ef76447b905187',1,'text.php']]], diff --git a/doc/html/search/all_73.js b/doc/html/search/all_73.js index c0f8c30ad..d9a496489 100644 --- a/doc/html/search/all_73.js +++ b/doc/html/search/all_73.js @@ -35,8 +35,6 @@ var searchData= ['set_5fcommentable',['set_commentable',['../classItem.html#aa1bd19fc8b5577078530265a7bf64123',1,'Item']]], ['set_5fconfig',['set_config',['../include_2config_8php.html#ad6da879e4fb5b37d1e161d4e9be5c32a',1,'config.php']]], ['set_5fconversation',['set_conversation',['../classItem.html#aa8b1bbc4236890694635295e46d7fd72',1,'Item']]], - ['set_5fcurl_5fcode',['set_curl_code',['../classApp.html#a5e6a6bd641e4d9909df56f0283c03821',1,'App']]], - ['set_5fcurl_5fheaders',['set_curl_headers',['../classApp.html#a9632092d9e8fdaa82a9fc4586433fd31',1,'App']]], ['set_5fdefault_5flogin_5fidentity',['set_default_login_identity',['../identity_8php.html#a78151baf4407a8482d2681a91a9c486b',1,'identity.php']]], ['set_5fgroups',['set_groups',['../classApp.html#a3d84af5e42082098672531cd1a618853',1,'App']]], ['set_5fhostname',['set_hostname',['../classApp.html#a344d2b7dc2f276648d521aee4da1731c',1,'App']]], diff --git a/doc/html/search/all_7a.js b/doc/html/search/all_7a.js index caf8b84ca..a5c681623 100644 --- a/doc/html/search/all_7a.js +++ b/doc/html/search/all_7a.js @@ -1,6 +1,6 @@ var searchData= [ - ['z_5fbirthday',['z_birthday',['../boot_8php.html#ab55e545b72ec8c097e052ea7d373491f',1,'boot.php']]], + ['z_5fbirthday',['z_birthday',['../datetime_8php.html#ab55e545b72ec8c097e052ea7d373491f',1,'datetime.php']]], ['z_5ffetch_5furl',['z_fetch_url',['../include_2network_8php.html#aafd06c0a75402aefb06cfb9f9740fa37',1,'network.php']]], ['z_5finput_5ffilter',['z_input_filter',['../text_8php.html#a324c58f37f6acdf9cd1922aa76077d9f',1,'text.php']]], ['z_5fmime_5fcontent_5ftype',['z_mime_content_type',['../include_2attach_8php.html#a6fdd92775f31c07d2863e16e0026018a',1,'attach.php']]], @@ -11,8 +11,8 @@ var searchData= ['zcurl_5ftimeout',['ZCURL_TIMEOUT',['../boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af',1,'boot.php']]], ['zfinger_2ephp',['zfinger.php',['../zfinger_8php.html',1,'']]], ['zfinger_5finit',['zfinger_init',['../zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0',1,'zfinger.php']]], - ['zid',['zid',['../boot_8php.html#a5b815330f3d177ab383af37a6c12e532',1,'boot.php']]], - ['zid_5finit',['zid_init',['../boot_8php.html#a680fbafc2db023c5b1309e0180e81315',1,'boot.php']]], + ['zid',['zid',['../identity_8php.html#a5b815330f3d177ab383af37a6c12e532',1,'identity.php']]], + ['zid_5finit',['zid_init',['../identity_8php.html#a680fbafc2db023c5b1309e0180e81315',1,'identity.php']]], ['zidify_5fcallback',['zidify_callback',['../text_8php.html#a405afe814a23f3bd94d826101aa168ab',1,'text.php']]], ['zidify_5fimg_5fcallback',['zidify_img_callback',['../text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4',1,'text.php']]], ['zidify_5flinks',['zidify_links',['../text_8php.html#a29988052f3944111def3b6aaf2c7a8f6',1,'text.php']]], diff --git a/doc/html/search/files_6e.js b/doc/html/search/files_6e.js index fcb0aa467..0aa61f5c1 100644 --- a/doc/html/search/files_6e.js +++ b/doc/html/search/files_6e.js @@ -4,10 +4,9 @@ var searchData= ['network_2ephp',['network.php',['../include_2network_8php.html',1,'']]], ['network_2ephp',['network.php',['../mod_2network_8php.html',1,'']]], ['new_5fchannel_2ephp',['new_channel.php',['../new__channel_8php.html',1,'']]], - ['nogroup_2ephp',['nogroup.php',['../nogroup_8php.html',1,'']]], ['none_2ephp',['none.php',['../none_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',['../include_2notify_8php.html',1,'']]], + ['notify_2ephp',['notify.php',['../mod_2notify_8php.html',1,'']]] ]; diff --git a/doc/html/search/files_70.js b/doc/html/search/files_70.js index 295000ad9..46e664291 100644 --- a/doc/html/search/files_70.js +++ b/doc/html/search/files_70.js @@ -10,8 +10,8 @@ var searchData= ['photo_5fdriver_2ephp',['photo_driver.php',['../photo__driver_8php.html',1,'']]], ['photo_5fgd_2ephp',['photo_gd.php',['../photo__gd_8php.html',1,'']]], ['photo_5fimagick_2ephp',['photo_imagick.php',['../photo__imagick_8php.html',1,'']]], - ['photos_2ephp',['photos.php',['../mod_2photos_8php.html',1,'']]], ['photos_2ephp',['photos.php',['../include_2photos_8php.html',1,'']]], + ['photos_2ephp',['photos.php',['../mod_2photos_8php.html',1,'']]], ['php_2ephp',['php.php',['../php_8php.html',1,'']]], ['php2po_2ephp',['php2po.php',['../php2po_8php.html',1,'']]], ['pine_2ephp',['pine.php',['../pine_8php.html',1,'']]], @@ -26,7 +26,6 @@ var searchData= ['pretheme_2ephp',['pretheme.php',['../pretheme_8php.html',1,'']]], ['probe_2ephp',['probe.php',['../probe_8php.html',1,'']]], ['profile_2ephp',['profile.php',['../profile_8php.html',1,'']]], - ['profile_5fadvanced_2ephp',['profile_advanced.php',['../profile__advanced_8php.html',1,'']]], ['profile_5fphoto_2ephp',['profile_photo.php',['../profile__photo_8php.html',1,'']]], ['profile_5fselectors_2ephp',['profile_selectors.php',['../profile__selectors_8php.html',1,'']]], ['profiles_2ephp',['profiles.php',['../profiles_8php.html',1,'']]], diff --git a/doc/html/search/functions_61.js b/doc/html/search/functions_61.js index de5178fed..6a1b52ef3 100644 --- a/doc/html/search/functions_61.js +++ b/doc/html/search/functions_61.js @@ -13,7 +13,6 @@ var searchData= ['activity_5fsanitise',['activity_sanitise',['../items_8php.html#a36e656667193c83aa2cc03a024fc131b',1,'items.php']]], ['add_5fchild',['add_child',['../classItem.html#a80dcd9d0f548c3ad550abe7e6981fb51',1,'Item']]], ['add_5fchildren_5fto_5flist',['add_children_to_list',['../conversation_8php.html#ad3e1d4b15e7d6d026ee182edd58f692b',1,'conversation.php']]], - ['add_5ffcontact',['add_fcontact',['../include_2network_8php.html#a0bdc4b0bfc54797c249dc4eca25aeda4',1,'network.php']]], ['add_5fthread',['add_thread',['../classConversation.html#a8335cdd43f1836e3c255638e61a09e16',1,'Conversation']]], ['admin_5fcontent',['admin_content',['../admin_8php.html#afef415e4011607fbb665610441595015',1,'admin.php']]], ['admin_5fpage_5fdbsync',['admin_page_dbsync',['../admin_8php.html#aaa6addf2dbc3f3fcf99244a56b41eade',1,'admin.php']]], @@ -29,7 +28,7 @@ var searchData= ['admin_5fpage_5fusers',['admin_page_users',['../admin_8php.html#a62f10f90c47686c9c3c37c4c03a108d2',1,'admin.php']]], ['admin_5fpage_5fusers_5fpost',['admin_page_users_post',['../admin_8php.html#a5a696706a3869800e65fb365214241b7',1,'admin.php']]], ['admin_5fpost',['admin_post',['../admin_8php.html#acf51f5837a7427832144c2bf7308ada3',1,'admin.php']]], - ['advanced_5fprofile',['advanced_profile',['../profile__advanced_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4',1,'profile_advanced.php']]], + ['advanced_5fprofile',['advanced_profile',['../identity_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4',1,'identity.php']]], ['aes256cbc_5fdecrypt',['AES256CBC_decrypt',['../crypto_8php.html#ac852ee41392d1358c3a54d54935e0bf9',1,'crypto.php']]], ['aes256cbc_5fencrypt',['AES256CBC_encrypt',['../crypto_8php.html#a5c61821d205f95f127114159cbffa764',1,'crypto.php']]], ['aes_5fencapsulate',['aes_encapsulate',['../crypto_8php.html#a2148d7aac7b30c720f7ebda7e9790286',1,'crypto.php']]], diff --git a/doc/html/search/functions_63.js b/doc/html/search/functions_63.js index 2fd8ce91d..b7e0d9f33 100644 --- a/doc/html/search/functions_63.js +++ b/doc/html/search/functions_63.js @@ -89,7 +89,6 @@ var searchData= ['contact_5freputation',['contact_reputation',['../contact__selectors_8php.html#ae499960d6467bd30c78607b1018baf53',1,'contact_selectors.php']]], ['contact_5fselect',['contact_select',['../acl__selectors_8php.html#a9476997d2968a5794f3723878ed89c91',1,'acl_selectors.php']]], ['contactgroup_5fcontent',['contactgroup_content',['../contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3',1,'contactgroup.php']]], - ['contacts_5fnot_5fgrouped',['contacts_not_grouped',['../Contact_8php.html#a228fc01f90ae9bfdde4c2ad0772bd7dc',1,'Contact.php']]], ['conv_5fsort',['conv_sort',['../conversation_8php.html#abed85a41f1160598de880b84021c9cf7',1,'conversation.php']]], ['conversation',['conversation',['../conversation_8php.html#affea1afb3f32ca41e966c8ddb4204d81',1,'conversation.php']]], ['convert',['convert',['../namespacefriendica-to-smarty-tpl.html#a38503e37fe68ac27c88cce91a9ac9efa',1,'friendica-to-smarty-tpl']]], diff --git a/doc/html/search/functions_64.js b/doc/html/search/functions_64.js index e4a0ec8df..635a4e07c 100644 --- a/doc/html/search/functions_64.js +++ b/doc/html/search/functions_64.js @@ -26,7 +26,6 @@ var searchData= ['design_5ftools',['design_tools',['../text_8php.html#a87a3cefc603302c78982f1d8e1245265',1,'text.php']]], ['destroy',['destroy',['../classphoto__driver.html#ae1a9edaf846983780dc65ea77d99e813',1,'photo_driver\destroy()'],['../classphoto__gd.html#a724703ecf71b1f1d04a80e86c76db6b1',1,'photo_gd\destroy()'],['../classphoto__imagick.html#afd49d64751ee3a298eac0c0ce0ba0207',1,'photo_imagick\destroy()']]], ['detect_5flanguage',['detect_language',['../language_8php.html#a632da17c7ac0d2dc1a00a4706870194b',1,'language.php']]], - ['dfrn_5fdeliver',['dfrn_deliver',['../items_8php.html#a8395d189a36abfa0dfff81a2b0e70669',1,'items.php']]], ['diaspora2bb',['diaspora2bb',['../bb2diaspora_8php.html#a26c09c218413610e62e60754c579f6c6',1,'bb2diaspora.php']]], ['diaspora_5fol',['diaspora_ol',['../bb2diaspora_8php.html#a8b96bd45884fa1c40b942939354197d4',1,'bb2diaspora.php']]], ['diaspora_5ful',['diaspora_ul',['../bb2diaspora_8php.html#adc92ccda5f85ed27e64fcc17712c89cc',1,'bb2diaspora.php']]], diff --git a/doc/html/search/functions_66.js b/doc/html/search/functions_66.js index f45e2a64f..a97f0bc6e 100644 --- a/doc/html/search/functions_66.js +++ b/doc/html/search/functions_66.js @@ -7,8 +7,6 @@ var searchData= ['feed_5fsalmonlinks',['feed_salmonlinks',['../text_8php.html#a89929fa6f70a8ba54d5273fcf622b665',1,'text.php']]], ['fetch_5flrdd_5ftemplate',['fetch_lrdd_template',['../include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0',1,'network.php']]], ['fetch_5fpost_5ftags',['fetch_post_tags',['../items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9',1,'items.php']]], - ['fetch_5furl',['fetch_url',['../include_2network_8php.html#a37ddeb88a3fd1dee9e8339723f9edf9a',1,'network.php']]], - ['fetch_5fxrd_5flinks',['fetch_xrd_links',['../include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d',1,'network.php']]], ['field_5ftimezone',['field_timezone',['../datetime_8php.html#a03900dcf0f9e3c58793a031673a70326',1,'datetime.php']]], ['file_5ftag_5fdecode',['file_tag_decode',['../taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6',1,'taxonomy.php']]], ['file_5ftag_5fencode',['file_tag_encode',['../taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37',1,'taxonomy.php']]], @@ -24,7 +22,6 @@ var searchData= ['first_5fpost_5fdate',['first_post_date',['../items_8php.html#a0cf98bb619f07dd18f602683a55a5f59',1,'items.php']]], ['fix_5fattached_5ffile_5fpermissions',['fix_attached_file_permissions',['../item_8php.html#a3daae7944f737bd30412a0d042207c0f',1,'item.php']]], ['fix_5fattached_5fphoto_5fpermissions',['fix_attached_photo_permissions',['../item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10',1,'item.php']]], - ['fix_5fcontact_5fssl_5fpolicy',['fix_contact_ssl_policy',['../include_2network_8php.html#a2729d012410e470c527a62a3f777ded8',1,'network.php']]], ['fix_5felement',['fix_element',['../namespacefriendica-to-smarty-tpl.html#a3719dd46e286a57d315e6adae1845854',1,'friendica-to-smarty-tpl']]], ['fix_5fmce_5flf',['fix_mce_lf',['../text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28',1,'text.php']]], ['fix_5fprivate_5fphotos',['fix_private_photos',['../items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87',1,'items.php']]], diff --git a/doc/html/search/functions_67.js b/doc/html/search/functions_67.js index 987b0b2ab..b3e96032c 100644 --- a/doc/html/search/functions_67.js +++ b/doc/html/search/functions_67.js @@ -13,7 +13,7 @@ var searchData= ['get_5fbaseurl',['get_baseurl',['../classApp.html#a604d659d6977a99de42a160343e5289a',1,'App']]], ['get_5fbb_5ftag_5fpos',['get_bb_tag_pos',['../bb2diaspora_8php.html#a4c2f8f11b29a06809d9b07782215b1b2',1,'bb2diaspora.php']]], ['get_5fbest_5flanguage',['get_best_language',['../language_8php.html#a980dee1d8715a98ab02e36b59facf8ed',1,'language.php']]], - ['get_5fbirthdays',['get_birthdays',['../boot_8php.html#ad2c97627a313d53df1a1c7b4215ddb51',1,'boot.php']]], + ['get_5fbirthdays',['get_birthdays',['../identity_8php.html#ad2c97627a313d53df1a1c7b4215ddb51',1,'identity.php']]], ['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']]], @@ -25,14 +25,12 @@ var searchData= ['get_5fconfig',['get_config',['../include_2config_8php.html#af02c96e6b37335774b548914ede1d22e',1,'config.php']]], ['get_5fconfig_5ffrom_5fstorage',['get_config_from_storage',['../include_2config_8php.html#af08b7adb63adfb2eda7c466fba0cce74',1,'config.php']]], ['get_5fconversation',['get_conversation',['../classItem.html#a0c301aaed2b7d682728d18db3a22afa3',1,'Item']]], - ['get_5fcurl_5fcode',['get_curl_code',['../classApp.html#ab410451f132910773d0a02e35d0dced9',1,'App']]], - ['get_5fcurl_5fheaders',['get_curl_headers',['../classApp.html#abaf2173711e861ae4aebf43a7f70157e',1,'App']]], ['get_5fcustom_5fnav',['get_custom_nav',['../boot_8php.html#a899d24fd074594ceebbf72e1feff335f',1,'boot.php']]], ['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_5fdim',['get_dim',['../datetime_8php.html#a7df24d72ea05922d3127363e2295174c',1,'datetime.php']]], - ['get_5fevents',['get_events',['../boot_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312',1,'boot.php']]], + ['get_5fevents',['get_events',['../identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312',1,'identity.php']]], ['get_5ffeatures',['get_features',['../features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c',1,'features.php']]], ['get_5ffeed_5ffor',['get_feed_for',['../items_8php.html#a04a35b610acfe54434df08adec39c0c7',1,'items.php']]], ['get_5ffirst_5fdim',['get_first_dim',['../datetime_8php.html#aba971b67f17fecf050813f1eba72367f',1,'datetime.php']]], @@ -51,8 +49,8 @@ var searchData= ['get_5fmentions',['get_mentions',['../text_8php.html#a76d1b3435c067978d7b484c45f56472b',1,'text.php']]], ['get_5fmode',['get_mode',['../classConversation.html#a87a0d704d5f2b1a008cc2e9ce06a1bcd',1,'Conversation']]], ['get_5fmood_5fverbs',['get_mood_verbs',['../text_8php.html#a736db13a966b8abaf8c9198faa35911a',1,'text.php']]], - ['get_5fmy_5faddress',['get_my_address',['../boot_8php.html#a490972c02fdb638c52ec0e012a30bfd2',1,'boot.php']]], - ['get_5fmy_5furl',['get_my_url',['../boot_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec',1,'boot.php']]], + ['get_5fmy_5faddress',['get_my_address',['../identity_8php.html#a490972c02fdb638c52ec0e012a30bfd2',1,'identity.php']]], + ['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_5fowner_5fname',['get_owner_name',['../classItem.html#a67892aa23d19f4431bb2e5f43c74000e',1,'Item']]], @@ -81,7 +79,7 @@ var searchData= ['get_5ftheme_5fconfig_5ffile',['get_theme_config_file',['../settings_8php.html#a39abc76ff5459c57e3b957664f273f18',1,'settings.php']]], ['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',['../boot_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3',1,'boot.php']]], + ['get_5ftheme_5fuid',['get_theme_uid',['../identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3',1,'identity.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']]], @@ -112,5 +110,5 @@ var searchData= ['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']]], ['groups_5fcontaining',['groups_containing',['../include_2group_8php.html#afb802ae2ce73aae4bc36d157f7b6a92f',1,'group.php']]], - ['guess_5fimage_5ftype',['guess_image_type',['../photo__driver_8php.html#a7273b82b017fd96d29b2c57bab03aea6',1,'photo_driver.php']]] + ['guess_5fimage_5ftype',['guess_image_type',['../photo__driver_8php.html#a243cee492ce443afb6a7d77d54b6c4aa',1,'photo_driver.php']]] ]; diff --git a/doc/html/search/functions_69.js b/doc/html/search/functions_69.js index bb2eae50c..a1e34fb82 100644 --- a/doc/html/search/functions_69.js +++ b/doc/html/search/functions_69.js @@ -1,11 +1,11 @@ var searchData= [ ['identity_5fbasic_5fexport',['identity_basic_export',['../identity_8php.html#a3570a4eb77332b292d394c4132cb8f03',1,'identity.php']]], - ['identity_5fbasic_5fimport',['identity_basic_import',['../identity_8php.html#a77ee7d66eb0758f7e7882f70ad0f9485',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']]], ['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_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']]], ['import_5fcontent',['import_content',['../import_8php.html#afdf25ed70096d5dbf4f6d0ca79fea184',1,'import.php']]], ['import_5fdirectory_5fkeywords',['import_directory_keywords',['../zot_8php.html#a3bf11286c2619b4ca28e49d5b5ab374a',1,'zot.php']]], diff --git a/doc/html/search/functions_6c.js b/doc/html/search/functions_6c.js index 1464690de..7df51ec1b 100644 --- a/doc/html/search/functions_6c.js +++ b/doc/html/search/functions_6c.js @@ -34,6 +34,5 @@ var searchData= ['lookup_5fnonce',['lookup_nonce',['../classFKOAuthDataStore.html#a4edfe2e77ecd2e16ff6b5eb516ed3599',1,'FKOAuthDataStore']]], ['lookup_5ftoken',['lookup_token',['../classFKOAuthDataStore.html#a96f76387c3a93b0abe27a98013804bab',1,'FKOAuthDataStore']]], ['lostpass_5fcontent',['lostpass_content',['../lostpass_8php.html#a0314d94e48c789b1b3a201d740c9eab3',1,'lostpass.php']]], - ['lostpass_5fpost',['lostpass_post',['../lostpass_8php.html#a8ed35ba71a4404eaf4903da61d0321cc',1,'lostpass.php']]], - ['lrdd',['lrdd',['../include_2network_8php.html#adbc7fe45cc7fd9cd78f6b2f425ee9041',1,'network.php']]] + ['lostpass_5fpost',['lostpass_post',['../lostpass_8php.html#a8ed35ba71a4404eaf4903da61d0321cc',1,'lostpass.php']]] ]; diff --git a/doc/html/search/functions_6e.js b/doc/html/search/functions_6e.js index 6bdcef685..075156110 100644 --- a/doc/html/search/functions_6e.js +++ b/doc/html/search/functions_6e.js @@ -6,7 +6,7 @@ var searchData= ['navbar_5fcomplete',['navbar_complete',['../acl_8php.html#a57dceff370d4a0e7ae673d50fbfda61f',1,'acl.php']]], ['network_5fcontent',['network_content',['../mod_2network_8php.html#a43f2f29b90c5e29072c561934bc8f8b4',1,'network.php']]], ['network_5finit',['network_init',['../mod_2network_8php.html#a180fce90ad11d7e0e45be094da7149ec',1,'network.php']]], - ['network_5fquery_5fget_5fsel_5ftab',['network_query_get_sel_tab',['../mod_2network_8php.html#aeaa518c1a317516a3da337b88d358666',1,'network.php']]], + ['network_5ftabs',['network_tabs',['../conversation_8php.html#a96b34b9d64d13c543e8163e52f5ce8c4',1,'conversation.php']]], ['network_5fto_5fname',['network_to_name',['../contact__selectors_8php.html#ad472e4716426dd1a9dd77b62962454be',1,'contact_selectors.php']]], ['new_5faccess_5ftoken',['new_access_token',['../classFKOAuthDataStore.html#a434882f03e3cdb171ed89e09e337e934',1,'FKOAuthDataStore']]], ['new_5fchannel_5fcontent',['new_channel_content',['../new__channel_8php.html#ae585191610f79da129492482ce8e2fee',1,'new_channel.php']]], @@ -18,8 +18,6 @@ var searchData= ['new_5frequest_5ftoken',['new_request_token',['../classFKOAuthDataStore.html#a431b44d70e3da6a8256ab38f710e3050',1,'FKOAuthDataStore']]], ['node2bbcode',['node2bbcode',['../html2bbcode_8php.html#ad174afe0ccbd8c475e48f8a6ee2f27d8',1,'html2bbcode.php']]], ['node2bbcodesub',['node2bbcodesub',['../html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7',1,'html2bbcode.php']]], - ['nogroup_5fcontent',['nogroup_content',['../nogroup_8php.html#a52085b183f97c552f1db5c4926e8ec30',1,'nogroup.php']]], - ['nogroup_5finit',['nogroup_init',['../nogroup_8php.html#a099cb353bf62e8453069ce107b763212',1,'nogroup.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']]], diff --git a/doc/html/search/functions_70.js b/doc/html/search/functions_70.js index daed5c765..00f3caee0 100644 --- a/doc/html/search/functions_70.js +++ b/doc/html/search/functions_70.js @@ -37,7 +37,7 @@ var searchData= ['poke_5finit',['poke_init',['../poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b',1,'poke.php']]], ['poller_5frun',['poller_run',['../poller_8php.html#a5f12df3a4738124b6c039971e87e76da',1,'poller.php']]], ['pop_5flang',['pop_lang',['../language_8php.html#a78bd204955ec4cc3a9ac651285a1689d',1,'language.php']]], - ['populate_5facl',['populate_acl',['../acl__selectors_8php.html#a51f2ec7a143d5a5b38e35efd5f3d6e2c',1,'acl_selectors.php']]], + ['populate_5facl',['populate_acl',['../acl__selectors_8php.html#a7b5446e999636ceceea65c154d865a31',1,'acl_selectors.php']]], ['post_5factivity_5fitem',['post_activity_item',['../items_8php.html#a410f9c743877c125ca06312373346903',1,'items.php']]], ['post_5finit',['post_init',['../post_8php.html#af4b48181ce773ef0cdfc972441445c34',1,'post.php']]], ['post_5fpost',['post_post',['../post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75',1,'post.php']]], @@ -57,7 +57,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']]], - ['post_5furl',['post_url',['../include_2network_8php.html#aa44d9e33a579d930e9e79c4ebb3d6b5e',1,'network.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']]], @@ -81,14 +80,14 @@ var searchData= ['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',['../boot_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620',1,'boot.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',['../boot_8php.html#a4751b522ea913d0e7ed43e03d22e9e68',1,'boot.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',['../boot_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc',1,'boot.php']]], - ['profile_5ftabs',['profile_tabs',['../boot_8php.html#a1dfcb5146e9d1eca4528bc580ad5d273',1,'boot.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']]], diff --git a/doc/html/search/functions_72.js b/doc/html/search/functions_72.js index fe9a6ae9b..e00c170d9 100644 --- a/doc/html/search/functions_72.js +++ b/doc/html/search/functions_72.js @@ -1,6 +1,6 @@ var searchData= [ - ['random_5fprofile',['random_profile',['../Contact_8php.html#a91281b5d4bbbb2ed468e27ec82ca083c',1,'Contact.php']]], + ['random_5fprofile',['random_profile',['../Contact_8php.html#a852fa476f0c70bde10a4f2533aec5f71',1,'Contact.php']]], ['random_5fstring',['random_string',['../text_8php.html#a9d6a5ee1290de7a8b483fe78585daade',1,'text.php']]], ['randprof_5finit',['randprof_init',['../randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090',1,'randprof.php']]], ['rconnect_5furl',['rconnect_url',['../Contact_8php.html#a2f4f495d53f2a334ab75292af79d3c91',1,'Contact.php']]], diff --git a/doc/html/search/functions_73.js b/doc/html/search/functions_73.js index 3bb2b7427..b62e60888 100644 --- a/doc/html/search/functions_73.js +++ b/doc/html/search/functions_73.js @@ -31,8 +31,6 @@ var searchData= ['set_5fcommentable',['set_commentable',['../classItem.html#aa1bd19fc8b5577078530265a7bf64123',1,'Item']]], ['set_5fconfig',['set_config',['../include_2config_8php.html#ad6da879e4fb5b37d1e161d4e9be5c32a',1,'config.php']]], ['set_5fconversation',['set_conversation',['../classItem.html#aa8b1bbc4236890694635295e46d7fd72',1,'Item']]], - ['set_5fcurl_5fcode',['set_curl_code',['../classApp.html#a5e6a6bd641e4d9909df56f0283c03821',1,'App']]], - ['set_5fcurl_5fheaders',['set_curl_headers',['../classApp.html#a9632092d9e8fdaa82a9fc4586433fd31',1,'App']]], ['set_5fdefault_5flogin_5fidentity',['set_default_login_identity',['../identity_8php.html#a78151baf4407a8482d2681a91a9c486b',1,'identity.php']]], ['set_5fgroups',['set_groups',['../classApp.html#a3d84af5e42082098672531cd1a618853',1,'App']]], ['set_5fhostname',['set_hostname',['../classApp.html#a344d2b7dc2f276648d521aee4da1731c',1,'App']]], diff --git a/doc/html/search/functions_7a.js b/doc/html/search/functions_7a.js index f1f59bfdc..ed0141186 100644 --- a/doc/html/search/functions_7a.js +++ b/doc/html/search/functions_7a.js @@ -1,6 +1,6 @@ var searchData= [ - ['z_5fbirthday',['z_birthday',['../boot_8php.html#ab55e545b72ec8c097e052ea7d373491f',1,'boot.php']]], + ['z_5fbirthday',['z_birthday',['../datetime_8php.html#ab55e545b72ec8c097e052ea7d373491f',1,'datetime.php']]], ['z_5ffetch_5furl',['z_fetch_url',['../include_2network_8php.html#aafd06c0a75402aefb06cfb9f9740fa37',1,'network.php']]], ['z_5finput_5ffilter',['z_input_filter',['../text_8php.html#a324c58f37f6acdf9cd1922aa76077d9f',1,'text.php']]], ['z_5fmime_5fcontent_5ftype',['z_mime_content_type',['../include_2attach_8php.html#a6fdd92775f31c07d2863e16e0026018a',1,'attach.php']]], @@ -9,8 +9,8 @@ var searchData= ['z_5freaddir',['z_readdir',['../include_2attach_8php.html#aeb07968990e66a88c95483ca09a7f909',1,'attach.php']]], ['z_5froot',['z_root',['../boot_8php.html#add517a0958ac684792c62142a3877f81',1,'boot.php']]], ['zfinger_5finit',['zfinger_init',['../zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0',1,'zfinger.php']]], - ['zid',['zid',['../boot_8php.html#a5b815330f3d177ab383af37a6c12e532',1,'boot.php']]], - ['zid_5finit',['zid_init',['../boot_8php.html#a680fbafc2db023c5b1309e0180e81315',1,'boot.php']]], + ['zid',['zid',['../identity_8php.html#a5b815330f3d177ab383af37a6c12e532',1,'identity.php']]], + ['zid_5finit',['zid_init',['../identity_8php.html#a680fbafc2db023c5b1309e0180e81315',1,'identity.php']]], ['zidify_5fcallback',['zidify_callback',['../text_8php.html#a405afe814a23f3bd94d826101aa168ab',1,'text.php']]], ['zidify_5fimg_5fcallback',['zidify_img_callback',['../text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4',1,'text.php']]], ['zidify_5flinks',['zidify_links',['../text_8php.html#a29988052f3944111def3b6aaf2c7a8f6',1,'text.php']]], diff --git a/doc/html/taxonomy_8php.html b/doc/html/taxonomy_8php.html index ee96e0101..bb854072f 100644 --- a/doc/html/taxonomy_8php.html +++ b/doc/html/taxonomy_8php.html @@ -331,7 +331,7 @@ Functions
      -

      Referenced by lrdd().

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

      Referenced by aes_encapsulate(), allowed_public_recips(), create_identity(), fix_system_urls(), get_item_elements(), get_mail_elements(), get_profile_elements(), identity_basic_export(), 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_post(), random_string(), smile_encode(), zfinger_init(), zot_build_packet(), zot_fetch(), zot_import(), zot_new_uid(), and zot_register_hub().

      @@ -599,7 +597,7 @@ Variables
      -

      Referenced by profile_sidebar().

      +

      Referenced by profile_sidebar().

      @@ -617,7 +615,7 @@ Variables
      -

      Referenced by advanced_profile(), cal(), events_content(), format_event_diaspora(), format_event_html(), get_birthdays(), get_events(), ping_init(), and posted_dates().

      +

      Referenced by advanced_profile(), cal(), events_content(), format_event_diaspora(), format_event_html(), get_birthdays(), get_events(), ping_init(), and posted_dates().

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

      Referenced by channel_content(), network_content(), and network_init().

      +

      Referenced by channel_content(), and network_content().

      @@ -1239,7 +1237,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(), dfrn_deliver(), directory_content(), directory_run(), email_send(), encode_item(), expire_run(), feed_init(), fetch_lrdd_template(), fetch_xrd_links(), 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_xchan(), 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(), lrdd(), 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(), 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().

      @@ -1468,7 +1466,7 @@ Variables
      -

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

      +

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

      @@ -1593,7 +1591,7 @@ Variables
      -

      Referenced by advanced_profile(), api_format_items(), api_format_messages(), api_status_show(), api_users_show(), atom_entry(), check_item_source(), comanche_block(), connect_content(), and prepare_body().

      +

      Referenced by advanced_profile(), api_format_items(), api_format_messages(), api_status_show(), api_users_show(), atom_entry(), check_item_source(), comanche_block(), connect_content(), and prepare_body().

      @@ -1707,7 +1705,7 @@ Variables
      -

      Referenced by aes_encapsulate(), attach_mkdir(), attach_store(), bb_parse_crypt(), bbcode(), build_sync_packet(), create_account(), create_identity(), dfrn_deliver(), 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(), redir_init(), removeme_content(), send_message(), send_reg_approval_email(), settings_post(), setup_post(), syncdirs(), and thing_init().

      @@ -1772,7 +1770,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(), dfrn_deliver(), 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(), fetch_url(), 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_max_import_size(), get_pconfig(), get_plink(), Item\get_template_data(), get_theme_screenshot(), get_xconfig(), gprobe_run(), group_aside(), group_content(), group_post(), group_select(), guess_image_type(), handle_tag(), hcard_aside(), hcard_init(), 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(), lrdd(), 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(), nogroup_content(), nogroup_init(), notice(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), oexchange_content(), oexchange_init(), 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(), post_url(), preg_heart(), prepare_body(), probe_content(), proc_run(), profile_activity(), profile_aside(), profile_content(), profile_create_sidebar(), profile_init(), profile_load(), profile_photo_aside(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profile_tabs(), profiles_aside(), profiles_content(), profiles_init(), profiles_post(), profperm_aside(), profperm_content(), profperm_init(), push_lang(), queue_run(), randprof_init(), redbasic_form(), 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_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().

      diff --git a/doc/html/zot_8php.html b/doc/html/zot_8php.html index 3fa97efb2..014f6795b 100644 --- a/doc/html/zot_8php.html +++ b/doc/html/zot_8php.html @@ -166,6 +166,8 @@ Functions
       
       get_rpost_path ($observer)
       
       import_author_zot ($x)
       

      Function Documentation

      @@ -265,6 +267,24 @@ Functions
      + + + + + + + +
      import_author_zot ( $x)
      +
      + +

      Referenced by import_author_xchan().

      +
      @@ -1008,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_xchan(), onepoll_run(), and post_post().

      +

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

      diff --git a/doc/html/zot_8php.js b/doc/html/zot_8php.js index 5a0ae148c..dd70498b0 100644 --- a/doc/html/zot_8php.js +++ b/doc/html/zot_8php.js @@ -4,6 +4,7 @@ var zot_8php = [ "build_sync_packet", "zot_8php.html#ac34e479d27f32b82dd6b33542f81a6a7", null ], [ "delete_imported_item", "zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72", null ], [ "get_rpost_path", "zot_8php.html#a8e22dbc6f884be3644a892a876cbd972", null ], + [ "import_author_zot", "zot_8php.html#ad149f1e98c0c5b88ff9147e6ee3f330d", null ], [ "import_directory_keywords", "zot_8php.html#a3bf11286c2619b4ca28e49d5b5ab374a", null ], [ "import_directory_profile", "zot_8php.html#aeec89da5b6ff090c63a79de4de884a35", null ], [ "import_site", "zot_8php.html#a2657e141d62d5f67ad3c87651b585299", null ], -- cgit v1.2.3 From 5382f607d9d67951fe50ed88e87875086276b4d3 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 6 Dec 2013 00:11:15 -0800 Subject: yeah - that's what I'm going to do. we'll just keep system notifications. If somebody wants web pages for the others we'll start fresh. It's easier than starting with curfty friendica code that doesn't work anymore and will never work without starting over. --- include/nav.php | 3 - mod/notifications.php | 326 --- util/messages.po | 7178 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 7178 insertions(+), 329 deletions(-) diff --git a/include/nav.php b/include/nav.php index f0dd20c6b..f89de2de0 100644 --- a/include/nav.php +++ b/include/nav.php @@ -147,16 +147,13 @@ EOT; if(local_user()) { $nav['network'] = array('network', t('Matrix'), "", t('Your matrix')); - $nav['network']['all']=array('notifications/network', t('See all matrix notifications'), "", ""); $nav['network']['mark'] = array('', t('Mark all matrix notifications seen'), '',''); $nav['home'] = array('channel/' . $channel['channel_address'], t('Channel Home'), "", t('Channel home')); - $nav['home']['all']=array('notifications/channel', t('See all channel notifications'), "", ""); $nav['home']['mark'] = array('', t('Mark all channel notifications seen'), '',''); $nav['intros'] = array('connections/pending', t('Intros'), "", t('New Connections')); - $nav['intros']['all']=array('notifications/intros', t('See all channel introductions'), "", ""); $nav['notifications'] = array('notifications/system', t('Notices'), "", t('Notifications')); diff --git a/mod/notifications.php b/mod/notifications.php index 18f515704..f327c2fe2 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -71,157 +71,6 @@ function notifications_content(&$a) { $o = ''; - $tabs = array( - array( - 'label' => t('System'), - 'url'=>$a->get_baseurl(true) . '/notifications/system', - 'sel'=> (($a->argv[1] == 'system') ? 'active' : ''), - ), -// array( -// 'label' => t('Network'), -// 'url'=>$a->get_baseurl(true) . '/notifications/network', -// 'sel'=> (($a->argv[1] == 'network') ? 'active' : ''), -// ), - array( - 'label' => t('Personal'), - 'url'=>$a->get_baseurl(true) . '/notifications/personal', - 'sel'=> (($a->argv[1] == 'personal') ? 'active' : ''), - ), -// array( -// 'label' => t('Home'), -// 'url' => $a->get_baseurl(true) . '/notifications/home', -// 'sel'=> (($a->argv[1] == 'home') ? 'active' : ''), -// ), - array( - 'label' => t('Introductions'), - 'url' => $a->get_baseurl(true) . '/connections/pending', - 'sel'=> (($a->argv[1] == 'intros') ? 'active' : ''), - ), - array( - 'label' => t('Messages'), - 'url' => $a->get_baseurl(true) . '/message', - 'sel'=> '', - ), - ); - - $o = ""; - - - if((argc() > 1) && (argv(1) == 'intros')) { - nav_set_selected('introductions'); - - $r = q("select * from abook left join xchan on abook_xchan = xchan_hash where uid = %d and (abook_flags & %d) and not (abook_flags & %d)", - intval(local_user()), - intval(ABOOK_FLAG_PENDING), - intval(ABOOK_FLAG_IGNORED) - ); - - if($r) { - // FIXME finish this - foreach($r as $rr) { - - } - - } - else - info( t('No introductions.') . EOL); - - $o .= replace_macros($notif_tpl,array( - '$notif_header' => t('Notifications'), - '$tabs' => $tabs, - '$notif_content' => $notif_content, - )); - -// $o .= paginate($a); - return $o; - - } - - elseif (($a->argc > 1) && ($a->argv[1] == 'network')) { - - $notif_tpl = get_markup_template('notifications.tpl'); - - $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, - `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`, - `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` - FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND - `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 ORDER BY `item`.`created` DESC" , - intval(local_user()) - ); - - $tpl_item_likes = get_markup_template('notifications_likes_item.tpl'); - $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); - $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); - $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); - $tpl_item_posts = get_markup_template('notifications_posts_item.tpl'); - - $notif_content = ''; - - if (count($r) > 0) { - - foreach ($r as $it) { - switch($it['verb']){ - case ACTIVITY_LIKE: - $notif_content .= replace_macros($tpl_item_likes,array( - '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - break; - - case ACTIVITY_DISLIKE: - $notif_content .= replace_macros($tpl_item_dislikes,array( - '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - break; - - case ACTIVITY_FRIEND: - - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; - $obj = parse_xml_string($xmlhead.$it['object']); - $it['fname'] = $obj->title; - - $notif_content .= replace_macros($tpl_item_friends,array( - '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), - '$item_when' => relative_date($it['created']) - )); - break; - - default: - $item_text = (($it['id'] == $it['parent']) - ? sprintf( t("%s created a new post"), $it['author-name']) - : sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname'])); - $tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments); - - $notif_content .= replace_macros($tpl,array( - '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_image' => $it['author-avatar'], - '$item_text' => $item_text, - '$item_when' => relative_date($it['created']) - )); - } - } - - } else { - - $notif_content = t('No more network notifications.'); - } - - $o .= replace_macros($notif_tpl,array( - '$notif_header' => t('Network Notifications'), - '$tabs' => $tabs, - '$notif_content' => $notif_content, - )); - - } else if (($a->argc > 1) && ($a->argv[1] == 'system')) { - $notif_tpl = get_markup_template('notifications.tpl'); $not_tpl = get_markup_template('notify.tpl'); @@ -246,183 +95,8 @@ function notifications_content(&$a) { $o .= replace_macros($notif_tpl,array( '$notif_header' => t('System Notifications'), - '$tabs' => $tabs, '$notif_content' => $notif_content, )); - } else if (($a->argc > 1) && ($a->argv[1] == 'personal')) { - - $notif_tpl = get_markup_template('notifications.tpl'); - - $myurl = $a->get_baseurl(true) . '/channel/'. $a->user['nickname']; - $myurl = substr($myurl,strpos($myurl,'://')+3); - $myurl = str_replace(array('www.','.'),array('','\\.'),$myurl); - $diasp_url = str_replace('/channel/','/u/',$myurl); - $sql_extra .= sprintf(" AND ( `item`.`author-link` regexp '%s' or `item`.`tag` regexp '%s' or `item`.`tag` regexp '%s' ) ", - dbesc($myurl . '$'), - dbesc($myurl . '\\]'), - dbesc($diasp_url . '\\]') - ); - - - $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, - `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`, - `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` - FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 - $sql_extra - AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 ORDER BY `item`.`created` DESC" , - intval(local_user()) - ); - - $tpl_item_likes = get_markup_template('notifications_likes_item.tpl'); - $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); - $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); - $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); - $tpl_item_posts = get_markup_template('notifications_posts_item.tpl'); - - $notif_content = ''; - - if (count($r) > 0) { - - foreach ($r as $it) { - switch($it['verb']){ - case ACTIVITY_LIKE: - $notif_content .= replace_macros($tpl_item_likes,array( - '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - break; - - case ACTIVITY_DISLIKE: - $notif_content .= replace_macros($tpl_item_dislikes,array( - '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - break; - - case ACTIVITY_FRIEND: - - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; - $obj = parse_xml_string($xmlhead.$it['object']); - $it['fname'] = $obj->title; - - $notif_content .= replace_macros($tpl_item_friends,array( - '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), - '$item_when' => relative_date($it['created']) - )); - break; - - default: - $item_text = (($it['id'] == $it['parent']) - ? sprintf( t("%s created a new post"), $it['author-name']) - : sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname'])); - $tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments); - - $notif_content .= replace_macros($tpl,array( - '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_image' => $it['author-avatar'], - '$item_text' => $item_text, - '$item_when' => relative_date($it['created']) - )); - } - } - - } else { - - $notif_content = t('No more personal notifications.'); - } - - $o .= replace_macros($notif_tpl,array( - '$notif_header' => t('Personal Notifications'), - '$tabs' => $tabs, - '$notif_content' => $notif_content, - )); - - - } else if (($a->argc > 1) && ($a->argv[1] == 'home')) { - - $notif_tpl = get_markup_template('notifications.tpl'); - - $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, - `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`, - `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` - FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` - WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND - `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1 ORDER BY `item`.`created` DESC", - intval(local_user()) - ); - - $tpl_item_likes = get_markup_template('notifications_likes_item.tpl'); - $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl'); - $tpl_item_friends = get_markup_template('notifications_friends_item.tpl'); - $tpl_item_comments = get_markup_template('notifications_comments_item.tpl'); - - $notif_content = ''; - - if (count($r) > 0) { - - foreach ($r as $it) { - switch($it['verb']){ - case ACTIVITY_LIKE: - $notif_content .= replace_macros($tpl_item_likes,array( - '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - - break; - case ACTIVITY_DISLIKE: - $notif_content .= replace_macros($tpl_item_dislikes,array( - '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - - break; - case ACTIVITY_FRIEND: - - $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; - $obj = parse_xml_string($xmlhead.$it['object']); - $it['fname'] = $obj->title; - - $notif_content .= replace_macros($tpl_item_friends,array( - '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']), - '$item_when' => relative_date($it['created']) - )); - - break; - default: - $notif_content .= replace_macros($tpl_item_comments,array( - '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'], - '$item_image' => $it['author-avatar'], - '$item_text' => sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname']), - '$item_when' => relative_date($it['created']) - )); - } - } - - } else { - $notif_content = t('No more home notifications.'); - } - - $o .= replace_macros($notif_tpl,array( - '$notif_header' => t('Home Notifications'), - '$tabs' => $tabs, - '$notif_content' => $notif_content, - )); - } - - $o .= paginate($a); return $o; } diff --git a/util/messages.po b/util/messages.po index e69de29bb..485d47394 100644 --- a/util/messages.po +++ b/util/messages.po @@ -0,0 +1,7178 @@ +# Red Communications Project +# Copyright (C) 2013 the Red Matrix Project +# This file is distributed under the same license as the Red package. +# Mike Macgirvin, 2013 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: 2013-12-06.519\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-12-06 00:02-0800\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"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" +msgstr "" + +#: ../../include/acl_selectors.php:236 +msgid "show" +msgstr "" + +#: ../../include/acl_selectors.php:237 +msgid "don't show" +msgstr "" + +#: ../../include/activities.php:37 +msgid " and " +msgstr "" + +#: ../../include/activities.php:45 +msgid "public profile" +msgstr "" + +#: ../../include/activities.php:50 +#, php-format +msgid "%1$s changed %2$s to “%3$s”" +msgstr "" + +#: ../../include/activities.php:51 +#, php-format +msgid "Visit %1$s's %2$s" +msgstr "" + +#: ../../include/activities.php:54 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." +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 "%s Administrator" +msgstr "" + +#: ../../include/enotify.php:80 +#, php-format +msgid "%s " +msgstr "" + +#: ../../include/enotify.php:84 +#, php-format +msgid "[Red:Notify] New mail received at %s" +msgstr "" + +#: ../../include/enotify.php:86 +#, php-format +msgid "%1$s, %2$s sent you a new private message at %3$s." +msgstr "" + +#: ../../include/enotify.php:87 +#, php-format +msgid "%1$s sent you %2$s." +msgstr "" + +#: ../../include/enotify.php:87 +msgid "a private message" +msgstr "" + +#: ../../include/enotify.php:88 +#, php-format +msgid "Please visit %s to view and/or reply to your private messages." +msgstr "" + +#: ../../include/enotify.php:139 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]" +msgstr "" + +#: ../../include/enotify.php:147 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]" +msgstr "" + +#: ../../include/enotify.php:156 +#, php-format +msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]" +msgstr "" + +#: ../../include/enotify.php:167 +#, php-format +msgid "[Red:Notify] Comment to conversation #%1$d by %2$s" +msgstr "" + +#: ../../include/enotify.php:168 +#, php-format +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 +#, php-format +msgid "Please visit %s to view and/or reply to the conversation." +msgstr "" + +#: ../../include/enotify.php:178 +#, php-format +msgid "[Red:Notify] %s posted to your profile wall" +msgstr "" + +#: ../../include/enotify.php:180 +#, php-format +msgid "%1$s, %2$s posted to your profile wall at %3$s" +msgstr "" + +#: ../../include/enotify.php:182 +#, php-format +msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" +msgstr "" + +#: ../../include/enotify.php:209 +#, php-format +msgid "[Red:Notify] %s tagged you" +msgstr "" + +#: ../../include/enotify.php:210 +#, php-format +msgid "%1$s, %2$s tagged you at %3$s" +msgstr "" + +#: ../../include/enotify.php:211 +#, php-format +msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." +msgstr "" + +#: ../../include/enotify.php:224 +#, php-format +msgid "[Red:Notify] %1$s poked you" +msgstr "" + +#: ../../include/enotify.php:225 +#, php-format +msgid "%1$s, %2$s poked you at %3$s" +msgstr "" + +#: ../../include/enotify.php:226 +#, php-format +msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." +msgstr "" + +#: ../../include/enotify.php:242 +#, php-format +msgid "[Red:Notify] %s tagged your post" +msgstr "" + +#: ../../include/enotify.php:243 +#, php-format +msgid "%1$s, %2$s tagged your post at %3$s" +msgstr "" + +#: ../../include/enotify.php:244 +#, php-format +msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" +msgstr "" + +#: ../../include/enotify.php:256 +msgid "[Red:Notify] Introduction received" +msgstr "" + +#: ../../include/enotify.php:257 +#, php-format +msgid "%1$s, you've received an introduction from '%2$s' at %3$s" +msgstr "" + +#: ../../include/enotify.php:258 +#, 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 +#, php-format +msgid "You may visit their profile at %s" +msgstr "" + +#: ../../include/enotify.php:264 +#, php-format +msgid "Please visit %s to approve or reject the introduction." +msgstr "" + +#: ../../include/enotify.php:271 +msgid "[Red:Notify] Friend suggestion received" +msgstr "" + +#: ../../include/enotify.php:272 +#, php-format +msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" +msgstr "" + +#: ../../include/enotify.php:273 +#, 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 +msgid "Name:" +msgstr "" + +#: ../../include/enotify.php:280 +msgid "Photo:" +msgstr "" + +#: ../../include/enotify.php:283 +#, php-format +msgid "Please visit %s to approve or reject the suggestion." +msgstr "" + +#: ../../include/ItemObject.php:88 ../../mod/photos.php:963 +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/layouts.php:102 ../../mod/editlayout.php:100 +#: ../../mod/editwebpage.php:119 ../../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 +#: ../../mod/filestorage.php:82 +msgid "Delete" +msgstr "" + +#: ../../include/ItemObject.php:113 ../../include/conversation.php:627 +msgid "Select" +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:160 ../../include/conversation.php:638 +msgid "Message is verified" +msgstr "" + +#: ../../include/ItemObject.php:168 +msgid "add tag" +msgstr "" + +#: ../../include/ItemObject.php:174 ../../mod/photos.php:1069 +msgid "I like this (toggle)" +msgstr "" + +#: ../../include/ItemObject.php:174 ../../include/taxonomy.php:251 +msgid "like" +msgstr "" + +#: ../../include/ItemObject.php:175 ../../mod/photos.php:1070 +msgid "I don't like this (toggle)" +msgstr "" + +#: ../../include/ItemObject.php:175 ../../include/taxonomy.php:252 +msgid "dislike" +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:216 ../../include/conversation.php:682 +#, php-format +msgid " from %s" +msgstr "" + +#: ../../include/ItemObject.php:219 ../../include/conversation.php:685 +#, 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 +#: ../../mod/editpost.php:106 ../../mod/editblock.php:123 +msgid "Please wait" +msgstr "" + +#: ../../include/ItemObject.php:267 +#, 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:148 +msgid "show more" +msgstr "" + +#: ../../include/ItemObject.php:527 ../../mod/photos.php:1088 +#: ../../mod/photos.php:1175 +msgid "This is you" +msgstr "" + +#: ../../include/ItemObject.php:529 ../../include/js_strings.php:6 +#: ../../mod/photos.php:1090 ../../mod/photos.php:1177 +msgid "Comment" +msgstr "" + +#: ../../include/ItemObject.php:530 ../../mod/events.php:469 +#: ../../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/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 +#: ../../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/ItemObject.php:531 +msgid "Bold" +msgstr "" + +#: ../../include/ItemObject.php:532 +msgid "Italic" +msgstr "" + +#: ../../include/ItemObject.php:533 +msgid "Underline" +msgstr "" + +#: ../../include/ItemObject.php:534 +msgid "Quote" +msgstr "" + +#: ../../include/ItemObject.php:535 +msgid "Code" +msgstr "" + +#: ../../include/ItemObject.php:536 +msgid "Image" +msgstr "" + +#: ../../include/ItemObject.php:537 +msgid "Link" +msgstr "" + +#: ../../include/ItemObject.php:538 +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 +#: ../../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 +#: ../../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 +msgid "Connect" +msgstr "" + +#: ../../include/Contact.php:103 +msgid "New window" +msgstr "" + +#: ../../include/Contact.php:104 +msgid "Open the selected location in a different window or browser tab" +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:686 +#: ../../mod/admin.php:695 ../../boot.php:1442 +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/datetime.php:287 +msgid "days" +msgstr "" + +#: ../../include/datetime.php:288 +msgid "hour" +msgstr "" + +#: ../../include/datetime.php:288 +msgid "hours" +msgstr "" + +#: ../../include/datetime.php:289 +msgid "minute" +msgstr "" + +#: ../../include/datetime.php:289 +msgid "minutes" +msgstr "" + +#: ../../include/datetime.php:290 +msgid "second" +msgstr "" + +#: ../../include/datetime.php:290 +msgid "seconds" +msgstr "" + +#: ../../include/datetime.php:299 +#, php-format +msgid "%1$d %2$s ago" +msgstr "" + +#: ../../include/dba/dba_driver.php:50 +#, php-format +msgid "Cannot locate DNS info for database server '%s'" +msgstr "" + +#: ../../include/event.php:11 ../../include/bb2diaspora.php:433 +msgid "l F d, Y \\@ g:i A" +msgstr "" + +#: ../../include/event.php:20 ../../include/bb2diaspora.php:439 +msgid "Starts:" +msgstr "" + +#: ../../include/event.php:30 ../../include/bb2diaspora.php:447 +msgid "Finishes:" +msgstr "" + +#: ../../include/event.php:40 ../../include/identity.php:663 +#: ../../include/bb2diaspora.php:455 ../../mod/events.php:462 +#: ../../mod/directory.php:173 +msgid "Location:" +msgstr "" + +#: ../../include/features.php:21 +msgid "General Features" +msgstr "" + +#: ../../include/features.php:23 +msgid "Content Expiration" +msgstr "" + +#: ../../include/features.php:23 +msgid "Remove posts/comments and/or private messages at a future time" +msgstr "" + +#: ../../include/features.php:24 +msgid "Multiple Profiles" +msgstr "" + +#: ../../include/features.php:24 +msgid "Ability to create multiple profiles" +msgstr "" + +#: ../../include/features.php:25 +msgid "Web Pages" +msgstr "" + +#: ../../include/features.php:25 +msgid "Provide managed web pages on your channel" +msgstr "" + +#: ../../include/features.php:26 +msgid "Enhanced Photo Albums" +msgstr "" + +#: ../../include/features.php:26 +msgid "Enable photo album with enhanced features" +msgstr "" + +#: ../../include/features.php:28 +msgid "Extended Identity Sharing" +msgstr "" + +#: ../../include/features.php:28 ../../include/js_strings.php:30 +msgid " " +msgstr "" + +#: ../../include/features.php:29 +msgid "Expert Mode" +msgstr "" + +#: ../../include/features.php:29 +msgid "Enable Expert Mode to provide advanced configuration options" +msgstr "" + +#: ../../include/features.php:30 +msgid "Premium Channel" +msgstr "" + +#: ../../include/features.php:30 +msgid "" +"Allows you to set restrictions and terms on those that connect with your " +"channel" +msgstr "" + +#: ../../include/features.php:35 +msgid "Post Composition Features" +msgstr "" + +#: ../../include/features.php:36 +msgid "Richtext Editor" +msgstr "" + +#: ../../include/features.php:36 +msgid "Enable richtext editor" +msgstr "" + +#: ../../include/features.php:37 +msgid "Post Preview" +msgstr "" + +#: ../../include/features.php:37 +msgid "Allow previewing posts and comments before publishing them" +msgstr "" + +#: ../../include/features.php:38 ../../mod/settings.php:120 +#: ../../mod/sources.php:67 +msgid "Channel Sources" +msgstr "" + +#: ../../include/features.php:38 +msgid "Automatically import channel content from other channels or feeds" +msgstr "" + +#: ../../include/features.php:39 +msgid "Even More Encryption" +msgstr "" + +#: ../../include/features.php:39 +msgid "Allow encryption of content end-to-end with a shared secret key" +msgstr "" + +#: ../../include/features.php:44 +msgid "Network and Stream Filtering" +msgstr "" + +#: ../../include/features.php:45 +msgid "Search by Date" +msgstr "" + +#: ../../include/features.php:45 +msgid "Ability to select posts by date ranges" +msgstr "" + +#: ../../include/features.php:46 +msgid "Collections Filter" +msgstr "" + +#: ../../include/features.php:46 +msgid "Enable widget to display Network posts only from selected collections" +msgstr "" + +#: ../../include/features.php:47 ../../mod/search.php:17 +#: ../../mod/network.php:122 +msgid "Saved Searches" +msgstr "" + +#: ../../include/features.php:47 +msgid "Save search terms for re-use" +msgstr "" + +#: ../../include/features.php:48 +msgid "Network Personal Tab" +msgstr "" + +#: ../../include/features.php:48 +msgid "Enable tab to display only Network posts that you've interacted on" +msgstr "" + +#: ../../include/features.php:49 +msgid "Network New Tab" +msgstr "" + +#: ../../include/features.php:49 +msgid "Enable tab to display all new Network activity" +msgstr "" + +#: ../../include/features.php:50 +msgid "Affinity Tool" +msgstr "" + +#: ../../include/features.php:50 +msgid "Filter stream activity by depth of relationships" +msgstr "" + +#: ../../include/features.php:55 +msgid "Post/Comment Tools" +msgstr "" + +#: ../../include/features.php:57 +msgid "Edit Sent Posts" +msgstr "" + +#: ../../include/features.php:57 +msgid "Edit and correct posts and comments after sending" +msgstr "" + +#: ../../include/features.php:58 +msgid "Tagging" +msgstr "" + +#: ../../include/features.php:58 +msgid "Ability to tag existing posts" +msgstr "" + +#: ../../include/features.php:59 +msgid "Post Categories" +msgstr "" + +#: ../../include/features.php:59 +msgid "Add categories to your posts" +msgstr "" + +#: ../../include/features.php:60 ../../include/contact_widgets.php:76 +msgid "Saved Folders" +msgstr "" + +#: ../../include/features.php:60 +msgid "Ability to file posts under folders" +msgstr "" + +#: ../../include/features.php:61 +msgid "Dislike Posts" +msgstr "" + +#: ../../include/features.php:61 +msgid "Ability to dislike posts/comments" +msgstr "" + +#: ../../include/features.php:62 +msgid "Star Posts" +msgstr "" + +#: ../../include/features.php:62 +msgid "Ability to mark special posts with a star indicator" +msgstr "" + +#: ../../include/features.php:63 +msgid "Tag Cloud" +msgstr "" + +#: ../../include/features.php:63 +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." +msgstr "" + +#: ../../include/group.php:223 +msgid "Default privacy group for new contacts" +msgstr "" + +#: ../../include/group.php:242 ../../mod/admin.php:695 +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 ../../mod/network.php:123 +msgid "add" +msgstr "" + +#: ../../include/js_strings.php:5 +msgid "Delete this item?" +msgstr "" + +#: ../../include/js_strings.php:8 +msgid "show fewer" +msgstr "" + +#: ../../include/js_strings.php:9 +msgid "Password too short" +msgstr "" + +#: ../../include/js_strings.php:10 +msgid "Passwords do not match" +msgstr "" + +#: ../../include/js_strings.php:11 ../../mod/photos.php:45 +msgid "everybody" +msgstr "" + +#: ../../include/js_strings.php:12 +msgid "Secret Passphrase" +msgstr "" + +#: ../../include/js_strings.php:13 +msgid "Passphrase hint" +msgstr "" + +#: ../../include/js_strings.php:15 +msgid "timeago.prefixAgo" +msgstr "" + +#: ../../include/js_strings.php:16 +msgid "timeago.suffixAgo" +msgstr "" + +#: ../../include/js_strings.php:17 +msgid "ago" +msgstr "" + +#: ../../include/js_strings.php:18 +msgid "from now" +msgstr "" + +#: ../../include/js_strings.php:19 +msgid "less than a minute" +msgstr "" + +#: ../../include/js_strings.php:20 +msgid "about a minute" +msgstr "" + +#: ../../include/js_strings.php:21 +#, php-format +msgid "%d minutes" +msgstr "" + +#: ../../include/js_strings.php:22 +msgid "about an hour" +msgstr "" + +#: ../../include/js_strings.php:23 +#, php-format +msgid "about %d hours" +msgstr "" + +#: ../../include/js_strings.php:24 +msgid "a day" +msgstr "" + +#: ../../include/js_strings.php:25 +#, php-format +msgid "%d days" +msgstr "" + +#: ../../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: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: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" +msgstr "" + +#: ../../include/api.php:972 +msgid "Public Timeline" +msgstr "" + +#: ../../include/network.php:640 +msgid "view full size" +msgstr "" + +#: ../../include/bbcode.php:94 ../../include/bbcode.php:494 +#: ../../include/bbcode.php:497 +msgid "Image/photo" +msgstr "" + +#: ../../include/bbcode.php:126 ../../include/bbcode.php:502 +msgid "Encrypted content" +msgstr "" + +#: ../../include/bbcode.php:173 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" +msgstr "" + +#: ../../include/bbcode.php:175 +msgid "post" +msgstr "" + +#: ../../include/bbcode.php:454 ../../include/bbcode.php:474 +msgid "$1 wrote:" +msgstr "" + +#: ../../include/oembed.php:150 +msgid "Embedded content" +msgstr "" + +#: ../../include/oembed.php:159 +msgid "Embedding disabled" +msgstr "" + +#: ../../include/notify.php:23 +msgid "created a new post" +msgstr "" + +#: ../../include/notify.php:24 +#, php-format +msgid "commented on %s's post" +msgstr "" + +#: ../../include/photos.php:15 ../../include/attach.php:102 +#: ../../include/attach.php:133 ../../include/attach.php:189 +#: ../../include/attach.php:204 ../../include/attach.php:237 +#: ../../include/attach.php:251 ../../include/attach.php:272 +#: ../../include/attach.php:464 ../../include/attach.php:539 +#: ../../include/items.php:3412 ../../mod/common.php:43 +#: ../../mod/events.php:139 ../../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/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/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/editblock.php:48 ../../mod/item.php:181 ../../mod/item.php:189 +#: ../../mod/suggest.php:32 ../../mod/register.php:68 ../../mod/regmod.php:18 +#: ../../mod/authtest.php:13 ../../mod/mood.php:114 ../../index.php:178 +#: ../../index.php:340 +msgid "Permission denied." +msgstr "" + +#: ../../include/photos.php:88 +#, php-format +msgid "Image exceeds website size limit of %lu bytes" +msgstr "" + +#: ../../include/photos.php:95 +msgid "Image file is empty." +msgstr "" + +#: ../../include/photos.php:124 ../../mod/profile_photo.php:157 +msgid "Unable to process image" +msgstr "" + +#: ../../include/photos.php:186 +msgid "Photo storage failed." +msgstr "" + +#: ../../include/photos.php:288 ../../include/conversation.php:1453 +msgid "Photo Albums" +msgstr "" + +#: ../../include/photos.php:292 ../../mod/photos.php:813 +#: ../../mod/photos.php:1287 +msgid "Upload New Photos" +msgstr "" + +#: ../../include/profile_selectors.php:6 +msgid "Male" +msgstr "" + +#: ../../include/profile_selectors.php:6 +msgid "Female" +msgstr "" + +#: ../../include/profile_selectors.php:6 +msgid "Currently Male" +msgstr "" + +#: ../../include/profile_selectors.php:6 +msgid "Currently Female" +msgstr "" + +#: ../../include/profile_selectors.php:6 +msgid "Mostly Male" +msgstr "" + +#: ../../include/profile_selectors.php:6 +msgid "Mostly Female" +msgstr "" + +#: ../../include/profile_selectors.php:6 +msgid "Transgender" +msgstr "" + +#: ../../include/profile_selectors.php:6 +msgid "Intersex" +msgstr "" + +#: ../../include/profile_selectors.php:6 +msgid "Transsexual" +msgstr "" + +#: ../../include/profile_selectors.php:6 +msgid "Hermaphrodite" +msgstr "" + +#: ../../include/profile_selectors.php:6 +msgid "Neuter" +msgstr "" + +#: ../../include/profile_selectors.php:6 +msgid "Non-specific" +msgstr "" + +#: ../../include/profile_selectors.php:6 +msgid "Other" +msgstr "" + +#: ../../include/profile_selectors.php:6 +msgid "Undecided" +msgstr "" + +#: ../../include/profile_selectors.php:23 +msgid "Males" +msgstr "" + +#: ../../include/profile_selectors.php:23 +msgid "Females" +msgstr "" + +#: ../../include/profile_selectors.php:23 +msgid "Gay" +msgstr "" + +#: ../../include/profile_selectors.php:23 +msgid "Lesbian" +msgstr "" + +#: ../../include/profile_selectors.php:23 +msgid "No Preference" +msgstr "" + +#: ../../include/profile_selectors.php:23 +msgid "Bisexual" +msgstr "" + +#: ../../include/profile_selectors.php:23 +msgid "Autosexual" +msgstr "" + +#: ../../include/profile_selectors.php:23 +msgid "Abstinent" +msgstr "" + +#: ../../include/profile_selectors.php:23 +msgid "Virgin" +msgstr "" + +#: ../../include/profile_selectors.php:23 +msgid "Deviant" +msgstr "" + +#: ../../include/profile_selectors.php:23 +msgid "Fetish" +msgstr "" + +#: ../../include/profile_selectors.php:23 +msgid "Oodles" +msgstr "" + +#: ../../include/profile_selectors.php:23 +msgid "Nonsexual" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Single" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Lonely" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Available" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Unavailable" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Has crush" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Infatuated" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Dating" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Unfaithful" +msgstr "" + +#: ../../include/profile_selectors.php:42 +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 "" + +#: ../../include/profile_selectors.php:42 +msgid "Casual" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Engaged" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Married" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Imaginarily married" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Partners" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Cohabiting" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Common law" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Happy" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Not looking" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Swinger" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Betrayed" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Separated" +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" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Widowed" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Uncertain" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "It's complicated" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Don't care" +msgstr "" + +#: ../../include/profile_selectors.php:42 +msgid "Ask me" +msgstr "" + +#: ../../include/attach.php:184 ../../include/attach.php:232 +msgid "Item was not found." +msgstr "" + +#: ../../include/attach.php:285 +msgid "No source file." +msgstr "" + +#: ../../include/attach.php:302 +msgid "Cannot locate file to replace" +msgstr "" + +#: ../../include/attach.php:320 +msgid "Cannot locate file to revise/update" +msgstr "" + +#: ../../include/attach.php:331 +#, php-format +msgid "File exceeds size limit of %d" +msgstr "" + +#: ../../include/attach.php:342 +#, php-format +msgid "You have reached your limit of %1$.0f Mbytes attachment storage." +msgstr "" + +#: ../../include/attach.php:424 +msgid "File upload failed. Possible system limit or action terminated." +msgstr "" + +#: ../../include/attach.php:436 +msgid "Stored file could not be verified. Upload failed." +msgstr "" + +#: ../../include/attach.php:480 ../../include/attach.php:497 +msgid "Path not available." +msgstr "" + +#: ../../include/attach.php:544 +msgid "Empty pathname" +msgstr "" + +#: ../../include/attach.php:562 +msgid "duplicate filename or path" +msgstr "" + +#: ../../include/attach.php:584 +msgid "Path not found." +msgstr "" + +#: ../../include/attach.php:628 +msgid "mkdir failed." +msgstr "" + +#: ../../include/attach.php:632 +msgid "database storage failed." +msgstr "" + +#: ../../include/zot.php:545 +msgid "Invalid data packet" +msgstr "" + +#: ../../include/zot.php:555 +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:1439 +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:925 +#: ../../mod/connections.php:327 ../../mod/connections.php:441 +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:1450 +#: ../../mod/fbrowser.php:25 +msgid "Photos" +msgstr "" + +#: ../../include/nav.php:79 +msgid "Your photos" +msgstr "" + +#: ../../include/nav.php:85 ../../boot.php:1440 +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:1416 +msgid "Register" +msgstr "" + +#: ../../include/nav.php:125 +msgid "Create an account" +msgstr "" + +#: ../../include/nav.php:130 ../../mod/help.php:45 ../../mod/help.php:49 +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 +#: ../../mod/search.php:96 +msgid "Search" +msgstr "" + +#: ../../include/nav.php:135 +msgid "Search site content" +msgstr "" + +#: ../../include/nav.php:138 ../../mod/directory.php:225 +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 "See all matrix notifications" +msgstr "" + +#: ../../include/nav.php:151 +msgid "Mark all matrix notifications seen" +msgstr "" + +#: ../../include/nav.php:153 +msgid "Channel Home" +msgstr "" + +#: ../../include/nav.php:153 +msgid "Channel home" +msgstr "" + +#: ../../include/nav.php:154 +msgid "See all channel notifications" +msgstr "" + +#: ../../include/nav.php:155 +msgid "Mark all channel notifications seen" +msgstr "" + +#: ../../include/nav.php:158 +msgid "Intros" +msgstr "" + +#: ../../include/nav.php:158 ../../mod/connections.php:585 +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 +msgid "Notifications" +msgstr "" + +#: ../../include/nav.php:163 +msgid "See all notifications" +msgstr "" + +#: ../../include/nav.php:164 +msgid "Mark all system notifications seen" +msgstr "" + +#: ../../include/nav.php:166 +msgid "Mail" +msgstr "" + +#: ../../include/nav.php:166 +msgid "Private mail" +msgstr "" + +#: ../../include/nav.php:167 +msgid "See all private messages" +msgstr "" + +#: ../../include/nav.php:168 +msgid "Mark all private messages seen" +msgstr "" + +#: ../../include/nav.php:169 +msgid "Inbox" +msgstr "" + +#: ../../include/nav.php:170 +msgid "Outbox" +msgstr "" + +#: ../../include/nav.php:171 ../../mod/message.php:24 +msgid "New Message" +msgstr "" + +#: ../../include/nav.php:174 ../../include/conversation.php:1461 +#: ../../mod/events.php:353 +msgid "Events" +msgstr "" + +#: ../../include/nav.php:174 +msgid "Event Calendar" +msgstr "" + +#: ../../include/nav.php:175 +msgid "See all events" +msgstr "" + +#: ../../include/nav.php:176 +msgid "Mark all events seen" +msgstr "" + +#: ../../include/nav.php:178 +msgid "Channel Select" +msgstr "" + +#: ../../include/nav.php:178 +msgid "Manage Your Channels" +msgstr "" + +#: ../../include/nav.php:180 ../../mod/settings.php:131 +#: ../../mod/admin.php:782 ../../mod/admin.php:987 +msgid "Settings" +msgstr "" + +#: ../../include/nav.php:180 +msgid "Account/Channel Settings" +msgstr "" + +#: ../../include/nav.php:182 ../../mod/connections.php:690 +msgid "Connections" +msgstr "" + +#: ../../include/nav.php:182 +msgid "Manage/Edit Friends and Connections" +msgstr "" + +#: ../../include/nav.php:189 ../../mod/admin.php:111 +msgid "Admin" +msgstr "" + +#: ../../include/nav.php:189 +msgid "Site Setup and Configuration" +msgstr "" + +#: ../../include/nav.php:215 +msgid "Nothing new here" +msgstr "" + +#: ../../include/nav.php:220 +msgid "Please wait..." +msgstr "" + +#: ../../include/account.php:23 +msgid "Not a valid email address" +msgstr "" + +#: ../../include/account.php:25 +msgid "Your email domain is not among those allowed on this site" +msgstr "" + +#: ../../include/account.php:31 +msgid "Your email address is already registered at this site." +msgstr "" + +#: ../../include/account.php:64 +msgid "An invitation is required." +msgstr "" + +#: ../../include/account.php:68 +msgid "Invitation could not be verified." +msgstr "" + +#: ../../include/account.php:118 +msgid "Please enter the required information." +msgstr "" + +#: ../../include/account.php:186 +msgid "Failed to store account information." +msgstr "" + +#: ../../include/account.php:272 +#, php-format +msgid "Registration request at %s" +msgstr "" + +#: ../../include/account.php:274 ../../include/account.php:301 +#: ../../include/account.php:358 +msgid "Administrator" +msgstr "" + +#: ../../include/account.php:296 +msgid "your registration password" +msgstr "" + +#: ../../include/account.php:299 ../../include/account.php:356 +#, php-format +msgid "Registration details for %s" +msgstr "" + +#: ../../include/account.php:365 +msgid "Account approved." +msgstr "" + +#: ../../include/account.php:399 +#, php-format +msgid "Registration revoked for %s" +msgstr "" + +#: ../../include/conversation.php:117 ../../include/text.php:1609 +#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45 +msgid "photo" +msgstr "" + +#: ../../include/conversation.php:120 ../../include/text.php:1612 +#: ../../mod/tagger.php:49 +msgid "event" +msgstr "" + +#: ../../include/conversation.php:123 +msgid "channel" +msgstr "" + +#: ../../include/conversation.php:145 ../../include/text.php:1615 +#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53 +msgid "status" +msgstr "" + +#: ../../include/conversation.php:147 ../../include/text.php:1617 +#: ../../mod/tagger.php:55 +msgid "comment" +msgstr "" + +#: ../../include/conversation.php:161 ../../mod/like.php:134 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "" + +#: ../../include/conversation.php:164 ../../mod/like.php:136 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" +msgstr "" + +#: ../../include/conversation.php:201 +#, php-format +msgid "%1$s is now connected with %2$s" +msgstr "" + +#: ../../include/conversation.php:232 +#, php-format +msgid "%1$s poked %2$s" +msgstr "" + +#: ../../include/conversation.php:236 ../../include/text.php:776 +msgid "poked" +msgstr "" + +#: ../../include/conversation.php:254 ../../mod/mood.php:63 +#, php-format +msgid "%1$s is currently %2$s" +msgstr "" + +#: ../../include/conversation.php:658 +#, php-format +msgid "View %s's profile @ %s" +msgstr "" + +#: ../../include/conversation.php:672 +msgid "Categories:" +msgstr "" + +#: ../../include/conversation.php:673 +msgid "Filed under:" +msgstr "" + +#: ../../include/conversation.php:700 +msgid "View in context" +msgstr "" + +#: ../../include/conversation.php:826 +msgid "remove" +msgstr "" + +#: ../../include/conversation.php:830 +msgid "Loading..." +msgstr "" + +#: ../../include/conversation.php:831 +msgid "Delete Selected Items" +msgstr "" + +#: ../../include/conversation.php:922 +msgid "View Source" +msgstr "" + +#: ../../include/conversation.php:923 +msgid "Follow Thread" +msgstr "" + +#: ../../include/conversation.php:924 +msgid "View Status" +msgstr "" + +#: ../../include/conversation.php:926 +msgid "View Photos" +msgstr "" + +#: ../../include/conversation.php:927 +msgid "Matrix Activity" +msgstr "" + +#: ../../include/conversation.php:928 +msgid "Edit Contact" +msgstr "" + +#: ../../include/conversation.php:929 +msgid "Send PM" +msgstr "" + +#: ../../include/conversation.php:930 +msgid "Poke" +msgstr "" + +#: ../../include/conversation.php:992 +#, php-format +msgid "%s likes this." +msgstr "" + +#: ../../include/conversation.php:992 +#, php-format +msgid "%s doesn't like this." +msgstr "" + +#: ../../include/conversation.php:996 +#, php-format +msgid "%2$d people like this." +msgid_plural "%2$d people like this." +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:998 +#, 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 +msgid "and" +msgstr "" + +#: ../../include/conversation.php:1007 +#, php-format +msgid ", and %d other people" +msgid_plural ", and %d other people" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:1008 +#, php-format +msgid "%s like this." +msgstr "" + +#: ../../include/conversation.php:1008 +#, php-format +msgid "%s don't like this." +msgstr "" + +#: ../../include/conversation.php:1058 +msgid "Visible to everybody" +msgstr "" + +#: ../../include/conversation.php:1059 ../../mod/message.php:281 +#: ../../mod/message.php:417 +msgid "Please enter a link URL:" +msgstr "" + +#: ../../include/conversation.php:1060 +msgid "Please enter a video link/URL:" +msgstr "" + +#: ../../include/conversation.php:1061 +msgid "Please enter an audio link/URL:" +msgstr "" + +#: ../../include/conversation.php:1062 +msgid "Tag term:" +msgstr "" + +#: ../../include/conversation.php:1063 ../../mod/filer.php:35 +msgid "Save to Folder:" +msgstr "" + +#: ../../include/conversation.php:1064 +msgid "Where are you right now?" +msgstr "" + +#: ../../include/conversation.php:1065 ../../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 +msgid "Share" +msgstr "" + +#: ../../include/conversation.php:1091 +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 +#: ../../mod/editblock.php:115 +msgid "Upload photo" +msgstr "" + +#: ../../include/conversation.php:1094 +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 +#: ../../mod/editblock.php:116 +msgid "Attach file" +msgstr "" + +#: ../../include/conversation.php:1096 +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 +#: ../../mod/editblock.php:117 +msgid "Insert web link" +msgstr "" + +#: ../../include/conversation.php:1098 +msgid "web link" +msgstr "" + +#: ../../include/conversation.php:1099 +msgid "Insert video link" +msgstr "" + +#: ../../include/conversation.php:1100 +msgid "video link" +msgstr "" + +#: ../../include/conversation.php:1101 +msgid "Insert audio link" +msgstr "" + +#: ../../include/conversation.php:1102 +msgid "audio link" +msgstr "" + +#: ../../include/conversation.php:1103 ../../mod/editlayout.php:107 +#: ../../mod/editwebpage.php:126 ../../mod/editpost.php:104 +#: ../../mod/editblock.php:121 +msgid "Set your location" +msgstr "" + +#: ../../include/conversation.php:1104 +msgid "set location" +msgstr "" + +#: ../../include/conversation.php:1105 ../../mod/editlayout.php:108 +#: ../../mod/editwebpage.php:127 ../../mod/editpost.php:105 +#: ../../mod/editblock.php:122 +msgid "Clear browser location" +msgstr "" + +#: ../../include/conversation.php:1106 +msgid "clear location" +msgstr "" + +#: ../../include/conversation.php:1108 ../../mod/editlayout.php:121 +#: ../../mod/editwebpage.php:142 ../../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 +#: ../../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 +#: ../../mod/editblock.php:124 +msgid "Permission settings" +msgstr "" + +#: ../../include/conversation.php:1114 +msgid "permissions" +msgstr "" + +#: ../../include/conversation.php:1122 ../../mod/editlayout.php:118 +#: ../../mod/editwebpage.php:137 ../../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 +#: ../../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 +#: ../../mod/editblock.php:149 +msgid "Set expiration date" +msgstr "" + +#: ../../include/conversation.php:1364 +msgid "Commented Order" +msgstr "" + +#: ../../include/conversation.php:1367 +msgid "Sort by Comment Date" +msgstr "" + +#: ../../include/conversation.php:1370 +msgid "Posted Order" +msgstr "" + +#: ../../include/conversation.php:1373 +msgid "Sort by Post Date" +msgstr "" + +#: ../../include/conversation.php:1377 ../../mod/notifications.php:86 +msgid "Personal" +msgstr "" + +#: ../../include/conversation.php:1380 +msgid "Posts that mention or involve you" +msgstr "" + +#: ../../include/conversation.php:1383 ../../mod/menu.php:57 +#: ../../mod/connections.php:552 +msgid "New" +msgstr "" + +#: ../../include/conversation.php:1386 +msgid "Activity Stream - by date" +msgstr "" + +#: ../../include/conversation.php:1393 +msgid "Starred" +msgstr "" + +#: ../../include/conversation.php:1396 +msgid "Favourite Posts" +msgstr "" + +#: ../../include/conversation.php:1403 +msgid "Spam" +msgstr "" + +#: ../../include/conversation.php:1406 +msgid "Posts flagged as SPAM" +msgstr "" + +#: ../../include/conversation.php:1436 +msgid "Channel" +msgstr "" + +#: ../../include/conversation.php:1439 +msgid "Status Messages and Posts" +msgstr "" + +#: ../../include/conversation.php:1443 +msgid "About" +msgstr "" + +#: ../../include/conversation.php:1446 +msgid "Profile Details" +msgstr "" + +#: ../../include/conversation.php:1464 +msgid "Events and Calendar" +msgstr "" + +#: ../../include/conversation.php:1469 +msgid "Webpages" +msgstr "" + +#: ../../include/conversation.php:1472 +msgid "Manage Webpages" +msgstr "" + +#: ../../include/auth.php:69 +msgid "Logged out." +msgstr "" + +#: ../../include/auth.php:181 +msgid "Failed authentication" +msgstr "" + +#: ../../include/auth.php:190 +msgid "Login failed." +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 +msgid "Find Channels" +msgstr "" + +#: ../../include/contact_widgets.php:45 +msgid "Enter name or interest" +msgstr "" + +#: ../../include/contact_widgets.php:46 +msgid "Connect/Follow" +msgstr "" + +#: ../../include/contact_widgets.php:47 +msgid "Examples: Robert Morgenstein, Fishing" +msgstr "" + +#: ../../include/contact_widgets.php:48 ../../mod/connections.php:696 +#: ../../mod/directory.php:221 ../../mod/directory.php:226 +msgid "Find" +msgstr "" + +#: ../../include/contact_widgets.php:49 ../../mod/suggest.php:64 +msgid "Channel Suggestions" +msgstr "" + +#: ../../include/contact_widgets.php:51 +msgid "Random Profile" +msgstr "" + +#: ../../include/contact_widgets.php:52 +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 +#, 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/text.php:315 +msgid "prev" +msgstr "" + +#: ../../include/text.php:317 +msgid "first" +msgstr "" + +#: ../../include/text.php:346 +msgid "last" +msgstr "" + +#: ../../include/text.php:349 +msgid "next" +msgstr "" + +#: ../../include/text.php:361 +msgid "older" +msgstr "" + +#: ../../include/text.php:363 +msgid "newer" +msgstr "" + +#: ../../include/text.php:654 +msgid "No connections" +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" +msgstr "" + +#: ../../include/text.php:738 ../../mod/filer.php:36 +msgid "Save" +msgstr "" + +#: ../../include/text.php:776 +msgid "poke" +msgstr "" + +#: ../../include/text.php:777 +msgid "ping" +msgstr "" + +#: ../../include/text.php:777 +msgid "pinged" +msgstr "" + +#: ../../include/text.php:778 +msgid "prod" +msgstr "" + +#: ../../include/text.php:778 +msgid "prodded" +msgstr "" + +#: ../../include/text.php:779 +msgid "slap" +msgstr "" + +#: ../../include/text.php:779 +msgid "slapped" +msgstr "" + +#: ../../include/text.php:780 +msgid "finger" +msgstr "" + +#: ../../include/text.php:780 +msgid "fingered" +msgstr "" + +#: ../../include/text.php:781 +msgid "rebuff" +msgstr "" + +#: ../../include/text.php:781 +msgid "rebuffed" +msgstr "" + +#: ../../include/text.php:793 +msgid "happy" +msgstr "" + +#: ../../include/text.php:794 +msgid "sad" +msgstr "" + +#: ../../include/text.php:795 +msgid "mellow" +msgstr "" + +#: ../../include/text.php:796 +msgid "tired" +msgstr "" + +#: ../../include/text.php:797 +msgid "perky" +msgstr "" + +#: ../../include/text.php:798 +msgid "angry" +msgstr "" + +#: ../../include/text.php:799 +msgid "stupified" +msgstr "" + +#: ../../include/text.php:800 +msgid "puzzled" +msgstr "" + +#: ../../include/text.php:801 +msgid "interested" +msgstr "" + +#: ../../include/text.php:802 +msgid "bitter" +msgstr "" + +#: ../../include/text.php:803 +msgid "cheerful" +msgstr "" + +#: ../../include/text.php:804 +msgid "alive" +msgstr "" + +#: ../../include/text.php:805 +msgid "annoyed" +msgstr "" + +#: ../../include/text.php:806 +msgid "anxious" +msgstr "" + +#: ../../include/text.php:807 +msgid "cranky" +msgstr "" + +#: ../../include/text.php:808 +msgid "disturbed" +msgstr "" + +#: ../../include/text.php:809 +msgid "frustrated" +msgstr "" + +#: ../../include/text.php:810 +msgid "motivated" +msgstr "" + +#: ../../include/text.php:811 +msgid "relaxed" +msgstr "" + +#: ../../include/text.php:812 +msgid "surprised" +msgstr "" + +#: ../../include/text.php:976 +msgid "Monday" +msgstr "" + +#: ../../include/text.php:976 +msgid "Tuesday" +msgstr "" + +#: ../../include/text.php:976 +msgid "Wednesday" +msgstr "" + +#: ../../include/text.php:976 +msgid "Thursday" +msgstr "" + +#: ../../include/text.php:976 +msgid "Friday" +msgstr "" + +#: ../../include/text.php:976 +msgid "Saturday" +msgstr "" + +#: ../../include/text.php:976 +msgid "Sunday" +msgstr "" + +#: ../../include/text.php:980 +msgid "January" +msgstr "" + +#: ../../include/text.php:980 +msgid "February" +msgstr "" + +#: ../../include/text.php:980 +msgid "March" +msgstr "" + +#: ../../include/text.php:980 +msgid "April" +msgstr "" + +#: ../../include/text.php:980 +msgid "May" +msgstr "" + +#: ../../include/text.php:980 +msgid "June" +msgstr "" + +#: ../../include/text.php:980 +msgid "July" +msgstr "" + +#: ../../include/text.php:980 +msgid "August" +msgstr "" + +#: ../../include/text.php:980 +msgid "September" +msgstr "" + +#: ../../include/text.php:980 +msgid "October" +msgstr "" + +#: ../../include/text.php:980 +msgid "November" +msgstr "" + +#: ../../include/text.php:980 +msgid "December" +msgstr "" + +#: ../../include/text.php:1058 ../../mod/message.php:453 +msgid "unknown.???" +msgstr "" + +#: ../../include/text.php:1059 ../../mod/message.php:454 +msgid "bytes" +msgstr "" + +#: ../../include/text.php:1094 +msgid "remove category" +msgstr "" + +#: ../../include/text.php:1116 +msgid "remove from file" +msgstr "" + +#: ../../include/text.php:1170 ../../include/text.php:1182 +msgid "Click to open/close" +msgstr "" + +#: ../../include/text.php:1358 ../../mod/events.php:331 +msgid "link to source" +msgstr "" + +#: ../../include/text.php:1377 +msgid "Select a page layout: " +msgstr "" + +#: ../../include/text.php:1380 ../../include/text.php:1445 +msgid "default" +msgstr "" + +#: ../../include/text.php:1416 +msgid "Page content type: " +msgstr "" + +#: ../../include/text.php:1457 +msgid "Select an alternate language" +msgstr "" + +#: ../../include/text.php:1622 +msgid "activity" +msgstr "" + +#: ../../include/text.php:1884 +msgid "Design" +msgstr "" + +#: ../../include/text.php:1886 +msgid "Blocks" +msgstr "" + +#: ../../include/text.php:1887 +msgid "Menus" +msgstr "" + +#: ../../include/text.php:1888 +msgid "Layouts" +msgstr "" + +#: ../../include/text.php:1889 +msgid "Pages" +msgstr "" + +#: ../../include/follow.php:21 +msgid "Channel is blocked on this site." +msgstr "" + +#: ../../include/follow.php:26 +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." +msgstr "" + +#: ../../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/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/permissions.php:21 +msgid "Can send me their channel stream and posts" +msgstr "" + +#: ../../include/permissions.php:22 +msgid "Can post on my channel page (\"wall\")" +msgstr "" + +#: ../../include/permissions.php:23 +msgid "Can comment on my posts" +msgstr "" + +#: ../../include/permissions.php:24 +msgid "Can send me private mail messages" +msgstr "" + +#: ../../include/permissions.php:25 +msgid "Can post photos to my photo albums" +msgstr "" + +#: ../../include/permissions.php:26 +msgid "Can forward to all my channel contacts via post @mentions" +msgstr "" + +#: ../../include/permissions.php:26 +msgid "Advanced - useful for creating group forum channels" +msgstr "" + +#: ../../include/permissions.php:27 +msgid "Can chat with me (when available)" +msgstr "" + +#: ../../include/permissions.php:27 +msgid "Requires compatible chat plugin" +msgstr "" + +#: ../../include/permissions.php:28 +msgid "Can write to my \"public\" file storage" +msgstr "" + +#: ../../include/permissions.php:29 +msgid "Can edit my \"public\" pages" +msgstr "" + +#: ../../include/permissions.php:31 +msgid "Can source my \"public\" posts in derived channels" +msgstr "" + +#: ../../include/permissions.php:31 +msgid "Somewhat advanced - very useful in open communities" +msgstr "" + +#: ../../include/permissions.php:32 +msgid "Can administer my channel resources" +msgstr "" + +#: ../../include/permissions.php:32 +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 +msgid "Unable to obtain identity information from database" +msgstr "" + +#: ../../include/identity.php:62 +msgid "Empty name" +msgstr "" + +#: ../../include/identity.php:64 +msgid "Name too long" +msgstr "" + +#: ../../include/identity.php:132 +msgid "No account identifier" +msgstr "" + +#: ../../include/identity.php:142 +msgid "Nickname is required." +msgstr "" + +#: ../../include/identity.php:156 +msgid "" +"Nickname has unsupported characters or is already being used on this site." +msgstr "" + +#: ../../include/identity.php:215 +msgid "Unable to retrieve created identity" +msgstr "" + +#: ../../include/identity.php:273 +msgid "Default Profile" +msgstr "" + +#: ../../include/identity.php:465 +msgid "Requested channel is not available." +msgstr "" + +#: ../../include/identity.php:477 +msgid " Sorry, you don't have the permission to view this profile. " +msgstr "" + +#: ../../include/identity.php:512 ../../mod/webpages.php:8 +#: ../../mod/connect.php:13 ../../mod/layouts.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:624 +msgid "Change profile photo" +msgstr "" + +#: ../../include/identity.php:633 +msgid "Profiles" +msgstr "" + +#: ../../include/identity.php:633 +msgid "Manage/edit profiles" +msgstr "" + +#: ../../include/identity.php:634 ../../mod/profiles.php:625 +msgid "Create New Profile" +msgstr "" + +#: ../../include/identity.php:637 +msgid "Edit Profile" +msgstr "" + +#: ../../include/identity.php:648 ../../mod/profiles.php:636 +msgid "Profile Image" +msgstr "" + +#: ../../include/identity.php:651 ../../mod/profiles.php:639 +msgid "visible to everybody" +msgstr "" + +#: ../../include/identity.php:652 ../../mod/profiles.php:640 +msgid "Edit visibility" +msgstr "" + +#: ../../include/identity.php:665 ../../include/identity.php:883 +#: ../../mod/directory.php:175 +msgid "Gender:" +msgstr "" + +#: ../../include/identity.php:666 ../../include/identity.php:903 +#: ../../mod/directory.php:177 +msgid "Status:" +msgstr "" + +#: ../../include/identity.php:667 ../../include/identity.php:914 +#: ../../mod/directory.php:179 +msgid "Homepage:" +msgstr "" + +#: ../../include/identity.php:730 ../../include/identity.php:810 +#: ../../mod/ping.php:230 +msgid "g A l F d" +msgstr "" + +#: ../../include/identity.php:731 ../../include/identity.php:811 +msgid "F d" +msgstr "" + +#: ../../include/identity.php:776 ../../include/identity.php:851 +#: ../../mod/ping.php:252 +msgid "[today]" +msgstr "" + +#: ../../include/identity.php:788 +msgid "Birthday Reminders" +msgstr "" + +#: ../../include/identity.php:789 +msgid "Birthdays this week:" +msgstr "" + +#: ../../include/identity.php:844 +msgid "[No description]" +msgstr "" + +#: ../../include/identity.php:862 +msgid "Event Reminders" +msgstr "" + +#: ../../include/identity.php:863 +msgid "Events this week:" +msgstr "" + +#: ../../include/identity.php:873 ../../include/identity.php:984 +#: ../../mod/profperm.php:112 +msgid "Profile" +msgstr "" + +#: ../../include/identity.php:881 ../../mod/settings.php:1013 +msgid "Full Name:" +msgstr "" + +#: ../../include/identity.php:888 +msgid "j F, Y" +msgstr "" + +#: ../../include/identity.php:889 +msgid "j F" +msgstr "" + +#: ../../include/identity.php:896 +msgid "Birthday:" +msgstr "" + +#: ../../include/identity.php:900 +msgid "Age:" +msgstr "" + +#: ../../include/identity.php:909 +#, php-format +msgid "for %1$d %2$s" +msgstr "" + +#: ../../include/identity.php:912 ../../mod/profiles.php:549 +msgid "Sexual Preference:" +msgstr "" + +#: ../../include/identity.php:916 ../../mod/profiles.php:551 +msgid "Hometown:" +msgstr "" + +#: ../../include/identity.php:918 +msgid "Tags:" +msgstr "" + +#: ../../include/identity.php:920 ../../mod/profiles.php:552 +msgid "Political Views:" +msgstr "" + +#: ../../include/identity.php:922 +msgid "Religion:" +msgstr "" + +#: ../../include/identity.php:924 ../../mod/directory.php:181 +msgid "About:" +msgstr "" + +#: ../../include/identity.php:926 +msgid "Hobbies/Interests:" +msgstr "" + +#: ../../include/identity.php:928 ../../mod/profiles.php:555 +msgid "Likes:" +msgstr "" + +#: ../../include/identity.php:930 ../../mod/profiles.php:556 +msgid "Dislikes:" +msgstr "" + +#: ../../include/identity.php:933 +msgid "Contact information and Social Networks:" +msgstr "" + +#: ../../include/identity.php:935 +msgid "Musical interests:" +msgstr "" + +#: ../../include/identity.php:937 +msgid "Books, literature:" +msgstr "" + +#: ../../include/identity.php:939 +msgid "Television:" +msgstr "" + +#: ../../include/identity.php:941 +msgid "Film/dance/culture/entertainment:" +msgstr "" + +#: ../../include/identity.php:943 +msgid "Love/Romance:" +msgstr "" + +#: ../../include/identity.php:945 +msgid "Work/employment:" +msgstr "" + +#: ../../include/identity.php:947 +msgid "School/education:" +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: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 "" + +#: ../../include/items.php:201 ../../mod/like.php:55 ../../mod/group.php:74 +#: ../../mod/profperm.php:28 ../../index.php:339 +msgid "Permission denied" +msgstr "" + +#: ../../include/items.php:3350 ../../mod/admin.php:150 +#: ../../mod/admin.php:727 ../../mod/admin.php:930 ../../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 +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" +msgstr "" + +#: ../../include/dir_fns.php:29 +msgid "Enable Safe Search" +msgstr "" + +#: ../../include/dir_fns.php:31 +msgid "Disable Safe Search" +msgstr "" + +#: ../../include/dir_fns.php:33 +msgid "Safe Mode" +msgstr "" + +#: ../../mod/common.php:10 +msgid "No channel." +msgstr "" + +#: ../../mod/common.php:47 +msgid "Common connections" +msgstr "" + +#: ../../mod/common.php:52 +msgid "No connections in common." +msgstr "" + +#: ../../mod/events.php:71 +msgid "Event title and start time are required." +msgstr "" + +#: ../../mod/events.php:286 +msgid "l, F j" +msgstr "" + +#: ../../mod/events.php:308 +msgid "Edit event" +msgstr "" + +#: ../../mod/events.php:354 +msgid "Create New Event" +msgstr "" + +#: ../../mod/events.php:355 +msgid "Previous" +msgstr "" + +#: ../../mod/events.php:356 ../../mod/setup.php:256 +msgid "Next" +msgstr "" + +#: ../../mod/events.php:428 +msgid "hour:minute" +msgstr "" + +#: ../../mod/events.php:447 +msgid "Event details" +msgstr "" + +#: ../../mod/events.php:448 +#, php-format +msgid "Format is %s %s. Starting date and Title are required." +msgstr "" + +#: ../../mod/events.php:450 +msgid "Event Starts:" +msgstr "" + +#: ../../mod/events.php:450 ../../mod/events.php:464 +msgid "Required" +msgstr "" + +#: ../../mod/events.php:453 +msgid "Finish date/time is not known or not relevant" +msgstr "" + +#: ../../mod/events.php:455 +msgid "Event Finishes:" +msgstr "" + +#: ../../mod/events.php:458 +msgid "Adjust for viewer timezone" +msgstr "" + +#: ../../mod/events.php:460 +msgid "Description:" +msgstr "" + +#: ../../mod/events.php:464 +msgid "Title:" +msgstr "" + +#: ../../mod/events.php:466 +msgid "Share this event" +msgstr "" + +#: ../../mod/thing.php:109 +msgid "Object store: failed" +msgstr "" + +#: ../../mod/thing.php:113 +msgid "thing/stuff added" +msgstr "" + +#: ../../mod/thing.php:129 +#, php-format +msgid "OBJ: %1$s %2$s %3$s" +msgstr "" + +#: ../../mod/thing.php:175 +msgid "not yet implemented." +msgstr "" + +#: ../../mod/thing.php:181 +msgid "Add Stuff to your Profile" +msgstr "" + +#: ../../mod/thing.php:183 +msgid "Select a profile" +msgstr "" + +#: ../../mod/thing.php:185 +msgid "Select a category of stuff. e.g. I ______ something" +msgstr "" + +#: ../../mod/thing.php:187 +msgid "Name of thing or stuff e.g. something" +msgstr "" + +#: ../../mod/thing.php:188 +msgid "URL of thing or stuff (optional)" +msgstr "" + +#: ../../mod/thing.php:189 +msgid "URL for photo of thing or stuff (optional)" +msgstr "" + +#: ../../mod/invite.php:25 +msgid "Total invitation limit exceeded." +msgstr "" + +#: ../../mod/invite.php:47 +#, php-format +msgid "%s : Not a valid email address." +msgstr "" + +#: ../../mod/invite.php:74 +msgid "Please join us on Red" +msgstr "" + +#: ../../mod/invite.php:85 +msgid "Invitation limit exceeded. Please contact your site administrator." +msgstr "" + +#: ../../mod/invite.php:90 +#, php-format +msgid "%s : Message delivery failed." +msgstr "" + +#: ../../mod/invite.php:94 +#, php-format +msgid "%d message sent." +msgid_plural "%d messages sent." +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/invite.php:113 +msgid "You have no more invitations available" +msgstr "" + +#: ../../mod/invite.php:139 +msgid "Send invitations" +msgstr "" + +#: ../../mod/invite.php:140 +msgid "Enter email addresses, one per line:" +msgstr "" + +#: ../../mod/invite.php:141 ../../mod/message.php:326 +#: ../../mod/message.php:508 +msgid "Your message:" +msgstr "" + +#: ../../mod/invite.php:142 +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 +msgid "You will need to supply this invitation code: $invite_code" +msgstr "" + +#: ../../mod/invite.php:145 +msgid "Please visit my channel at" +msgstr "" + +#: ../../mod/invite.php:149 +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 +msgid "Click the [Register] link on the following page to join." +msgstr "" + +#: ../../mod/invite.php:153 +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 "" + +#: ../../mod/allfriends.php:35 +#, php-format +msgid "Friends of %s" +msgstr "" + +#: ../../mod/allfriends.php:41 +msgid "No friends to display." +msgstr "" + +#: ../../mod/webpages.php:104 ../../mod/layouts.php:105 +#: ../../mod/blocks.php:96 +msgid "View" +msgstr "" + +#: ../../mod/api.php:76 ../../mod/api.php:102 +msgid "Authorize application connection" +msgstr "" + +#: ../../mod/api.php:77 +msgid "Return to your app and insert this Securty Code:" +msgstr "" + +#: ../../mod/api.php:89 +msgid "Please login to continue." +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?" +msgstr "" + +#: ../../mod/api.php:105 ../../mod/settings.php:967 ../../mod/settings.php:972 +#: ../../mod/profiles.php:506 +msgid "Yes" +msgstr "" + +#: ../../mod/api.php:106 ../../mod/settings.php:967 ../../mod/settings.php:972 +#: ../../mod/profiles.php:507 +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 "" + +#: ../../mod/apps.php:13 +msgid "Applications" +msgstr "" + +#: ../../mod/page.php:35 +msgid "Invalid item." +msgstr "" + +#: ../../mod/page.php:47 ../../mod/chanview.php:78 ../../mod/home.php:51 +#: ../../mod/wall_upload.php:35 +msgid "Channel not found." +msgstr "" + +#: ../../mod/page.php:83 ../../mod/help.php:56 ../../mod/display.php:100 +#: ../../index.php:229 +msgid "Page not found." +msgstr "" + +#: ../../mod/attach.php:9 +msgid "Item not available." +msgstr "" + +#: ../../mod/setup.php:161 +msgid "Red Matrix Server - Setup" +msgstr "" + +#: ../../mod/setup.php:167 +msgid "Could not connect to database." +msgstr "" + +#: ../../mod/setup.php:171 +msgid "" +"Could not connect to specified site URL. Possible SSL certificate or DNS " +"issue." +msgstr "" + +#: ../../mod/setup.php:176 +msgid "Could not create table." +msgstr "" + +#: ../../mod/setup.php:182 +msgid "Your site database has been installed." +msgstr "" + +#: ../../mod/setup.php:187 +msgid "" +"You may need to import the file \"install/database.sql\" manually using " +"phpmyadmin or mysql." +msgstr "" + +#: ../../mod/setup.php:188 ../../mod/setup.php:255 ../../mod/setup.php:584 +msgid "Please see the file \"install/INSTALL.txt\"." +msgstr "" + +#: ../../mod/setup.php:252 +msgid "System check" +msgstr "" + +#: ../../mod/setup.php:257 +msgid "Check again" +msgstr "" + +#: ../../mod/setup.php:279 +msgid "Database connection" +msgstr "" + +#: ../../mod/setup.php:280 +msgid "" +"In order to install Red Matrix we need to know how to connect to your " +"database." +msgstr "" + +#: ../../mod/setup.php:281 +msgid "" +"Please contact your hosting provider or site administrator if you have " +"questions about these settings." +msgstr "" + +#: ../../mod/setup.php:282 +msgid "" +"The database you specify below should already exist. If it does not, please " +"create it before continuing." +msgstr "" + +#: ../../mod/setup.php:286 +msgid "Database Server Name" +msgstr "" + +#: ../../mod/setup.php:286 +msgid "Default is localhost" +msgstr "" + +#: ../../mod/setup.php:287 +msgid "Database Port" +msgstr "" + +#: ../../mod/setup.php:287 +msgid "Communication port number - use 0 for default" +msgstr "" + +#: ../../mod/setup.php:288 +msgid "Database Login Name" +msgstr "" + +#: ../../mod/setup.php:289 +msgid "Database Login Password" +msgstr "" + +#: ../../mod/setup.php:290 +msgid "Database Name" +msgstr "" + +#: ../../mod/setup.php:292 ../../mod/setup.php:334 +msgid "Site administrator email address" +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." +msgstr "" + +#: ../../mod/setup.php:293 ../../mod/setup.php:336 +msgid "Website URL" +msgstr "" + +#: ../../mod/setup.php:293 ../../mod/setup.php:336 +msgid "Please use SSL (https) URL if available." +msgstr "" + +#: ../../mod/setup.php:296 ../../mod/setup.php:339 +msgid "Please select a default timezone for your website" +msgstr "" + +#: ../../mod/setup.php:323 +msgid "Site settings" +msgstr "" + +#: ../../mod/setup.php:379 +msgid "Could not find a command line version of PHP in the web server PATH." +msgstr "" + +#: ../../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/setup.php:384 +msgid "PHP executable path" +msgstr "" + +#: ../../mod/setup.php:384 +msgid "" +"Enter full path to php executable. You can leave this blank to continue the " +"installation." +msgstr "" + +#: ../../mod/setup.php:389 +msgid "Command line PHP" +msgstr "" + +#: ../../mod/setup.php:398 +msgid "" +"The command line version of PHP on your system does not have " +"\"register_argc_argv\" enabled." +msgstr "" + +#: ../../mod/setup.php:399 +msgid "This is required for message delivery to work." +msgstr "" + +#: ../../mod/setup.php:401 +msgid "PHP register_argc_argv" +msgstr "" + +#: ../../mod/setup.php:422 +msgid "" +"Error: the \"openssl_pkey_new\" function on this system is not able to " +"generate encryption keys" +msgstr "" + +#: ../../mod/setup.php:423 +msgid "" +"If running under Windows, please see \"http://www.php.net/manual/en/openssl." +"installation.php\"." +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" +msgstr "" + +#: ../../mod/setup.php:436 +msgid "mb_string PHP module" +msgstr "" + +#: ../../mod/setup.php:437 +msgid "mcrypt PHP module" +msgstr "" + +#: ../../mod/setup.php:442 ../../mod/setup.php:444 +msgid "Apache mod_rewrite module" +msgstr "" + +#: ../../mod/setup.php:442 +msgid "" +"Error: Apache webserver mod-rewrite module is required but not installed." +msgstr "" + +#: ../../mod/setup.php:448 ../../mod/setup.php:451 +msgid "proc_open" +msgstr "" + +#: ../../mod/setup.php:448 +msgid "" +"Error: proc_open is required but is either not installed or has been " +"disabled in php.ini" +msgstr "" + +#: ../../mod/setup.php:456 +msgid "Error: libCURL PHP module required but not installed." +msgstr "" + +#: ../../mod/setup.php:460 +msgid "" +"Error: GD graphics PHP module with JPEG support required but not installed." +msgstr "" + +#: ../../mod/setup.php:464 +msgid "Error: openssl PHP module required but not installed." +msgstr "" + +#: ../../mod/setup.php:468 +msgid "Error: mysqli PHP module required but not installed." +msgstr "" + +#: ../../mod/setup.php:472 +msgid "Error: mb_string PHP module required but not installed." +msgstr "" + +#: ../../mod/setup.php:476 +msgid "Error: mcrypt PHP module required but not installed." +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." +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." +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." +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." +msgstr "" + +#: ../../mod/setup.php:498 +msgid ".htconfig.php is writable" +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." +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." +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." +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." +msgstr "" + +#: ../../mod/setup.php:514 +msgid "view/tpl/smarty3 is writable" +msgstr "" + +#: ../../mod/setup.php:528 +msgid "SSL certificate validation" +msgstr "" + +#: ../../mod/setup.php:528 +msgid "" +"SSL certificate cannot be validated. Fix certificate or disable https access " +"to this site." +msgstr "" + +#: ../../mod/setup.php:535 +msgid "" +"Url rewrite in .htaccess is not working. Check your server configuration." +msgstr "" + +#: ../../mod/setup.php:537 +msgid "Url rewrite is working" +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." +msgstr "" + +#: ../../mod/setup.php:571 +msgid "Errors encountered creating database tables." +msgstr "" + +#: ../../mod/setup.php:582 +msgid "

      What next

      " +msgstr "" + +#: ../../mod/setup.php:583 +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." +msgstr "" + +#: ../../mod/settings.php:339 +msgid "System failure storing new email. Please try again." +msgstr "" + +#: ../../mod/settings.php:537 +msgid "Settings updated." +msgstr "" + +#: ../../mod/settings.php:608 ../../mod/settings.php:634 +#: ../../mod/settings.php:670 +msgid "Add application" +msgstr "" + +#: ../../mod/settings.php:610 ../../mod/settings.php:636 +#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/fbrowser.php:82 +#: ../../mod/fbrowser.php:117 +msgid "Cancel" +msgstr "" + +#: ../../mod/settings.php:611 ../../mod/settings.php:637 +#: ../../mod/admin.php:686 ../../mod/crepair.php:148 +msgid "Name" +msgstr "" + +#: ../../mod/settings.php:611 +msgid "Name of application" +msgstr "" + +#: ../../mod/settings.php:612 ../../mod/settings.php:638 +msgid "Consumer Key" +msgstr "" + +#: ../../mod/settings.php:612 ../../mod/settings.php:613 +msgid "Automatically generated - change if desired. Max length 20" +msgstr "" + +#: ../../mod/settings.php:613 ../../mod/settings.php:639 +msgid "Consumer Secret" +msgstr "" + +#: ../../mod/settings.php:614 ../../mod/settings.php:640 +msgid "Redirect" +msgstr "" + +#: ../../mod/settings.php:614 +msgid "" +"Redirect URI - leave blank unless your application specifically requires this" +msgstr "" + +#: ../../mod/settings.php:615 ../../mod/settings.php:641 +msgid "Icon url" +msgstr "" + +#: ../../mod/settings.php:615 +msgid "Optional" +msgstr "" + +#: ../../mod/settings.php:626 +msgid "You can't edit this application." +msgstr "" + +#: ../../mod/settings.php:669 +msgid "Connected Apps" +msgstr "" + +#: ../../mod/settings.php:673 +msgid "Client key starts with" +msgstr "" + +#: ../../mod/settings.php:674 +msgid "No name" +msgstr "" + +#: ../../mod/settings.php:675 +msgid "Remove authorization" +msgstr "" + +#: ../../mod/settings.php:686 +msgid "No feature settings configured" +msgstr "" + +#: ../../mod/settings.php:694 +msgid "Feature Settings" +msgstr "" + +#: ../../mod/settings.php:717 +msgid "Account Settings" +msgstr "" + +#: ../../mod/settings.php:718 +msgid "Password Settings" +msgstr "" + +#: ../../mod/settings.php:719 +msgid "New Password:" +msgstr "" + +#: ../../mod/settings.php:720 +msgid "Confirm:" +msgstr "" + +#: ../../mod/settings.php:720 +msgid "Leave password fields blank unless changing" +msgstr "" + +#: ../../mod/settings.php:722 ../../mod/settings.php:1014 +msgid "Email Address:" +msgstr "" + +#: ../../mod/settings.php:723 +msgid "Remove Account" +msgstr "" + +#: ../../mod/settings.php:724 +msgid "Warning: This action is permanent and cannot be reversed." +msgstr "" + +#: ../../mod/settings.php:740 +msgid "Off" +msgstr "" + +#: ../../mod/settings.php:740 +msgid "On" +msgstr "" + +#: ../../mod/settings.php:747 +msgid "Additional Features" +msgstr "" + +#: ../../mod/settings.php:772 +msgid "Connector Settings" +msgstr "" + +#: ../../mod/settings.php:802 ../../mod/admin.php:369 +msgid "No special theme for mobile devices" +msgstr "" + +#: ../../mod/settings.php:842 +msgid "Display Settings" +msgstr "" + +#: ../../mod/settings.php:848 +msgid "Display Theme:" +msgstr "" + +#: ../../mod/settings.php:849 +msgid "Mobile Theme:" +msgstr "" + +#: ../../mod/settings.php:850 +msgid "Update browser every xx seconds" +msgstr "" + +#: ../../mod/settings.php:850 +msgid "Minimum of 10 seconds, no maximum" +msgstr "" + +#: ../../mod/settings.php:851 +msgid "Maximum number of conversations to load at any time:" +msgstr "" + +#: ../../mod/settings.php:851 +msgid "Maximum of 100 items" +msgstr "" + +#: ../../mod/settings.php:852 +msgid "Don't show emoticons" +msgstr "" + +#: ../../mod/settings.php:888 +msgid "Nobody except yourself" +msgstr "" + +#: ../../mod/settings.php:889 +msgid "Only those you specifically allow" +msgstr "" + +#: ../../mod/settings.php:890 +msgid "Anybody in your address book" +msgstr "" + +#: ../../mod/settings.php:891 +msgid "Anybody on this website" +msgstr "" + +#: ../../mod/settings.php:892 +msgid "Anybody in this network" +msgstr "" + +#: ../../mod/settings.php:893 +msgid "Anybody on the internet" +msgstr "" + +#: ../../mod/settings.php:967 +msgid "Publish your default profile in the network directory" +msgstr "" + +#: ../../mod/settings.php:972 +msgid "Allow us to suggest you as a potential friend to new members?" +msgstr "" + +#: ../../mod/settings.php:976 ../../mod/profile_photo.php:298 +msgid "or" +msgstr "" + +#: ../../mod/settings.php:981 +msgid "Your channel address is" +msgstr "" + +#: ../../mod/settings.php:1003 +msgid "Channel Settings" +msgstr "" + +#: ../../mod/settings.php:1012 +msgid "Basic Settings" +msgstr "" + +#: ../../mod/settings.php:1015 +msgid "Your Timezone:" +msgstr "" + +#: ../../mod/settings.php:1016 +msgid "Default Post Location:" +msgstr "" + +#: ../../mod/settings.php:1017 +msgid "Use Browser Location:" +msgstr "" + +#: ../../mod/settings.php:1019 +msgid "Adult Content" +msgstr "" + +#: ../../mod/settings.php:1019 +msgid "This channel publishes adult content." +msgstr "" + +#: ../../mod/settings.php:1021 +msgid "Security and Privacy Settings" +msgstr "" + +#: ../../mod/settings.php:1023 +msgid "Quick Privacy Settings:" +msgstr "" + +#: ../../mod/settings.php:1024 +msgid "Very Public - extremely permissive" +msgstr "" + +#: ../../mod/settings.php:1025 +msgid "Typical - default public, privacy when desired" +msgstr "" + +#: ../../mod/settings.php:1026 +msgid "Private - default private, rarely open or public" +msgstr "" + +#: ../../mod/settings.php:1027 +msgid "Blocked - default blocked to/from everybody" +msgstr "" + +#: ../../mod/settings.php:1030 +msgid "Maximum Friend Requests/Day:" +msgstr "" + +#: ../../mod/settings.php:1030 +msgid "May reduce spam activity" +msgstr "" + +#: ../../mod/settings.php:1031 +msgid "Default Post Permissions" +msgstr "" + +#: ../../mod/settings.php:1032 +msgid "(click to open/close)" +msgstr "" + +#: ../../mod/settings.php:1043 +msgid "Maximum private messages per day from unknown people:" +msgstr "" + +#: ../../mod/settings.php:1043 +msgid "Useful to reduce spamming" +msgstr "" + +#: ../../mod/settings.php:1046 +msgid "Notification Settings" +msgstr "" + +#: ../../mod/settings.php:1047 +msgid "By default post a status message when:" +msgstr "" + +#: ../../mod/settings.php:1048 +msgid "accepting a friend request" +msgstr "" + +#: ../../mod/settings.php:1049 +msgid "joining a forum/community" +msgstr "" + +#: ../../mod/settings.php:1050 +msgid "making an interesting profile change" +msgstr "" + +#: ../../mod/settings.php:1051 +msgid "Send a notification email when:" +msgstr "" + +#: ../../mod/settings.php:1052 +msgid "You receive an introduction" +msgstr "" + +#: ../../mod/settings.php:1053 +msgid "Your introductions are confirmed" +msgstr "" + +#: ../../mod/settings.php:1054 +msgid "Someone writes on your profile wall" +msgstr "" + +#: ../../mod/settings.php:1055 +msgid "Someone writes a followup comment" +msgstr "" + +#: ../../mod/settings.php:1056 +msgid "You receive a private message" +msgstr "" + +#: ../../mod/settings.php:1057 +msgid "You receive a friend suggestion" +msgstr "" + +#: ../../mod/settings.php:1058 +msgid "You are tagged in a post" +msgstr "" + +#: ../../mod/settings.php:1059 +msgid "You are poked/prodded/etc. in a post" +msgstr "" + +#: ../../mod/settings.php:1062 +msgid "Advanced Account/Page Type Settings" +msgstr "" + +#: ../../mod/settings.php:1063 +msgid "Change the behaviour of this account for special situations" +msgstr "" + +#: ../../mod/viewconnections.php:28 ../../mod/search.php:80 +#: ../../mod/photos.php:576 ../../mod/display.php:9 ../../mod/community.php:18 +#: ../../mod/directory.php:32 +msgid "Public access denied." +msgstr "" + +#: ../../mod/viewconnections.php:57 +msgid "No connections." +msgstr "" + +#: ../../mod/viewconnections.php:69 +#, php-format +msgid "Visit %s's profile [%s]" +msgstr "" + +#: ../../mod/viewconnections.php:84 +msgid "View Connnections" +msgstr "" + +#: ../../mod/tagrm.php:41 +msgid "Tag removed" +msgstr "" + +#: ../../mod/tagrm.php:79 +msgid "Remove Item Tag" +msgstr "" + +#: ../../mod/tagrm.php:81 +msgid "Select a tag to remove: " +msgstr "" + +#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130 +msgid "Remove" +msgstr "" + +#: ../../mod/connect.php:59 ../../mod/connect.php:107 +msgid "Continue" +msgstr "" + +#: ../../mod/connect.php:88 +msgid "Premium Channel Setup" +msgstr "" + +#: ../../mod/connect.php:90 +msgid "Enable premium channel connection restrictions" +msgstr "" + +#: ../../mod/connect.php:91 +msgid "" +"Please enter your restrictions or conditions, such as paypal receipt, usage " +"guidelines, etc." +msgstr "" + +#: ../../mod/connect.php:93 ../../mod/connect.php:113 +msgid "" +"This channel may require additional steps or acknowledgement of the " +"following conditions prior to connecting:" +msgstr "" + +#: ../../mod/connect.php:94 +msgid "" +"Potential connections will then see the following text before proceeding:" +msgstr "" + +#: ../../mod/connect.php:95 ../../mod/connect.php:116 +msgid "" +"By continuing, I certify that I have complied with any instructions provided " +"on this page." +msgstr "" + +#: ../../mod/connect.php:104 +msgid "(No specific instructions have been provided by the channel owner.)" +msgstr "" + +#: ../../mod/connect.php:112 +msgid "Restricted or Premium Channel" +msgstr "" + +#: ../../mod/delegate.php:95 +msgid "No potential page delegates located." +msgstr "" + +#: ../../mod/delegate.php:121 +msgid "Delegate Page Management" +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." +msgstr "" + +#: ../../mod/delegate.php:124 +msgid "Existing Page Managers" +msgstr "" + +#: ../../mod/delegate.php:126 +msgid "Existing Page Delegates" +msgstr "" + +#: ../../mod/delegate.php:128 +msgid "Potential Delegates" +msgstr "" + +#: ../../mod/delegate.php:131 +msgid "Add" +msgstr "" + +#: ../../mod/delegate.php:132 +msgid "No entries." +msgstr "" + +#: ../../mod/sources.php:27 +msgid "Source created." +msgstr "" + +#: ../../mod/sources.php:39 +msgid "Source updated." +msgstr "" + +#: ../../mod/sources.php:68 +msgid "Manage remote sources of content for your channel." +msgstr "" + +#: ../../mod/sources.php:69 ../../mod/sources.php:79 +msgid "New Source" +msgstr "" + +#: ../../mod/sources.php:80 ../../mod/sources.php:106 +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 +msgid "Only import content with these words (one per line)" +msgstr "" + +#: ../../mod/sources.php:81 ../../mod/sources.php:107 +msgid "Leave blank to import all public content" +msgstr "" + +#: ../../mod/sources.php:82 ../../mod/sources.php:109 +#: ../../mod/new_channel.php:110 +msgid "Channel Name" +msgstr "" + +#: ../../mod/sources.php:96 ../../mod/sources.php:122 +msgid "Source not found." +msgstr "" + +#: ../../mod/sources.php:103 +msgid "Edit Source" +msgstr "" + +#: ../../mod/sources.php:104 +msgid "Delete Source" +msgstr "" + +#: ../../mod/sources.php:130 +msgid "Source removed" +msgstr "" + +#: ../../mod/sources.php:132 +msgid "Unable to remove source." +msgstr "" + +#: ../../mod/admin.php:48 +msgid "Theme settings updated." +msgstr "" + +#: ../../mod/admin.php:87 ../../mod/admin.php:417 +msgid "Site" +msgstr "" + +#: ../../mod/admin.php:88 ../../mod/admin.php:682 ../../mod/admin.php:694 +msgid "Users" +msgstr "" + +#: ../../mod/admin.php:89 ../../mod/admin.php:780 ../../mod/admin.php:822 +msgid "Plugins" +msgstr "" + +#: ../../mod/admin.php:90 ../../mod/admin.php:985 ../../mod/admin.php:1021 +msgid "Themes" +msgstr "" + +#: ../../mod/admin.php:91 ../../mod/admin.php:475 +msgid "Server" +msgstr "" + +#: ../../mod/admin.php:92 +msgid "DB updates" +msgstr "" + +#: ../../mod/admin.php:106 ../../mod/admin.php:113 ../../mod/admin.php:1108 +msgid "Logs" +msgstr "" + +#: ../../mod/admin.php:112 +msgid "Plugin Features" +msgstr "" + +#: ../../mod/admin.php:114 +msgid "User registrations waiting for confirmation" +msgstr "" + +#: ../../mod/admin.php:188 +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 +msgid "Administration" +msgstr "" + +#: ../../mod/admin.php:194 +msgid "Summary" +msgstr "" + +#: ../../mod/admin.php:196 +msgid "Registered users" +msgstr "" + +#: ../../mod/admin.php:198 ../../mod/admin.php:478 +msgid "Pending registrations" +msgstr "" + +#: ../../mod/admin.php:199 +msgid "Version" +msgstr "" + +#: ../../mod/admin.php:201 ../../mod/admin.php:479 +msgid "Active plugins" +msgstr "" + +#: ../../mod/admin.php:340 +msgid "Site settings updated." +msgstr "" + +#: ../../mod/admin.php:371 +msgid "No special theme for accessibility" +msgstr "" + +#: ../../mod/admin.php:396 +msgid "Closed" +msgstr "" + +#: ../../mod/admin.php:397 +msgid "Requires approval" +msgstr "" + +#: ../../mod/admin.php:398 +msgid "Open" +msgstr "" + +#: ../../mod/admin.php:403 +msgid "Private" +msgstr "" + +#: ../../mod/admin.php:404 +msgid "Paid Access" +msgstr "" + +#: ../../mod/admin.php:405 +msgid "Free Access" +msgstr "" + +#: ../../mod/admin.php:406 +msgid "Tiered Access" +msgstr "" + +#: ../../mod/admin.php:419 ../../mod/register.php:180 +msgid "Registration" +msgstr "" + +#: ../../mod/admin.php:420 +msgid "File upload" +msgstr "" + +#: ../../mod/admin.php:421 +msgid "Policies" +msgstr "" + +#: ../../mod/admin.php:422 +msgid "Advanced" +msgstr "" + +#: ../../mod/admin.php:426 +msgid "Site name" +msgstr "" + +#: ../../mod/admin.php:427 +msgid "Banner/Logo" +msgstr "" + +#: ../../mod/admin.php:428 +msgid "System language" +msgstr "" + +#: ../../mod/admin.php:429 +msgid "System theme" +msgstr "" + +#: ../../mod/admin.php:429 +msgid "" +"Default system theme - may be over-ridden by user profiles - change theme settings" +msgstr "" + +#: ../../mod/admin.php:430 +msgid "Mobile system theme" +msgstr "" + +#: ../../mod/admin.php:430 +msgid "Theme for mobile devices" +msgstr "" + +#: ../../mod/admin.php:431 +msgid "Accessibility system theme" +msgstr "" + +#: ../../mod/admin.php:431 +msgid "Accessibility theme" +msgstr "" + +#: ../../mod/admin.php:432 +msgid "Channel to use for this website's static pages" +msgstr "" + +#: ../../mod/admin.php:432 +msgid "Site Channel" +msgstr "" + +#: ../../mod/admin.php:434 +msgid "Maximum image size" +msgstr "" + +#: ../../mod/admin.php:434 +msgid "" +"Maximum size in bytes of uploaded images. Default is 0, which means no " +"limits." +msgstr "" + +#: ../../mod/admin.php:435 +msgid "Register policy" +msgstr "" + +#: ../../mod/admin.php:436 +msgid "Access policy" +msgstr "" + +#: ../../mod/admin.php:437 +msgid "Register text" +msgstr "" + +#: ../../mod/admin.php:437 +msgid "Will be displayed prominently on the registration page." +msgstr "" + +#: ../../mod/admin.php:438 +msgid "Accounts abandoned after x days" +msgstr "" + +#: ../../mod/admin.php:438 +msgid "" +"Will not waste system resources polling external sites for abandonded " +"accounts. Enter 0 for no time limit." +msgstr "" + +#: ../../mod/admin.php:439 +msgid "Allowed friend domains" +msgstr "" + +#: ../../mod/admin.php:439 +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 +msgid "Allowed email domains" +msgstr "" + +#: ../../mod/admin.php:440 +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 +msgid "Block public" +msgstr "" + +#: ../../mod/admin.php:441 +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 +msgid "Force publish" +msgstr "" + +#: ../../mod/admin.php:442 +msgid "" +"Check to force all profiles on this site to be listed in the site directory." +msgstr "" + +#: ../../mod/admin.php:444 +msgid "Proxy user" +msgstr "" + +#: ../../mod/admin.php:445 +msgid "Proxy URL" +msgstr "" + +#: ../../mod/admin.php:446 +msgid "Network timeout" +msgstr "" + +#: ../../mod/admin.php:446 +msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." +msgstr "" + +#: ../../mod/admin.php:447 +msgid "Delivery interval" +msgstr "" + +#: ../../mod/admin.php:447 +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 +msgid "Poll interval" +msgstr "" + +#: ../../mod/admin.php:448 +msgid "" +"Delay background polling processes by this many seconds to reduce system " +"load. If 0, use delivery interval." +msgstr "" + +#: ../../mod/admin.php:449 +msgid "Maximum Load Average" +msgstr "" + +#: ../../mod/admin.php:449 +msgid "" +"Maximum system load before delivery and poll processes are deferred - " +"default 50." +msgstr "" + +#: ../../mod/admin.php:466 +msgid "No server found" +msgstr "" + +#: ../../mod/admin.php:473 ../../mod/admin.php:695 +msgid "ID" +msgstr "" + +#: ../../mod/admin.php:473 +msgid "for channel" +msgstr "" + +#: ../../mod/admin.php:473 +msgid "on server" +msgstr "" + +#: ../../mod/admin.php:473 +msgid "Status" +msgstr "" + +#: ../../mod/admin.php:493 +msgid "Update has been marked successful" +msgstr "" + +#: ../../mod/admin.php:503 +#, php-format +msgid "Executing %s failed. Check system logs." +msgstr "" + +#: ../../mod/admin.php:506 +#, php-format +msgid "Update %s was successfully applied." +msgstr "" + +#: ../../mod/admin.php:510 +#, php-format +msgid "Update %s did not return a status. Unknown if it succeeded." +msgstr "" + +#: ../../mod/admin.php:513 +#, php-format +msgid "Update function %s could not be found." +msgstr "" + +#: ../../mod/admin.php:528 +msgid "No failed updates." +msgstr "" + +#: ../../mod/admin.php:532 +msgid "Failed Updates" +msgstr "" + +#: ../../mod/admin.php:534 +msgid "Mark success (if update was manually applied)" +msgstr "" + +#: ../../mod/admin.php:535 +msgid "Attempt to execute this update step automatically" +msgstr "" + +#: ../../mod/admin.php:561 +#, php-format +msgid "%s user blocked/unblocked" +msgid_plural "%s users blocked/unblocked" +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/admin.php:568 +#, php-format +msgid "%s user deleted" +msgid_plural "%s users deleted" +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/admin.php:599 +msgid "Account not found" +msgstr "" + +#: ../../mod/admin.php:610 +#, php-format +msgid "User '%s' deleted" +msgstr "" + +#: ../../mod/admin.php:619 +#, php-format +msgid "User '%s' unblocked" +msgstr "" + +#: ../../mod/admin.php:619 +#, php-format +msgid "User '%s' blocked" +msgstr "" + +#: ../../mod/admin.php:684 +msgid "select all" +msgstr "" + +#: ../../mod/admin.php:685 +msgid "User registrations waiting for confirm" +msgstr "" + +#: ../../mod/admin.php:686 +msgid "Request date" +msgstr "" + +#: ../../mod/admin.php:687 +msgid "No registrations." +msgstr "" + +#: ../../mod/admin.php:688 ../../mod/intro.php:11 ../../mod/intro.php:98 +#: ../../mod/notifications.php:159 ../../mod/notifications.php:206 +msgid "Approve" +msgstr "" + +#: ../../mod/admin.php:689 +msgid "Deny" +msgstr "" + +#: ../../mod/admin.php:691 ../../mod/intro.php:14 ../../mod/intro.php:99 +#: ../../mod/connections.php:348 ../../mod/connections.php:490 +msgid "Block" +msgstr "" + +#: ../../mod/admin.php:692 ../../mod/connections.php:348 +#: ../../mod/connections.php:490 +msgid "Unblock" +msgstr "" + +#: ../../mod/admin.php:695 +msgid "Register date" +msgstr "" + +#: ../../mod/admin.php:695 +msgid "Last login" +msgstr "" + +#: ../../mod/admin.php:695 +msgid "Expires" +msgstr "" + +#: ../../mod/admin.php:695 +msgid "Service Class" +msgstr "" + +#: ../../mod/admin.php:697 +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 +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 +#, php-format +msgid "Plugin %s disabled." +msgstr "" + +#: ../../mod/admin.php:743 +#, php-format +msgid "Plugin %s enabled." +msgstr "" + +#: ../../mod/admin.php:753 ../../mod/admin.php:955 +msgid "Disable" +msgstr "" + +#: ../../mod/admin.php:755 ../../mod/admin.php:957 +msgid "Enable" +msgstr "" + +#: ../../mod/admin.php:781 ../../mod/admin.php:986 +msgid "Toggle" +msgstr "" + +#: ../../mod/admin.php:789 ../../mod/admin.php:996 +msgid "Author: " +msgstr "" + +#: ../../mod/admin.php:790 ../../mod/admin.php:997 +msgid "Maintainer: " +msgstr "" + +#: ../../mod/admin.php:919 +msgid "No themes found." +msgstr "" + +#: ../../mod/admin.php:978 +msgid "Screenshot" +msgstr "" + +#: ../../mod/admin.php:1026 +msgid "[Experimental]" +msgstr "" + +#: ../../mod/admin.php:1027 +msgid "[Unsupported]" +msgstr "" + +#: ../../mod/admin.php:1054 +msgid "Log settings updated." +msgstr "" + +#: ../../mod/admin.php:1110 +msgid "Clear" +msgstr "" + +#: ../../mod/admin.php:1116 +msgid "Debugging" +msgstr "" + +#: ../../mod/admin.php:1117 +msgid "Log file" +msgstr "" + +#: ../../mod/admin.php:1117 +msgid "" +"Must be writable by web server. Relative to your Red top-level directory." +msgstr "" + +#: ../../mod/admin.php:1118 +msgid "Log level" +msgstr "" + +#: ../../mod/mitem.php:13 ../../mod/menu.php:87 +msgid "Menu not found." +msgstr "" + +#: ../../mod/mitem.php:66 +msgid "Menu element updated." +msgstr "" + +#: ../../mod/mitem.php:70 +msgid "Unable to update menu element." +msgstr "" + +#: ../../mod/mitem.php:76 +msgid "Menu element added." +msgstr "" + +#: ../../mod/mitem.php:80 +msgid "Unable to add menu element." +msgstr "" + +#: ../../mod/mitem.php:97 ../../mod/xchan.php:25 ../../mod/menu.php:113 +msgid "Not found." +msgstr "" + +#: ../../mod/mitem.php:116 +msgid "Manage Menu Elements" +msgstr "" + +#: ../../mod/mitem.php:119 +msgid "Edit menu" +msgstr "" + +#: ../../mod/mitem.php:122 +msgid "Edit element" +msgstr "" + +#: ../../mod/mitem.php:123 +msgid "Drop element" +msgstr "" + +#: ../../mod/mitem.php:124 +msgid "New element" +msgstr "" + +#: ../../mod/mitem.php:125 +msgid "Edit this menu container" +msgstr "" + +#: ../../mod/mitem.php:126 +msgid "Add menu element" +msgstr "" + +#: ../../mod/mitem.php:127 +msgid "Delete this menu item" +msgstr "" + +#: ../../mod/mitem.php:128 +msgid "Edit this menu item" +msgstr "" + +#: ../../mod/mitem.php:141 +msgid "New Menu Element" +msgstr "" + +#: ../../mod/mitem.php:143 ../../mod/mitem.php:184 +msgid "Link text" +msgstr "" + +#: ../../mod/mitem.php:144 ../../mod/mitem.php:185 +msgid "URL of link" +msgstr "" + +#: ../../mod/mitem.php:145 ../../mod/mitem.php:186 +msgid "Use Red magic-auth if available" +msgstr "" + +#: ../../mod/mitem.php:146 ../../mod/mitem.php:187 +msgid "Open link in new window" +msgstr "" + +#: ../../mod/mitem.php:148 ../../mod/mitem.php:189 +msgid "Order in list" +msgstr "" + +#: ../../mod/mitem.php:148 ../../mod/mitem.php:189 +msgid "Higher numbers will sink to bottom of listing" +msgstr "" + +#: ../../mod/mitem.php:149 ../../mod/menu.php:79 ../../mod/new_channel.php:117 +msgid "Create" +msgstr "" + +#: ../../mod/mitem.php:161 +msgid "Menu item not found." +msgstr "" + +#: ../../mod/mitem.php:170 +msgid "Menu item deleted." +msgstr "" + +#: ../../mod/mitem.php:172 +msgid "Menu item could not be deleted." +msgstr "" + +#: ../../mod/mitem.php:181 +msgid "Edit Menu Element" +msgstr "" + +#: ../../mod/mitem.php:190 ../../mod/menu.php:107 +msgid "Modify" +msgstr "" + +#: ../../mod/group.php:26 +msgid "Collection created." +msgstr "" + +#: ../../mod/group.php:32 +msgid "Could not create collection." +msgstr "" + +#: ../../mod/group.php:60 +msgid "Collection updated." +msgstr "" + +#: ../../mod/group.php:92 +msgid "Create a collection of channels." +msgstr "" + +#: ../../mod/group.php:93 ../../mod/group.php:189 +msgid "Collection Name: " +msgstr "" + +#: ../../mod/group.php:95 ../../mod/group.php:192 +msgid "Members are visible to other channels" +msgstr "" + +#: ../../mod/group.php:113 +msgid "Collection removed." +msgstr "" + +#: ../../mod/group.php:115 +msgid "Unable to remove collection." +msgstr "" + +#: ../../mod/group.php:188 +msgid "Collection Editor" +msgstr "" + +#: ../../mod/group.php:202 +msgid "Members" +msgstr "" + +#: ../../mod/group.php:204 +msgid "All Connected Channels" +msgstr "" + +#: ../../mod/group.php:237 +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 "" + +#: ../../mod/photos.php:103 +msgid "Album not found." +msgstr "" + +#: ../../mod/photos.php:125 ../../mod/photos.php:791 +msgid "Delete Album" +msgstr "" + +#: ../../mod/photos.php:165 ../../mod/photos.php:1052 +msgid "Delete Photo" +msgstr "" + +#: ../../mod/photos.php:510 +#, php-format +msgid "%1$s was tagged in %2$s by %3$s" +msgstr "" + +#: ../../mod/photos.php:510 +msgid "a photo" +msgstr "" + +#: ../../mod/photos.php:586 +msgid "No photos selected" +msgstr "" + +#: ../../mod/photos.php:631 +msgid "Access to this item is restricted." +msgstr "" + +#: ../../mod/photos.php:696 +#, php-format +msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." +msgstr "" + +#: ../../mod/photos.php:699 +#, php-format +msgid "You have used %1$.2f Mbytes of photo storage." +msgstr "" + +#: ../../mod/photos.php:718 +msgid "Upload Photos" +msgstr "" + +#: ../../mod/photos.php:722 ../../mod/photos.php:786 +msgid "New album name: " +msgstr "" + +#: ../../mod/photos.php:723 +msgid "or existing album name: " +msgstr "" + +#: ../../mod/photos.php:724 +msgid "Do not show a status post for this upload" +msgstr "" + +#: ../../mod/photos.php:726 ../../mod/photos.php:1047 +msgid "Permissions" +msgstr "" + +#: ../../mod/photos.php:775 ../../mod/photos.php:797 ../../mod/photos.php:1223 +#: ../../mod/photos.php:1238 +msgid "Contact Photos" +msgstr "" + +#: ../../mod/photos.php:801 +msgid "Edit Album" +msgstr "" + +#: ../../mod/photos.php:807 +msgid "Show Newest First" +msgstr "" + +#: ../../mod/photos.php:809 +msgid "Show Oldest First" +msgstr "" + +#: ../../mod/photos.php:853 ../../mod/photos.php:1270 +msgid "View Photo" +msgstr "" + +#: ../../mod/photos.php:897 +msgid "Permission denied. Access to this item may be restricted." +msgstr "" + +#: ../../mod/photos.php:899 +msgid "Photo not available" +msgstr "" + +#: ../../mod/photos.php:957 +msgid "Use as profile photo" +msgstr "" + +#: ../../mod/photos.php:981 +msgid "View Full Size" +msgstr "" + +#: ../../mod/photos.php:1035 +msgid "Edit photo" +msgstr "" + +#: ../../mod/photos.php:1037 +msgid "Rotate CW (right)" +msgstr "" + +#: ../../mod/photos.php:1038 +msgid "Rotate CCW (left)" +msgstr "" + +#: ../../mod/photos.php:1040 +msgid "New album name" +msgstr "" + +#: ../../mod/photos.php:1043 +msgid "Caption" +msgstr "" + +#: ../../mod/photos.php:1045 +msgid "Add a Tag" +msgstr "" + +#: ../../mod/photos.php:1049 +msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" +msgstr "" + +#: ../../mod/photos.php:1276 +msgid "View Album" +msgstr "" + +#: ../../mod/photos.php:1285 +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 "" + +#: ../../mod/menu.php:17 +msgid "Menu updated." +msgstr "" + +#: ../../mod/menu.php:21 +msgid "Unable to update menu." +msgstr "" + +#: ../../mod/menu.php:26 +msgid "Menu created." +msgstr "" + +#: ../../mod/menu.php:30 +msgid "Unable to create menu." +msgstr "" + +#: ../../mod/menu.php:53 +msgid "Manage Menus" +msgstr "" + +#: ../../mod/menu.php:56 +msgid "Drop" +msgstr "" + +#: ../../mod/menu.php:58 +msgid "Create a new menu" +msgstr "" + +#: ../../mod/menu.php:59 +msgid "Delete this menu" +msgstr "" + +#: ../../mod/menu.php:60 ../../mod/menu.php:104 +msgid "Edit menu contents" +msgstr "" + +#: ../../mod/menu.php:61 +msgid "Edit this menu" +msgstr "" + +#: ../../mod/menu.php:76 +msgid "New Menu" +msgstr "" + +#: ../../mod/menu.php:77 ../../mod/menu.php:105 +msgid "Menu name" +msgstr "" + +#: ../../mod/menu.php:77 ../../mod/menu.php:105 +msgid "Must be unique, only seen by you" +msgstr "" + +#: ../../mod/menu.php:78 ../../mod/menu.php:106 +msgid "Menu title" +msgstr "" + +#: ../../mod/menu.php:78 ../../mod/menu.php:106 +msgid "Menu title as seen by others" +msgstr "" + +#: ../../mod/menu.php:93 +msgid "Menu deleted." +msgstr "" + +#: ../../mod/menu.php:95 +msgid "Menu could not be deleted." +msgstr "" + +#: ../../mod/menu.php:101 +msgid "Edit Menu" +msgstr "" + +#: ../../mod/menu.php:103 +msgid "Add or remove entries to this menu" +msgstr "" + +#: ../../mod/home.php:76 +#, php-format +msgid "Welcome to %s" +msgstr "" + +#: ../../mod/message.php:19 +msgid "Check Mail" +msgstr "" + +#: ../../mod/message.php:56 +msgid "Unable to lookup recipient." +msgstr "" + +#: ../../mod/message.php:64 +msgid "Unable to communicate with requested channel." +msgstr "" + +#: ../../mod/message.php:71 +msgid "Cannot verify requested channel." +msgstr "" + +#: ../../mod/message.php:97 +msgid "Selected channel has private message restrictions. Send failed." +msgstr "" + +#: ../../mod/message.php:223 ../../mod/notifications.php:101 +msgid "Messages" +msgstr "" + +#: ../../mod/message.php:234 +msgid "Message deleted." +msgstr "" + +#: ../../mod/message.php:241 +msgid "Conversation removed." +msgstr "" + +#: ../../mod/message.php:258 +msgid "Message recalled." +msgstr "" + +#: ../../mod/message.php:316 +msgid "Send Private Message" +msgstr "" + +#: ../../mod/message.php:317 ../../mod/message.php:503 +msgid "To:" +msgstr "" + +#: ../../mod/message.php:322 ../../mod/message.php:505 +msgid "Subject:" +msgstr "" + +#: ../../mod/message.php:359 +msgid "No messages." +msgstr "" + +#: ../../mod/message.php:375 ../../mod/message.php:472 +msgid "Delete message" +msgstr "" + +#: ../../mod/message.php:377 +msgid "D, d M Y - g:i A" +msgstr "" + +#: ../../mod/message.php:396 +msgid "Message not found." +msgstr "" + +#: ../../mod/message.php:473 +msgid "Recall message" +msgstr "" + +#: ../../mod/message.php:475 +msgid "Message has been recalled." +msgstr "" + +#: ../../mod/message.php:492 +msgid "Private Conversation" +msgstr "" + +#: ../../mod/message.php:496 +msgid "Delete conversation" +msgstr "" + +#: ../../mod/message.php:498 +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" +msgstr "" + +#: ../../mod/layouts.php:52 +msgid "Layout Help" +msgstr "" + +#: ../../mod/layouts.php:55 +msgid "Help with this feature" +msgstr "" + +#: ../../mod/layouts.php:74 +msgid "Layout Name" +msgstr "" + +#: ../../mod/help.php:41 +msgid "Help:" +msgstr "" + +#: ../../mod/help.php:53 ../../index.php:226 +msgid "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/network.php:172 +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" +msgstr "" + +#: ../../mod/network.php:234 +msgid "Search Results For:" +msgstr "" + +#: ../../mod/network.php:296 +msgid "Collection: " +msgstr "" + +#: ../../mod/network.php:309 +msgid "Connection: " +msgstr "" + +#: ../../mod/network.php:312 +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 " +"logout and retry." +msgstr "" + +#: ../../mod/post.php:251 +#, php-format +msgid "Welcome %s. Remote authentication successful." +msgstr "" + +#: ../../mod/dirsearch.php:21 +msgid "This site is not a directory server" +msgstr "" + +#: ../../mod/lockview.php:34 +msgid "Remote privacy information not available." +msgstr "" + +#: ../../mod/lockview.php:43 +msgid "Visible to:" +msgstr "" + +#: ../../mod/magic.php:63 +msgid "Hub not found." +msgstr "" + +#: ../../mod/profiles.php:18 ../../mod/profiles.php:138 +#: ../../mod/profiles.php:179 ../../mod/profiles.php:486 +msgid "Profile not found." +msgstr "" + +#: ../../mod/profiles.php:38 +msgid "Profile deleted." +msgstr "" + +#: ../../mod/profiles.php:56 ../../mod/profiles.php:92 +msgid "Profile-" +msgstr "" + +#: ../../mod/profiles.php:77 ../../mod/profiles.php:120 +msgid "New profile created." +msgstr "" + +#: ../../mod/profiles.php:98 +msgid "Profile unavailable to clone." +msgstr "" + +#: ../../mod/profiles.php:189 +msgid "Profile Name is required." +msgstr "" + +#: ../../mod/profiles.php:317 +msgid "Marital Status" +msgstr "" + +#: ../../mod/profiles.php:321 +msgid "Romantic Partner" +msgstr "" + +#: ../../mod/profiles.php:325 +msgid "Likes" +msgstr "" + +#: ../../mod/profiles.php:329 +msgid "Dislikes" +msgstr "" + +#: ../../mod/profiles.php:333 +msgid "Work/Employment" +msgstr "" + +#: ../../mod/profiles.php:336 +msgid "Religion" +msgstr "" + +#: ../../mod/profiles.php:340 +msgid "Political Views" +msgstr "" + +#: ../../mod/profiles.php:344 +msgid "Gender" +msgstr "" + +#: ../../mod/profiles.php:348 +msgid "Sexual Preference" +msgstr "" + +#: ../../mod/profiles.php:352 +msgid "Homepage" +msgstr "" + +#: ../../mod/profiles.php:356 +msgid "Interests" +msgstr "" + +#: ../../mod/profiles.php:360 +msgid "Address" +msgstr "" + +#: ../../mod/profiles.php:367 ../../mod/pubsites.php:31 +msgid "Location" +msgstr "" + +#: ../../mod/profiles.php:450 +msgid "Profile updated." +msgstr "" + +#: ../../mod/profiles.php:505 +msgid "Hide your contact/friend list from viewers of this profile?" +msgstr "" + +#: ../../mod/profiles.php:528 +msgid "Edit Profile Details" +msgstr "" + +#: ../../mod/profiles.php:530 +msgid "View this profile" +msgstr "" + +#: ../../mod/profiles.php:531 +msgid "Change Profile Photo" +msgstr "" + +#: ../../mod/profiles.php:532 +msgid "Create a new profile using these settings" +msgstr "" + +#: ../../mod/profiles.php:533 +msgid "Clone this profile" +msgstr "" + +#: ../../mod/profiles.php:534 +msgid "Delete this profile" +msgstr "" + +#: ../../mod/profiles.php:535 +msgid "Profile Name:" +msgstr "" + +#: ../../mod/profiles.php:536 +msgid "Your Full Name:" +msgstr "" + +#: ../../mod/profiles.php:537 +msgid "Title/Description:" +msgstr "" + +#: ../../mod/profiles.php:538 +msgid "Your Gender:" +msgstr "" + +#: ../../mod/profiles.php:539 +#, php-format +msgid "Birthday (%s):" +msgstr "" + +#: ../../mod/profiles.php:540 +msgid "Street Address:" +msgstr "" + +#: ../../mod/profiles.php:541 +msgid "Locality/City:" +msgstr "" + +#: ../../mod/profiles.php:542 +msgid "Postal/Zip Code:" +msgstr "" + +#: ../../mod/profiles.php:543 +msgid "Country:" +msgstr "" + +#: ../../mod/profiles.php:544 +msgid "Region/State:" +msgstr "" + +#: ../../mod/profiles.php:545 +msgid "♥ Marital Status:" +msgstr "" + +#: ../../mod/profiles.php:546 +msgid "Who: (if applicable)" +msgstr "" + +#: ../../mod/profiles.php:547 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "" + +#: ../../mod/profiles.php:548 +msgid "Since [date]:" +msgstr "" + +#: ../../mod/profiles.php:550 +msgid "Homepage URL:" +msgstr "" + +#: ../../mod/profiles.php:553 +msgid "Religious Views:" +msgstr "" + +#: ../../mod/profiles.php:554 +msgid "Keywords:" +msgstr "" + +#: ../../mod/profiles.php:557 +msgid "Example: fishing photography software" +msgstr "" + +#: ../../mod/profiles.php:558 +msgid "Used in directory listings" +msgstr "" + +#: ../../mod/profiles.php:559 +msgid "Tell us about yourself..." +msgstr "" + +#: ../../mod/profiles.php:560 +msgid "Hobbies/Interests" +msgstr "" + +#: ../../mod/profiles.php:561 +msgid "Contact information and Social Networks" +msgstr "" + +#: ../../mod/profiles.php:562 +msgid "My other channels" +msgstr "" + +#: ../../mod/profiles.php:563 +msgid "Musical interests" +msgstr "" + +#: ../../mod/profiles.php:564 +msgid "Books, literature" +msgstr "" + +#: ../../mod/profiles.php:565 +msgid "Television" +msgstr "" + +#: ../../mod/profiles.php:566 +msgid "Film/dance/culture/entertainment" +msgstr "" + +#: ../../mod/profiles.php:567 +msgid "Love/romance" +msgstr "" + +#: ../../mod/profiles.php:568 +msgid "Work/employment" +msgstr "" + +#: ../../mod/profiles.php:569 +msgid "School/education" +msgstr "" + +#: ../../mod/profiles.php:574 +msgid "" +"This is your public profile.
      It may " +"be visible to anybody using the internet." +msgstr "" + +#: ../../mod/profiles.php:584 ../../mod/directory.php:160 +msgid "Age: " +msgstr "" + +#: ../../mod/profiles.php:623 +msgid "Edit/Manage Profiles" +msgstr "" + +#: ../../mod/new_channel.php:107 +msgid "Add a Channel" +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." +msgstr "" + +#: ../../mod/new_channel.php:111 +msgid "" +"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " +"Group\" " +msgstr "" + +#: ../../mod/new_channel.php:112 +msgid "Choose a short nickname" +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." +msgstr "" + +#: ../../mod/new_channel.php:114 +msgid "" +"Or import an existing channel from another location" +msgstr "" + +#: ../../mod/connections.php:67 +msgid "Could not access contact record." +msgstr "" + +#: ../../mod/connections.php:81 +msgid "Could not locate selected profile." +msgstr "" + +#: ../../mod/connections.php:124 +msgid "Failed to update connection record." +msgstr "" + +#: ../../mod/connections.php:219 +msgid "Could not access address book record." +msgstr "" + +#: ../../mod/connections.php:233 +msgid "Refresh failed - channel is currently unavailable." +msgstr "" + +#: ../../mod/connections.php:240 +msgid "Channel has been unblocked" +msgstr "" + +#: ../../mod/connections.php:241 +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 +msgid "Unable to set address book parameters." +msgstr "" + +#: ../../mod/connections.php:252 +msgid "Channel has been unignored" +msgstr "" + +#: ../../mod/connections.php:253 +msgid "Channel has been ignored" +msgstr "" + +#: ../../mod/connections.php:264 +msgid "Channel has been unarchived" +msgstr "" + +#: ../../mod/connections.php:265 +msgid "Channel has been archived" +msgstr "" + +#: ../../mod/connections.php:276 +msgid "Channel has been unhidden" +msgstr "" + +#: ../../mod/connections.php:277 +msgid "Channel has been hidden" +msgstr "" + +#: ../../mod/connections.php:291 +msgid "Channel has been approved" +msgstr "" + +#: ../../mod/connections.php:292 +msgid "Channel has been unapproved" +msgstr "" + +#: ../../mod/connections.php:310 +msgid "Contact has been removed." +msgstr "" + +#: ../../mod/connections.php:330 +#, php-format +msgid "View %s's profile" +msgstr "" + +#: ../../mod/connections.php:334 +msgid "Refresh Permissions" +msgstr "" + +#: ../../mod/connections.php:337 +msgid "Fetch updated permissions" +msgstr "" + +#: ../../mod/connections.php:341 +msgid "Recent Activity" +msgstr "" + +#: ../../mod/connections.php:344 +msgid "View recent posts and comments" +msgstr "" + +#: ../../mod/connections.php:351 +msgid "Block or Unblock this connection" +msgstr "" + +#: ../../mod/connections.php:355 ../../mod/connections.php:491 +msgid "Unignore" +msgstr "" + +#: ../../mod/connections.php:358 +msgid "Ignore or Unignore this connection" +msgstr "" + +#: ../../mod/connections.php:361 +msgid "Unarchive" +msgstr "" + +#: ../../mod/connections.php:361 +msgid "Archive" +msgstr "" + +#: ../../mod/connections.php:364 +msgid "Archive or Unarchive this connection" +msgstr "" + +#: ../../mod/connections.php:367 +msgid "Unhide" +msgstr "" + +#: ../../mod/connections.php:367 +msgid "Hide" +msgstr "" + +#: ../../mod/connections.php:370 +msgid "Hide or Unhide this connection" +msgstr "" + +#: ../../mod/connections.php:377 +msgid "Delete this connection" +msgstr "" + +#: ../../mod/connections.php:410 +msgid "Unknown" +msgstr "" + +#: ../../mod/connections.php:420 ../../mod/connections.php:449 +msgid "Approve this connection" +msgstr "" + +#: ../../mod/connections.php:420 +msgid "Accept connection to allow communication" +msgstr "" + +#: ../../mod/connections.php:436 +msgid "Automatic Permissions Settings" +msgstr "" + +#: ../../mod/connections.php:436 +#, php-format +msgid "Connections: settings for %s" +msgstr "" + +#: ../../mod/connections.php:440 +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 +msgid "Slide to adjust your degree of friendship" +msgstr "" + +#: ../../mod/connections.php:448 +msgid "inherited" +msgstr "" + +#: ../../mod/connections.php:450 +msgid "Connection has no individual permissions!" +msgstr "" + +#: ../../mod/connections.php:451 +msgid "" +"This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"." +msgstr "" + +#: ../../mod/connections.php:453 +msgid "Profile Visibility" +msgstr "" + +#: ../../mod/connections.php:454 +#, php-format +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." +msgstr "" + +#: ../../mod/connections.php:455 +msgid "Contact Information / Notes" +msgstr "" + +#: ../../mod/connections.php:456 +msgid "Edit contact notes" +msgstr "" + +#: ../../mod/connections.php:458 +msgid "Their Settings" +msgstr "" + +#: ../../mod/connections.php:459 +msgid "My Settings" +msgstr "" + +#: ../../mod/connections.php:461 +msgid "Forum Members" +msgstr "" + +#: ../../mod/connections.php:462 +msgid "Soapbox" +msgstr "" + +#: ../../mod/connections.php:463 +msgid "Full Sharing" +msgstr "" + +#: ../../mod/connections.php:464 +msgid "Cautious Sharing" +msgstr "" + +#: ../../mod/connections.php:465 +msgid "Follow Only" +msgstr "" + +#: ../../mod/connections.php:466 +msgid "Individual Permissions" +msgstr "" + +#: ../../mod/connections.php:467 +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 +msgid "Advanced Permissions" +msgstr "" + +#: ../../mod/connections.php:469 +msgid "Quick Links" +msgstr "" + +#: ../../mod/connections.php:473 +#, php-format +msgid "Visit %s's profile - %s" +msgstr "" + +#: ../../mod/connections.php:474 +msgid "Block/Unblock contact" +msgstr "" + +#: ../../mod/connections.php:475 +msgid "Ignore contact" +msgstr "" + +#: ../../mod/connections.php:476 +msgid "Repair URL settings" +msgstr "" + +#: ../../mod/connections.php:477 +msgid "View conversations" +msgstr "" + +#: ../../mod/connections.php:479 +msgid "Delete contact" +msgstr "" + +#: ../../mod/connections.php:482 +msgid "Last update:" +msgstr "" + +#: ../../mod/connections.php:484 +msgid "Update public posts" +msgstr "" + +#: ../../mod/connections.php:486 +msgid "Update now" +msgstr "" + +#: ../../mod/connections.php:492 +msgid "Currently blocked" +msgstr "" + +#: ../../mod/connections.php:493 +msgid "Currently ignored" +msgstr "" + +#: ../../mod/connections.php:494 +msgid "Currently archived" +msgstr "" + +#: ../../mod/connections.php:495 +msgid "Currently pending" +msgstr "" + +#: ../../mod/connections.php:496 +msgid "" +"Replies/likes to your public posts may still be visible" +msgstr "" + +#: ../../mod/connections.php:532 ../../mod/connections.php:604 +msgid "Blocked" +msgstr "" + +#: ../../mod/connections.php:537 ../../mod/connections.php:611 +msgid "Ignored" +msgstr "" + +#: ../../mod/connections.php:542 ../../mod/connections.php:625 +msgid "Hidden" +msgstr "" + +#: ../../mod/connections.php:547 ../../mod/connections.php:618 +msgid "Archived" +msgstr "" + +#: ../../mod/connections.php:558 +msgid "All" +msgstr "" + +#: ../../mod/connections.php:579 +msgid "Suggestions" +msgstr "" + +#: ../../mod/connections.php:582 +msgid "Suggest new connections" +msgstr "" + +#: ../../mod/connections.php:588 +msgid "Show pending (new) connections" +msgstr "" + +#: ../../mod/connections.php:591 +msgid "All Connections" +msgstr "" + +#: ../../mod/connections.php:594 +msgid "Show all connections" +msgstr "" + +#: ../../mod/connections.php:597 +msgid "Unblocked" +msgstr "" + +#: ../../mod/connections.php:600 +msgid "Only show unblocked connections" +msgstr "" + +#: ../../mod/connections.php:607 +msgid "Only show blocked connections" +msgstr "" + +#: ../../mod/connections.php:614 +msgid "Only show ignored connections" +msgstr "" + +#: ../../mod/connections.php:621 +msgid "Only show archived connections" +msgstr "" + +#: ../../mod/connections.php:628 +msgid "Only show hidden connections" +msgstr "" + +#: ../../mod/connections.php:670 +#, php-format +msgid "%1$s [%2$s]" +msgstr "" + +#: ../../mod/connections.php:671 +msgid "Edit contact" +msgstr "" + +#: ../../mod/connections.php:694 +msgid "Search your connections" +msgstr "" + +#: ../../mod/connections.php:695 +msgid "Finding: " +msgstr "" + +#: ../../mod/filestorage.php:35 +msgid "Permission Denied." +msgstr "" + +#: ../../mod/filestorage.php:42 +msgid "Permission denied. VS." +msgstr "" + +#: ../../mod/filestorage.php:79 +msgid "Download" +msgstr "" + +#: ../../mod/filestorage.php:84 +msgid "Used: " +msgstr "" + +#: ../../mod/filestorage.php:86 +msgid "Limit: " +msgstr "" + +#: ../../mod/lostpass.php:15 +msgid "No valid account found." +msgstr "" + +#: ../../mod/lostpass.php:29 +msgid "Password reset request issued. Check your email." +msgstr "" + +#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102 +#, php-format +msgid "Site Member (%s)" +msgstr "" + +#: ../../mod/lostpass.php:40 +#, php-format +msgid "Password reset requested at %s" +msgstr "" + +#: ../../mod/lostpass.php:63 +msgid "" +"Request could not be verified. (You may have previously submitted it.) " +"Password reset failed." +msgstr "" + +#: ../../mod/lostpass.php:85 ../../boot.php:1450 +msgid "Password Reset" +msgstr "" + +#: ../../mod/lostpass.php:86 +msgid "Your password has been reset as requested." +msgstr "" + +#: ../../mod/lostpass.php:87 +msgid "Your new password is" +msgstr "" + +#: ../../mod/lostpass.php:88 +msgid "Save or copy your new password - and then" +msgstr "" + +#: ../../mod/lostpass.php:89 +msgid "click here to login" +msgstr "" + +#: ../../mod/lostpass.php:90 +msgid "" +"Your password may be changed from the Settings page after " +"successful login." +msgstr "" + +#: ../../mod/lostpass.php:107 +#, php-format +msgid "Your password has changed at %s" +msgstr "" + +#: ../../mod/lostpass.php:122 +msgid "Forgot your Password?" +msgstr "" + +#: ../../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/lostpass.php:124 +msgid "Email Address" +msgstr "" + +#: ../../mod/lostpass.php:125 +msgid "Reset" +msgstr "" + +#: ../../mod/import.php:36 +msgid "Nothing to import." +msgstr "" + +#: ../../mod/import.php:58 +msgid "Unable to download data from old server" +msgstr "" + +#: ../../mod/import.php:64 +msgid "Imported file is empty." +msgstr "" + +#: ../../mod/import.php:88 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." +msgstr "" + +#: ../../mod/import.php:106 +msgid "Channel clone failed. Import failed." +msgstr "" + +#: ../../mod/import.php:116 +msgid "Cloned channel not found. Import failed." +msgstr "" + +#: ../../mod/import.php:358 +msgid "Import completed." +msgstr "" + +#: ../../mod/import.php:371 +msgid "You must be logged in to use this feature." +msgstr "" + +#: ../../mod/import.php:376 +msgid "Import Channel" +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." +msgstr "" + +#: ../../mod/import.php:378 +msgid "File to Upload" +msgstr "" + +#: ../../mod/import.php:379 +msgid "Or provide the old server/hub details" +msgstr "" + +#: ../../mod/import.php:380 +msgid "Your old identity address (xyz@example.com)" +msgstr "" + +#: ../../mod/import.php:381 +msgid "Your old login email address" +msgstr "" + +#: ../../mod/import.php:382 +msgid "Your old login password" +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." +msgstr "" + +#: ../../mod/import.php:384 +msgid "Make this hub my primary location" +msgstr "" + +#: ../../mod/manage.php:63 +#, php-format +msgid "You have created %1$.0f of %2$.0f allowed channels." +msgstr "" + +#: ../../mod/manage.php:71 +msgid "Create a new channel" +msgstr "" + +#: ../../mod/manage.php:76 +msgid "Channel Manager" +msgstr "" + +#: ../../mod/manage.php:77 +msgid "Current Channel" +msgstr "" + +#: ../../mod/manage.php:79 +msgid "Attach to one of your channels by selecting it." +msgstr "" + +#: ../../mod/manage.php:80 +msgid "Default Channel" +msgstr "" + +#: ../../mod/manage.php:81 +msgid "Make Default" +msgstr "" + +#: ../../mod/vote.php:97 +msgid "Total votes" +msgstr "" + +#: ../../mod/vote.php:98 +msgid "Average Rating" +msgstr "" + +#: ../../mod/match.php:16 +msgid "Profile Match" +msgstr "" + +#: ../../mod/match.php:24 +msgid "No keywords to match. Please add keywords to your default profile." +msgstr "" + +#: ../../mod/match.php:61 +msgid "is interested in:" +msgstr "" + +#: ../../mod/match.php:69 +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 "" + +#: ../../mod/follow.php:25 +msgid "Channel added." +msgstr "" + +#: ../../mod/editlayout.php:36 ../../mod/editwebpage.php:30 +#: ../../mod/editpost.php:20 ../../mod/editblock.php:36 +msgid "Item not found" +msgstr "" + +#: ../../mod/editlayout.php:68 +msgid "Edit Layout" +msgstr "" + +#: ../../mod/editlayout.php:104 ../../mod/editwebpage.php:123 +#: ../../mod/editpost.php:101 ../../mod/editblock.php:118 +msgid "Insert YouTube video" +msgstr "" + +#: ../../mod/editlayout.php:105 ../../mod/editwebpage.php:124 +#: ../../mod/editpost.php:102 ../../mod/editblock.php:119 +msgid "Insert Vorbis [.ogg] video" +msgstr "" + +#: ../../mod/editlayout.php:106 ../../mod/editwebpage.php:125 +#: ../../mod/editpost.php:103 ../../mod/editblock.php:120 +msgid "Insert Vorbis [.ogg] audio" +msgstr "" + +#: ../../mod/editlayout.php:140 +msgid "Delete Layout" +msgstr "" + +#: ../../mod/profile_photo.php:54 +msgid "Image uploaded but image cropping failed." +msgstr "" + +#: ../../mod/profile_photo.php:107 +msgid "Image resize failed." +msgstr "" + +#: ../../mod/profile_photo.php:151 +msgid "" +"Shift-reload the page or clear browser cache if the new photo does not " +"display immediately." +msgstr "" + +#: ../../mod/profile_photo.php:173 +#, php-format +msgid "Image exceeds size limit of %d" +msgstr "" + +#: ../../mod/profile_photo.php:182 +msgid "Unable to process image." +msgstr "" + +#: ../../mod/profile_photo.php:224 ../../mod/profile_photo.php:272 +msgid "Photo not available." +msgstr "" + +#: ../../mod/profile_photo.php:291 +msgid "Upload File:" +msgstr "" + +#: ../../mod/profile_photo.php:292 +msgid "Select a profile:" +msgstr "" + +#: ../../mod/profile_photo.php:293 +msgid "Upload Profile Photo" +msgstr "" + +#: ../../mod/profile_photo.php:294 +msgid "Upload" +msgstr "" + +#: ../../mod/profile_photo.php:298 +msgid "skip this step" +msgstr "" + +#: ../../mod/profile_photo.php:298 +msgid "select a photo from your photo albums" +msgstr "" + +#: ../../mod/profile_photo.php:312 +msgid "Crop Image" +msgstr "" + +#: ../../mod/profile_photo.php:313 +msgid "Please adjust the image cropping for optimum viewing." +msgstr "" + +#: ../../mod/profile_photo.php:315 +msgid "Done Editing" +msgstr "" + +#: ../../mod/profile_photo.php:350 +msgid "Image uploaded successfully." +msgstr "" + +#: ../../mod/profile_photo.php:352 +msgid "Image upload failed." +msgstr "" + +#: ../../mod/profile_photo.php:361 +#, php-format +msgid "Image size reduction [%s] failed." +msgstr "" + +#: ../../mod/editwebpage.php:87 +msgid "Edit Webpage" +msgstr "" + +#: ../../mod/editwebpage.php:162 +msgid "Delete Webpage" +msgstr "" + +#: ../../mod/notifications.php:26 +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" +msgstr "" + +#: ../../mod/notifications.php:332 ../../mod/notify.php:54 +msgid "No more system notifications." +msgstr "" + +#: ../../mod/notifications.php:336 ../../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 "" + +#: ../../mod/oexchange.php:23 +msgid "Unable to find your hub." +msgstr "" + +#: ../../mod/oexchange.php:37 +msgid "Post successful." +msgstr "" + +#: ../../mod/editpost.php:31 +msgid "Item is not editable" +msgstr "" + +#: ../../mod/profile.php:112 +msgid "Access to this profile has been restricted." +msgstr "" + +#: ../../mod/poke.php:159 +msgid "Poke/Prod" +msgstr "" + +#: ../../mod/poke.php:160 +msgid "poke, prod or do other things to somebody" +msgstr "" + +#: ../../mod/poke.php:161 +msgid "Recipient" +msgstr "" + +#: ../../mod/poke.php:162 +msgid "Choose what you wish to do to recipient" +msgstr "" + +#: ../../mod/poke.php:165 +msgid "Make this post private" +msgstr "" + +#: ../../mod/wall_upload.php:41 ../../mod/item.php:1074 +msgid "Wall Photos" +msgstr "" + +#: ../../mod/channel.php:107 +msgid "Insufficient permissions. Request redirected to profile page." +msgstr "" + +#: ../../mod/community.php:23 +msgid "Not available." +msgstr "" + +#: ../../mod/community.php:32 +msgid "Community" +msgstr "" + +#: ../../mod/community.php:63 ../../mod/community.php:88 +msgid "No results." +msgstr "" + +#: ../../mod/fbrowser.php:114 +msgid "Files" +msgstr "" + +#: ../../mod/fsuggest.php:63 +msgid "Friend suggestion sent." +msgstr "" + +#: ../../mod/fsuggest.php:97 +msgid "Suggest Friends" +msgstr "" + +#: ../../mod/fsuggest.php:99 +#, php-format +msgid "Suggest a friend for %s" +msgstr "" + +#: ../../mod/editblock.php:82 +msgid "Edit Block" +msgstr "" + +#: ../../mod/editblock.php:156 +msgid "Delete Block" +msgstr "" + +#: ../../mod/profperm.php:34 ../../mod/profperm.php:64 +msgid "Invalid profile identifier." +msgstr "" + +#: ../../mod/profperm.php:110 +msgid "Profile Visibility Editor" +msgstr "" + +#: ../../mod/profperm.php:114 +msgid "Click on a contact to add or remove." +msgstr "" + +#: ../../mod/profperm.php:123 +msgid "Visible To" +msgstr "" + +#: ../../mod/profperm.php:139 +msgid "All Contacts (with secure profile access)" +msgstr "" + +#: ../../mod/item.php:144 +msgid "Unable to locate original post." +msgstr "" + +#: ../../mod/item.php:341 +msgid "Empty post discarded." +msgstr "" + +#: ../../mod/item.php:383 +msgid "Executable content type not permitted to this channel." +msgstr "" + +#: ../../mod/item.php:793 +msgid "System error. Post not saved." +msgstr "" + +#: ../../mod/item.php:1153 +#, php-format +msgid "You have reached your limit of %1$.0f top level posts." +msgstr "" + +#: ../../mod/item.php:1159 +#, php-format +msgid "You have reached your limit of %1$.0f webpages." +msgstr "" + +#: ../../mod/siteinfo.php:51 +#, php-format +msgid "Version %s" +msgstr "" + +#: ../../mod/siteinfo.php:65 +msgid "Installed plugins/addons/apps:" +msgstr "" + +#: ../../mod/siteinfo.php:78 +msgid "No installed plugins/addons/apps" +msgstr "" + +#: ../../mod/siteinfo.php:81 +msgid "Red" +msgstr "" + +#: ../../mod/siteinfo.php:82 +msgid "" +"This is a hub of the Red Matrix - a global cooperative network of " +"decentralised privacy enhanced websites." +msgstr "" + +#: ../../mod/siteinfo.php:84 +msgid "Running at web location" +msgstr "" + +#: ../../mod/siteinfo.php:85 +msgid "" +"Please visit GetZot.com to learn more " +"about the Red Matrix." +msgstr "" + +#: ../../mod/siteinfo.php:86 +msgid "Bug reports and issues: please visit" +msgstr "" + +#: ../../mod/siteinfo.php:89 +msgid "" +"Suggestions, praise, donations, etc. - please email \"redmatrix\" at " +"librelist - dot com" +msgstr "" + +#: ../../mod/suggest.php:41 +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 "" + +#: ../../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 "" + +#: ../../mod/pubsites.php:31 +msgid "Site URL" +msgstr "" + +#: ../../mod/pubsites.php:31 +msgid "Access Type" +msgstr "" + +#: ../../mod/pubsites.php:31 +msgid "Registration Policy" +msgstr "" + +#: ../../mod/register.php:43 +msgid "Maximum daily site registrations exceeded. Please try again tomorrow." +msgstr "" + +#: ../../mod/register.php:49 +msgid "" +"Please indicate acceptance of the Terms of Service. Registration failed." +msgstr "" + +#: ../../mod/register.php:77 +msgid "Passwords do not match." +msgstr "" + +#: ../../mod/register.php:105 +msgid "" +"Registration successful. Please check your email for validation instructions." +msgstr "" + +#: ../../mod/register.php:111 +msgid "Your registration is pending approval by the site owner." +msgstr "" + +#: ../../mod/register.php:114 +msgid "Your registration can not be processed." +msgstr "" + +#: ../../mod/register.php:149 +msgid "" +"This site has exceeded the number of allowed daily account registrations. " +"Please try again tomorrow." +msgstr "" + +#: ../../mod/register.php:160 +msgid "Terms of Service" +msgstr "" + +#: ../../mod/register.php:166 +#, php-format +msgid "I accept the %s for this website" +msgstr "" + +#: ../../mod/register.php:168 +#, php-format +msgid "I am over 13 years of age and accept the %s for this website" +msgstr "" + +#: ../../mod/register.php:183 +msgid "Membership on this site is by invitation only." +msgstr "" + +#: ../../mod/register.php:184 +msgid "Please enter your invitation code" +msgstr "" + +#: ../../mod/register.php:187 +msgid "Your email address" +msgstr "" + +#: ../../mod/register.php:188 +msgid "Choose a password" +msgstr "" + +#: ../../mod/register.php:189 +msgid "Please re-enter your password" +msgstr "" + +#: ../../mod/regmod.php:12 +msgid "Please login." +msgstr "" + +#: ../../mod/removeme.php:49 +msgid "Remove This Channel" +msgstr "" + +#: ../../mod/removeme.php:50 +msgid "" +"This will completely remove this channel from the network. Once this has " +"been done it is not recoverable." +msgstr "" + +#: ../../mod/removeme.php:51 +msgid "Please enter your password for verification:" +msgstr "" + +#: ../../mod/removeme.php:52 +msgid "Remove this channel and all its clones from the network" +msgstr "" + +#: ../../mod/removeme.php:52 +msgid "" +"By default only the instance of the channel located on this hub will be " +"removed from the network" +msgstr "" + +#: ../../mod/removeme.php:53 +msgid "Remove My Account" +msgstr "" + +#: ../../mod/directory.php:163 +msgid "Gender: " +msgstr "" + +#: ../../mod/directory.php:222 +msgid "Finding:" +msgstr "" + +#: ../../mod/directory.php:230 +msgid "next page" +msgstr "" + +#: ../../mod/directory.php:230 +msgid "previous page" +msgstr "" + +#: ../../mod/directory.php:237 +msgid "No entries (some entries may be hidden)." +msgstr "" + +#: ../../mod/mood.php:133 +msgid "Mood" +msgstr "" + +#: ../../mod/mood.php:134 +msgid "Set your current mood and tell your friends" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:74 +msgid "Scheme Default" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:75 +msgid "red" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:76 +msgid "black" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:77 +msgid "silver" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:88 +#: ../../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/apw/php/config.php:235 +msgid "Set scheme" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:90 +msgid "Navigation bar colour" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:91 +msgid "Set font-colour for banner" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:92 +msgid "Set the background colour" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:93 +msgid "Set the background image" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:94 +msgid "Set the background colour of items" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:95 +msgid "Set the opacity of items" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:96 +msgid "Set the basic colour for item icons" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:97 +msgid "Set the hover colour for item icons" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:98 +msgid "Set font-size for the entire application" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:99 +#: ../../view/theme/apw/php/config.php:236 +msgid "Set font-size for posts and comments" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:100 +msgid "Set font-colour for posts and comments" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:101 +msgid "Set radius of corners" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:102 +msgid "Set shadow depth of photos" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:103 +msgid "Set maximum width of conversation regions" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:104 +msgid "Set minimum opacity of nav bar - to hide it" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:105 +msgid "Set size of conversation author photo" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:106 +msgid "Set size of followup author photos" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:107 +msgid "Sloppy photo albums" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:107 +msgid "Are you a clean desk or a messy desk person?" +msgstr "" + +#: ../../view/theme/apw/php/config.php:193 +#: ../../view/theme/apw/php/config.php:211 +msgid "Schema Default" +msgstr "" + +#: ../../view/theme/apw/php/config.php:194 +msgid "Sans-Serif" +msgstr "" + +#: ../../view/theme/apw/php/config.php:195 +msgid "Monospace" +msgstr "" + +#: ../../view/theme/apw/php/config.php:237 +msgid "Set font face" +msgstr "" + +#: ../../view/theme/apw/php/config.php:238 +msgid "Set iconset" +msgstr "" + +#: ../../view/theme/apw/php/config.php:239 +msgid "Set big shadow size, default 15px 15px 15px" +msgstr "" + +#: ../../view/theme/apw/php/config.php:240 +msgid "Set small shadow size, default 5px 5px 5px" +msgstr "" + +#: ../../view/theme/apw/php/config.php:241 +msgid "Set shadow colour, default #000" +msgstr "" + +#: ../../view/theme/apw/php/config.php:242 +msgid "Set radius size, default 5px" +msgstr "" + +#: ../../view/theme/apw/php/config.php:243 +msgid "Set line-height for posts and comments" +msgstr "" + +#: ../../view/theme/apw/php/config.php:244 +msgid "Set background image" +msgstr "" + +#: ../../view/theme/apw/php/config.php:245 +msgid "Set background colour" +msgstr "" + +#: ../../view/theme/apw/php/config.php:246 +msgid "Set section background image" +msgstr "" + +#: ../../view/theme/apw/php/config.php:247 +msgid "Set section background colour" +msgstr "" + +#: ../../view/theme/apw/php/config.php:248 +msgid "Set colour of items - use hex" +msgstr "" + +#: ../../view/theme/apw/php/config.php:249 +msgid "Set colour of links - use hex" +msgstr "" + +#: ../../view/theme/apw/php/config.php:250 +msgid "Set max-width for items. Default 400px" +msgstr "" + +#: ../../view/theme/apw/php/config.php:251 +msgid "Set min-width for items. Default 240px" +msgstr "" + +#: ../../view/theme/apw/php/config.php:252 +msgid "Set the generic content wrapper width. Default 48%" +msgstr "" + +#: ../../view/theme/apw/php/config.php:253 +msgid "Set colour of fonts - use hex" +msgstr "" + +#: ../../view/theme/apw/php/config.php:254 +msgid "Set background-size element" +msgstr "" + +#: ../../view/theme/apw/php/config.php:255 +msgid "Item opacity" +msgstr "" + +#: ../../view/theme/apw/php/config.php:256 +msgid "Display post previews only" +msgstr "" + +#: ../../view/theme/apw/php/config.php:257 +msgid "Display side bar on channel page" +msgstr "" + +#: ../../view/theme/apw/php/config.php:258 +msgid "Colour of the navigation bar" +msgstr "" + +#: ../../view/theme/apw/php/config.php:259 +msgid "Item float" +msgstr "" + +#: ../../view/theme/apw/php/config.php:260 +msgid "Left offset of the section element" +msgstr "" + +#: ../../view/theme/apw/php/config.php:261 +msgid "Right offset of the section element" +msgstr "" + +#: ../../view/theme/apw/php/config.php:262 +msgid "Section width" +msgstr "" + +#: ../../view/theme/apw/php/config.php:263 +msgid "Left offset of the aside" +msgstr "" + +#: ../../view/theme/apw/php/config.php:264 +msgid "Right offset of the aside element" +msgstr "" + +#: ../../view/theme/blogga/view/theme/blog/config.php:47 +#: ../../view/theme/blogga/php/config.php:47 +msgid "None" +msgstr "" + +#: ../../view/theme/blogga/view/theme/blog/config.php:70 +#: ../../view/theme/blogga/php/config.php:70 +msgid "Header image" +msgstr "" + +#: ../../view/theme/blogga/view/theme/blog/config.php:71 +#: ../../view/theme/blogga/php/config.php:71 +msgid "Header image only on profile pages" +msgstr "" + +#: ../../boot.php:1255 +#, php-format +msgid "Update %s failed. See error logs." +msgstr "" + +#: ../../boot.php:1258 +#, php-format +msgid "Update Error at %s" +msgstr "" + +#: ../../boot.php:1415 +msgid "" +"Create an account to access services and applications within the Red Matrix" +msgstr "" + +#: ../../boot.php:1443 +msgid "Password" +msgstr "" + +#: ../../boot.php:1444 +msgid "Remember me" +msgstr "" + +#: ../../boot.php:1449 +msgid "Forgot your password?" +msgstr "" + +#: ../../boot.php:1514 +msgid "permission denied" +msgstr "" + +#: ../../boot.php:1515 +msgid "Got Zot?" +msgstr "" + +#: ../../boot.php:1902 +msgid "toggle mobile" +msgstr "" -- cgit v1.2.3 From 6c6c8a245150a49dbd6191d15452366c3522f56e Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Fri, 6 Dec 2013 12:00:43 +0100 Subject: add option to hide login form from homepage --- mod/admin.php | 3 +++ mod/home.php | 1 + view/tpl/admin_site.tpl | 1 + 3 files changed, 5 insertions(+) diff --git a/mod/admin.php b/mod/admin.php index 031fe7852..2fd762e27 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -234,6 +234,7 @@ function admin_page_site_post(&$a){ $allowed_email = ((x($_POST,'allowed_email')) ? notags(trim($_POST['allowed_email'])) : ''); $block_public = ((x($_POST,'block_public')) ? True : False); $force_publish = ((x($_POST,'publish_all')) ? True : False); + $no_login_on_homepage = ((x($_POST,'no_login_on_homepage')) ? True : False); $global_directory = ((x($_POST,'directory_submit_url')) ? notags(trim($_POST['directory_submit_url'])) : ''); $no_community_page = !((x($_POST,'no_community_page')) ? True : False); @@ -291,6 +292,7 @@ function admin_page_site_post(&$a){ set_config('system','poll_interval',$poll_interval); set_config('system','maxloadavg',$maxloadavg); set_config('system','sitename',$sitename); + set_config('system','no_login_on_homepage',$no_login_on_homepage); if ($banner=="") { del_config('system','banner'); @@ -440,6 +442,7 @@ function admin_page_site(&$a) { '$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")), '$block_public' => array('block_public', t("Block public"), get_config('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.")), '$force_publish' => array('publish_all', t("Force publish"), get_config('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")), + '$no_login_on_homepage' => array('no_login_on_homepage', t("No login on Homepage"), get_config('system','no_login_on_homepage'), t("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).")), '$proxyuser' => array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""), '$proxy' => array('proxy', t("Proxy URL"), get_config('system','proxy'), ""), diff --git a/mod/home.php b/mod/home.php index d17d477c8..edcaa938d 100644 --- a/mod/home.php +++ b/mod/home.php @@ -78,6 +78,7 @@ require_once('include/conversation.php'); $o .= file_get_contents('home.html'); } + if (!$a->config['system']['no_login_on_homepage']) $o .= login(($a->config['system']['register_policy'] == REGISTER_CLOSED) ? 0 : 1); call_hooks("home_content",$o); diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index d0a5254fe..b0f9d4a74 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -47,6 +47,7 @@ {{include file="field_select.tpl" field=$theme_mobile}} {{include file="field_select.tpl" field=$theme_accessibility}} {{include file="field_input.tpl" field=$site_channel}} + {{include file="field_checkbox.tpl" field=$no_login_on_homepage}}
      -- cgit v1.2.3 From e70b0d4e202cea1b1dc430400c034345a63a00f5 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 6 Dec 2013 20:01:32 -0800 Subject: need include/conversation for events now --- mod/events.php | 1 + 1 file changed, 1 insertion(+) diff --git a/mod/events.php b/mod/events.php index 77756fb13..265c74fce 100755 --- a/mod/events.php +++ b/mod/events.php @@ -1,5 +1,6 @@ Date: Fri, 6 Dec 2013 21:40:01 -0800 Subject: suggestion widget --- include/contact_widgets.php | 43 ++++++++++++++++++++++++++++++++++++++- include/socgraph.php | 4 ++++ mod/network.php | 1 + view/theme/redbasic/css/style.css | 3 ++- view/tpl/suggest_friends.tpl | 2 +- view/tpl/suggest_widget.tpl | 10 +++++++++ 6 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 view/tpl/suggest_widget.tpl diff --git a/include/contact_widgets.php b/include/contact_widgets.php index af05f8c9f..a6e66eb17 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -1,5 +1,6 @@ channel['channel_id']; @@ -149,4 +150,44 @@ function common_friends_visitor_widget($profile_uid) { '$items' => $r )); -}; \ No newline at end of file +}; + + +function suggest_widget() { + + require_once('include/socgraph.php'); + + $r = suggestion_query(local_user(),get_observer_hash(),0,2); + + if(! $r) { + return; + } + + $arr = array(); + + foreach($r as $rr) { + + $connlnk = z_root() . '/follow/?url=' . $rr['xchan_addr']; + + $arr[] = array( + 'url' => chanlink_url($rr['xchan_url']), + 'name' => $rr['xchan_name'], + 'photo' => $rr['xchan_photo_m'], + 'ignlnk' => z_root() . '/suggest?ignore=' . $rr['xchan_hash'], + 'conntxt' => t('Connect'), + 'connlnk' => $connlnk, + 'ignore' => t('Ignore/Hide') + ); + } + + + $o = replace_macros(get_markup_template('suggest_widget.tpl'),array( + '$title' => t('Suggestions'), + '$more' => t('See more...'), + '$entries' => $arr + )); + + return $o; + +} + diff --git a/include/socgraph.php b/include/socgraph.php index b34d5142c..0e91eba60 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -287,11 +287,13 @@ function suggestion_query($uid, $myxchan, $start = 0, $limit = 80) { and not xlink_link in ( select xchan from xign where uid = %d ) and xlink_xchan != '' and not ( xchan_flags & %d ) + and not ( xchan_flags & %d ) group by xchan_hash order by total desc limit %d, %d ", intval($uid), intval($uid), intval($uid), intval(XCHAN_FLAGS_HIDDEN), + intval(XCHAN_FLAGS_DELETED), intval($start), intval($limit) ); @@ -305,10 +307,12 @@ function suggestion_query($uid, $myxchan, $start = 0, $limit = 80) { and not xlink_link in ( select abook_xchan from abook where abook_channel = %d ) and not xlink_link in ( select xchan from xign where uid = %d ) and not ( xchan_flags & %d ) + and not ( xchan_flags & %d ) group by xchan_hash order by total desc limit %d, %d ", intval($uid), intval($uid), intval(XCHAN_FLAGS_HIDDEN), + intval(XCHAN_FLAGS_DELETED), intval($start), intval($limit) ); diff --git a/mod/network.php b/mod/network.php index 18173043e..f087149f3 100644 --- a/mod/network.php +++ b/mod/network.php @@ -50,6 +50,7 @@ function network_init(&$a) { $a->page['aside'] .= group_side('network','network',true,$_GET['gid']); $a->page['aside'] .= posted_date_widget($a->get_baseurl() . '/network',local_user(),false); + $a->page['aside'] .= suggest_widget(); $a->page['aside'] .= saved_searches($search); $a->page['aside'] .= fileas_widget($a->get_baseurl(true) . '/network',(x($_GET, 'file') ? $_GET['file'] : '')); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 0ddbe1b86..2e00fde41 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -932,7 +932,7 @@ tr.mceLast { .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: 4px 4px 3px 0 #444444; + box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; } #sidebar-page-list .label { @@ -2979,3 +2979,4 @@ img.mail-list-sender-photo { .comment-edit-text-full { color: black; } +.suggest-widget-more { margin-top: 10px; } \ No newline at end of file diff --git a/view/tpl/suggest_friends.tpl b/view/tpl/suggest_friends.tpl index 80a606912..baece361a 100755 --- a/view/tpl/suggest_friends.tpl +++ b/view/tpl/suggest_friends.tpl @@ -1,5 +1,5 @@
      - +
      {{$entry.name}} diff --git a/view/tpl/suggest_widget.tpl b/view/tpl/suggest_widget.tpl new file mode 100644 index 000000000..eba8b496e --- /dev/null +++ b/view/tpl/suggest_widget.tpl @@ -0,0 +1,10 @@ +
      +

      {{$title}}

      +{{if $entries}} +{{foreach $entries as $child}} +{{include file="suggest_friends.tpl" entry=$child}} +{{/foreach}} +{{/if}} +
      +
      {{$more}}
      +
      \ No newline at end of file -- cgit v1.2.3 From 6d3aebb4838262e4eaebb9c5f39946cd97636b0e Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 6 Dec 2013 21:45:36 -0800 Subject: add suggestions to a couple of other pages --- mod/connections.php | 2 ++ mod/directory.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/mod/connections.php b/mod/connections.php index 6b3ed113c..b29e4dde8 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -43,6 +43,8 @@ function connections_aside(&$a) { } $a->set_widget('collections', group_side('connections','group',false,0,((array_key_exists('abook',$a->data)) ? $a->data['abook']['abook_xchan'] : ''))); + + $a->set_widget('suggest',suggest_widget()); $a->set_widget('findpeople',findpeople_widget()); } diff --git a/mod/directory.php b/mod/directory.php index 1f22e9bf8..e6c003099 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -213,6 +213,8 @@ function directory_content(&$a) { if($j['keywords']) { $a->set_widget('dirtagblock',dir_tagblock(z_root() . '/directory',$j['keywords'])); } + $a->set_widget('suggest',suggest_widget()); + // logger('mod_directory: entries: ' . print_r($entries,true), LOGGER_DATA); -- cgit v1.2.3 From a1a5b7047605eb595c6f97e8719a0af7f3aaf973 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 6 Dec 2013 21:53:32 -0800 Subject: more overflow hidden important so it works --- 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 2e00fde41..dd11fa144 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1634,7 +1634,7 @@ a.mail-list-link { float: left; text-align: center; width: 120px; - overflow: hidden; + overflow: hidden !important; } .profile-match-note { -- cgit v1.2.3 From 4123d3aa54e1655300ae7aac8cd8860524178e41 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 6 Dec 2013 22:04:07 -0800 Subject: tweaking of the name field size and limits so it doesn't push the content around --- view/theme/redbasic/css/style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index dd11fa144..491f0a60e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1631,9 +1631,10 @@ a.mail-list-link { } .profile-match-name { - float: left; +/* float: left; */ text-align: center; width: 120px; + height: 18px; overflow: hidden !important; } -- cgit v1.2.3 From 39536f6b7d7e7484c560b0584d2fb58e9925737d Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 6 Dec 2013 22:48:06 -0800 Subject: add some entropy --- include/contact_widgets.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index a6e66eb17..6d90abb01 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -157,7 +157,7 @@ function suggest_widget() { require_once('include/socgraph.php'); - $r = suggestion_query(local_user(),get_observer_hash(),0,2); + $r = suggestion_query(local_user(),get_observer_hash(),0,20); if(! $r) { return; @@ -165,7 +165,18 @@ function suggest_widget() { $arr = array(); - foreach($r as $rr) { + // Get two random entries from the top 20 returned. + // We'll grab the first one and the one immediately following. + // This will throw some entropy intot he situation so you won't + // be looking at the same two mug shots every time the widget runs + + $index = mt_rand(0,count($r) - 2); + + + + for($x = $index; $x <= ($index+1); $x ++) { + + $rr = $r[$x]; $connlnk = z_root() . '/follow/?url=' . $rr['xchan_addr']; -- cgit v1.2.3 From 08bbab9a06e56e2305ec3d48f5507ce3b909d286 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 6 Dec 2013 22:54:21 -0800 Subject: show a clean url in the hovertip for suggested friends --- include/contact_widgets.php | 1 + mod/suggest.php | 1 + view/tpl/suggest_friends.tpl | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 6d90abb01..ddc89346a 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -182,6 +182,7 @@ function suggest_widget() { $arr[] = array( 'url' => chanlink_url($rr['xchan_url']), + 'profile' => $rr['xchan_url'], 'name' => $rr['xchan_name'], 'photo' => $rr['xchan_photo_m'], 'ignlnk' => z_root() . '/suggest?ignore=' . $rr['xchan_hash'], diff --git a/mod/suggest.php b/mod/suggest.php index f891ebefc..bfa471fa5 100644 --- a/mod/suggest.php +++ b/mod/suggest.php @@ -50,6 +50,7 @@ function suggest_content(&$a) { $arr[] = array( 'url' => chanlink_url($rr['xchan_url']), + 'profile' => $rr['xchan_url'], 'name' => $rr['xchan_name'], 'photo' => $rr['xchan_photo_m'], 'ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['xchan_hash'], diff --git a/view/tpl/suggest_friends.tpl b/view/tpl/suggest_friends.tpl index baece361a..0388504d2 100755 --- a/view/tpl/suggest_friends.tpl +++ b/view/tpl/suggest_friends.tpl @@ -2,7 +2,7 @@
      - {{$entry.name}} + {{$entry.name}}
      -- cgit v1.2.3 From e33d9d358a8cee4851e7db22258bc70c9ac9dab3 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 7 Dec 2013 00:59:36 -0800 Subject: make suggestion photo sizes match top level post sizes --- version.inc | 2 +- view/theme/redbasic/css/style.css | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/version.inc b/version.inc index 6c5b67d47..4844f6170 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-06.519 +2013-12-07.520 diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 491f0a60e..14a708e55 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -935,6 +935,11 @@ tr.mceLast { box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444; } +.profile-match-photo img { + width: $top_photo !important; + height: $top_photo !important; +} + #sidebar-page-list .label { margin-left: 5px; } -- cgit v1.2.3 From 6dc157a9f9f46dbb4fe694d32e733eb1a2f5444f Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 7 Dec 2013 13:05:17 -0800 Subject: finish ACL's in personal menus --- include/contact_widgets.php | 10 ++++--- include/menu.php | 70 +++++++++++++++++++++++++++++++++++++-------- mod/mitem.php | 45 ++++++++++++++--------------- view/js/mod_mitem.js | 22 ++++++++++++++ view/tpl/mitemedit.tpl | 20 +++++++++++++ 5 files changed, 128 insertions(+), 39 deletions(-) create mode 100644 view/js/mod_mitem.js diff --git a/include/contact_widgets.php b/include/contact_widgets.php index ddc89346a..2fa5dee0b 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -170,14 +170,16 @@ function suggest_widget() { // This will throw some entropy intot he situation so you won't // be looking at the same two mug shots every time the widget runs - $index = mt_rand(0,count($r) - 2); - - + + $index = ((count($r) > 2) ? mt_rand(0,count($r) - 2) : 0); + for($x = $index; $x <= ($index+1); $x ++) { $rr = $r[$x]; - + if(! $rr['xchan_url']) + break; + $connlnk = z_root() . '/follow/?url=' . $rr['xchan_addr']; $arr[] = array( diff --git a/include/menu.php b/include/menu.php index 900b48e65..c10a669b3 100644 --- a/include/menu.php +++ b/include/menu.php @@ -196,6 +196,31 @@ function menu_add_item($menu_id, $uid, $arr) { $mitem_desc = escape_tags($arr['mitem_desc']); $mitem_order = intval($arr['mitem_order']); $mitem_flags = intval($arr['mitem_flags']); + + if(local_user() == $uid) { + $channel = get_app()->get_channel(); + } + + if ((! $arr['contact_allow']) + && (! $arr['group_allow']) + && (! $arr['contact_deny']) + && (! $arr['group_deny'])) { + $str_group_allow = $channel['channel_allow_gid']; + $str_contact_allow = $channel['channel_allow_cid']; + $str_group_deny = $channel['channel_deny_gid']; + $str_contact_deny = $channel['channel_deny_cid']; + } + else { + + // use the posted permissions + + $str_group_allow = perms2str($arr['group_allow']); + $str_contact_allow = perms2str($arr['contact_allow']); + $str_group_deny = perms2str($arr['group_deny']); + $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']); @@ -205,10 +230,10 @@ function menu_add_item($menu_id, $uid, $arr) { dbesc($mitem_link), dbesc($mitem_desc), intval($mitem_flags), - dbesc($allow_cid), - dbesc($allow_gid), - dbesc($deny_cid), - dbesc($deny_gid), + dbesc($str_contact_allow), + dbesc($str_group_allow), + dbesc($str_contact_deny), + dbesc($str_group_deny), intval($uid), intval($menu_id), intval($mitem_order) @@ -225,19 +250,40 @@ function menu_edit_item($menu_id, $uid, $arr) { $mitem_desc = escape_tags($arr['mitem_desc']); $mitem_order = intval($arr['mitem_order']); $mitem_flags = intval($arr['mitem_flags']); - $allow_cid = perms2str($arr['allow_cid']); - $allow_gid = perms2str($arr['allow_gid']); - $deny_cid = perms2str($arr['deny_cid']); - $deny_gid = perms2str($arr['deny_gid']); + + + if(local_user() == $uid) { + $channel = get_app()->get_channel(); + } + + if ((! $arr['contact_allow']) + && (! $arr['group_allow']) + && (! $arr['contact_deny']) + && (! $arr['group_deny'])) { + $str_group_allow = $channel['channel_allow_gid']; + $str_contact_allow = $channel['channel_allow_cid']; + $str_group_deny = $channel['channel_deny_gid']; + $str_contact_deny = $channel['channel_deny_cid']; + } + else { + + // use the posted permissions + + $str_group_allow = perms2str($arr['group_allow']); + $str_contact_allow = perms2str($arr['contact_allow']); + $str_group_deny = perms2str($arr['group_deny']); + $str_contact_deny = perms2str($arr['contact_deny']); + } + $r = q("update menu_item set mitem_link = '%s', mitem_desc = '%s', mitem_flags = %d, allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s', mitem_order = %d where mitem_channel_id = %d and mitem_menu_id = %d and mitem_id = %d limit 1", dbesc($mitem_link), dbesc($mitem_desc), intval($mitem_flags), - dbesc($allow_cid), - dbesc($allow_gid), - dbesc($deny_cid), - dbesc($deny_gid), + dbesc($str_contact_allow), + dbesc($str_group_allow), + dbesc($str_contact_deny), + dbesc($str_group_deny), intval($mitem_order), intval($uid), intval($menu_id), diff --git a/mod/mitem.php b/mod/mitem.php index 6a5785114..8e60e2d65 100644 --- a/mod/mitem.php +++ b/mod/mitem.php @@ -1,6 +1,7 @@ data['menu']) return; + + $channel = $a->get_channel(); + $_REQUEST['mitem_channel_id'] = local_user(); $_REQUEST['menu_id'] = $a->data['menu']['menu_id']; @@ -34,29 +38,6 @@ function mitem_post(&$a) { if($_REQUEST['newwin']) $_REQUEST['mitem_flags'] |= MENU_ITEM_NEWWIN; -// FIXME!!!! - - if ((! $_REQUEST['contact_allow']) - && (! $_REQUEST['group_allow']) - && (! $_REQUEST['contact_deny']) - && (! $_REQUEST['group_deny'])) { - $str_group_allow = $channel['channel_allow_gid']; - $str_contact_allow = $channel['channel_allow_cid']; - $str_group_deny = $channel['channel_deny_gid']; - $str_contact_deny = $channel['channel_deny_cid']; - } - else { - - // use the posted permissions - - $str_group_allow = perms2str($_REQUEST['group_allow']); - $str_contact_allow = perms2str($_REQUEST['contact_allow']); - $str_group_deny = perms2str($_REQUEST['group_deny']); - $str_contact_deny = perms2str($_REQUEST['contact_deny']); - } - - - $mitem_id = ((argc() > 2) ? intval(argv(2)) : 0); if($mitem_id) { @@ -98,6 +79,8 @@ function mitem_content(&$a) { return ''; } + $channel = $a->get_channel(); + $a->set_widget('design',design_tools()); @@ -135,11 +118,24 @@ function mitem_content(&$a) { if(argc() > 2) { + + + if(argv(2) === 'new') { + $perm_defaults = 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'] + ); + $o = replace_macros(get_markup_template('mitemedit.tpl'), array( '$header' => t('New Menu Element'), '$menu_id' => $a->data['menu']['menu_id'], + '$permissions' => t('Menu Item Permissions'), + '$permdesc' => t("\x28click to open/close\x29"), + '$aclselect' => populate_acl($perm_defaults), '$mitem_desc' => array('mitem_desc', t('Link text'), '', '','*'), '$mitem_link' => array('mitem_link', t('URL of link'), '', '', '*'), '$usezid' => array('usezid', t('Use Red magic-auth if available'), true, ''), @@ -180,6 +176,9 @@ function mitem_content(&$a) { $o = replace_macros(get_markup_template('mitemedit.tpl'), array( '$header' => t('Edit Menu Element'), '$menu_id' => $a->data['menu']['menu_id'], + '$permissions' => t('Menu Item Permissions'), + '$permdesc' => t("\x28click to open/close\x29"), + '$aclselect' => populate_acl($mitem), '$mitem_id' => intval(argv(2)), '$mitem_desc' => array('mitem_desc', t('Link text'), $mitem['mitem_desc'], '','*'), '$mitem_link' => array('mitem_link', t('URL of link'), $mitem['mitem_link'], '', '*'), diff --git a/view/js/mod_mitem.js b/view/js/mod_mitem.js new file mode 100644 index 000000000..d33713ee3 --- /dev/null +++ b/view/js/mod_mitem.js @@ -0,0 +1,22 @@ +$(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() { + 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/mitemedit.tpl b/view/tpl/mitemedit.tpl index ef61be809..8f13f80c9 100644 --- a/view/tpl/mitemedit.tpl +++ b/view/tpl/mitemedit.tpl @@ -14,6 +14,26 @@ {{include file="field_input.tpl" field=$mitem_order}} {{include file="field_checkbox.tpl" field=$usezid}} {{include file="field_checkbox.tpl" field=$newwin}} + +
      + {{$permissions}} {{$permdesc}} +
      + + +
      +
      +
      + + +
      -- cgit v1.2.3 From f2d8127012c36cd2c25959c2582982c5d54515bc Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 7 Dec 2013 13:17:41 -0800 Subject: update the to-do list --- doc/To-Do-Code.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/To-Do-Code.md b/doc/To-Do-Code.md index d61ff1077..f8efa2854 100644 --- a/doc/To-Do-Code.md +++ b/doc/To-Do-Code.md @@ -39,6 +39,12 @@ We need much more than this, but here are areas where developers can help. Pleas * Implement owned and exchangeable "things". +* 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 the Photos pages to integrate with "conversation" modules and bring back photo tagging, which is currently broken. + +* 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. -- cgit v1.2.3 From 48c650c715dde9ab7f748b4ba9a82bd2e51e8eb2 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 7 Dec 2013 15:20:12 -0800 Subject: improve editing ability of webpages - acls, photos, location, page link title, etc. --- mod/editwebpage.php | 36 +++++++++++++++++++++++++++++++----- mod/webpages.php | 19 ++++++++++++++++++- 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/mod/editwebpage.php b/mod/editwebpage.php index 5a21aa78d..840bda336 100644 --- a/mod/editwebpage.php +++ b/mod/editwebpage.php @@ -19,6 +19,8 @@ function editwebpage_content(&$a) { $owner = intval($r[0]['channel_id']); //logger('owner: ' . print_r($owner,true)); } + + $is_owner = ((local_user() && local_user() == $owner) ? true : false); $o = ''; @@ -52,6 +54,23 @@ function editwebpage_content(&$a) { ); + if($itm[0]['item_flags'] & ITEM_OBSCURED) { + $key = get_config('system','prvkey'); + if($itm[0]['title']) + $itm[0]['title'] = crypto_unencapsulate(json_decode_plus($itm[0]['title']),$key); + if($itm[0]['body']) + $itm[0]['body'] = crypto_unencapsulate(json_decode_plus($itm[0]['body']),$key); + } + + $item_id = q("select * from item_id where service = 'WEBPAGE' and iid = %d limit 1", + $itm[0]['id'] + ); + if($item_id) + $page_title = $item_id[0]['sid']; + + + + $plaintext = true; if(feature_enabled($itm[0]['uid'],'richtext')) @@ -112,9 +131,14 @@ function editwebpage_content(&$a) { //FIXME A return path with $_SESSION doesn't always work for observer - it may WSoD instead of loading a sensible page. So, send folk to the webpage list. $rp = '/webpages/' . $which; + $lockstate = $o .= replace_macros($tpl,array( '$return_path' => $rp, + '$webpage' => true, + '$placeholdpagetitle' => t('Page link title'), + '$pagetitle' => $page_title, + '$action' => 'item', '$share' => t('Edit'), '$upload' => t('Upload photo'), @@ -131,9 +155,11 @@ function editwebpage_content(&$a) { '$content' => undo_post_tagging($itm[0]['body']), '$post_id' => $post_id, '$baseurl' => $a->get_baseurl(), - '$defloc' => $channel['channel_location'], - '$visitor' => 'none', - '$pvisit' => 'none', + '$defloc' => $itm[0]['location'], + '$visitor' => ($is_owner) ? 'block' : 'none', + '$acl' => populate_acl($itm[0]), + '$showacl' => true, + '$pvisit' => ($is_owner) ? 'block' : 'none', '$public' => t('Public post'), '$jotnets' => $jotnets, '$mimeselect' => $mimeselect, @@ -143,8 +169,8 @@ function editwebpage_content(&$a) { '$category' => '', '$placeholdercategory' => t('Categories (comma-separated list)'), '$emtitle' => t('Example: bob@example.com, mary@example.com'), - '$lockstate' => $lockstate, - '$acl' => '', + 'lockstate' => (((strlen($itm[0]['allow_cid'])) || (strlen($itm[0]['allow_gid'])) || (strlen($itm[0]['deny_cid'])) || (strlen($itm[0]['deny_gid']))) ? 'lock' : 'unlock'), + '$acl' => populate_acl($itm[0]), '$bang' => '', '$profile_uid' => (intval($owner)), '$preview' => ((feature_enabled(local_user(),'preview')) ? t('Preview') : ''), diff --git a/mod/webpages.php b/mod/webpages.php index 5257bc91d..90004faa1 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -60,13 +60,30 @@ function webpages_content(&$a) { require_once ('include/conversation.php'); require_once('include/acl_selectors.php'); + + if(local_user() && local_user() == $a->profile_uid) { + $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'] + ); + } + else + $channel_acl = array(); + + + + + $x = array( 'webpage' => ITEM_WEBPAGE, 'is_owner' => true, 'nickname' => $a->profile['channel_address'], 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), 'bang' => (($group || $cid) ? '!' : ''), - 'acl' => ((local_user() && local_user() == $owner) ? populate_acl($a->get_channel()) : ''), + 'acl' => ((local_user() && local_user() == $owner) ? populate_acl($channel_acl) : ''), 'visitor' => 'block', 'profile_uid' => intval($owner), 'mimetype' => $mimetype, -- cgit v1.2.3 From d6d6387a7b788165ffb0a46703252271d546bd8a Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 7 Dec 2013 22:46:52 -0800 Subject: typo in mod_poke.js --- view/js/mod_poke.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/js/mod_poke.js b/view/js/mod_poke.js index edd53bb6a..78972888f 100644 --- a/view/js/mod_poke.js +++ b/view/js/mod_poke.js @@ -4,7 +4,7 @@ $(document).ready(function() { serviceUrl: baseurl + '/acl', minChars: 2, width: 250, - id: 'poke-recip-ac'; + id: 'poke-recip-ac', onSelect: function(value,data) { $("#poke-recip-complete").val(data); } -- cgit v1.2.3 From b8454cbd1df76bb96af6a6d65ff40f08f6919dc5 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 7 Dec 2013 23:29:26 -0800 Subject: post_activity_item issues --- include/conversation.php | 4 ++++ include/crypto.php | 2 ++ include/items.php | 28 +++++++++++++++++++++++----- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 13990e89b..f5fc9da93 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -203,6 +203,10 @@ function localize_item(&$item){ } if (stristr($item['verb'],ACTIVITY_POKE)) { + + // FIXME for obscured private posts, until then leave untranslated + return; + $verb = urldecode(substr($item['verb'],strpos($item['verb'],'#')+1)); if(! $verb) return; diff --git a/include/crypto.php b/include/crypto.php index ca01814da..e9372fbb4 100644 --- a/include/crypto.php +++ b/include/crypto.php @@ -75,6 +75,8 @@ function aes_encapsulate($data,$pubkey) { } function crypto_unencapsulate($data,$prvkey) { + if(! $data) + return; $alg = ((array_key_exists('alg',$data)) ? $data['alg'] : 'aes256cbc'); if($alg === 'aes256cbc') return aes_unencapsulate($data,$prvkey); diff --git a/include/items.php b/include/items.php index b6a196f4a..4af544de1 100755 --- a/include/items.php +++ b/include/items.php @@ -202,11 +202,29 @@ function post_activity_item($arr) { return $ret; } - if(array_key_exists('content_type',$arr) && $arr['content_type'] == 'text/html') - $arr['body'] = purify_html($arr['body']); - else - $arr['body'] = escape_tags($arr['body']); + if(! array_key_exists('mimetype',$arr)) + $arr['mimetype'] = 'text/bbcode'; + + if(array_key_exists('item_private',$arr) && $arr['item_private']) { + + $arr['body'] = z_input_filter($arr['uid'],$arr['body'],$arr['mimetype']); + + if($channel) { + if($channel['channel_hash'] === $arr['author_xchan']) { + $arr['sig'] = base64url_encode(rsa_sign($arr['body'],$channel['channel_prvkey'])); + $arr['item_flags'] = $arr['item_flags'] | ITEM_VERIFIED; + } + } + + logger('Encrypting local storage'); + $key = get_config('system','pubkey'); + $arr['item_flags'] = $arr['item_flags'] | ITEM_OBSCURED; + if($arr['title']) + $arr['title'] = json_encode(aes_encapsulate($arr['title'],$key)); + if($arr['body']) + $arr['body'] = json_encode(aes_encapsulate($arr['body'],$key)); + } $arr['mid'] = ((x($arr,'mid')) ? $arr['mid'] : item_message_id()); $arr['parent_mid'] = ((x($arr,'parent_mid')) ? $arr['parent_mid'] : $arr['mid']); @@ -238,7 +256,7 @@ function post_activity_item($arr) { $post = item_store($arr); - if($post['result']) + if($post['success']) $post_id = $post['item_id']; if($post_id) { -- cgit v1.2.3 From 5aa6b69320c1e53e184361490cb13e3710fbe539 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 8 Dec 2013 16:57:05 +0100 Subject: submit button height --- view/css/conversation.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/css/conversation.css b/view/css/conversation.css index bf8e0236e..5bf6a3607 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -37,7 +37,7 @@ } #profile-jot-submit { - height: 30px; + height: 22px; width: 70px; float: right; } -- cgit v1.2.3 From 2dfd65f90b23e92da692311f2c5b7c6503e0ce25 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 8 Dec 2013 18:49:48 +0100 Subject: override bootstrap in bootstrap-red so theme developers are not forced to change anything --- view/css/bootstrap-red.css | 67 ++++++++++++++++++++++++++++++++++++++++++++ view/css/default.css | 69 ---------------------------------------------- view/php/theme_init.php | 1 + 3 files changed, 68 insertions(+), 69 deletions(-) create mode 100644 view/css/bootstrap-red.css diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css new file mode 100644 index 000000000..73c06fd4b --- /dev/null +++ b/view/css/bootstrap-red.css @@ -0,0 +1,67 @@ +/* override some bootstrap settings */ +*, +*:before, +*:after { + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} + +html { +font-size: 100%; +} + +.panel-body .form-control{ + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +.profile-jot-text{ + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} + + +h1, +.h1 { + font-size: 24px; +} + +h2, +.h2 { + font-size: 18px; +} + +h3, +.h3 { + font-size: 16px; +} + +h4, +.h4 { + font-size: 14px; +} + +h5, +.h5 { + font-size: 12px; +} + +h6, +.h6 { + font-size: 10px; +} +textarea { +line-height: initial; +} + +.radio, .checkbox{ +padding-left: 0px; +margin-left: 0px; +} + +.checkbox input[type="checkbox"], inline input[type="checkbox"]{ +float:none; +margin-left:0px; +} diff --git a/view/css/default.css b/view/css/default.css index eb39b31d5..27df38dee 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -30,72 +30,3 @@ section { right: 15px; padding-bottom: 350px; } - - -/* override some bootstrap settings */ -*, -*:before, -*:after { - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; -} - -html { -font-size: 100%; -} - -.panel-body .form-control{ - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} -.profile-jot-text{ - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; -} - - -h1, -.h1 { - font-size: 24px; -} - -h2, -.h2 { - font-size: 18px; -} - -h3, -.h3 { - font-size: 16px; -} - -h4, -.h4 { - font-size: 14px; -} - -h5, -.h5 { - font-size: 12px; -} - -h6, -.h6 { - font-size: 10px; -} -textarea { -line-height: initial; -} - -.radio, .checkbox{ -padding-left: 0px; -margin-left: 0px; -} - -.checkbox input[type="checkbox"], inline input[type="checkbox"]{ -float:none; -margin-left:0px; -} diff --git a/view/php/theme_init.php b/view/php/theme_init.php index e0992f0f0..e2c536812 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -12,6 +12,7 @@ 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_js('js/jquery.js'); head_add_js('library/bootstrap/js/bootstrap.min.js'); -- cgit v1.2.3 From 9f185b95f5a35b841a0c1ba9b49a0b7de47cda5e Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 8 Dec 2013 19:06:43 +0100 Subject: Minified bootstrap css --- view/php/theme_init.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/php/theme_init.php b/view/php/theme_init.php index e2c536812..ffbc02e48 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -3,7 +3,7 @@ require_once('include/plugin.php'); head_add_css('library/bootstrap/css/bootstrap-theme.min.css'); -head_add_css('library/bootstrap/css/bootstrap.css'); +head_add_css('library/bootstrap/css/bootstrap.min.css'); 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'); -- cgit v1.2.3 From b61658ee738edbebccfb0670c330522362c895d5 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 8 Dec 2013 19:37:41 +0100 Subject: bootbox --- library/bootstrap/js/bootbox.min.js | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 library/bootstrap/js/bootbox.min.js diff --git a/library/bootstrap/js/bootbox.min.js b/library/bootstrap/js/bootbox.min.js new file mode 100644 index 000000000..4ea792f3a --- /dev/null +++ b/library/bootstrap/js/bootbox.min.js @@ -0,0 +1,6 @@ +/** + * bootbox.js v4.1.0 + * + * http://bootboxjs.com/license.txt + */ +window.bootbox=window.bootbox||function a(b,c){"use strict";function d(a){var b=r[p.locale];return b?b[a]:r.en[a]}function e(a,c,d){a.preventDefault();var e=b.isFunction(d)&&d(a)===!1;e||c.modal("hide")}function f(a){var b,c=0;for(b in a)c++;return c}function g(a,c){var d=0;b.each(a,function(a,b){c(a,b,d++)})}function h(a){var c,d;if("object"!=typeof a)throw new Error("Please supply an object of options");if(!a.message)throw new Error("Please specify a message");return a=b.extend({},p,a),a.buttons||(a.buttons={}),a.backdrop=a.backdrop?"static":!1,c=a.buttons,d=f(c),g(c,function(a,e,f){if(b.isFunction(e)&&(e=c[a]={callback:e}),"object"!==b.type(e))throw new Error("button with key "+a+" must be an object");e.label||(e.label=a),e.className||(e.className=2>=d&&f===d-1?"btn-primary":"btn-default")}),a}function i(a,b){var c=a.length,d={};if(1>c||c>2)throw new Error("Invalid argument length");return 2===c||"string"==typeof a[0]?(d[b[0]]=a[0],d[b[1]]=a[1]):d=a[0],d}function j(a,c,d){return b.extend(!0,{},a,i(c,d))}function k(a,b,c,d){var e={className:"bootbox-"+a,buttons:l.apply(null,b)};return m(j(e,d,c),b)}function l(){for(var a={},b=0,c=arguments.length;c>b;b++){var e=arguments[b],f=e.toLowerCase(),g=e.toUpperCase();a[f]={label:d(g)}}return a}function m(a,b){var d={};return g(b,function(a,b){d[b]=!0}),g(a.buttons,function(a){if(d[a]===c)throw new Error("button key "+a+" is not allowed (options are "+b.join("\n")+")")}),a}var n={dialog:"",header:"

      ",footer:"
      ",closeButton:"",form:"
      ",inputs:{text:"",email:"",select:"",checkbox:"
      "}},o=b("body"),p={locale:"en",backdrop:!0,animate:!0,className:null,closeButton:!0,show:!0},q={};q.alert=function(){var a;if(a=k("alert",["ok"],["message","callback"],arguments),a.callback&&!b.isFunction(a.callback))throw new Error("alert requires callback property to be a function when provided");return a.buttons.ok.callback=a.onEscape=function(){return b.isFunction(a.callback)?a.callback():!0},q.dialog(a)},q.confirm=function(){var a;if(a=k("confirm",["cancel","confirm"],["message","callback"],arguments),a.buttons.cancel.callback=a.onEscape=function(){return a.callback(!1)},a.buttons.confirm.callback=function(){return a.callback(!0)},!b.isFunction(a.callback))throw new Error("confirm requires a callback");return q.dialog(a)},q.prompt=function(){var a,d,e,f,h,i,k;if(f=b(n.form),d={className:"bootbox-prompt",buttons:l("cancel","confirm"),value:"",inputType:"text"},a=m(j(d,arguments,["title","callback"]),["cancel","confirm"]),i=a.show===c?!0:a.show,a.message=f,a.buttons.cancel.callback=a.onEscape=function(){return a.callback(null)},a.buttons.confirm.callback=function(){var c;switch(a.inputType){case"text":case"email":case"select":c=h.val();break;case"checkbox":var d=h.find("input:checked");c=[],g(d,function(a,d){c.push(b(d).val())})}return a.callback(c)},a.show=!1,!a.title)throw new Error("prompt requires a title");if(!b.isFunction(a.callback))throw new Error("prompt requires a callback");if(!n.inputs[a.inputType])throw new Error("invalid prompt type");switch(h=b(n.inputs[a.inputType]),a.inputType){case"text":case"email":h.val(a.value);break;case"select":var o={};if(k=a.inputOptions||[],!k.length)throw new Error("prompt with select requires options");g(k,function(a,d){var e=h;if(d.value===c||d.text===c)throw new Error("given options in wrong format");d.group&&(o[d.group]||(o[d.group]=b("").attr("label",d.group)),e=o[d.group]),e.append("")}),g(o,function(a,b){h.append(b)}),h.val(a.value);break;case"checkbox":var p=b.isArray(a.value)?a.value:[a.value];if(k=a.inputOptions||[],!k.length)throw new Error("prompt with checkbox requires options");if(!k[0].value||!k[0].text)throw new Error("given options in wrong format");h=b("
      "),g(k,function(c,d){var e=b(n.inputs[a.inputType]);e.find("input").attr("value",d.value),e.find("label").append(d.text),g(p,function(a,b){b===d.value&&e.find("input").prop("checked",!0)}),h.append(e)})}return a.placeholder&&h.attr("placeholder",a.placeholder),f.append(h),f.on("submit",function(a){a.preventDefault(),e.find(".btn-primary").click()}),e=q.dialog(a),e.off("shown.bs.modal"),e.on("shown.bs.modal",function(){h.focus()}),i===!0&&e.modal("show"),e},q.dialog=function(a){a=h(a);var c=b(n.dialog),d=c.find(".modal-body"),f=a.buttons,i="",j={onEscape:a.onEscape};if(g(f,function(a,b){i+="",j[a]=b.callback}),d.find(".bootbox-body").html(a.message),a.animate===!0&&c.addClass("fade"),a.className&&c.addClass(a.className),a.title&&d.before(n.header),a.closeButton){var k=b(n.closeButton);a.title?c.find(".modal-header").prepend(k):k.css("margin-top","-10px").prependTo(d)}return a.title&&c.find(".modal-title").html(a.title),i.length&&(d.after(n.footer),c.find(".modal-footer").html(i)),c.on("hidden.bs.modal",function(a){a.target===this&&c.remove()}),c.on("shown.bs.modal",function(){c.find(".btn-primary:first").focus()}),c.on("escape.close.bb",function(a){j.onEscape&&e(a,c,j.onEscape)}),c.on("click",".modal-footer button",function(a){var d=b(this).data("bb-handler");e(a,c,j[d])}),c.on("click",".bootbox-close-button",function(a){e(a,c,j.onEscape)}),c.on("keyup",function(a){27===a.which&&c.trigger("escape.close.bb")}),o.append(c),c.modal({backdrop:a.backdrop,keyboard:!1,show:!1}),a.show&&c.modal("show"),c},q.setDefaults=function(){var a={};2===arguments.length?a[arguments[0]]=arguments[1]:a=arguments[0],b.extend(p,a)},q.hideAll=function(){b(".bootbox").modal("hide")};var r={br:{OK:"OK",CANCEL:"Cancelar",CONFIRM:"Sim"},da:{OK:"OK",CANCEL:"Annuller",CONFIRM:"Accepter"},de:{OK:"OK",CANCEL:"Abbrechen",CONFIRM:"Akzeptieren"},en:{OK:"OK",CANCEL:"Cancel",CONFIRM:"OK"},es:{OK:"OK",CANCEL:"Cancelar",CONFIRM:"Aceptar"},fi:{OK:"OK",CANCEL:"Peruuta",CONFIRM:"OK"},fr:{OK:"OK",CANCEL:"Annuler",CONFIRM:"D'accord"},it:{OK:"OK",CANCEL:"Annulla",CONFIRM:"Conferma"},nl:{OK:"OK",CANCEL:"Annuleren",CONFIRM:"Accepteren"},no:{OK:"OK",CANCEL:"Avbryt",CONFIRM:"OK"},pl:{OK:"OK",CANCEL:"Anuluj",CONFIRM:"Potwierdź"},ru:{OK:"OK",CANCEL:"Отмена",CONFIRM:"Применить"},zh_CN:{OK:"OK",CANCEL:"取消",CONFIRM:"确认"},zh_TW:{OK:"OK",CANCEL:"取消",CONFIRM:"確認"}};return q.init=function(c){window.bootbox=a(c||b)},q}(window.jQuery); \ No newline at end of file -- cgit v1.2.3 From d32e05fb5e30dc634754e9d2e55cc7702a883ede Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Dec 2013 16:04:28 -0800 Subject: starting on the journey to comanche everywhere - beginning with widget conversions. There are approximately 20 which need to be wrapped for accessibility to comanche. --- include/group.php | 4 ++-- include/widgets.php | 8 ++++++++ mod/network.php | 4 ++-- version.inc | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/include/group.php b/include/group.php index d339301b4..8f690785d 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 = '') { +function group_side($every="contacts",$each="group",$edit = false, $group_id = 0, $cid = '',$mode = 1) { $o = ''; @@ -272,7 +272,7 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0 'cid' => $cid, 'text' => $rr['name'], 'selected' => $selected, - 'href' => (($each === 'network') ? $each.'?f=&gid='.$rr['id'] : $each."/".$rr['id']), + 'href' => (($mode == 0) ? $each.'?f=&gid='.$rr['id'] : $each."/".$rr['id']), 'edit' => $groupedit, 'ismember' => in_array($rr['id'],$member_of), ); diff --git a/include/widgets.php b/include/widgets.php index 87941f40f..5be77498c 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -32,3 +32,11 @@ function widget_tagcloud($args) { return $o; } +function widget_collections($args) { + require_once('include/group.php'); + $page = argv(0); + $gid = $_REQUEST['gid']; + + return group_side($page,$page,true,$_REQUEST['gid'],'',0); + +} \ No newline at end of file diff --git a/mod/network.php b/mod/network.php index f087149f3..b2eed8a73 100644 --- a/mod/network.php +++ b/mod/network.php @@ -47,8 +47,8 @@ function network_init(&$a) { ); } - - $a->page['aside'] .= group_side('network','network',true,$_GET['gid']); + require_once('include/widgets.php'); + $a->page['aside'] .= widget_collections(array()); $a->page['aside'] .= posted_date_widget($a->get_baseurl() . '/network',local_user(),false); $a->page['aside'] .= suggest_widget(); diff --git a/version.inc b/version.inc index 4844f6170..33910aea3 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-07.520 +2013-12-08.521 -- cgit v1.2.3 From 8959487f1c7e5b785df2f8e7658da8b2534b2ad9 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Dec 2013 16:16:54 -0800 Subject: transition to $a->set_widget in /network on the short term - long term this will be in view/pdl files --- mod/network.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mod/network.php b/mod/network.php index b2eed8a73..e6cb2b6c6 100644 --- a/mod/network.php +++ b/mod/network.php @@ -48,12 +48,12 @@ function network_init(&$a) { } require_once('include/widgets.php'); - $a->page['aside'] .= widget_collections(array()); - $a->page['aside'] .= posted_date_widget($a->get_baseurl() . '/network',local_user(),false); - $a->page['aside'] .= suggest_widget(); - $a->page['aside'] .= saved_searches($search); - $a->page['aside'] .= fileas_widget($a->get_baseurl(true) . '/network',(x($_GET, 'file') ? $_GET['file'] : '')); + $a->set_widget('collections',widget_collections(array())); + $a->set_widget('archives',posted_date_widget($a->get_baseurl() . '/network',local_user(),false)); + $a->set_widget('suggestions',suggest_widget()); + $a->set_widget('savedsearch',saved_searches($search)); + $a->set_widget('filer',fileas_widget($a->get_baseurl(true) . '/network',(x($_GET, 'file') ? $_GET['file'] : ''))); if($search) { -- cgit v1.2.3 From 082ac6777829c98ded48c271f4210ac5d6e1a68f Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Dec 2013 20:08:50 -0800 Subject: suggestion widget tweaked to make it comanche capable. Remove old versions of specs that are so obsolete it isn't funny. Zot protocol reference is in red's github wiki, and in the code. We should move the github copy to /doc once it is updated to match the code. There's no point in documenting dfrn in the red code base. --- include/contact_widgets.php | 52 ------- include/items.php | 12 +- include/widgets.php | 53 +++++++ mod/connections.php | 4 +- mod/directory.php | 3 +- mod/network.php | 4 +- spec/dfrn-snap2.jpg | Bin 246724 -> 0 bytes spec/dfrn2.odt | Bin 209276 -> 0 bytes spec/dfrn2.pdf | Bin 304958 -> 0 bytes spec/zot-2012.txt | 44 ------ spec/zot.txt | 362 -------------------------------------------- 11 files changed, 69 insertions(+), 465 deletions(-) delete mode 100644 spec/dfrn-snap2.jpg delete mode 100644 spec/dfrn2.odt delete mode 100644 spec/dfrn2.pdf delete mode 100644 spec/zot-2012.txt delete mode 100644 spec/zot.txt diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 2fa5dee0b..ac5382862 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -153,55 +153,3 @@ function common_friends_visitor_widget($profile_uid) { }; -function suggest_widget() { - - require_once('include/socgraph.php'); - - $r = suggestion_query(local_user(),get_observer_hash(),0,20); - - if(! $r) { - return; - } - - $arr = array(); - - // Get two random entries from the top 20 returned. - // We'll grab the first one and the one immediately following. - // This will throw some entropy intot he situation so you won't - // be looking at the same two mug shots every time the widget runs - - - $index = ((count($r) > 2) ? mt_rand(0,count($r) - 2) : 0); - - - for($x = $index; $x <= ($index+1); $x ++) { - - $rr = $r[$x]; - if(! $rr['xchan_url']) - break; - - $connlnk = z_root() . '/follow/?url=' . $rr['xchan_addr']; - - $arr[] = array( - 'url' => chanlink_url($rr['xchan_url']), - 'profile' => $rr['xchan_url'], - 'name' => $rr['xchan_name'], - 'photo' => $rr['xchan_photo_m'], - 'ignlnk' => z_root() . '/suggest?ignore=' . $rr['xchan_hash'], - 'conntxt' => t('Connect'), - 'connlnk' => $connlnk, - 'ignore' => t('Ignore/Hide') - ); - } - - - $o = replace_macros(get_markup_template('suggest_widget.tpl'),array( - '$title' => t('Suggestions'), - '$more' => t('See more...'), - '$entries' => $arr - )); - - return $o; - -} - diff --git a/include/items.php b/include/items.php index 4af544de1..dd3cf7644 100755 --- a/include/items.php +++ b/include/items.php @@ -3692,6 +3692,8 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C $sql_options = ''; $sql_extra2 = ''; $sql_extra3 = ''; + $def_acl = ''; + $item_uids = ' true '; if($channel) { @@ -3708,7 +3710,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C $sql_extra = " AND item.parent IN ( SELECT parent FROM item WHERE (item_flags & " . intval(ITEM_THREAD_TOP) . ") $sql_options ) "; - if($arr['group'] && $uid) { + if($arr['gid'] && $uid) { $r = q("SELECT * FROM `group` WHERE id = %d AND uid = %d LIMIT 1", intval($arr['group']), intval($uid) @@ -3718,7 +3720,6 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C return $result; } - $contact_str = ''; $contacts = group_get_members($group); if($contacts) { @@ -3730,11 +3731,15 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C } else { $contact_str = ' 0 '; - info( t('Group is empty')); + $result['message'] = t('Collection is empty.'); + return $result; } $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND (( author_xchan IN ( $contact_str ) OR owner_xchan in ( $contact_str)) or allow_gid like '" . protect_sprintf('%<' . dbesc($r[0]['hash']) . '>%') . "' ) and id = parent and item_restrict = 0 ) "; + $x = group_rec_byhash($uid,$r[0]['hash']); + $result['headline'] = sprintf( t('Collection: %s'),$x['name']); + } elseif($arr['cid'] && $uid) { @@ -3744,6 +3749,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C ); if($r) { $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval($arr['uid']) . " AND ( author_xchan = '" . dbesc($r[0]['abook_xchan']) . "' or owner_xchan = '" . dbesc($r[0]['abook_xchan']) . "' ) and item_restrict = 0 ) "; + $result['headline'] = sprintf( t('Connection: %s'),$r[0]['xchan_name']); } else { $result['message'] = t('Connection not found.'); diff --git a/include/widgets.php b/include/widgets.php index 5be77498c..f152e8ee1 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -39,4 +39,57 @@ function widget_collections($args) { return group_side($page,$page,true,$_REQUEST['gid'],'',0); +} + + +function widget_suggestions($arr) { + + require_once('include/socgraph.php'); + + $r = suggestion_query(local_user(),get_observer_hash(),0,20); + + if(! $r) { + return; + } + + $arr = array(); + + // Get two random entries from the top 20 returned. + // We'll grab the first one and the one immediately following. + // This will throw some entropy intot he situation so you won't + // be looking at the same two mug shots every time the widget runs + + + $index = ((count($r) > 2) ? mt_rand(0,count($r) - 2) : 0); + + + for($x = $index; $x <= ($index+1); $x ++) { + + $rr = $r[$x]; + if(! $rr['xchan_url']) + break; + + $connlnk = z_root() . '/follow/?url=' . $rr['xchan_addr']; + + $arr[] = array( + 'url' => chanlink_url($rr['xchan_url']), + 'profile' => $rr['xchan_url'], + 'name' => $rr['xchan_name'], + 'photo' => $rr['xchan_photo_m'], + 'ignlnk' => z_root() . '/suggest?ignore=' . $rr['xchan_hash'], + 'conntxt' => t('Connect'), + 'connlnk' => $connlnk, + 'ignore' => t('Ignore/Hide') + ); + } + + + $o = replace_macros(get_markup_template('suggest_widget.tpl'),array( + '$title' => t('Suggestions'), + '$more' => t('See more...'), + '$entries' => $arr + )); + + return $o; + } \ No newline at end of file diff --git a/mod/connections.php b/mod/connections.php index b29e4dde8..b3532efbf 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -6,6 +6,7 @@ require_once('include/contact_selectors.php'); require_once('include/group.php'); require_once('include/contact_widgets.php'); require_once('include/zot.php'); +require_once('include/widgets.php'); function connections_init(&$a) { @@ -32,6 +33,7 @@ function connections_init(&$a) { function connections_aside(&$a) { + if (! local_user()) return; @@ -44,7 +46,7 @@ function connections_aside(&$a) { $a->set_widget('collections', group_side('connections','group',false,0,((array_key_exists('abook',$a->data)) ? $a->data['abook']['abook_xchan'] : ''))); - $a->set_widget('suggest',suggest_widget()); + $a->set_widget('suggest',widget_suggestions(array())); $a->set_widget('findpeople',findpeople_widget()); } diff --git a/mod/directory.php b/mod/directory.php index e6c003099..616035339 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -1,6 +1,7 @@ set_widget('dirtagblock',dir_tagblock(z_root() . '/directory',$j['keywords'])); } - $a->set_widget('suggest',suggest_widget()); + $a->set_widget('suggest',widget_suggestions(array())); // logger('mod_directory: entries: ' . print_r($entries,true), LOGGER_DATA); diff --git a/mod/network.php b/mod/network.php index e6cb2b6c6..efb3116ae 100644 --- a/mod/network.php +++ b/mod/network.php @@ -51,7 +51,7 @@ function network_init(&$a) { $a->set_widget('collections',widget_collections(array())); $a->set_widget('archives',posted_date_widget($a->get_baseurl() . '/network',local_user(),false)); - $a->set_widget('suggestions',suggest_widget()); + $a->set_widget('suggestions',widget_suggestions(array())); $a->set_widget('savedsearch',saved_searches($search)); $a->set_widget('filer',fileas_widget($a->get_baseurl(true) . '/network',(x($_GET, 'file') ? $_GET['file'] : ''))); @@ -286,7 +286,7 @@ function network_content(&$a, $update = 0, $load = false) { } else { $contact_str = ' 0 '; - info( t('Group is empty')); + info( t('Collection is empty')); } $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND (( author_xchan IN ( $contact_str ) OR owner_xchan in ( $contact_str )) or allow_gid like '" . protect_sprintf('%<' . dbesc($group_hash) . '>%') . "' ) and id = parent and item_restrict = 0 ) "; diff --git a/spec/dfrn-snap2.jpg b/spec/dfrn-snap2.jpg deleted file mode 100644 index ee00f5654..000000000 Binary files a/spec/dfrn-snap2.jpg and /dev/null differ diff --git a/spec/dfrn2.odt b/spec/dfrn2.odt deleted file mode 100644 index 390fc4bb8..000000000 Binary files a/spec/dfrn2.odt and /dev/null differ diff --git a/spec/dfrn2.pdf b/spec/dfrn2.pdf deleted file mode 100644 index e46225f7e..000000000 Binary files a/spec/dfrn2.pdf and /dev/null differ diff --git a/spec/zot-2012.txt b/spec/zot-2012.txt deleted file mode 100644 index d01af5c87..000000000 --- a/spec/zot-2012.txt +++ /dev/null @@ -1,44 +0,0 @@ - -Initial cut at Zot-2012 protocol. This is a very rough draft of some very rough ideas and concepts. -It is not yet intended to be a definitive specification and many things like the security handshakes are yet to be specified precisely. - -All communications are https - - -First create a global unique channel and assign a location - -Site id is 'https://macgirvin.com' -Site channel-id is 'https://macgirvin.com/channel/1' - -$guid = base64url_encode(hash('whirlpool','https://macgirvin.com/channel/1.' . mt_rand(1000000,9999999),1); - -$guid_sig = base64_urlencode(rsa_sign($guid,$myprivatekey)); - -$location = Site id -$location_sig = base64_urlencode(rsa_sign($location,$myprivatekey)); - - -This information will identify a channel+site pair in the future. When contact is made initially, a lookup is performed to a well known URL at this site to verify the signatures of both the guid and the site. After this information has been verified, it is stored and we can use them to uniquely identify a channel/location pair in the future. - -If a new location is provided, this process is repeated but only the new location needs to be verified and stored. - -Messages are sent by providing this information in an HTTP post (*) to the other site, along with a protocol version specifier and type of message and a verification token. For message types which do not require identity validation, the message may be included. Others will require a security handshake with the remote site calling back the original to verify the identity assertion and the message is only collected at that time. - -Multiple messages may be sent, and a callback may result in the collection of multiple messages destined for this site, not necessarily limited to the channel/location which was asserted. - - -(*) A POST method is used for many protocol transactions as site "hardening" tools may place overly restrictive length limits on GET data. We are typically sending several encoded/encrypted strings and these requests are likely to fail on some sites and become a nagging support issue if a GET request is used. - -The verification token is signed by the remote site and the signed token returned during the callback. This verifies the identity of the callback - by matching with known tokens. - - -Permissions: - -Permissions are available for several different activities. This list is enumerated by a POST to the permissions service with the above channel+location information. An array of permissions will be returned. If no identity assertion is made, a list of the default channel permissions is returned. - - - - - - - diff --git a/spec/zot.txt b/spec/zot.txt deleted file mode 100644 index 2c3bbb180..000000000 --- a/spec/zot.txt +++ /dev/null @@ -1,362 +0,0 @@ -This is the Zot! social communications protocol. - -Specification revision: 1 -2 October 2011 - -Mike Macgirvin -This specification is public domain. - -Zot is a framework for secure delivery of messages on the web based on -webfinger and encapsulating salmon. - -First read the salmon and salmon magic envelope specifications. Zot also -makes use of webfinger and ActivityStreams and several concepts from RFC822 -(email). Zot encompasses the zot delivery framework and the zid remote -access protocol. - -The current specification revision (1) is frozen until a reference -implementation is available. After that, any protocol changes will require a -change to the revision number. - -**************** -* Zot delivery * -**************** - -Format of a zot wrapper. This completely encapsulates a salmon magic envelope -and provides privacy protection, while defining a delivery envelope - a -concept familiar to email systems. All addresses in zot are webfinger -resolvable addresses containing zot endpoints and salmon public keys (zot -is a superset of salmon). - - - - - ((key)) - ((iv)) - ((env_key)) - ((env_iv)) - ((envelope)) - ((sender signature)) - AES-256-CBC - ((salmon)) - - - -zot:key -******* - -A suitable randomly generated encyption key of length 32 octets for encrypting -the salmon packet. This is then encrypted with the sender's private key and -base64url encoded. - -zot:iv -****** - -A suitable randomly generated initialisation vector of length 16 octets for -encrypting the salmon packet. This is then encrypted with the sender's private -key and base64url encoded. - -zot:env_key -*********** - -A suitable randomly generated encyption key of length 32 octets for encrypting -the envelope. This is then encrypted with the recipient's public key and -base64url encoded. For bulk deliveries, it is encrypted with the site bulk -delivery public key. - - -zot:env_iv -********** - -A suitable randomly generated initialisation vector of length 16 octets for -encrypting the envelope. This is then encrypted with the recipient's public -key and base64url encoded. For bulk deliveries, it is encrypted with the site -bulk delivery public key. - - -zot:env -******* - -This consists of RFC822-style header fields representing the sender and -recipient(s). Line lengths have no defined limit and RFC822 continuation -lines are not supported. If an inbound server is not able to process an -envelope or post due to size constraints, it SHOULD return a -"413 Entity too large" HTTP response. - -Example: - -Z-From: zot:bob@example.com -Z-Sender: zot:bob@example.com -Z-To: zot:alice@example.com - -Both "Z-From:" and "Z-Sender:" MUST be provided, and represent a single -webfinger address of the author and sender respectively. The webfinger -address for the From address MUST contain a discoverable salmon public key -which is needed to verify the enclosed salmon data. Sender is used to indicate -the webfinger identity responsible for transmitting this message. From -indicates the message author. - -In web-based social systems, a reply to a message SHOULD be conveyed to all of -the original message participants. Only the author of the original message -may know all the recipients (such as those contained in Bcc: elements). The -author of a message always provides 'From'. They MUST duplicate this -information as 'Sender' when posting a followup message. - -A reply to a given message MUST be sent to the From address of the original -post, and MAY be sent to any additional addresses in the recipient list. The -original post author MUST send the reply to all known recipients of the -original message, with their webfinger identity as Sender, and the -comment/reply author as From. - -Receiving agents SHOULD validate the From identity as the signer of the salmon -magic envelope, and MAY reject it. They SHOULD also verify the Sender signature -of the zot packet if it is different than the salmon signature. They MAY -reject the message if the Sender is not allowed in their "friend list", or if -they do not have a suitable relationship with the Sender, or if either -signature fails to validate. Rejected messages for one of these reasons SHOULD -be indicated with a "400 Bad Request" HTTP response. - - -Z-To: * - -indicates a public message with no specifically enumerated recipients. - -The fields Z-To: and/or Z-Bcc: MAY be present. At least one recipient field -MUST be present. - -Z-To: zot:bob@example.com, zot:alice@example.com, mailto:dave@example.com -Z-Bcc: zot:https://example.com/profile/richard - -are valid entries. Adresses are comma separated and individual entries MUST NOT -contain commas. There MAY be any number of ASCII space characters between -entries for legibility. Header lines are terminated with a linefeed character -(ASCII 0x0A). - -This specification provides the following protocol address prefixes -for use in Z-To: or Z-Bcc: elements: - -zot: - normal zot delivery using webfinger or LRDD resolvable address -dfrn: - legacy DFRN mode delivery using webfinger or LRDD resovable address -ostatus: - normal OStatus delivery using webfinger or LRDD resovable address -diaspora: - Diaspora network delivery using webfinger address -facebook: - Facebook profile page URL -twitter: - Twitter personal page URL without AJAX '#!' fragment -mailto: - email RFC822/ESMTP address - -Examples: - -twitter:http://twitter.com/bjensen -facebook:http://facebook.com/profile.php?id=000000001 - -Foreign protocol addresses which have not been defined in this specification -or future revisions of this specification and which are unknown to the -recipient delivery process MAY be ignored. - -In cases where an address may contain either a webfinger or LRDD address, the -webfinger address SHOULD be used preferentially. - - -Z-Bcc: -****** - -The Z-Bcc element may contain one or more addresses which are hidden from end -user presentation. A zot receiving system MUST NOT store or allow for -the display of the Bcc information. Implementations which require extreme -privacy SHOULD send individual posts to each of the Bcc: recipients containing -only a single address. They MAY send all Bcc: posts using bulk delivery, -however this may have privacy implications as there is no guarantee a -receiving system will not log, store, or otherwise reveal the contents of the -Bcc recipient list. - -Z-To: addresses MAY be shown to an end user. - - -Envelope encryption -******************* - - -The entire envelope is encrypted using alg with env_key and env_iv and -base64url encoded for transmission. - -The zot envelope MAY include remote addresses. A zot inbound delivery agent -MUST parse the envelope and determine whether a delivery address to the -current endpoint is valid. This may be the result of: - - 1. An address contains the public message wildcard '*' - - 2. The current endpoint is a personal endpoint and one of the recipients -listed in the Z-To: or Z-Bcc: addresses matches the webfinger address of -the "owner" of the endpoint. - - 3. The current endpoint is a bulk delivery endpoint. The bulk delivery -endpoint is defined elsewhere in this document. The bulk delivery agent -will deliver to all local addresses found in the address lists. - -zot:sig -******* - -The Sender of the message signs the underlying salmon data in the manner -prescribed by salmon. If the Sender and From address are identical, the -signature will be identical to the signature of the underlying salmon packet. -If they are different, this signature is verified with the Sender's public -key to verify the Sender. - -zot:alg -******* - -Currently the only valid choice for alg is "AES-256-CBC". - - -zot:data -******** - -The data field is a salmon magic envelope. This is encrypted with alg using -key and iv. The result is then base64url encoded for transmission. - -For the first release of this specification, the data format of the enclosed -salmon SHOULD be 'application/atom+xml' representing an Atom formatted -ActivityStream. Future revisions MAY allow other alternate data formats. -All acceptable formats MUST be listed in an XRD property (described elsewhere -in this document). - - -Delivery -******** - -The zot message is then POSTed to the zot endpoint URL as -application/text+xml and can be decoded/decrypted by the recipient using -their private key. - -The normal salmon endpoint for a service MAY be used as an alternate -delivery method for non-encrypted (e.g. public) messages. - -Discover of the zot endpoint is based on webfinger XRD: - - - - -Bulk Delivery -************* - -A site MAY provide a bulk delivery endpoint, which MAY be used to avoid -multiple encryptions of the same data for a single destination. -This is discoverable by providing a zot endpoint with a corresponding -salmon public key in the site's .well-known/host-meta file. -A delivery to this endpoint will deliver to all local recipients provided -within the zot envelope. - - -Extensibility -************* - -This specification is subject to change. The current version which is in -effect at a given site may be noted by XRD properties. The following -properties MUST be present in the XRD providing the relevant endpoint: - -1 -application/atom+xml - - -Version is specified in this document and indicates the current revision. -Version is an increasing non-zero integer value. There are no minor versions. -Implementations MAY provide compatibility to multiple incompatible versions -by using this version indication. The "accept" indicates a range of document -content types which may be enclosed in the underlying salmon magic envelope. -We anticipate this specification will in the future allow for a close variant -of "message/rfc822" and which may include MIME. This may also be used to -embed alternate message formats and protocols such as -"application/x-diaspora+xml". If a delivery agent is unable to provide any -acceptable data format to the remote system, the delivery to that system MUST -be terminated/cancelled. - -Foreign Messages -**************** - -Messages MAY be imported from other networks and systems which have no -knowledge of salmon signatures. The salmon signature in this case MUST be the -exact string 'NOTSIGNED' to indicate that the author (From address) cannot be -validated using salmon verification. This message MUST be relayed by a Sender -who can provide a valid salmon signature of the message via zot:sig. Delivery -systems MAY reject foreign messages. - - - - - -******************************* -* Zid (Zot-ID) authentication * -******************************* - -This section of the document is considered separate from the delivery -specification precding it and represents a different protocol, which is -currently incomplete. This will be split off into another document in the -future, but is presented here as a synergistic component of the Zot network -model. - - -URLs may be present within a zot message which refer to private and/or -protected resources. Zid uses OpenID to gain access to these protected -resources. These could be private photos or profile information - or *any* -web accessible resource. Using zid, these can have access controls which -extends to any resolvable webfinger address. - -Zid authentication relies on the presence of an OpenID provider element in -webfinger, and a URL template which is applied to protected resources within -a zot message. - -The template is designated with the characters "{zid=}" within a URL of a zot -message. When the page is rendered for viewing to an observer, this template -is replaced with the webfinger address of the viewer (if known), or an empty -string if the webfinger address of the viewer cannot be determined. - -For example in a message body: - -http://example.com/photos/bob/picture.jpg?{zid=} - -refers to a private photo which is only visible to alice@example.com. - -If Alice is viewing the page, the link is rendered with - -http://example.com/photos/bob/picture.jpg?zid=alice@example.com - -If the page viewer is unknown, it is rendered as - -http://example.com/photos/bob/picture.jpg?zid= - - -When the link is visited, the web server at example.com notes the presence of -the zid parameter and uses information from webfinger to locate the OpenID -provider for the zid webfinger address. It then redirects to the OpenID -server and requests authentication of the given person. If this is successful, -access to the protected resource is granted. - -A browser cookie may be provided to avoid future authentication redirects -and allow authenticated browsing to other resources on the website. - -Only authentication via OpenID is defined in this version of the specification. - -This can be used to provide access control of any web resource to any -webfinger identity on the internet. - - -********* -* Links * -********* - -Salmon Protocol - http://www.salmon-protocol.org/salmon-protocol-summary - -Salmon Magic Envelope - http://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-magicsig-01.html - -Atom Activity Stream Draft - http://activitystrea.ms/specs/atom/1.0/ - -Activty Stream Base Schema - http://activitystrea.ms/head/activity-schema.html - -WebFinger Protocol - http://code.google.com/p/webfinger/wiki/WebFingerProtocol - - -- cgit v1.2.3 From aad0e978621016987c1348189f8786ce6fdec3bc Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Dec 2013 20:17:26 -0800 Subject: description of work needed on photos module was duplicated --- 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 f8efa2854..60b94e6da 100644 --- a/doc/To-Do-Code.md +++ b/doc/To-Do-Code.md @@ -41,8 +41,6 @@ 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 the Photos pages to integrate with "conversation" modules and bring back photo tagging, which is currently broken. - * 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. -- cgit v1.2.3 From 77fd6e71379f78d2abb94f85ce4ad68caa7aa370 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Dec 2013 21:00:52 -0800 Subject: icon update --- view/tpl/photo_drop.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/photo_drop.tpl b/view/tpl/photo_drop.tpl index 94ef5a3ee..cb7ae17ba 100755 --- a/view/tpl/photo_drop.tpl +++ b/view/tpl/photo_drop.tpl @@ -1,4 +1,4 @@
      - +
      -- cgit v1.2.3 From 00f4ee271789b61393edd384f12cda1c14af4b94 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 9 Dec 2013 00:12:44 -0800 Subject: migrate follow widget to comanche and remove obsolete mod/intro.php --- include/contact_widgets.php | 25 ---------- include/widgets.php | 31 ++++++++++++- mod/connections.php | 2 +- mod/intro.php | 110 -------------------------------------------- mod/suggest.php | 3 +- version.inc | 2 +- 6 files changed, 34 insertions(+), 139 deletions(-) delete mode 100644 mod/intro.php diff --git a/include/contact_widgets.php b/include/contact_widgets.php index ac5382862..cc0a3d617 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -1,31 +1,6 @@ channel['channel_id']; - $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']; - $limit = service_class_fetch($uid,'total_channels'); - if($limit !== false) { - $abook_usage_message = sprintf( t("You have %1$.0f of %2$.0f allowed connections."), $total_channels, $limit); - } - else { - $abook_usage_message = ''; - } - return replace_macros(get_markup_template('follow.tpl'),array( - '$connect' => t('Add New Connection'), - '$desc' => t('Enter the channel address'), - '$hint' => t('Example: bob@example.com, http://example.com/barbara'), - '$follow' => t('Connect'), - '$abook_usage_message' => $abook_usage_message - )); - -} function findpeople_widget() { require_once('include/Contact.php'); diff --git a/include/widgets.php b/include/widgets.php index f152e8ee1..6e3452ac6 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -92,4 +92,33 @@ function widget_suggestions($arr) { return $o; -} \ No newline at end of file +} + + +function widget_follow($args) { + if(! local_user()) + return ''; + $a = get_app(); + $uid =$a->channel['channel_id']; + $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']; + $limit = service_class_fetch($uid,'total_channels'); + if($limit !== false) { + $abook_usage_message = sprintf( t("You have %1$.0f of %2$.0f allowed connections."), $total_channels, $limit); + } + else { + $abook_usage_message = ''; + } + return replace_macros(get_markup_template('follow.tpl'),array( + '$connect' => t('Add New Connection'), + '$desc' => t('Enter the channel address'), + '$hint' => t('Example: bob@example.com, http://example.com/barbara'), + '$follow' => t('Connect'), + '$abook_usage_message' => $abook_usage_message + )); + +} diff --git a/mod/connections.php b/mod/connections.php index b3532efbf..5711b2b3f 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -41,7 +41,7 @@ function connections_aside(&$a) { $a->set_widget('vcard',vcard_from_xchan($a->data['abook'],$a->get_observer())); } else { - $a->set_widget('follow', follow_widget()); + $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'] : ''))); diff --git a/mod/intro.php b/mod/intro.php deleted file mode 100644 index 5b660485a..000000000 --- a/mod/intro.php +++ /dev/null @@ -1,110 +0,0 @@ -set_widget('follow', follow_widget()); - -} - - -function intro_content(&$a) { - - if( ! local_user()) { - notice( t('Permission denied.') . EOL); - return; - } - - - $o = replace_macros(get_markup_template('intros_header.tpl'),array( - '$title' => t('Introductions and Connection Requests') - )); - - $r = q("select count(abook_id) as total from abook where abook_channel = %d and (abook_flags & %d) and not (abook_flags & %d) ", - intval(local_user()), - intval(ABOOK_FLAG_PENDING), - intval(ABOOK_FLAG_SELF) - ); - if($r) { - $a->set_pager_total($r[0]['total']); - if(! intval($r[0]['total'])) { - notice( t('No pending introductions.') . EOL); - return $o; - } - } - else { - notice( t('System error. Please try again later.') . EOL); - return $o; - } - - $r = q("select abook.*, xchan.* from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and (abook_flags & %d) and not (abook_flags & %d) LIMIT %d, %d", - intval(local_user()), - intval(ABOOK_FLAG_PENDING), - intval(ABOOK_FLAG_SELF), - intval($a->pager['start']), - intval($a->pager['itemspage']) - ); - - if($r) { - - $tpl = get_markup_template("intros.tpl"); - - foreach($r as $rr) { - $o .= replace_macros($tpl,array( - '$uid' => local_user(), - - '$contact_id' => $rr['abook_id'], - '$photo' => ((x($rr,'xchan_photo_l')) ? $rr['xchan_photo_l'] : "images/person-175.jpg"), - '$fullname' => $rr['xchan_name'], - '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['abook_flags'] & ABOOK_FLAG_HIDDEN), ''), - '$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')), - '$url' => zid($rr['xchan_url']), - '$approve' => t('Approve'), - '$block' => t('Block'), - '$ignore' => t('Ignore'), - '$discard' => t('Discard') - - )); - } - } - - $o .= paginate($a); - return $o; - -} \ No newline at end of file diff --git a/mod/suggest.php b/mod/suggest.php index bfa471fa5..baccbd38f 100644 --- a/mod/suggest.php +++ b/mod/suggest.php @@ -2,6 +2,7 @@ require_once('include/socgraph.php'); require_once('include/contact_widgets.php'); +require_once('include/widgets.php'); function suggest_init(&$a) { @@ -20,7 +21,7 @@ function suggest_init(&$a) { function suggest_aside(&$a) { - $a->set_widget('follow', follow_widget()); + $a->set_widget('follow', widget_follow(array())); $a->set_widget('findpeople', findpeople_widget()); } diff --git a/version.inc b/version.inc index 33910aea3..96c514ecf 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-08.521 +2013-12-09.522 -- cgit v1.2.3 From d8c632ada202f4552e85796008837c293a323a31 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 9 Dec 2013 00:41:49 -0800 Subject: more comanchisation (I declare this to be a word) --- include/widgets.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/widgets.php b/include/widgets.php index 6e3452ac6..632f85436 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -1,5 +1,18 @@ 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(); -- cgit v1.2.3 From 860966ce421210e9f48d36dee72b8aa10a39c7c6 Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 9 Dec 2013 10:07:24 +0100 Subject: this reduces pageloadsize by 355,93KB --- view/php/theme_init.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/php/theme_init.php b/view/php/theme_init.php index ffbc02e48..a2024d658 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -29,7 +29,7 @@ head_add_js('library/jquery.divgrow/jquery.divgrow-1.3.1.js'); head_add_js('library/jquery_ac/friendica.complete.js'); head_add_js('library/tiptip/jquery.tipTip.minified.js'); head_add_js('library/jgrowl/jquery.jgrowl_minimized.js'); -head_add_js('library/tinymce/jscripts/tiny_mce/tiny_mce_src.js'); +head_add_js('library/tinymce/jscripts/tiny_mce/tiny_mce.js'); head_add_js('library/cryptojs/components/core-min.js'); head_add_js('library/cryptojs/rollups/aes.js'); head_add_js('library/cryptojs/rollups/rabbit.js'); -- cgit v1.2.3 From 6a9432c725efb9f313282c7ca8ce954ea9be8c75 Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 9 Dec 2013 11:30:32 +0100 Subject: editor_plugin_src.js compressed at jscompress.com --- library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8f8821fd6..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(a,b){var d=this,c=a.getParam("bbcode_dialect","punbb").toLowerCase();a.onBeforeSetContent.add(function(e,f){f.content=d["_"+c+"_bbcode2html"](f.content)});a.onPostProcess.add(function(e,f){if(f.set){f.content=d["_"+c+"_bbcode2html"](f.content)}if(f.get){f.content=d["_"+c+"_html2bbcode"](f.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}},_punbb_html2bbcode:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/(.*?)<\/a>/gi,"[url=$1]$2[/url]");b(/(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/(.*?)<\/span>/gi,"[color=$1]$2[/color]");b(/(.*?)<\/font>/gi,"[color=$1]$2[/color]");b(/(.*?)<\/span>/gi,"[size=$1]$2[/size]");b(/(.*?)<\/font>/gi,"$1");b(//gi,"[img]$1[/img]");b(/(.*?)<\/span>/gi,"[code]$1[/code]");b(/(.*?)<\/span>/gi,"[quote]$1[/quote]");b(/(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");b(/(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");b(/(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");b(/(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");b(/(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");b(/(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");b(/<\/(strong|b)>/gi,"[/b]");b(/<(strong|b)>/gi,"[b]");b(/<\/(em|i)>/gi,"[/i]");b(/<(em|i)>/gi,"[i]");b(/<\/u>/gi,"[/u]");b(/(.*?)<\/span>/gi,"[u]$1[/u]");b(//gi,"[u]");b(/]*>/gi,"[quote]");b(/<\/blockquote>/gi,"[/quote]");b(/
      /gi,"\n");b(//gi,"\n");b(/
      /gi,"\n");b(/

      /gi,"");b(/<\/p>/gi,"\n");b(/ |\u00a0/gi," ");b(/"/gi,'"');b(/</gi,"<");b(/>/gi,">");b(/&/gi,"&");return a},_punbb_bbcode2html:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/\n/gi,"
      ");b(/\[b\]/gi,"");b(/\[\/b\]/gi,"");b(/\[i\]/gi,"");b(/\[\/i\]/gi,"");b(/\[u\]/gi,"");b(/\[\/u\]/gi,"");b(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'$2');b(/\[url\](.*?)\[\/url\]/gi,'$1');b(/\[img\](.*?)\[\/img\]/gi,'');b(/\[color=(.*?)\](.*?)\[\/color\]/gi,'$2');b(/\[code\](.*?)\[\/code\]/gi,'$1 ');b(/\[quote.*?\](.*?)\[\/quote\]/gi,'$1 ');return a}});tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)})(); \ No newline at end of file +(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)})() -- cgit v1.2.3 From 198264aaf917b8365b5de3ec92d0ae44eabe0395 Mon Sep 17 00:00:00 2001 From: zottel Date: Mon, 9 Dec 2013 13:30:00 +0100 Subject: set JS cookie --- index.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/index.php b/index.php index 1953dd5cd..adfa6534f 100755 --- a/index.php +++ b/index.php @@ -245,6 +245,12 @@ if (file_exists($theme_info_file)){ if(! x($a->page,'content')) $a->page['content'] = ''; +/* set JS cookie */ +if($_COOKIE['jsAvailable'] != 1) { + $a->page['content'] .= ''; +} + + if(! $install) call_hooks('page_content_top',$a->page['content']); -- cgit v1.2.3 From c20f207cde7c4bfcfc856542cffe7db273694c6e Mon Sep 17 00:00:00 2001 From: zottel Date: Mon, 9 Dec 2013 13:30:35 +0100 Subject: enable JS-less display of channel --- mod/channel.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mod/channel.php b/mod/channel.php index 2014cd08b..7879f72ee 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -189,7 +189,7 @@ function channel_content(&$a, $update = 0, $load = false) { $a->set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20)); $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage'])); - if($load) { + if($load || ($_COOKIE['jsAvailable'] != 1)) { $r = q("SELECT distinct id AS item_id FROM item left join abook on item.author_xchan = abook.abook_xchan WHERE uid = %d AND item_restrict = 0 @@ -281,9 +281,13 @@ function channel_content(&$a, $update = 0, $load = false) { } - $o .= conversation($a,$items,'channel',$update,'client'); + if($_COOKIE['jsAvailable'] == 1) { + $o .= conversation($a,$items,'channel',$update,'client'); + } else { + $o .= conversation($a,$items,'channel',$update,'traditional'); + } - if(! $update) + if((! $update) || ($_COOKIE['jsAvailable'] != 1)) $o .= alt_pager($a,count($items)); return $o; -- cgit v1.2.3 From f8e19271502035473197c8bf1b4cd267aa827851 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 9 Dec 2013 13:43:15 -0800 Subject: this should fix the "always loads page 2 first if you're scrolled down the page a fair ways and reload the page". --- js/main.js | 53 +++++++++++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/js/main.js b/js/main.js index f9dc95daa..ba36861b2 100644 --- a/js/main.js +++ b/js/main.js @@ -150,7 +150,7 @@ var scroll_next = false; var next_page = 1; var page_load = true; - var loadingPage = false; + var loadingPage = true; var pageHasMoreContent = true; var updateCountsOnly = false; @@ -511,6 +511,10 @@ function updateConvItems(mode,data) { } prev = ident; }); + + if(loadingPage) { + loadingPage = false; + } } $('.like-rotator').spin(false); @@ -984,35 +988,28 @@ function previewTheme(elm) { $(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(); - - + 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(); }); -- cgit v1.2.3 From 75ebf06131e935795b7072acc012c9e37669eade Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 9 Dec 2013 14:05:52 -0800 Subject: some work on modularising the default profile photo so we can make them site selectable. Also red != friendica so we don't need all these friendica logos taking up space --- images/default_profile_photos/rainbow_man/175.jpg | Bin 0 -> 8510 bytes images/default_profile_photos/rainbow_man/48.jpg | Bin 0 -> 1274 bytes images/default_profile_photos/rainbow_man/80.jpg | Bin 0 -> 2303 bytes images/diaspora.png | Bin 461 -> 0 bytes images/friendica-128.jpg | Bin 8368 -> 0 bytes images/friendica-128.png | Bin 6453 -> 0 bytes images/friendica-16.jpg | Bin 659 -> 0 bytes images/friendica-16.png | Bin 756 -> 0 bytes images/friendica-1600.png | Bin 286517 -> 0 bytes images/friendica-256.jpg | Bin 17130 -> 0 bytes images/friendica-256.png | Bin 10273 -> 0 bytes images/friendica-32.jpg | Bin 1541 -> 0 bytes images/friendica-32.png | Bin 1593 -> 0 bytes images/friendica-48.png | Bin 2404 -> 0 bytes images/friendica-64.jpg | Bin 3450 -> 0 bytes images/friendica-64.png | Bin 3250 -> 0 bytes images/friendica-96.png | Bin 5484 -> 0 bytes images/friendica-red.svg | 240 ---------------------- images/friendica-red.xcf | Bin 87425 -> 0 bytes images/friendica.svg | 240 ---------------------- images/friendika-128.jpg | Bin 8368 -> 0 bytes images/friendika-128.png | Bin 6453 -> 0 bytes images/friendika-16.jpg | Bin 659 -> 0 bytes images/friendika-16.png | Bin 756 -> 0 bytes images/friendika-1600.png | Bin 286517 -> 0 bytes images/friendika-256.jpg | Bin 17130 -> 0 bytes images/friendika-256.png | Bin 10273 -> 0 bytes images/friendika-32.jpg | Bin 1541 -> 0 bytes images/friendika-32.png | Bin 1593 -> 0 bytes images/friendika-48.png | Bin 2404 -> 0 bytes images/friendika-64.jpg | Bin 3450 -> 0 bytes images/friendika-64.png | Bin 3250 -> 0 bytes images/friendika-96.png | Bin 5484 -> 0 bytes images/friendika.svg | 240 ---------------------- images/person-175.jpg | Bin 8510 -> 0 bytes images/person-48.jpg | Bin 1274 -> 0 bytes images/person-80.jpg | Bin 2303 -> 0 bytes include/network.php | 2 +- include/photo/photo_driver.php | 6 +- include/text.php | 8 +- mod/photo.php | 12 +- 41 files changed, 13 insertions(+), 735 deletions(-) create mode 100644 images/default_profile_photos/rainbow_man/175.jpg create mode 100644 images/default_profile_photos/rainbow_man/48.jpg create mode 100644 images/default_profile_photos/rainbow_man/80.jpg delete mode 100644 images/diaspora.png delete mode 100644 images/friendica-128.jpg delete mode 100644 images/friendica-128.png delete mode 100644 images/friendica-16.jpg delete mode 100644 images/friendica-16.png delete mode 100644 images/friendica-1600.png delete mode 100644 images/friendica-256.jpg delete mode 100644 images/friendica-256.png delete mode 100644 images/friendica-32.jpg delete mode 100644 images/friendica-32.png delete mode 100644 images/friendica-48.png delete mode 100644 images/friendica-64.jpg delete mode 100644 images/friendica-64.png delete mode 100644 images/friendica-96.png delete mode 100644 images/friendica-red.svg delete mode 100644 images/friendica-red.xcf delete mode 100644 images/friendica.svg delete mode 100644 images/friendika-128.jpg delete mode 100644 images/friendika-128.png delete mode 100644 images/friendika-16.jpg delete mode 100644 images/friendika-16.png delete mode 100644 images/friendika-1600.png delete mode 100644 images/friendika-256.jpg delete mode 100644 images/friendika-256.png delete mode 100644 images/friendika-32.jpg delete mode 100644 images/friendika-32.png delete mode 100644 images/friendika-48.png delete mode 100644 images/friendika-64.jpg delete mode 100644 images/friendika-64.png delete mode 100644 images/friendika-96.png delete mode 100644 images/friendika.svg delete mode 100644 images/person-175.jpg delete mode 100644 images/person-48.jpg delete mode 100644 images/person-80.jpg diff --git a/images/default_profile_photos/rainbow_man/175.jpg b/images/default_profile_photos/rainbow_man/175.jpg new file mode 100644 index 000000000..fc0ec3d77 Binary files /dev/null and b/images/default_profile_photos/rainbow_man/175.jpg differ diff --git a/images/default_profile_photos/rainbow_man/48.jpg b/images/default_profile_photos/rainbow_man/48.jpg new file mode 100644 index 000000000..dc5eb6e69 Binary files /dev/null and b/images/default_profile_photos/rainbow_man/48.jpg differ diff --git a/images/default_profile_photos/rainbow_man/80.jpg b/images/default_profile_photos/rainbow_man/80.jpg new file mode 100644 index 000000000..75b8faf92 Binary files /dev/null and b/images/default_profile_photos/rainbow_man/80.jpg differ diff --git a/images/diaspora.png b/images/diaspora.png deleted file mode 100644 index 725fae718..000000000 Binary files a/images/diaspora.png and /dev/null differ diff --git a/images/friendica-128.jpg b/images/friendica-128.jpg deleted file mode 100644 index f7d86ae50..000000000 Binary files a/images/friendica-128.jpg and /dev/null differ diff --git a/images/friendica-128.png b/images/friendica-128.png deleted file mode 100644 index d2792ab54..000000000 Binary files a/images/friendica-128.png and /dev/null differ diff --git a/images/friendica-16.jpg b/images/friendica-16.jpg deleted file mode 100644 index ce59a70a0..000000000 Binary files a/images/friendica-16.jpg and /dev/null differ diff --git a/images/friendica-16.png b/images/friendica-16.png deleted file mode 100644 index 745b7ac6c..000000000 Binary files a/images/friendica-16.png and /dev/null differ diff --git a/images/friendica-1600.png b/images/friendica-1600.png deleted file mode 100644 index 615a81dd9..000000000 Binary files a/images/friendica-1600.png and /dev/null differ diff --git a/images/friendica-256.jpg b/images/friendica-256.jpg deleted file mode 100644 index 182810d62..000000000 Binary files a/images/friendica-256.jpg and /dev/null differ diff --git a/images/friendica-256.png b/images/friendica-256.png deleted file mode 100644 index e965fbaba..000000000 Binary files a/images/friendica-256.png and /dev/null differ diff --git a/images/friendica-32.jpg b/images/friendica-32.jpg deleted file mode 100644 index 4e697411d..000000000 Binary files a/images/friendica-32.jpg and /dev/null differ diff --git a/images/friendica-32.png b/images/friendica-32.png deleted file mode 100644 index 61764bf20..000000000 Binary files a/images/friendica-32.png and /dev/null differ diff --git a/images/friendica-48.png b/images/friendica-48.png deleted file mode 100644 index f858d9a81..000000000 Binary files a/images/friendica-48.png and /dev/null differ diff --git a/images/friendica-64.jpg b/images/friendica-64.jpg deleted file mode 100644 index 050830fff..000000000 Binary files a/images/friendica-64.jpg and /dev/null differ diff --git a/images/friendica-64.png b/images/friendica-64.png deleted file mode 100644 index 88cb8b016..000000000 Binary files a/images/friendica-64.png and /dev/null differ diff --git a/images/friendica-96.png b/images/friendica-96.png deleted file mode 100644 index 76a102ef2..000000000 Binary files a/images/friendica-96.png and /dev/null differ diff --git a/images/friendica-red.svg b/images/friendica-red.svg deleted file mode 100644 index b8afb09c7..000000000 --- a/images/friendica-red.svg +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff --git a/images/friendica-red.xcf b/images/friendica-red.xcf deleted file mode 100644 index 811ecb1e7..000000000 Binary files a/images/friendica-red.xcf and /dev/null differ diff --git a/images/friendica.svg b/images/friendica.svg deleted file mode 100644 index 2105ef317..000000000 --- a/images/friendica.svg +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff --git a/images/friendika-128.jpg b/images/friendika-128.jpg deleted file mode 100644 index f7d86ae50..000000000 Binary files a/images/friendika-128.jpg and /dev/null differ diff --git a/images/friendika-128.png b/images/friendika-128.png deleted file mode 100644 index d2792ab54..000000000 Binary files a/images/friendika-128.png and /dev/null differ diff --git a/images/friendika-16.jpg b/images/friendika-16.jpg deleted file mode 100644 index ce59a70a0..000000000 Binary files a/images/friendika-16.jpg and /dev/null differ diff --git a/images/friendika-16.png b/images/friendika-16.png deleted file mode 100644 index 745b7ac6c..000000000 Binary files a/images/friendika-16.png and /dev/null differ diff --git a/images/friendika-1600.png b/images/friendika-1600.png deleted file mode 100644 index 615a81dd9..000000000 Binary files a/images/friendika-1600.png and /dev/null differ diff --git a/images/friendika-256.jpg b/images/friendika-256.jpg deleted file mode 100644 index 182810d62..000000000 Binary files a/images/friendika-256.jpg and /dev/null differ diff --git a/images/friendika-256.png b/images/friendika-256.png deleted file mode 100644 index e965fbaba..000000000 Binary files a/images/friendika-256.png and /dev/null differ diff --git a/images/friendika-32.jpg b/images/friendika-32.jpg deleted file mode 100644 index 4e697411d..000000000 Binary files a/images/friendika-32.jpg and /dev/null differ diff --git a/images/friendika-32.png b/images/friendika-32.png deleted file mode 100644 index 61764bf20..000000000 Binary files a/images/friendika-32.png and /dev/null differ diff --git a/images/friendika-48.png b/images/friendika-48.png deleted file mode 100644 index f858d9a81..000000000 Binary files a/images/friendika-48.png and /dev/null differ diff --git a/images/friendika-64.jpg b/images/friendika-64.jpg deleted file mode 100644 index 050830fff..000000000 Binary files a/images/friendika-64.jpg and /dev/null differ diff --git a/images/friendika-64.png b/images/friendika-64.png deleted file mode 100644 index 88cb8b016..000000000 Binary files a/images/friendika-64.png and /dev/null differ diff --git a/images/friendika-96.png b/images/friendika-96.png deleted file mode 100644 index 76a102ef2..000000000 Binary files a/images/friendika-96.png and /dev/null differ diff --git a/images/friendika.svg b/images/friendika.svg deleted file mode 100644 index 2155d0b00..000000000 --- a/images/friendika.svg +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff --git a/images/person-175.jpg b/images/person-175.jpg deleted file mode 100644 index fc0ec3d77..000000000 Binary files a/images/person-175.jpg and /dev/null differ diff --git a/images/person-48.jpg b/images/person-48.jpg deleted file mode 100644 index dc5eb6e69..000000000 Binary files a/images/person-48.jpg and /dev/null differ diff --git a/images/person-80.jpg b/images/person-80.jpg deleted file mode 100644 index 75b8faf92..000000000 Binary files a/images/person-80.jpg and /dev/null differ diff --git a/include/network.php b/include/network.php index dac039230..50f853ca0 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/person-175.jpg'; + $avatar['url'] = $a->get_baseurl() . '/images/default_profile_photos/rainbow_man/175.jpg'; 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 ba95266f9..8730b4298 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/person-175.jpg'; - $thumb = $a->get_baseurl() . '/images/person-80.jpg'; - $micro = $a->get_baseurl() . '/images/person-48.jpg'; + $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'; $type = 'image/jpeg'; } diff --git a/include/text.php b/include/text.php index bd4376ce4..9254508a4 100755 --- a/include/text.php +++ b/include/text.php @@ -884,9 +884,7 @@ function smilies($s, $sample = false) { ':like', ':dislike', 'red#', - 'r#', - '~friendica' - + 'r#' ); $icons = array( @@ -923,8 +921,8 @@ function smilies($s, $sample = false) { ':like', ':dislike', 'redred#matrix', - 'redr#matrix', - '~friendica ~friendica' + 'redr#matrix' + ); $params = array('texts' => $texts, 'icons' => $icons, 'string' => $s); diff --git a/mod/photo.php b/mod/photo.php index 3e86b02ba..591d7198a 100644 --- a/mod/photo.php +++ b/mod/photo.php @@ -24,7 +24,7 @@ function photo_init(&$a) { $observer_xchan = get_observer_hash(); - $default = 'images/person-175.jpg'; + $default = 'images/default_profile_photos/rainbow_man/175.jpg'; if(isset($type)) { @@ -38,11 +38,11 @@ function photo_init(&$a) { case 'm': $resolution = 5; - $default = 'images/person-80.jpg'; + $default = 'images/default_profile_photos/rainbow_man/80.jpg'; break; case 's': $resolution = 6; - $default = 'images/person-48.jpg'; + $default = 'images/default_profile_photos/rainbow_man/48.jpg'; break; case 'l': default: @@ -135,15 +135,15 @@ function photo_init(&$a) { switch($resolution) { case 4: - $data = file_get_contents('images/person-175.jpg'); + $data = file_get_contents('images/default_profile_photos/rainbow_man/175.jpg'); $mimetype = 'image/jpeg'; break; case 5: - $data = file_get_contents('images/person-80.jpg'); + $data = file_get_contents('images/default_profile_photos/rainbow_man/80.jpg'); $mimetype = 'image/jpeg'; break; case 6: - $data = file_get_contents('images/person-48.jpg'); + $data = file_get_contents('images/default_profile_photos/rainbow_man/48.jpg'); $mimetype = 'image/jpeg'; break; default: -- cgit v1.2.3 From b5f73d01c57bce1758eb7abd3ede327218be5404 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 9 Dec 2013 14:18:51 -0800 Subject: doco and add document ready function --- js/icon_translate.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/js/icon_translate.js b/js/icon_translate.js index dad805404..9e69e0b7d 100644 --- a/js/icon_translate.js +++ b/js/icon_translate.js @@ -1,3 +1,6 @@ +// Include this file and adjust as necessary for alternate icon sets which use different icon names. + +$(document).ready(function() { $('.icon-smile').addClass(''); $('.icon-star-empty').addClass(''); @@ -47,3 +50,4 @@ $('.icon-check').addClass(''); $('.icon-globe').addClass(''); $('.icon-circle-blank').addClass(''); +}); \ No newline at end of file -- cgit v1.2.3 From f85cba10eb3d976d715c7a80fe69fe15d9dc468c Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 9 Dec 2013 15:27:46 -0800 Subject: notes widget --- include/widgets.php | 14 ++++++++++++++ mod/network.php | 2 +- mod/notes.php | 16 ++++++++++++++++ view/theme/redbasic/css/style.css | 9 ++++++++- view/tpl/notes.tpl | 13 +++++++++++++ 5 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 mod/notes.php create mode 100644 view/tpl/notes.tpl diff --git a/include/widgets.php b/include/widgets.php index 632f85436..2e8169bd7 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -135,3 +135,17 @@ function widget_follow($args) { )); } + + +function widget_notes($arr) { + if(! local_user()) + return ''; + $text = htmlspecialchars(get_pconfig(local_user(),'notes','text')); + + $o = replace_macros(get_markup_template('notes.tpl'), array( + '$banner' => t('Notes'), + '$text' => $text, + '$save' => t('Save'), + )); + return $o; +} diff --git a/mod/network.php b/mod/network.php index efb3116ae..13092d47d 100644 --- a/mod/network.php +++ b/mod/network.php @@ -54,7 +54,7 @@ function network_init(&$a) { $a->set_widget('suggestions',widget_suggestions(array())); $a->set_widget('savedsearch',saved_searches($search)); $a->set_widget('filer',fileas_widget($a->get_baseurl(true) . '/network',(x($_GET, 'file') ? $_GET['file'] : ''))); - + $a->set_widget('notes',widget_notes(array())); if($search) { if(strpos($search,'@') === 0) { diff --git a/mod/notes.php b/mod/notes.php new file mode 100644 index 000000000..ce3460aa4 --- /dev/null +++ b/mod/notes.php @@ -0,0 +1,16 @@ + true); + if($_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 diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 14a708e55..31aa45995 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2985,4 +2985,11 @@ img.mail-list-sender-photo { .comment-edit-text-full { color: black; } -.suggest-widget-more { margin-top: 10px; } \ No newline at end of file +.suggest-widget-more { margin-top: 10px; } + +#note-text { + width: 190px; + max-width: 190px; + height: 150px; +} +#note-save { margin-top: 10px; } \ No newline at end of file diff --git a/view/tpl/notes.tpl b/view/tpl/notes.tpl new file mode 100644 index 000000000..7300779f4 --- /dev/null +++ b/view/tpl/notes.tpl @@ -0,0 +1,13 @@ +
                    + + +

                    {{$banner}}

                    + + +
                    +
                    -- cgit v1.2.3 From 76d8501d671ae7d4234f1a905cd0e506c7f9b23e Mon Sep 17 00:00:00 2001 From: marijus Date: Tue, 10 Dec 2013 00:32:49 +0100 Subject: saved search icon work and bugfixes for #tags not beeing deletable and save button showing if saved search is disabled --- include/text.php | 2 +- mod/search.php | 2 +- view/theme/redbasic/css/style.css | 15 ++++++++++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/include/text.php b/include/text.php index 9254508a4..f425690ba 100755 --- a/include/text.php +++ b/include/text.php @@ -734,7 +734,7 @@ function search($s,$id='search-box',$url='/search',$save = false) { $o .= '
                    '; $o .= ''; $o .= ''; - if($save) + if(feature_enabled(local_user(),'savedsearch')) $o .= ''; $o .= '
      '; return $o; diff --git a/mod/search.php b/mod/search.php index bad071936..7651b3a4e 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"; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 14a708e55..ede7c4abd 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1232,13 +1232,26 @@ a.mail-list-link { .groupsideedit { margin-right: 10px; } + #saved-search-ul { list-style-type: none; } + +.saved-search-li i { + opacity: 0; +} + +.saved-search-li:hover i { + opacity: 1; +} + +/* .savedsearchdrop, .savedsearchterm { float: left; margin-top: 10px; } +*/ + .savedsearchterm { margin-left: 10px; } @@ -2985,4 +2998,4 @@ img.mail-list-sender-photo { .comment-edit-text-full { color: black; } -.suggest-widget-more { margin-top: 10px; } \ No newline at end of file +.suggest-widget-more { margin-top: 10px; } -- cgit v1.2.3 From bc78334be73d3f78aa13ec5a6917e6adb5143975 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 9 Dec 2013 18:28:52 -0800 Subject: more css shrinkage --- view/css/mod_connections.css | 122 +++++++++++++ view/css/mod_directory.css | 39 ++++ view/css/mod_photos.css | 154 ++++++++++++++++ view/theme/redbasic/css/style.css | 374 +------------------------------------- view/tpl/photo_album.tpl | 4 +- 5 files changed, 323 insertions(+), 370 deletions(-) create mode 100644 view/css/mod_directory.css create mode 100644 view/css/mod_photos.css diff --git a/view/css/mod_connections.css b/view/css/mod_connections.css index 978d81bc1..ee2ea52ac 100644 --- a/view/css/mod_connections.css +++ b/view/css/mod_connections.css @@ -32,3 +32,125 @@ .field_abook_help { float: left; } + +#contacts-main { + margin-top: 20px; + 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 { + 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; +} + diff --git a/view/css/mod_directory.css b/view/css/mod_directory.css new file mode 100644 index 000000000..578777054 --- /dev/null +++ b/view/css/mod_directory.css @@ -0,0 +1,39 @@ + +.directory-end { + clear: both; +} +.directory-name { + text-align: center; +} +.directory-photo { + margin-left: 25px; +} +.directory-details { + text-align: center; + margin-left: 5px; + margin-right: 5px; +} +.directory-item { + float: left; + width: 225px; + height: 260px; + overflow: hidden; + margin: 2px; +} + +#directory-search-wrapper { + margin-top: 20px; + margin-right: 20px; + margin-bottom: 50px; +} + +#directory-search-end { +} + +.directory-photo-img { + border: none; +} + +div.dirtagblock.widget { + overflow: hidden; +} diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css new file mode 100644 index 000000000..80508142a --- /dev/null +++ b/view/css/mod_photos.css @@ -0,0 +1,154 @@ + + +.photo-top-photo, .photo-album-photo { + padding: 10px; + max-width: 300px; +} + + +.photos-end { + clear: both; + margin-bottom: 25px; +} + +.photo-album-image-wrapper { + float: left; + margin-top: 15px; + margin-right: 15px; + margin-left: 15px; +} +.photo-album-image-wrapper .caption { + display: none; + width: 100%; + bottom: 0px; + padding: 0.5em 0.5em 0px 0.5em; + margin: 0px; +} +.photo-album-image-wrapper a:hover .caption { + display:block; +} + +#photo-album-end { + clear: both; + margin-bottom: 25px; +} + +.photo-top-image-wrapper { + float: left; + margin-top: 15px; + margin-right: 15px; + margin-left: 15px; + margin-bottom: 15px; +} +.photo-top-album-name { + width: 100%; + min-height: 2em; + bottom: 0px; + padding: 0px 3px; + padding-top: 0.5em; +} +#photo-top-end { + clear: both; +} + +#photo-top-links { + margin-bottom: 30px; + margin-left: 30px; +} + +#photos-upload-newalbum-div { + float: left; + width: 175px; +} + +#photos-upload-noshare { + margin-bottom: 10px; +} +#photos-upload-existing-album-text { + float: left; + width: 175px; +} +#photos-upload-newalbum { + float: left; +} +#photos-upload-album-select { + float: left; +} + +#photos-upload-spacer { + margin-top: 25px; +} +#photos-upload-new-end, #photos-upload-exist-end { + clear: both; +} +#photos-upload-exist-end { + margin-bottom: 15px; +} +#photos-upload-submit { + margin-top: 15px; +} + + +#photos-upload-select-files-text { + margin-top: 15px; + margin-bottom: 15px; +} + +#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label, #photo-edit-rotate-label { + float: left; + width: 150px; +} + +#photo-edit-perms-end { + margin-bottom: 15px; +} + +#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname, #photo-edit-rotate { + float: left; + margin-bottom: 25px; +} +#photo-edit-link-wrap { + margin-bottom: 15px; +} +#photo-like-div { + margin-bottom: 25px; +} + +#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end { + clear: both; +} + +#photo-edit-rotate-end { + margin-bottom: 15px; +} + +#photo-edit-delete-button { + margin-left: 200px; +} +#photo-edit-end { + margin-bottom: 35px; +} +#photo-caption { + margin-top: 15px; + margin-bottom: 15px; +} + +#in-this-photo-text { + margin-left: 30px; +} + +#in-this-photo { + margin-left: 60px; + margin-top: 10px; + margin-bottom: 20px; +} + +#photo-album-edit-submit, #photo-album-edit-drop { + margin-top: 15px; + margin-bottom: 15px; +} + +#photo-album-edit-drop { + margin-left: 200px; +} + diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 83781ebb9..708085b02 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -576,61 +576,6 @@ footer { } -#contacts-main { - margin-top: 20px; - 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; -} #fsuggest-desc, #fsuggest-submit-wrapper { margin-top: 15px; @@ -714,44 +659,8 @@ footer { } -.directory-end { - clear: both; -} -.directory-name { - text-align: center; -} -.directory-photo { - margin-left: 25px; -} .directory-details { font-size: 0.7em; - text-align: center; - margin-left: 5px; - margin-right: 5px; -} -.directory-item { - float: left; - width: 225px; - height: 260px; - overflow: hidden; - margin: 2px; -} - -#directory-search-wrapper { - margin-top: 20px; - margin-right: 20px; - margin-bottom: 50px; -} - -#directory-search-end { -} - -.directory-photo-img { - border: none; -} - -div.dirtagblock.widget { - overflow: hidden; } .pager { @@ -785,72 +694,6 @@ div.dirtagblock.widget { padding: 4px; } - -#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; -} - - #block-message, #ignore-message, #archive-message, #lost-contact-message { color: #FF0000; } @@ -944,8 +787,6 @@ tr.mceLast { margin-left: 5px; } -/*TODO - there appears to be significant redundancy here */ - .photo { border: 1px solid #AAAAAA; } @@ -957,104 +798,14 @@ tr.mceLast { } -.photos-end { - clear: both; - margin-bottom: 25px; -} - -.photo-album-image-wrapper { - float: left; - margin-top: 15px; - margin-right: 15px; - margin-left: 15px; -} .photo-album-image-wrapper .caption { - display: none; - width: 100%; - bottom: 0px; - padding: 0.5em 0.5em 0px 0.5em; background-color: rgba(245, 245, 255, 0.8); border-bottom: 2px solid #CCC; - margin: 0px; -} -.photo-album-image-wrapper a:hover .caption { - display:block; -} - -#photo-album-end { - clear: both; - margin-bottom: 25px; } -.photo-top-image-wrapper { - float: left; - margin-top: 15px; - margin-right: 15px; - margin-left: 15px; - margin-bottom: 15px; -} .photo-top-album-name { - width: 100%; - min-height: 2em; - bottom: 0px; - padding: 0px 3px; - padding-top: 0.5em; background-color: rgb(255, 255, 255); } -#photo-top-end { - clear: both; -} - -#photo-top-links { - margin-bottom: 30px; - margin-left: 30px; -} - -#photos-upload-newalbum-div { - float: left; - width: 175px; -} - -#photos-upload-noshare { - margin-bottom: 10px; -} -#photos-upload-existing-album-text { - float: left; - width: 175px; -} -#photos-upload-newalbum { - float: left; -} -#photos-upload-album-select { - float: left; -} - -#photos-upload-spacer { - margin-top: 25px; -} -#photos-upload-new-end, #photos-upload-exist-end { - clear: both; -} -#photos-upload-exist-end { - margin-bottom: 15px; -} -#photos-upload-submit { - margin-top: 15px; -} - -#photos_upload_applet_wrapper { - margin-bottom: 15px; -} - -#photos-upload-no-java-message { - margin-bottom: 15px; -} - - -#photos-upload-select-files-text { - margin-top: 15px; - margin-bottom: 15px; -} #photos-upload-perms-menu, #photos-upload-perms-menu:visited, #photos-upload-perms-menu:link { color: #8888FF; @@ -1068,126 +819,16 @@ tr.mceLast { cursor: pointer; } - -#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label, #photo-edit-rotate-label { - float: left; - width: 150px; -} - -#photo-edit-perms-end { - margin-bottom: 15px; -} - -#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname, #photo-edit-rotate { - float: left; - margin-bottom: 25px; -} -#photo-edit-link-wrap { - margin-bottom: 15px; -} -#photo-like-div { - margin-bottom: 25px; -} - -#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end { - clear: both; -} - -#photo-edit-rotate-end { - margin-bottom: 15px; -} - -#photo-edit-delete-button { - margin-left: 200px; -} -#photo-edit-end { - margin-bottom: 35px; -} #photo-caption { font-size: 110%; font-weight: bold; - margin-top: 15px; - margin-bottom: 15px; } #in-this-photo-text { color: #0080FF; - margin-left: 30px; -} - -#in-this-photo { - margin-left: 60px; - margin-top: 10px; - margin-bottom: 20px; -} - -#photo-album-edit-submit, #photo-album-edit-drop { - margin-top: 15px; - margin-bottom: 15px; -} - -#photo-album-edit-drop { - margin-left: 200px; -} - -/* might be obsolete -.mail-list-sender, -.mail-list-detail { - float: left; -} -.mail-list-detail { - margin-left: 20px; -} - -.mail-list-subject { - font-size: 1.1em; - margin-top: 10px; -} -a.mail-list-link { - font-weight: normal; - display: block; - font-size: 1.3em; - padding: 4px 0; -} - -.mail-list-outside-wrapper-end { - clear: both; -} - -.mail-list-outside-wrapper { - margin-top: 30px; -} - -.mail-list-delete-wrapper { - float: right; - margin-right: 30px; - margin-top: 15px; -} - -.mail-list-delete-icon { - border: none; -} -*/ - - -/* might be obsolete -.message-links ul { - list-style-type: none; - padding: 0px; } -.message-links li { - margin-top: 10px; - float: left; -} -.message-links a { - padding: 3px 5px; -} - -.message-links-end { - clear: both; -} -*/ +#netsearch-box { margin-bottom: 5px; } #sidebar-group-list ul { list-style-type: none; @@ -1199,10 +840,12 @@ a.mail-list-link { width: 12px; } -#sidebar-group-list li { - margin-top: 10px; +#sidebar-group-list li, +.saved-search-li { + margin-top: 3px; } + .nets-ul, .fileas-ul, .categories-ul { list-style-type: none; } @@ -1245,12 +888,7 @@ a.mail-list-link { opacity: 1; } -/* -.savedsearchdrop, .savedsearchterm { - float: left; - margin-top: 10px; -} -*/ + .savedsearchterm { margin-left: 10px; diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index d2016e41c..c170d47a3 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,7 +1,7 @@ {{include file="prettyphoto.tpl"}} -
      + -- cgit v1.2.3 From aaf21e892437320ddf63735fa7334bf21836b121 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 9 Dec 2013 18:31:13 -0800 Subject: slight mod of connections widgets --- mod/connections.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/connections.php b/mod/connections.php index 5711b2b3f..d1bb33748 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -42,9 +42,9 @@ function connections_aside(&$a) { } 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'] : ''))); } - $a->set_widget('collections', group_side('connections','group',false,0,((array_key_exists('abook',$a->data)) ? $a->data['abook']['abook_xchan'] : ''))); $a->set_widget('suggest',widget_suggestions(array())); $a->set_widget('findpeople',findpeople_widget()); -- cgit v1.2.3 From d13f693f85b9528559130ed642e3128607e1967c Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 9 Dec 2013 18:44:09 -0800 Subject: more css cleanup --- view/css/mod_photos.css | 13 ++++++ view/theme/redbasic/css/style.css | 98 --------------------------------------- 2 files changed, 13 insertions(+), 98 deletions(-) diff --git a/view/css/mod_photos.css b/view/css/mod_photos.css index 80508142a..58a9bea38 100644 --- a/view/css/mod_photos.css +++ b/view/css/mod_photos.css @@ -11,6 +11,19 @@ margin-bottom: 25px; } +#photo-prev-link, #photo-next-link { + padding: 10px; + float: left; +} + +#photo-photo { + float: left; +} + +#photo-photo-end { + clear: both; +} + .photo-album-image-wrapper { float: left; margin-top: 15px; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 708085b02..e13bc1edb 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -586,39 +586,6 @@ footer { margin-left: 50px; } - - -/* might be obsolete -#profile-youtube-wrapper { - float: left; - margin-left: 15px; -} - -#profile-title-wrapper { - float: left; - margin-left: 15px; -} - -#profile-jot-plugin-end{ - clear: both; -} - -#profile-jot-networks-end { - clear: both; -} - -#about-jot-submit-wrapper { - margin-top: 15px; -} -#about-jot-end { - margin-bottom: 30px; -} -*/ - -#contacts-main { - margin-bottom: 30px; -} - #profile-listing-desc { margin-left: 30px; } @@ -698,36 +665,6 @@ footer { color: #FF0000; } -#profile-edit-insecure { - margin-top: 20px; - color: #FF0000; - font-size: 1.1em; - border: 1px solid #FF8888; - background-color: #FFEEEE; - padding-left: 5px; - /*: 3px 3px 3px 5px; */ - width: 587px; -} - -/* TinyMCE */ - -/* TODO: this should, if needed at all, probably go to custom_tinymce.css - -DIV#profile-jot-text_toolbargroup{ -background: #FFF; -border: 1px #111; -} - - -iframe#profile-jot-text_ifr { -width: 100% !important; -box-shadow: 5px 5px 5px #000 inset !important;} - -tr.mceLast { - -} -*/ - .photo, .contact-block-img { border-radius: $radiuspx; -moz-border-radius: $radiuspx; @@ -1112,11 +1049,6 @@ tr.mceLast { clear: both; } -.cc-license { - margin-top: 50px; - font-size: 70%; -} - .descriptive-text { color: #888; } @@ -1267,19 +1199,6 @@ tr.mceLast { margin-top: 20px; } -#photo-prev-link, #photo-next-link { - padding: 10px; - float: left; -} - -#photo-photo { - float: left; -} - -#photo-photo-end { - clear: both; -} - .profile-match-photo { float: left; text-align: center; @@ -1287,7 +1206,6 @@ tr.mceLast { } .profile-match-name { -/* float: left; */ text-align: center; width: 120px; height: 18px; @@ -1432,22 +1350,6 @@ tr.mceLast { margin-top: 10px; } -/* might be obsolete -.posttags { - opacity: 0.5; - filter:alpha(opacity=50); -} - -.posttags { - opacity: 1.0 !important; - filter:alpha(opacity=100) !important; -} - -.posttags { - margin-top: 15px; -} -*/ - #item-delete-selected { margin-top: 30px; } -- cgit v1.2.3 From 251720bfd32541901b9e845651dbc037b34065e2 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 9 Dec 2013 18:54:50 -0800 Subject: turn private notes into a feature --- include/features.php | 1 + include/widgets.php | 3 +++ 2 files changed, 4 insertions(+) diff --git a/include/features.php b/include/features.php index c5ab95a34..05206106a 100644 --- a/include/features.php +++ b/include/features.php @@ -23,6 +23,7 @@ function get_features() { array('content_expire', t('Content Expiration'), t('Remove posts/comments and/or private messages at a future time')), 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')), //FIXME - needs a description, but how the hell do we explain this to normals? array('sendzid', t('Extended Identity Sharing'), t(' ')), diff --git a/include/widgets.php b/include/widgets.php index 2e8169bd7..3534c3978 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -140,6 +140,9 @@ function widget_follow($args) { function widget_notes($arr) { if(! local_user()) return ''; + if(! feature_enabled(local_user(),'private_notes')) + return ''; + $text = htmlspecialchars(get_pconfig(local_user(),'notes','text')); $o = replace_macros(get_markup_template('notes.tpl'), array( -- cgit v1.2.3 From ed9f10872240231125007cf32b95007281558cac Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 9 Dec 2013 21:20:55 -0800 Subject: comanchify the savedsearch widget --- doc/Features.md | 4 +++ include/text.php | 14 ++++++++ include/widgets.php | 83 +++++++++++++++++++++++++++++++++++++++++++++ mod/network.php | 6 ++-- view/tpl/saved_searches.tpl | 14 ++++++++ 5 files changed, 118 insertions(+), 3 deletions(-) create mode 100644 view/tpl/saved_searches.tpl diff --git a/doc/Features.md b/doc/Features.md index addc57704..184652742 100644 --- a/doc/Features.md +++ b/doc/Features.md @@ -15,6 +15,10 @@ The ability to create multiple profiles which are visible only to specific perso 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. +**Private Notes** + +On pages where it is available (your matrix page and personal web pages) provide a "widget" to create and store personal reminders and notes. + **Enhanced Photo Albums** Provides a photo album viewer that is a bit prettier than the normal interface. diff --git a/include/text.php b/include/text.php index f425690ba..aa23f96b0 100755 --- a/include/text.php +++ b/include/text.php @@ -741,6 +741,20 @@ function search($s,$id='search-box',$url='/search',$save = false) { } +function searchbox($s,$id='search-box',$url='/search',$save = false) { + $a = get_app(); + $o = '
      '; + $o .= '
      '; + $o .= ''; + $o .= ''; + $o .= ''; + if(feature_enabled(local_user(),'savedsearch')) + $o .= ''; + $o .= '
      '; + return $o; +} + + function valid_email($x){ if(get_config('system','disable_email_validation')) diff --git a/include/widgets.php b/include/widgets.php index 3534c3978..e64920cdc 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -152,3 +152,86 @@ function widget_notes($arr) { )); return $o; } + + +function widget_savedsearch($arr) { + if((! local_user()) || (! feature_enabled(local_user(),'savedsearch'))) + return ''; + + $a = get_app(); + + $search = ((x($_GET,'search')) ? $_GET['search'] : ''); + + if(x($_GET,'searchsave') && $search) { + $r = q("select * from `term` where `uid` = %d and `type` = %d and `term` = '%s' limit 1", + intval(local_user()), + intval(TERM_SAVEDSEARCH), + dbesc($search) + ); + if(! $r) { + q("insert into `term` ( `uid`,`type`,`term` ) values ( %d, %d, '%s') ", + intval(local_user()), + intval(TERM_SAVEDSEARCH), + dbesc($search) + ); + } + } + + if(x($_GET,'searchremove') && $search) { + q("delete from `term` where `uid` = %d and `type` = %d and `term` = '%s' limit 1", + intval(local_user()), + intval(TERM_SAVEDSEARCH), + dbesc($search) + ); + $search = ''; + } + + + + $srchurl = $a->query_string; + + $srchurl = rtrim(preg_replace('/searchsave\=[^\&].*?(\&|$)/is','',$srchurl),'&'); + $hasq = ((strpos($srchurl,'?') !== false) ? true : false); + $srchurl = rtrim(preg_replace('/searchremove\=[^\&].*?(\&|$)/is','',$srchurl),'&'); + $hasq = ((strpos($srchurl,'?') !== false) ? true : false); + + $srchurl = rtrim(preg_replace('/search\=[^\&].*?(\&|$)/is','',$srchurl),'&'); + $hasq = ((strpos($srchurl,'?') !== false) ? true : false); + + $o = ''; + + $r = q("select `tid`,`term` from `term` WHERE `uid` = %d and `type` = %d ", + intval(local_user()), + intval(TERM_SAVEDSEARCH) + ); + + $saved = array(); + + if(count($r)) { + foreach($r as $rr) { + + $saved[] = array( + 'id' => $rr['tid'], + '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']), + 'encodedterm' => urlencode($rr['term']), + 'delete' => t('Remove term'), + 'selected' => ($search==$rr['term']), + ); + } + } + + + $tpl = get_markup_template("saved_searches.tpl"); + $o = replace_macros($tpl, array( + '$title' => t('Saved Searches'), + '$add' => t('add'), + '$searchbox' => searchbox('','netsearch-box',$srchurl . (($hasq) ? '' : '?f='),true), + '$saved' => $saved, + )); + + return $o; + +} diff --git a/mod/network.php b/mod/network.php index 13092d47d..6c9cef11e 100644 --- a/mod/network.php +++ b/mod/network.php @@ -24,7 +24,7 @@ function network_init(&$a) { $search = ((x($_GET,'search')) ? $_GET['search'] : ''); - +/* if(x($_GET,'save') && $search) { $r = q("select * from `term` where `uid` = %d and `type` = %d and `term` = '%s' limit 1", intval(local_user()), @@ -46,13 +46,13 @@ function network_init(&$a) { dbesc($search) ); } - +*/ require_once('include/widgets.php'); $a->set_widget('collections',widget_collections(array())); $a->set_widget('archives',posted_date_widget($a->get_baseurl() . '/network',local_user(),false)); $a->set_widget('suggestions',widget_suggestions(array())); - $a->set_widget('savedsearch',saved_searches($search)); + $a->set_widget('savedsearch',widget_savedsearch(array())); $a->set_widget('filer',fileas_widget($a->get_baseurl(true) . '/network',(x($_GET, 'file') ? $_GET['file'] : ''))); $a->set_widget('notes',widget_notes(array())); diff --git a/view/tpl/saved_searches.tpl b/view/tpl/saved_searches.tpl new file mode 100644 index 000000000..bdff72ba1 --- /dev/null +++ b/view/tpl/saved_searches.tpl @@ -0,0 +1,14 @@ +
      + + {{$searchbox}} + + +
      +
      -- cgit v1.2.3 From e873f6e95ed167e48a557365089ec97abee473cc Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 10 Dec 2013 00:05:31 -0800 Subject: we're almost ready to turn on comanche for mod_network. All the widgets are done. --- include/widgets.php | 67 ++++++++++++++++++++++++++- mod/network.php | 131 ++++++++++------------------------------------------ version.inc | 2 +- 3 files changed, 91 insertions(+), 109 deletions(-) diff --git a/include/widgets.php b/include/widgets.php index e64920cdc..e0fc94e18 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -231,7 +231,72 @@ function widget_savedsearch($arr) { '$searchbox' => searchbox('','netsearch-box',$srchurl . (($hasq) ? '' : '?f='),true), '$saved' => $saved, )); - + return $o; } + + +function widget_filer($arr) { + if(! local_user()) + return ''; + + $a = get_app(); + + $selected = ((x($_REQUEST,'file')) ? $_REQUEST['file'] : ''); + + $terms = array(); + $r = q("select distinct(term) from term where uid = %d and type = %d order by term asc", + intval(local_user()), + intval(TERM_FILE) + ); + if(! $r) + return; + + foreach($r as $rr) + $terms[] = array('name' => $rr['term'], 'selected' => (($selected == $rr['term']) ? 'selected' : '')); + + return replace_macros(get_markup_template('fileas_widget.tpl'),array( + '$title' => t('Saved Folders'), + '$desc' => '', + '$sel_all' => (($selected == '') ? 'selected' : ''), + '$all' => t('Everything'), + '$terms' => $terms, + '$base' => z_root() . '/' . $a->cmd + + )); +} + +function widget_archive($arr) { + + $o = ''; + $a = get_app(); + + if(! $a->profile_uid) { + return ''; + } + + $uid = $a->profile_uid; + + if(! feature_enabled($uid,'archives')) + return ''; + + + $wall = ((array_key_exists('wall', $arr)) ? intval($arr['wall']) : 0); + $url = z_root() . '/' . $a->cmd; + + $ret = posted_dates($uid,$wall); + + if(! count($ret)) + return ''; + + $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; +} + + diff --git a/mod/network.php b/mod/network.php index 6c9cef11e..31b377432 100644 --- a/mod/network.php +++ b/mod/network.php @@ -16,46 +16,34 @@ function network_init(&$a) { $channel = $a->get_channel(); $a->profile_uid = local_user(); head_set_icon($channel['xchan_photo_s']); - - - if(! x($a->page,'aside')) - $a->page['aside'] = ''; - - $search = ((x($_GET,'search')) ? $_GET['search'] : ''); - - -/* - if(x($_GET,'save') && $search) { - $r = q("select * 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')) { - q("delete from `term` where `uid` = %d and `type` = %d and `term` = '%s' limit 1", - intval(local_user()), - intval(TERM_SAVEDSEARCH), - dbesc($search) - ); - } -*/ + require_once('include/widgets.php'); $a->set_widget('collections',widget_collections(array())); - $a->set_widget('archives',posted_date_widget($a->get_baseurl() . '/network',local_user(),false)); + $a->set_widget('archives',widget_archive(array())); $a->set_widget('suggestions',widget_suggestions(array())); $a->set_widget('savedsearch',widget_savedsearch(array())); - $a->set_widget('filer',fileas_widget($a->get_baseurl(true) . '/network',(x($_GET, 'file') ? $_GET['file'] : ''))); + $a->set_widget('filer',widget_filer(array())); $a->set_widget('notes',widget_notes(array())); +} + +function network_content(&$a, $update = 0, $load = false) { + + + if(! local_user()) { + $_SESSION['return_url'] = $a->query_string; + return login(false); + } + + + $arr = array('query' => $a->query_string); + + call_hooks('network_content_init', $arr); + + $channel = $a->get_channel(); + + $search = (($_GET['search']) ? $_GET['search'] : ''); if($search) { if(strpos($search,'@') === 0) { $r = q("select abook_id from abook left join xchan on abook_xchan = xchan_hash where xchan_name = '%s' and abook_channel = %d limit 1", @@ -72,80 +60,7 @@ function network_init(&$a) { } } - $group_id = ((x($_GET,'gid')) ? intval($_GET['gid']) : 0); - - - - -} - -function saved_searches($search) { - if(! feature_enabled(local_user(),'savedsearch')) - return ''; - - $a = get_app(); - - $srchurl = '/network?f=' - . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') - . ((x($_GET,'star')) ? '&star=' . $_GET['star'] : '') - . ((x($_GET,'conv')) ? '&conv=' . $_GET['conv'] : '') - . ((x($_GET,'cmin')) ? '&cmin=' . $_GET['cmin'] : '') - . ((x($_GET,'cmax')) ? '&cmax=' . $_GET['cmax'] : '') - . ((x($_GET,'file')) ? '&file=' . $_GET['file'] : ''); - ; - - $o = ''; - - $r = q("select `tid`,`term` from `term` WHERE `uid` = %d and `type` = %d ", - intval(local_user()), - intval(TERM_SAVEDSEARCH) - ); - - $saved = array(); - - if(count($r)) { - foreach($r as $rr) { - $saved[] = array( - 'id' => $rr['tid'], - 'term' => $rr['term'], - 'displayterm' => htmlspecialchars($rr['term']), - 'encodedterm' => urlencode($rr['term']), - 'delete' => t('Remove term'), - 'selected' => ($search==$rr['term']), - ); - } - } - - - $tpl = get_markup_template("saved_searches_aside.tpl"); - $o = replace_macros($tpl, array( - '$title' => t('Saved Searches'), - '$add' => t('add'), - '$searchbox' => search('','netsearch-box',$srchurl,true), - '$saved' => $saved, - )); - - return $o; - -} - - - -function network_content(&$a, $update = 0, $load = false) { - - - if(! local_user()) { - $_SESSION['return_url'] = $a->query_string; - return login(false); - } - - - $arr = array('query' => $a->query_string); - - call_hooks('network_content_init', $arr); - - $channel = $a->get_channel(); $datequery = $datequery2 = ''; @@ -229,7 +144,9 @@ function network_content(&$a, $update = 0, $load = false) { // --- end item filter tabs - $search = (($_GET['search']) ? $_GET['search'] : ''); + + + // search terms header if($search) $o .= '

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

      '; diff --git a/version.inc b/version.inc index 96c514ecf..e228ff0df 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-12-09.522 +2013-12-10.523 -- cgit v1.2.3 From 1bc7cac4f542c68e16f6159e26603555706d4121 Mon Sep 17 00:00:00 2001 From: zottel Date: Tue, 10 Dec 2013 09:14:27 +0100 Subject: When counting not yet loaded images, count all in .wall-item-body. --- js/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/main.js b/js/main.js index ba36861b2..70d11bfd3 100644 --- a/js/main.js +++ b/js/main.js @@ -527,7 +527,7 @@ function updateConvItems(mode,data) { /* autocomplete @nicknames */ $(".comment-edit-form textarea").contact_autocomplete(baseurl+"/acl"); - var bimgs = $(".wall-item-body > img").not(function() { return this.complete; }); + var bimgs = $(".wall-item-body img").not(function() { return this.complete; }); var bimgcount = bimgs.length; if (bimgcount) { -- cgit v1.2.3 From 0043ef66b68cbdf1ae978e04f8bdeca39e6efa64 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 10 Dec 2013 00:25:32 -0800 Subject: mod_network is now running under Comanche. Yay. --- boot.php | 5 ++++- mod/network.php | 9 --------- view/pdl/mod_network.pdl | 8 ++++++++ 3 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 view/pdl/mod_network.pdl diff --git a/boot.php b/boot.php index a90d042a5..cf94c13e3 100755 --- a/boot.php +++ b/boot.php @@ -1808,7 +1808,10 @@ function get_custom_nav(&$a,$navname) { function construct_page(&$a) { require_once('include/comanche.php'); - + + if(file_exists('view/pdl/mod_' . $a->cmd . '.pdl')) + comanche_parser($a,@file_get_contents('view/pdl/mod_' . $a->cmd . '.pdl')); + $comanche = ((count($a->layout)) ? true : false); /** diff --git a/mod/network.php b/mod/network.php index 31b377432..754978949 100644 --- a/mod/network.php +++ b/mod/network.php @@ -16,15 +16,6 @@ function network_init(&$a) { $channel = $a->get_channel(); $a->profile_uid = local_user(); head_set_icon($channel['xchan_photo_s']); - - require_once('include/widgets.php'); - - $a->set_widget('collections',widget_collections(array())); - $a->set_widget('archives',widget_archive(array())); - $a->set_widget('suggestions',widget_suggestions(array())); - $a->set_widget('savedsearch',widget_savedsearch(array())); - $a->set_widget('filer',widget_filer(array())); - $a->set_widget('notes',widget_notes(array())); } diff --git a/view/pdl/mod_network.pdl b/view/pdl/mod_network.pdl new file mode 100644 index 000000000..e3d469842 --- /dev/null +++ b/view/pdl/mod_network.pdl @@ -0,0 +1,8 @@ +[region=aside] +[widget=collections][/widget] +[widget=archive][/widget] +[widget=suggestions][/widget] +[widget=savedsearch][/widget] +[widget=filer][/widget] +[widget=notes][/widget] +[/region] -- cgit v1.2.3 From 65e4fa3dcba55659b6fb38d5d212a5a2bda68099 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 10 Dec 2013 00:58:58 -0800 Subject: matrix/network page under Comanche cont. --- boot.php | 2 ++ view/pdl/mod_network.pdl | 2 ++ 2 files changed, 4 insertions(+) diff --git a/boot.php b/boot.php index cf94c13e3..196ab0304 100755 --- a/boot.php +++ b/boot.php @@ -1872,6 +1872,7 @@ function construct_page(&$a) { if($comanche) { foreach($a->layout as $k => $v) { + logger('layout: ' . $k . ' ' . strlen($v)); if((strpos($k,'region_') === 0) && strlen($v)) { if(strpos($v,'$region_') !== false) { $v = preg_replace_callback('/\$region_([a-zA-Z0-9]+)/ism','comanche_replace_region',$v); @@ -1887,6 +1888,7 @@ function construct_page(&$a) { } $a->page[substr($k,7)] = $v; + } } } diff --git a/view/pdl/mod_network.pdl b/view/pdl/mod_network.pdl index e3d469842..168ca6acb 100644 --- a/view/pdl/mod_network.pdl +++ b/view/pdl/mod_network.pdl @@ -1,3 +1,4 @@ +[region=nav]$nav[/region] [region=aside] [widget=collections][/widget] [widget=archive][/widget] @@ -6,3 +7,4 @@ [widget=filer][/widget] [widget=notes][/widget] [/region] +[region=section]$content[/region] \ No newline at end of file -- cgit v1.2.3 From 7d179ba4c4b27a9479a042be323e29ffa1d54990 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 10 Dec 2013 14:58:13 -0800 Subject: look for comanche module pages using theme_include() --- boot.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index 196ab0304..ce605adaf 100755 --- a/boot.php +++ b/boot.php @@ -1809,8 +1809,8 @@ function construct_page(&$a) { require_once('include/comanche.php'); - if(file_exists('view/pdl/mod_' . $a->cmd . '.pdl')) - comanche_parser($a,@file_get_contents('view/pdl/mod_' . $a->cmd . '.pdl')); + if(($p = theme_include('mod_' . $a->module . '.pdl')) != '') + comanche_parser($a,@file_get_contents($p)); $comanche = ((count($a->layout)) ? true : false); -- cgit v1.2.3 From e5ea4a009b81c7f3fa987ba34d20a996055775d6 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 10 Dec 2013 20:36:11 -0800 Subject: mod channel is now Comanchified --- boot.php | 1 - include/widgets.php | 31 +++++++++++++++++++++++++++++++ mod/admin.php | 2 +- mod/channel.php | 24 ------------------------ view/pdl/mod_channel.pdl | 6 ++++++ 5 files changed, 38 insertions(+), 26 deletions(-) create mode 100644 view/pdl/mod_channel.pdl diff --git a/boot.php b/boot.php index ce605adaf..ce85de89c 100755 --- a/boot.php +++ b/boot.php @@ -1872,7 +1872,6 @@ function construct_page(&$a) { if($comanche) { foreach($a->layout as $k => $v) { - logger('layout: ' . $k . ' ' . strlen($v)); if((strpos($k,'region_') === 0) && strlen($v)) { if(strpos($v,'$region_') !== false) { $v = preg_replace_callback('/\$region_([a-zA-Z0-9]+)/ism','comanche_replace_region',$v); diff --git a/include/widgets.php b/include/widgets.php index e0fc94e18..cea5a6ce2 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -196,6 +196,7 @@ function widget_savedsearch($arr) { $hasq = ((strpos($srchurl,'?') !== false) ? true : false); $srchurl = rtrim(preg_replace('/search\=[^\&].*?(\&|$)/is','',$srchurl),'&'); + $srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl); $hasq = ((strpos($srchurl,'?') !== false) ? true : false); $o = ''; @@ -285,6 +286,7 @@ function widget_archive($arr) { $wall = ((array_key_exists('wall', $arr)) ? intval($arr['wall']) : 0); $url = z_root() . '/' . $a->cmd; + $ret = posted_dates($uid,$wall); if(! count($ret)) @@ -300,3 +302,32 @@ function widget_archive($arr) { } +function widget_fullprofile($arr) { + $a = get_app(); + if(! $a->profile['profile_uid']) + return; + + $block = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false); + + return profile_sidebar($a->profile, $block); +} + +function widget_categories($arr) { + $a = get_app(); + $cat = ((x($_REQUEST,'cat')) ? htmlspecialchars($_REQUEST['cat']) : ''); + $srchurl = $a->query_string; + $srchurl = rtrim(preg_replace('/cat\=[^\&].*?(\&|$)/is','',$srchurl),'&'); + $srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl); + return categories_widget($srchurl,$cat); + +} + +function widget_tagcloud_wall($arr) { + $a = get_app(); + if((! $a->profile['profile_uid']) || (! $a->profile['channel_hash'])) + return ''; + $limit = ((array_key_exists('limit',$arr)) ? intval($arr['limit']) : 50); + 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 diff --git a/mod/admin.php b/mod/admin.php index 2fd762e27..9a6aea35a 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -628,7 +628,7 @@ function admin_page_users(&$a){ } /* get pending */ - $pending = q("SELECT * from account where (account_flags & %d ) ", + $pending = q("SELECT account.*, register.hash from account left join register on account_id = register.uid where (account_flags & %d ) ", intval(ACCOUNT_PENDING) ); diff --git a/mod/channel.php b/mod/channel.php index 7879f72ee..149936dd7 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -43,30 +43,6 @@ function channel_init(&$a) { } - -function channel_aside(&$a) { - - - if(! $a->profile['profile_uid']) - return; - - $channel_display = get_pconfig($a->profile['profile_uid'],'system','channel_format'); - if(! $channel_display) - profile_create_sidebar($a); - - if($channel_display === 'full') - $a->page['template'] = 'full'; - else { - $cat = ((x($_REQUEST,'cat')) ? htmlspecialchars($_REQUEST['cat']) : ''); - $a->set_widget('archive',posted_date_widget($a->get_baseurl(true) . '/channel/' . $a->profile['channel_address'],$a->profile['profile_uid'],true)); - $a->set_widget('categories',categories_widget($a->get_baseurl(true) . '/channel/' . $a->profile['channel_address'],$cat)); - } - if(feature_enabled($a->profile['profile_uid'],'tagadelic')) - $a->set_widget('tagcloud',tagblock('search',$a->profile['profile_uid'],50,$a->profile['channel_hash'],ITEM_WALL)); - -} - - function channel_content(&$a, $update = 0, $load = false) { $category = $datequery = $datequery2 = ''; diff --git a/view/pdl/mod_channel.pdl b/view/pdl/mod_channel.pdl new file mode 100644 index 000000000..dde8830ee --- /dev/null +++ b/view/pdl/mod_channel.pdl @@ -0,0 +1,6 @@ +[region=aside] +[widget=fullprofile][/widget] +[widget=archive][var=wall]1[/var][/widget] +[widget=categories][/widget] +[widget=tagcloud_wall][var=limit]24[/var][/widget] +[/region] -- cgit v1.2.3 From 5279f3bf6f0a61ed925e91016e27cd345e0c8b75 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 10 Dec 2013 20:48:54 -0800 Subject: issue #237 - when manually changing an uploaded photo URL in a post to an invalid URL that happens to not throw an error, it affects the ability to parse the URL to see if it's a local image and correct permissions. The correct way to do this is to change the '-2' to '-1' if you want 640 instead of 320 and '-0' if you want the original size - which is not likely to win you many friends if it happens to be a 42 megapixel photo. We might have limits in place to prevent monster photos from destroying everybody's streams, but many services you export the post to will probably not. --- mod/item.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mod/item.php b/mod/item.php index 6781eba2d..7f881d28d 100644 --- a/mod/item.php +++ b/mod/item.php @@ -1049,7 +1049,10 @@ function fix_attached_photo_permissions($uid,$xchan_hash,$body, if(! stristr($image,get_app()->get_baseurl() . '/photo/')) continue; $image_uri = substr($image,strrpos($image,'/') + 1); - $image_uri = substr($image_uri,0, strpos($image_uri,'-')); + if(strpos($image_uri,'-') !== false) + $image_uri = substr($image_uri,0, strpos($image_uri,'-')); + if(strpos($image_uri,'.') !== false) + $image_uri = substr($image_uri,0, strpos($image_uri,'.')); if(! strlen($image_uri)) continue; $srch = '<' . $xchan_hash . '>'; -- cgit v1.2.3 From 652959678f47b84830123df4fac8add31657b4c9 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 10 Dec 2013 23:27:17 -0800 Subject: cleanup and Comanchification of mod_profile --- include/identity.php | 3 +++ mod/profile.php | 50 +++++------------------------------------------- view/pdl/mod_profile.pdl | 3 +++ 3 files changed, 11 insertions(+), 45 deletions(-) create mode 100644 view/pdl/mod_profile.pdl diff --git a/include/identity.php b/include/identity.php index e22bb8645..b25594c87 100644 --- a/include/identity.php +++ b/include/identity.php @@ -868,6 +868,9 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) { function advanced_profile(&$a) { + if(! perm_is_allowed($a->profile['profile_uid'],get_observer_hash(),'view_profile')) + return ''; + $o = ''; $o .= '

      ' . t('Profile') . '

      '; diff --git a/mod/profile.php b/mod/profile.php index a307905e6..fca7c8f9f 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -43,72 +43,32 @@ function profile_init(&$a) { $a->profile = $x[0]; } } -// $channel_display = get_pconfig($a->profile['profile_uid'],'system','channel_format'); -// if(! $channel_display) - profile_load($a,$which,$profile); - - -} - - -function profile_aside(&$a) { + profile_load($a,$which,$profile); - profile_create_sidebar($a); } - function profile_content(&$a, $update = 0) { if(get_config('system','block_public') && (! get_account_id()) && (! remote_user())) { return login(); } - - $groups = array(); $tab = 'profile'; $o = ''; - - $contact = null; - $remote_contact = false; - - $contact_id = 0; - - if(is_array($_SESSION['remote'])) { - foreach($_SESSION['remote'] as $v) { - if($v['uid'] == $a->profile['profile_uid']) { - $contact_id = $v['cid']; - break; - } - } - } - - if($contact_id) { - $groups = init_groups_visitor($contact_id); - $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($contact_id), - intval($a->profile['profile_uid']) - ); - if(count($r)) { - $contact = $r[0]; - $remote_contact = true; - } + if(! (perm_is_allowed($a->profile['profile_uid'],get_observer_hash(), 'view_profile'))) { + notice( t('Access to this profile has been restricted.') . EOL); + return; } - if(! $remote_contact) { - if(local_user()) { - $contact_id = $_SESSION['cid']; - $contact = $a->contact; - } - } $is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false); - if($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) { + if($a->profile['hidewall'] && (! $is_owner) && (! remote_user())) { notice( t('Access to this profile has been restricted.') . EOL); return; } diff --git a/view/pdl/mod_profile.pdl b/view/pdl/mod_profile.pdl new file mode 100644 index 000000000..f12bf39c3 --- /dev/null +++ b/view/pdl/mod_profile.pdl @@ -0,0 +1,3 @@ +[region=aside] +[widget=fullprofile][/widget] +[/region] -- cgit v1.2.3 From 8077b393a4bd54a0ba6fe3438c5a0b88e6f08acb Mon Sep 17 00:00:00 2001 From: "p.tacconi" Date: Wed, 11 Dec 2013 09:18:56 +0100 Subject: italian translation --- view/it/messages.po | 4376 +++++++++++++++++++++++++-------------------------- view/it/strings.php | 496 +++--- 2 files changed, 2417 insertions(+), 2455 deletions(-) diff --git a/view/it/messages.po b/view/it/messages.po index 8d86d3c87..693e76cee 100644 --- a/view/it/messages.po +++ b/view/it/messages.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: Red Matrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-29 00:03-0800\n" -"PO-Revision-Date: 2013-12-01 09:46+0000\n" +"POT-Creation-Date: 2013-12-06 00:02-0800\n" +"PO-Revision-Date: 2013-12-10 16:05+0000\n" "Last-Translator: tuscanhobbit Pa \n" "Language-Team: Italian (http://www.transifex.com/projects/p/red-matrix/language/it/)\n" "MIME-Version: 1.0\n" @@ -58,203 +58,203 @@ msgstr "Guarda %2$s di %1$s " msgid "%1$s has an updated %2$s, changing %3$s." msgstr "%1$s ha aggiornato %2$s cambiando %3$s." -#: ../../include/enotify.php:36 +#: ../../include/enotify.php:40 msgid "Red Matrix Notification" msgstr "Notifica di Red Matrix" -#: ../../include/enotify.php:37 +#: ../../include/enotify.php:41 msgid "redmatrix" msgstr "redmatrix" -#: ../../include/enotify.php:39 +#: ../../include/enotify.php:43 msgid "Thank You," msgstr "Grazie," -#: ../../include/enotify.php:41 +#: ../../include/enotify.php:45 #, php-format msgid "%s Administrator" msgstr "Amministratore %s" -#: ../../include/enotify.php:76 +#: ../../include/enotify.php:80 #, php-format msgid "%s " msgstr "%s " -#: ../../include/enotify.php:80 +#: ../../include/enotify.php:84 #, php-format msgid "[Red:Notify] New mail received at %s" msgstr "[Red:Notifica] Nuovo messaggio ricevuto alle %s" -#: ../../include/enotify.php:82 +#: ../../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 ti ha mandato un messaggio privato alle %3$s." -#: ../../include/enotify.php:83 +#: ../../include/enotify.php:87 #, php-format msgid "%1$s sent you %2$s." msgstr "%1$s ti ha mandato %2$s." -#: ../../include/enotify.php:83 +#: ../../include/enotify.php:87 msgid "a private message" msgstr "un messaggio privato" -#: ../../include/enotify.php:84 +#: ../../include/enotify.php:88 #, php-format msgid "Please visit %s to view and/or reply to your private messages." msgstr "Visita %s per leggere i tuoi messaggi privati e rispondere." -#: ../../include/enotify.php:135 +#: ../../include/enotify.php:139 #, php-format msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]" msgstr "%1$s, %2$s ha commentato [zrl=%3$s]%4$s[/zrl]" -#: ../../include/enotify.php:143 +#: ../../include/enotify.php:147 #, php-format msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]" msgstr "%1$s, %2$s ha commentato [zrl=%3$s]%5$s di %4$s[/zrl]" -#: ../../include/enotify.php:152 +#: ../../include/enotify.php:156 #, php-format msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]" msgstr "%1$s, %2$s ha commentato [zrl=%3$s]%4$s che hai creato[/zrl]" -#: ../../include/enotify.php:163 +#: ../../include/enotify.php:167 #, php-format msgid "[Red:Notify] Comment to conversation #%1$d by %2$s" msgstr "[Red:Notifica] Nuovo commento di %2$s alla conversazione #%1$d" -#: ../../include/enotify.php:164 +#: ../../include/enotify.php:168 #, php-format msgid "%1$s, %2$s commented on an item/conversation you have been following." msgstr "%1$s, %2$s ha commentato un elemento che stavi seguendo." -#: ../../include/enotify.php:167 ../../include/enotify.php:186 -#: ../../include/enotify.php:212 ../../include/enotify.php:231 -#: ../../include/enotify.php:245 +#: ../../include/enotify.php:171 ../../include/enotify.php:190 +#: ../../include/enotify.php:216 ../../include/enotify.php:235 +#: ../../include/enotify.php:249 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "Visita %s per leggere o commentare la conversazione." -#: ../../include/enotify.php:174 +#: ../../include/enotify.php:178 #, php-format msgid "[Red:Notify] %s posted to your profile wall" msgstr "[Red:Notifica] %s ha scritto sulla tua bacheca" -#: ../../include/enotify.php:176 +#: ../../include/enotify.php:180 #, php-format msgid "%1$s, %2$s posted to your profile wall at %3$s" msgstr "%1$s, %2$s ha scritto sulla bacheca del tuo profilo alle %3$s" -#: ../../include/enotify.php:178 +#: ../../include/enotify.php:182 #, php-format msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" msgstr "%1$s, %2$s ha scritto sulla [zrl=%3$s]tua bacheca[/zrl]" -#: ../../include/enotify.php:205 +#: ../../include/enotify.php:209 #, php-format msgid "[Red:Notify] %s tagged you" msgstr "[Red:Notifica] %s ti ha taggato" -#: ../../include/enotify.php:206 +#: ../../include/enotify.php:210 #, php-format msgid "%1$s, %2$s tagged you at %3$s" msgstr "%1$s, %2$s ti ha taggato alle %3$s" -#: ../../include/enotify.php:207 +#: ../../include/enotify.php:211 #, php-format msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." msgstr "%1$s, %2$s [zrl=%3$s]ti ha taggato[/zrl]." -#: ../../include/enotify.php:220 +#: ../../include/enotify.php:224 #, php-format msgid "[Red:Notify] %1$s poked you" msgstr "[Red:Notifica] %1$s ti ha mandato un poke" -#: ../../include/enotify.php:221 +#: ../../include/enotify.php:225 #, php-format msgid "%1$s, %2$s poked you at %3$s" msgstr "%1$s, %2$s ti ha mandato un poke alle %3$s" -#: ../../include/enotify.php:222 +#: ../../include/enotify.php:226 #, php-format msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." msgstr "%1$s, %2$s [zrl=%2$s]ti ha mandato un poke[/zrl]." -#: ../../include/enotify.php:238 +#: ../../include/enotify.php:242 #, php-format msgid "[Red:Notify] %s tagged your post" msgstr "[Red:Notifica] %s ha taggato il tuo articolo" -#: ../../include/enotify.php:239 +#: ../../include/enotify.php:243 #, php-format msgid "%1$s, %2$s tagged your post at %3$s" msgstr "%1$s, %2$s ha taggato il tuo articolo alle %3$s" -#: ../../include/enotify.php:240 +#: ../../include/enotify.php:244 #, php-format msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" msgstr "%1$s, %2$s ha taggato [zrl=%3$s]il tuo articolo[/zrl]" -#: ../../include/enotify.php:252 +#: ../../include/enotify.php:256 msgid "[Red:Notify] Introduction received" msgstr "[Red:Notifica] Hai una richiesta di amicizia" -#: ../../include/enotify.php:253 +#: ../../include/enotify.php:257 #, php-format msgid "%1$s, you've received an introduction from '%2$s' at %3$s" msgstr "%1$s, hai ricevuto una richiesta di contatto da '%2$s' alle %3$s" -#: ../../include/enotify.php:254 +#: ../../include/enotify.php:258 #, php-format msgid "%1$s, you've received [zrl=%2$s]an introduction[/zrl] from %3$s." msgstr "%1$s, hai ricevuto [zrl=%2$s]una richiesta di amicizia[/zrl] da %3$s." -#: ../../include/enotify.php:258 ../../include/enotify.php:277 +#: ../../include/enotify.php:262 ../../include/enotify.php:281 #, php-format msgid "You may visit their profile at %s" msgstr "Puoi visitare il suo profilo su %s" -#: ../../include/enotify.php:260 +#: ../../include/enotify.php:264 #, php-format msgid "Please visit %s to approve or reject the introduction." msgstr "Visita %s per approvare o rifiutare la richiesta." -#: ../../include/enotify.php:267 +#: ../../include/enotify.php:271 msgid "[Red:Notify] Friend suggestion received" msgstr "[Red:Notifica] Ti è stato suggerito un amico" -#: ../../include/enotify.php:268 +#: ../../include/enotify.php:272 #, php-format msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" msgstr "%1$s, ti è stato suggerito un amico da '%2$s' alle %3$s" -#: ../../include/enotify.php:269 +#: ../../include/enotify.php:273 #, php-format msgid "" "%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from " "%4$s." msgstr "%1$s, %4$s ti [zrl=%2$s]ha suggerito %3$s[/zrl] come amico." -#: ../../include/enotify.php:275 +#: ../../include/enotify.php:279 msgid "Name:" msgstr "Nome:" -#: ../../include/enotify.php:276 +#: ../../include/enotify.php:280 msgid "Photo:" msgstr "Foto:" -#: ../../include/enotify.php:279 +#: ../../include/enotify.php:283 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "Visita %s per approvare o rifiutare il suggerimento." -#: ../../include/ItemObject.php:88 ../../mod/photos.php:952 +#: ../../include/ItemObject.php:88 ../../mod/photos.php:963 msgid "Private Message" msgstr "Messaggio privato" #: ../../include/ItemObject.php:95 ../../include/page_widgets.php:8 -#: ../../mod/webpages.php:101 ../../mod/settings.php:713 ../../mod/menu.php:55 +#: ../../mod/webpages.php:101 ../../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/editpost.php:97 ../../mod/editblock.php:114 @@ -262,8 +262,8 @@ msgid "Edit" msgstr "Modifica" #: ../../include/ItemObject.php:107 ../../include/conversation.php:628 -#: ../../mod/settings.php:714 ../../mod/admin.php:690 ../../mod/group.php:182 -#: ../../mod/photos.php:1130 ../../mod/connections.php:374 +#: ../../mod/settings.php:672 ../../mod/admin.php:690 ../../mod/group.php:182 +#: ../../mod/photos.php:1141 ../../mod/connections.php:374 #: ../../mod/filestorage.php:82 msgid "Delete" msgstr "Elimina" @@ -300,7 +300,7 @@ msgstr "Messaggio verificato" msgid "add tag" msgstr "Aggiungi tag" -#: ../../include/ItemObject.php:174 ../../mod/photos.php:1058 +#: ../../include/ItemObject.php:174 ../../mod/photos.php:1069 msgid "I like this (toggle)" msgstr "Attiva/disattiva Mi piace" @@ -308,7 +308,7 @@ msgstr "Attiva/disattiva Mi piace" msgid "like" msgstr "mi piace" -#: ../../include/ItemObject.php:175 ../../mod/photos.php:1059 +#: ../../include/ItemObject.php:175 ../../mod/photos.php:1070 msgid "I don't like this (toggle)" msgstr "Attiva/disattiva Non mi piace" @@ -356,7 +356,7 @@ msgid "last edited: %s" msgstr "ultima modifica: %s" #: ../../include/ItemObject.php:246 ../../include/conversation.php:702 -#: ../../include/conversation.php:1112 ../../mod/photos.php:1061 +#: ../../include/conversation.php:1112 ../../mod/photos.php:1072 #: ../../mod/message.php:332 ../../mod/message.php:516 #: ../../mod/editlayout.php:109 ../../mod/editwebpage.php:128 #: ../../mod/editpost.php:106 ../../mod/editblock.php:123 @@ -375,30 +375,30 @@ msgstr[1] "%d commenti" msgid "show more" msgstr "mostra tutto" -#: ../../include/ItemObject.php:527 ../../mod/photos.php:1077 -#: ../../mod/photos.php:1164 +#: ../../include/ItemObject.php:527 ../../mod/photos.php:1088 +#: ../../mod/photos.php:1175 msgid "This is you" msgstr "Questo sei tu" #: ../../include/ItemObject.php:529 ../../include/js_strings.php:6 -#: ../../mod/photos.php:1079 ../../mod/photos.php:1166 +#: ../../mod/photos.php:1090 ../../mod/photos.php:1177 msgid "Comment" msgstr "Commento" -#: ../../include/ItemObject.php:530 ../../mod/events.php:458 +#: ../../include/ItemObject.php:530 ../../mod/events.php:469 #: ../../mod/thing.php:190 ../../mod/invite.php:154 ../../mod/setup.php:302 -#: ../../mod/setup.php:345 ../../mod/settings.php:651 -#: ../../mod/settings.php:763 ../../mod/settings.php:791 -#: ../../mod/settings.php:815 ../../mod/settings.php:886 -#: ../../mod/settings.php:1054 ../../mod/connect.php:96 +#: ../../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/photos.php:779 ../../mod/photos.php:1040 -#: ../../mod/photos.php:1080 ../../mod/photos.php:1167 +#: ../../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/connections.php:452 ../../mod/profiles.php:529 -#: ../../mod/import.php:385 ../../mod/crepair.php:166 ../../mod/poke.php:166 +#: ../../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 #: ../../view/theme/apw/php/config.php:231 @@ -440,7 +440,7 @@ msgid "Video" msgstr "Video" #: ../../include/ItemObject.php:539 ../../include/conversation.php:1075 -#: ../../mod/webpages.php:105 ../../mod/photos.php:1081 +#: ../../mod/webpages.php:105 ../../mod/photos.php:1092 #: ../../mod/editlayout.php:129 ../../mod/editwebpage.php:150 #: ../../mod/editpost.php:126 ../../mod/editblock.php:144 msgid "Preview" @@ -453,8 +453,8 @@ msgid "Encrypt text" msgstr "Crittografia del testo" #: ../../include/Contact.php:87 ../../include/contact_widgets.php:23 -#: ../../mod/match.php:58 ../../mod/suggest.php:56 ../../mod/directory.php:198 -#: ../../boot.php:1741 +#: ../../include/identity.php:613 ../../mod/match.php:62 +#: ../../mod/suggest.php:56 ../../mod/directory.php:198 msgid "Connect" msgstr "Entra in contatto/segui" @@ -466,36 +466,6 @@ msgstr "Nuova finestra" msgid "Open the selected location in a different window or browser tab" msgstr "Apri l'indirizzo selezionato in una nuova scheda o finestra" -#: ../../include/Contact.php:524 ../../include/conversation.php:930 -msgid "Poke" -msgstr "Poke" - -#: ../../include/Contact.php:525 ../../include/conversation.php:924 -msgid "View Status" -msgstr "Guarda il messaggio di stato" - -#: ../../include/Contact.php:526 ../../include/nav.php:76 -#: ../../include/conversation.php:925 ../../mod/connections.php:327 -#: ../../mod/connections.php:441 -msgid "View Profile" -msgstr "Profilo" - -#: ../../include/Contact.php:527 ../../include/conversation.php:926 -msgid "View Photos" -msgstr "Guarda le foto" - -#: ../../include/Contact.php:528 -msgid "Network Posts" -msgstr "Articoli dalla tua rete" - -#: ../../include/Contact.php:529 ../../include/conversation.php:928 -msgid "Edit Contact" -msgstr "Modifica il contatto" - -#: ../../include/Contact.php:530 ../../include/conversation.php:929 -msgid "Send PM" -msgstr "Invia messaggio privato" - #: ../../include/contact_selectors.php:30 msgid "Unknown | Not categorised" msgstr "Sconosciuto | Senza categoria" @@ -557,7 +527,7 @@ msgid "RSS/Atom" msgstr "RSS/Atom" #: ../../include/contact_selectors.php:77 ../../mod/admin.php:686 -#: ../../mod/admin.php:695 ../../boot.php:1461 +#: ../../mod/admin.php:695 ../../boot.php:1442 msgid "Email" msgstr "Email" @@ -675,8 +645,9 @@ msgstr "Inizio:" msgid "Finishes:" msgstr "Fine:" -#: ../../include/event.php:40 ../../include/bb2diaspora.php:455 -#: ../../mod/events.php:450 ../../mod/directory.php:173 ../../boot.php:1791 +#: ../../include/event.php:40 ../../include/identity.php:663 +#: ../../include/bb2diaspora.php:455 ../../mod/events.php:462 +#: ../../mod/directory.php:173 msgid "Location:" msgstr "Luogo:" @@ -800,7 +771,7 @@ msgid "Enable widget to display Network posts only from selected collections" msgstr "Mostra il riquadro per filtrare gli articoli di certi insiemi di canali" #: ../../include/features.php:47 ../../mod/search.php:17 -#: ../../mod/network.php:173 +#: ../../mod/network.php:122 msgid "Saved Searches" msgstr "Ricerche salvate" @@ -927,7 +898,7 @@ msgstr "Crea un nuovo insieme" msgid "Channels not in any collection" msgstr "Canali che non sono in un insieme" -#: ../../include/group.php:290 ../../mod/network.php:174 +#: ../../include/group.php:290 ../../mod/network.php:123 msgid "add" msgstr "aggiungi" @@ -1044,1551 +1015,1510 @@ msgstr "Impossibile determinare il mittente." msgid "Stored post could not be verified." msgstr "Non è stato possibile verificare l'articolo inserito." -#: ../../include/network.php:1113 -msgid "view full size" -msgstr "guarda nelle dimensioni reali" - #: ../../include/photo/photo_driver.php:609 ../../include/photos.php:51 -#: ../../mod/photos.php:97 ../../mod/photos.php:764 ../../mod/photos.php:786 +#: ../../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" msgstr "Foto del profilo" -#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:118 -#: ../../mod/profperm.php:112 -msgid "Profile" -msgstr "Profilo" - -#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1062 -msgid "Full Name:" -msgstr "Nome completo:" +#: ../../include/api.php:972 +msgid "Public Timeline" +msgstr "Diario pubblico" -#: ../../include/profile_advanced.php:17 ../../mod/directory.php:175 -#: ../../boot.php:1793 -msgid "Gender:" -msgstr "Sesso:" +#: ../../include/network.php:640 +msgid "view full size" +msgstr "guarda nelle dimensioni reali" -#: ../../include/profile_advanced.php:22 -msgid "j F, Y" -msgstr "j F Y" +#: ../../include/bbcode.php:94 ../../include/bbcode.php:494 +#: ../../include/bbcode.php:497 +msgid "Image/photo" +msgstr "Immagine" -#: ../../include/profile_advanced.php:23 -msgid "j F" -msgstr "j F" +#: ../../include/bbcode.php:126 ../../include/bbcode.php:502 +msgid "Encrypted content" +msgstr "Contenuto crittografato" -#: ../../include/profile_advanced.php:30 -msgid "Birthday:" -msgstr "Compleanno:" +#: ../../include/bbcode.php:173 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" +msgstr "%1$s ha scritto %2$s seguente %3$s" -#: ../../include/profile_advanced.php:34 -msgid "Age:" -msgstr "Età:" +#: ../../include/bbcode.php:175 +msgid "post" +msgstr "l'articolo" -#: ../../include/profile_advanced.php:37 ../../mod/directory.php:177 -#: ../../boot.php:1794 -msgid "Status:" -msgstr "Stato:" +#: ../../include/bbcode.php:454 ../../include/bbcode.php:474 +msgid "$1 wrote:" +msgstr "$1 ha scritto:" -#: ../../include/profile_advanced.php:43 -#, php-format -msgid "for %1$d %2$s" -msgstr "per %1$d %2$s" +#: ../../include/oembed.php:150 +msgid "Embedded content" +msgstr "Contenuti incorporati" -#: ../../include/profile_advanced.php:46 ../../mod/profiles.php:549 -msgid "Sexual Preference:" -msgstr "Preferenze sessuali:" +#: ../../include/oembed.php:159 +msgid "Embedding disabled" +msgstr "Contenuti incorporati - funzione disabilitata" -#: ../../include/profile_advanced.php:48 ../../mod/directory.php:179 -#: ../../boot.php:1795 -msgid "Homepage:" -msgstr "Home page:" +#: ../../include/notify.php:23 +msgid "created a new post" +msgstr "Ha creato un nuovo articolo" -#: ../../include/profile_advanced.php:50 ../../mod/profiles.php:551 -msgid "Hometown:" -msgstr "Città dove vivo:" +#: ../../include/notify.php:24 +#, php-format +msgid "commented on %s's post" +msgstr "ha commentato l'articolo di %s" -#: ../../include/profile_advanced.php:52 -msgid "Tags:" -msgstr "Tag:" +#: ../../include/photos.php:15 ../../include/attach.php:102 +#: ../../include/attach.php:133 ../../include/attach.php:189 +#: ../../include/attach.php:204 ../../include/attach.php:237 +#: ../../include/attach.php:251 ../../include/attach.php:272 +#: ../../include/attach.php:464 ../../include/attach.php:539 +#: ../../include/items.php:3412 ../../mod/common.php:43 +#: ../../mod/events.php:139 ../../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/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/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/editblock.php:48 ../../mod/item.php:181 ../../mod/item.php:189 +#: ../../mod/suggest.php:32 ../../mod/register.php:68 ../../mod/regmod.php:18 +#: ../../mod/authtest.php:13 ../../mod/mood.php:114 ../../index.php:178 +#: ../../index.php:340 +msgid "Permission denied." +msgstr "Permesso negato." -#: ../../include/profile_advanced.php:54 ../../mod/profiles.php:552 -msgid "Political Views:" -msgstr "Orientamento politico:" +#: ../../include/photos.php:88 +#, php-format +msgid "Image exceeds website size limit of %lu bytes" +msgstr "L'immagine supera il limite massimo di %lu bytes" -#: ../../include/profile_advanced.php:56 -msgid "Religion:" -msgstr "Religione:" +#: ../../include/photos.php:95 +msgid "Image file is empty." +msgstr "Il file dell'immagine è vuoto." -#: ../../include/profile_advanced.php:58 ../../mod/directory.php:181 -msgid "About:" -msgstr "Informazioni:" +#: ../../include/photos.php:124 ../../mod/profile_photo.php:157 +msgid "Unable to process image" +msgstr "Impossibile elaborare l'immagine" -#: ../../include/profile_advanced.php:60 -msgid "Hobbies/Interests:" -msgstr "Interessi e hobby:" +#: ../../include/photos.php:186 +msgid "Photo storage failed." +msgstr "Impossibile caricare la foto." -#: ../../include/profile_advanced.php:62 ../../mod/profiles.php:555 -msgid "Likes:" -msgstr "Mi piace:" +#: ../../include/photos.php:288 ../../include/conversation.php:1453 +msgid "Photo Albums" +msgstr "Album foto" -#: ../../include/profile_advanced.php:64 ../../mod/profiles.php:556 -msgid "Dislikes:" -msgstr "Non mi piace:" +#: ../../include/photos.php:292 ../../mod/photos.php:813 +#: ../../mod/photos.php:1287 +msgid "Upload New Photos" +msgstr "Carica nuove foto" -#: ../../include/profile_advanced.php:67 -msgid "Contact information and Social Networks:" -msgstr "Contatti e social network:" +#: ../../include/profile_selectors.php:6 +msgid "Male" +msgstr "Maschio" -#: ../../include/profile_advanced.php:69 -msgid "Musical interests:" -msgstr "Gusti musicali:" +#: ../../include/profile_selectors.php:6 +msgid "Female" +msgstr "Femmina" -#: ../../include/profile_advanced.php:71 -msgid "Books, literature:" -msgstr "Libri, letteratura:" +#: ../../include/profile_selectors.php:6 +msgid "Currently Male" +msgstr "Al momento maschio" -#: ../../include/profile_advanced.php:73 -msgid "Television:" -msgstr "Televisione:" +#: ../../include/profile_selectors.php:6 +msgid "Currently Female" +msgstr "Al momento femmina" -#: ../../include/profile_advanced.php:75 -msgid "Film/dance/culture/entertainment:" -msgstr "Film, danza, cultura, intrattenimento:" +#: ../../include/profile_selectors.php:6 +msgid "Mostly Male" +msgstr "Prevalentemente maschio" -#: ../../include/profile_advanced.php:77 -msgid "Love/Romance:" -msgstr "Amore:" +#: ../../include/profile_selectors.php:6 +msgid "Mostly Female" +msgstr "Prevalentemente femmina" -#: ../../include/profile_advanced.php:79 -msgid "Work/employment:" -msgstr "Lavoro:" +#: ../../include/profile_selectors.php:6 +msgid "Transgender" +msgstr "Transgender" -#: ../../include/profile_advanced.php:81 -msgid "School/education:" -msgstr "Scuola:" +#: ../../include/profile_selectors.php:6 +msgid "Intersex" +msgstr "Intersex" -#: ../../include/text.php:312 -msgid "prev" -msgstr "prec" +#: ../../include/profile_selectors.php:6 +msgid "Transsexual" +msgstr "Transessuale" -#: ../../include/text.php:314 -msgid "first" -msgstr "inizio" +#: ../../include/profile_selectors.php:6 +msgid "Hermaphrodite" +msgstr "Ermafrodito" -#: ../../include/text.php:343 -msgid "last" -msgstr "fine" +#: ../../include/profile_selectors.php:6 +msgid "Neuter" +msgstr "Neutro" -#: ../../include/text.php:346 -msgid "next" -msgstr "succ" +#: ../../include/profile_selectors.php:6 +msgid "Non-specific" +msgstr "Non specificato" -#: ../../include/text.php:358 -msgid "older" -msgstr "più recenti" +#: ../../include/profile_selectors.php:6 +msgid "Other" +msgstr "Altro" -#: ../../include/text.php:360 -msgid "newer" -msgstr "più nuovi" +#: ../../include/profile_selectors.php:6 +msgid "Undecided" +msgstr "Indeciso" -#: ../../include/text.php:651 -msgid "No connections" -msgstr "Nessun contatto" +#: ../../include/profile_selectors.php:23 +msgid "Males" +msgstr "Maschi" -#: ../../include/text.php:662 -#, php-format -msgid "%d Connection" -msgid_plural "%d Connections" -msgstr[0] "%d contatto" -msgstr[1] "%d contatti" +#: ../../include/profile_selectors.php:23 +msgid "Females" +msgstr "Femmine" -#: ../../include/text.php:674 -msgid "View Connections" -msgstr "Elenco contatti" +#: ../../include/profile_selectors.php:23 +msgid "Gay" +msgstr "Gay" -#: ../../include/text.php:733 ../../include/nav.php:135 -#: ../../mod/search.php:96 -msgid "Search" -msgstr "Cerca" +#: ../../include/profile_selectors.php:23 +msgid "Lesbian" +msgstr "Lesbica" -#: ../../include/text.php:735 ../../mod/filer.php:36 -msgid "Save" -msgstr "Salva" +#: ../../include/profile_selectors.php:23 +msgid "No Preference" +msgstr "Senza preferenza" -#: ../../include/text.php:773 -msgid "poke" -msgstr "poke" +#: ../../include/profile_selectors.php:23 +msgid "Bisexual" +msgstr "Bisessuale" -#: ../../include/text.php:773 ../../include/conversation.php:236 -msgid "poked" -msgstr "ha ricevuto un poke" +#: ../../include/profile_selectors.php:23 +msgid "Autosexual" +msgstr "Autosessuale" -#: ../../include/text.php:774 -msgid "ping" -msgstr "ping" +#: ../../include/profile_selectors.php:23 +msgid "Abstinent" +msgstr "Astinente" -#: ../../include/text.php:774 -msgid "pinged" -msgstr "ha ricevuto un ping" - -#: ../../include/text.php:775 -msgid "prod" -msgstr "prod" +#: ../../include/profile_selectors.php:23 +msgid "Virgin" +msgstr "Vergine" -#: ../../include/text.php:775 -msgid "prodded" -msgstr "ha ricevuto un prod" +#: ../../include/profile_selectors.php:23 +msgid "Deviant" +msgstr "Deviato" -#: ../../include/text.php:776 -msgid "slap" -msgstr "schiaffo" +#: ../../include/profile_selectors.php:23 +msgid "Fetish" +msgstr "Feticista" -#: ../../include/text.php:776 -msgid "slapped" -msgstr "ha ricevuto uno schiaffo" +#: ../../include/profile_selectors.php:23 +msgid "Oodles" +msgstr "Un sacco" -#: ../../include/text.php:777 -msgid "finger" -msgstr "finger" +#: ../../include/profile_selectors.php:23 +msgid "Nonsexual" +msgstr "Asessuato" -#: ../../include/text.php:777 -msgid "fingered" -msgstr "ha ricevuto un finger" +#: ../../include/profile_selectors.php:42 +msgid "Single" +msgstr "Single" -#: ../../include/text.php:778 -msgid "rebuff" -msgstr "rifiuto" +#: ../../include/profile_selectors.php:42 +msgid "Lonely" +msgstr "Da solo" -#: ../../include/text.php:778 -msgid "rebuffed" -msgstr "ha ricevuto un rifiuto" +#: ../../include/profile_selectors.php:42 +msgid "Available" +msgstr "Disponibile" -#: ../../include/text.php:790 -msgid "happy" -msgstr "allegro" +#: ../../include/profile_selectors.php:42 +msgid "Unavailable" +msgstr "Non disponibile" -#: ../../include/text.php:791 -msgid "sad" -msgstr "triste" +#: ../../include/profile_selectors.php:42 +msgid "Has crush" +msgstr "Ha una cotta" -#: ../../include/text.php:792 -msgid "mellow" -msgstr "calmo" +#: ../../include/profile_selectors.php:42 +msgid "Infatuated" +msgstr "Infatuato/a" -#: ../../include/text.php:793 -msgid "tired" -msgstr "stanco" +#: ../../include/profile_selectors.php:42 +msgid "Dating" +msgstr "Disponibile a un incontro" -#: ../../include/text.php:794 -msgid "perky" -msgstr "vivace" +#: ../../include/profile_selectors.php:42 +msgid "Unfaithful" +msgstr "Infedele" -#: ../../include/text.php:795 -msgid "angry" -msgstr "arrabbiato" +#: ../../include/profile_selectors.php:42 +msgid "Sex Addict" +msgstr "Sesso-dipendente" -#: ../../include/text.php:796 -msgid "stupified" -msgstr "stordito" +#: ../../include/profile_selectors.php:42 ../../include/identity.php:298 +#: ../../mod/network.php:215 ../../mod/connections.php:407 +msgid "Friends" +msgstr "Amici" -#: ../../include/text.php:797 -msgid "puzzled" -msgstr "confuso" +#: ../../include/profile_selectors.php:42 +msgid "Friends/Benefits" +msgstr "Amici piccanti" -#: ../../include/text.php:798 -msgid "interested" -msgstr "attento" +#: ../../include/profile_selectors.php:42 +msgid "Casual" +msgstr "Casual" -#: ../../include/text.php:799 -msgid "bitter" -msgstr "amaro" +#: ../../include/profile_selectors.php:42 +msgid "Engaged" +msgstr "Impegnato" -#: ../../include/text.php:800 -msgid "cheerful" -msgstr "allegro" +#: ../../include/profile_selectors.php:42 +msgid "Married" +msgstr "Sposato/a" -#: ../../include/text.php:801 -msgid "alive" -msgstr "vivace" +#: ../../include/profile_selectors.php:42 +msgid "Imaginarily married" +msgstr "Sogna il matrimonio" -#: ../../include/text.php:802 -msgid "annoyed" -msgstr "seccato" +#: ../../include/profile_selectors.php:42 +msgid "Partners" +msgstr "Partner" -#: ../../include/text.php:803 -msgid "anxious" -msgstr "ansioso" +#: ../../include/profile_selectors.php:42 +msgid "Cohabiting" +msgstr "Convivente" -#: ../../include/text.php:804 -msgid "cranky" -msgstr "irritabile" +#: ../../include/profile_selectors.php:42 +msgid "Common law" +msgstr "Matrimonio regolare" -#: ../../include/text.php:805 -msgid "disturbed" -msgstr "turbato" +#: ../../include/profile_selectors.php:42 +msgid "Happy" +msgstr "Felice" -#: ../../include/text.php:806 -msgid "frustrated" -msgstr "frustrato" +#: ../../include/profile_selectors.php:42 +msgid "Not looking" +msgstr "Non in cerca" -#: ../../include/text.php:807 -msgid "motivated" -msgstr "motivato" +#: ../../include/profile_selectors.php:42 +msgid "Swinger" +msgstr "Scambista" -#: ../../include/text.php:808 -msgid "relaxed" -msgstr "rilassato" +#: ../../include/profile_selectors.php:42 +msgid "Betrayed" +msgstr "Tradito/a" -#: ../../include/text.php:809 -msgid "surprised" -msgstr "sorpreso" +#: ../../include/profile_selectors.php:42 +msgid "Separated" +msgstr "Separato/a" -#: ../../include/text.php:973 -msgid "Monday" -msgstr "lunedì" +#: ../../include/profile_selectors.php:42 +msgid "Unstable" +msgstr "Instabile" -#: ../../include/text.php:973 -msgid "Tuesday" -msgstr "martedì" +#: ../../include/profile_selectors.php:42 +msgid "Divorced" +msgstr "Divorziato/a" -#: ../../include/text.php:973 -msgid "Wednesday" -msgstr "mercoledì" +#: ../../include/profile_selectors.php:42 +msgid "Imaginarily divorced" +msgstr "Sogna il divorzio" -#: ../../include/text.php:973 -msgid "Thursday" -msgstr "giovedì" +#: ../../include/profile_selectors.php:42 +msgid "Widowed" +msgstr "Vedovo/a" -#: ../../include/text.php:973 -msgid "Friday" -msgstr "venerdì" +#: ../../include/profile_selectors.php:42 +msgid "Uncertain" +msgstr "Incerto/a" -#: ../../include/text.php:973 -msgid "Saturday" -msgstr "sabato" +#: ../../include/profile_selectors.php:42 +msgid "It's complicated" +msgstr "Relazione complicata" -#: ../../include/text.php:973 -msgid "Sunday" -msgstr "domenica" +#: ../../include/profile_selectors.php:42 +msgid "Don't care" +msgstr "Chi se ne frega" -#: ../../include/text.php:977 -msgid "January" -msgstr "gennaio" +#: ../../include/profile_selectors.php:42 +msgid "Ask me" +msgstr "Chiedimelo" -#: ../../include/text.php:977 -msgid "February" -msgstr "febbraio" +#: ../../include/attach.php:184 ../../include/attach.php:232 +msgid "Item was not found." +msgstr "Elemento non trovato." -#: ../../include/text.php:977 -msgid "March" -msgstr "marzo" +#: ../../include/attach.php:285 +msgid "No source file." +msgstr "Nessun file di origine." -#: ../../include/text.php:977 -msgid "April" -msgstr "aprile" +#: ../../include/attach.php:302 +msgid "Cannot locate file to replace" +msgstr "Il file da sostituire non è stato trovato" -#: ../../include/text.php:977 -msgid "May" -msgstr "maggio" +#: ../../include/attach.php:320 +msgid "Cannot locate file to revise/update" +msgstr "Il file da aggiornare non è stato trovato" -#: ../../include/text.php:977 -msgid "June" -msgstr "giugno" +#: ../../include/attach.php:331 +#, php-format +msgid "File exceeds size limit of %d" +msgstr "Il file supera la dimensione massima di %d" -#: ../../include/text.php:977 -msgid "July" -msgstr "luglio" +#: ../../include/attach.php:342 +#, php-format +msgid "You have reached your limit of %1$.0f Mbytes attachment storage." +msgstr "Hai raggiunto il limite complessivo di %1$.0f Mbytes per gli allegati." -#: ../../include/text.php:977 -msgid "August" -msgstr "agosto" +#: ../../include/attach.php:424 +msgid "File upload failed. Possible system limit or action terminated." +msgstr "Caricamento file fallito, potrebbe aver superato i limiti o l'azione potrebbe essere stata interrotta." -#: ../../include/text.php:977 -msgid "September" -msgstr "settembre" +#: ../../include/attach.php:436 +msgid "Stored file could not be verified. Upload failed." +msgstr "Il file non può essere verificato. Caricamento fallito." -#: ../../include/text.php:977 -msgid "October" -msgstr "ottobre" +#: ../../include/attach.php:480 ../../include/attach.php:497 +msgid "Path not available." +msgstr "Percorso non disponibile." -#: ../../include/text.php:977 -msgid "November" -msgstr "novembre" +#: ../../include/attach.php:544 +msgid "Empty pathname" +msgstr "Il percorso del file è vuoto" -#: ../../include/text.php:977 -msgid "December" -msgstr "dicembre" - -#: ../../include/text.php:1055 ../../mod/message.php:453 -msgid "unknown.???" -msgstr "sconosciuto???" +#: ../../include/attach.php:562 +msgid "duplicate filename or path" +msgstr "il file o percorso del file è duplicato" -#: ../../include/text.php:1056 ../../mod/message.php:454 -msgid "bytes" -msgstr "byte" +#: ../../include/attach.php:584 +msgid "Path not found." +msgstr "Percorso del file non trovato." -#: ../../include/text.php:1091 -msgid "remove category" -msgstr "rimuovi la categoria" +#: ../../include/attach.php:628 +msgid "mkdir failed." +msgstr "mkdir fallito." -#: ../../include/text.php:1113 -msgid "remove from file" -msgstr "rimuovi dal file" +#: ../../include/attach.php:632 +msgid "database storage failed." +msgstr "scrittura su database fallita." -#: ../../include/text.php:1167 ../../include/text.php:1179 -msgid "Click to open/close" -msgstr "Clicca per aprire/chiudere" +#: ../../include/zot.php:545 +msgid "Invalid data packet" +msgstr "Dati non validi" -#: ../../include/text.php:1355 ../../mod/events.php:326 -msgid "link to source" -msgstr "Link all'originale" +#: ../../include/zot.php:555 +msgid "Unable to verify channel signature" +msgstr "Impossibile verificare la firma elettronica del canale" -#: ../../include/text.php:1374 -msgid "Select a page layout: " -msgstr "Scegli il layout della pagina:" +#: ../../include/zot.php:732 +#, php-format +msgid "Unable to verify site signature for %s" +msgstr "Impossibile verificare la firma elettronica del sito %s" -#: ../../include/text.php:1377 ../../include/text.php:1442 -msgid "default" -msgstr "predefinito" +#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1439 +msgid "Logout" +msgstr "Esci" -#: ../../include/text.php:1413 -msgid "Page content type: " -msgstr "Contenuto della pagina:" +#: ../../include/nav.php:72 ../../include/nav.php:87 +msgid "End this session" +msgstr "Chiudi questa sessione" -#: ../../include/text.php:1454 -msgid "Select an alternate language" -msgstr "Seleziona una lingua diversa" +#: ../../include/nav.php:75 ../../include/nav.php:121 +msgid "Home" +msgstr "Bacheca" -#: ../../include/text.php:1606 ../../include/conversation.php:117 -#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45 -msgid "photo" -msgstr "la foto" +#: ../../include/nav.php:75 +msgid "Your posts and conversations" +msgstr "I tuoi articoli e conversazioni" -#: ../../include/text.php:1609 ../../include/conversation.php:120 -#: ../../mod/tagger.php:49 -msgid "event" -msgstr "l'evento" +#: ../../include/nav.php:76 ../../include/conversation.php:925 +#: ../../mod/connections.php:327 ../../mod/connections.php:441 +msgid "View Profile" +msgstr "Profilo" -#: ../../include/text.php:1612 ../../include/conversation.php:145 -#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53 -msgid "status" -msgstr "il messaggio di stato" +#: ../../include/nav.php:76 +msgid "Your profile page" +msgstr "Il tuo profilo" -#: ../../include/text.php:1614 ../../include/conversation.php:147 -#: ../../mod/tagger.php:55 -msgid "comment" -msgstr "il commento" +#: ../../include/nav.php:78 +msgid "Edit Profiles" +msgstr "Modifica i profili" -#: ../../include/text.php:1619 -msgid "activity" -msgstr "l'attività" +#: ../../include/nav.php:78 +msgid "Manage/Edit Profiles" +msgstr "Gestisci e modifica i profili" -#: ../../include/text.php:1881 -msgid "Design" -msgstr "Design" +#: ../../include/nav.php:79 ../../include/conversation.php:1450 +#: ../../mod/fbrowser.php:25 +msgid "Photos" +msgstr "Foto" -#: ../../include/text.php:1883 -msgid "Blocks" -msgstr "Riquadri" +#: ../../include/nav.php:79 +msgid "Your photos" +msgstr "Le tue foto" -#: ../../include/text.php:1884 -msgid "Menus" -msgstr "Menù" +#: ../../include/nav.php:85 ../../boot.php:1440 +msgid "Login" +msgstr "Accedi" -#: ../../include/text.php:1885 -msgid "Layouts" -msgstr "Layout" +#: ../../include/nav.php:85 +msgid "Sign in" +msgstr "Entra" -#: ../../include/text.php:1886 -msgid "Pages" -msgstr "Pagine" +#: ../../include/nav.php:102 +#, php-format +msgid "%s - click to logout" +msgstr "%s - clicca per uscire" -#: ../../include/api.php:972 -msgid "Public Timeline" -msgstr "Diario pubblico" +#: ../../include/nav.php:107 +msgid "Click to authenticate to your home hub" +msgstr "Clicca per autenticarti sul tuo server principale" -#: ../../include/identity.php:14 ../../mod/item.php:1148 -msgid "Unable to obtain identity information from database" -msgstr "Impossibile ottenere le informazioni di identificazione dal database" +#: ../../include/nav.php:121 +msgid "Home Page" +msgstr "Bacheca" -#: ../../include/identity.php:36 -msgid "Empty name" -msgstr "Nome vuoto" +#: ../../include/nav.php:125 ../../mod/register.php:195 ../../boot.php:1416 +msgid "Register" +msgstr "Iscriviti" -#: ../../include/identity.php:38 -msgid "Name too long" -msgstr "Nome troppo lungo" +#: ../../include/nav.php:125 +msgid "Create an account" +msgstr "Crea un account" -#: ../../include/identity.php:80 -msgid "No account identifier" -msgstr "Account senza identificativo" +#: ../../include/nav.php:130 ../../mod/help.php:45 ../../mod/help.php:49 +msgid "Help" +msgstr "Guida" -#: ../../include/identity.php:90 -msgid "Nickname is required." -msgstr "Il nome dell'account è obbligatorio." +#: ../../include/nav.php:130 +msgid "Help and documentation" +msgstr "Guida e documentazione" -#: ../../include/identity.php:104 -msgid "" -"Nickname has unsupported characters or is already being used on this site." -msgstr "Il nome dell'account è già in uso oppure ha dei caratteri non supportati." +#: ../../include/nav.php:133 +msgid "Apps" +msgstr "Apps" -#: ../../include/identity.php:163 -msgid "Unable to retrieve created identity" -msgstr "Impossibile caricare l'identità creata" +#: ../../include/nav.php:133 +msgid "Addon applications, utilities, games" +msgstr "App, strumenti e giochi aggiuntivi" -#: ../../include/identity.php:220 -msgid "Default Profile" -msgstr "Profilo predefinito" +#: ../../include/nav.php:135 ../../include/text.php:736 +#: ../../mod/search.php:96 +msgid "Search" +msgstr "Cerca" -#: ../../include/identity.php:245 ../../include/profile_selectors.php:42 -#: ../../mod/network.php:387 ../../mod/connections.php:407 -msgid "Friends" -msgstr "Amici" +#: ../../include/nav.php:135 +msgid "Search site content" +msgstr "Cerca nel sito" -#: ../../include/bbcode.php:94 ../../include/bbcode.php:494 -#: ../../include/bbcode.php:497 -msgid "Image/photo" -msgstr "Immagine" +#: ../../include/nav.php:138 ../../mod/directory.php:225 +msgid "Directory" +msgstr "Tutti i canali" -#: ../../include/bbcode.php:126 ../../include/bbcode.php:502 -msgid "Encrypted content" -msgstr "Contenuto crittografato" +#: ../../include/nav.php:138 +msgid "Channel Locator" +msgstr "Ricerca canali" -#: ../../include/bbcode.php:173 -#, php-format -msgid "%1$s wrote the following %2$s %3$s" -msgstr "%1$s ha scritto %2$s seguente %3$s" +#: ../../include/nav.php:149 +msgid "Matrix" +msgstr "La tua rete" -#: ../../include/bbcode.php:175 -msgid "post" -msgstr "l'articolo" +#: ../../include/nav.php:149 +msgid "Your matrix" +msgstr "La tua rete" -#: ../../include/bbcode.php:454 ../../include/bbcode.php:474 -msgid "$1 wrote:" -msgstr "$1 ha scritto:" +#: ../../include/nav.php:150 +msgid "See all matrix notifications" +msgstr "Notifiche dalla tua rete" -#: ../../include/oembed.php:149 -msgid "Embedded content" -msgstr "Contenuti incorporati" +#: ../../include/nav.php:151 +msgid "Mark all matrix notifications seen" +msgstr "Segna come lette le notifiche della tua rete" -#: ../../include/oembed.php:158 -msgid "Embedding disabled" -msgstr "Contenuti incorporati - funzione disabilitata" +#: ../../include/nav.php:153 +msgid "Channel Home" +msgstr "Bacheca del canale" -#: ../../include/notify.php:23 -msgid "created a new post" -msgstr "Ha creato un nuovo articolo" +#: ../../include/nav.php:153 +msgid "Channel home" +msgstr "Bacheca del canale" -#: ../../include/notify.php:24 -#, php-format -msgid "commented on %s's post" -msgstr "ha commentato l'articolo di %s" +#: ../../include/nav.php:154 +msgid "See all channel notifications" +msgstr "Guarda le notifiche dei canali" -#: ../../include/photos.php:15 ../../include/attach.php:102 -#: ../../include/attach.php:133 ../../include/attach.php:189 -#: ../../include/attach.php:204 ../../include/attach.php:237 -#: ../../include/attach.php:251 ../../include/attach.php:272 -#: ../../include/attach.php:464 ../../include/attach.php:539 -#: ../../include/items.php:3608 ../../mod/common.php:43 -#: ../../mod/events.php:134 ../../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:628 -#: ../../mod/viewconnections.php:33 ../../mod/viewconnections.php:38 -#: ../../mod/delegate.php:6 ../../mod/sources.php:48 ../../mod/mitem.php:92 -#: ../../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:7 -#: ../../mod/intro.php:50 ../../mod/connections.php:197 -#: ../../mod/profiles.php:163 ../../mod/profiles.php:476 -#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97 -#: ../../mod/filestorage.php:26 ../../mod/manage.php:6 -#: ../../mod/crepair.php:115 ../../mod/editlayout.php:48 -#: ../../mod/nogroup.php:25 ../../mod/profile_photo.php:197 -#: ../../mod/profile_photo.php:210 ../../mod/editwebpage.php:42 -#: ../../mod/editwebpage.php:64 ../../mod/notifications.php:66 -#: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/editpost.php:13 -#: ../../mod/poke.php:128 ../../mod/channel.php:123 ../../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/mood.php:114 ../../index.php:178 ../../index.php:340 -msgid "Permission denied." -msgstr "Permesso negato." +#: ../../include/nav.php:155 +msgid "Mark all channel notifications seen" +msgstr "Segna come lette le notifiche dei canali" -#: ../../include/photos.php:88 -#, php-format -msgid "Image exceeds website size limit of %lu bytes" -msgstr "L'immagine supera il limite massimo di %lu bytes" +#: ../../include/nav.php:158 +msgid "Intros" +msgstr "Richieste" -#: ../../include/photos.php:95 -msgid "Image file is empty." -msgstr "Il file dell'immagine è vuoto." +#: ../../include/nav.php:158 ../../mod/connections.php:585 +msgid "New Connections" +msgstr "Nuovi contatti" -#: ../../include/photos.php:124 ../../mod/profile_photo.php:157 -msgid "Unable to process image" -msgstr "Impossibile elaborare l'immagine" +#: ../../include/nav.php:159 +msgid "See all channel introductions" +msgstr "Guarda tutte le richieste di amicizia" -#: ../../include/photos.php:186 -msgid "Photo storage failed." -msgstr "Impossibile caricare la foto." +#: ../../include/nav.php:162 +msgid "Notices" +msgstr "Notifiche" -#: ../../include/photos.php:288 ../../boot.php:2242 -msgid "Photo Albums" -msgstr "Album foto" +#: ../../include/nav.php:162 ../../mod/notifications.php:218 +msgid "Notifications" +msgstr "Notifiche" -#: ../../include/photos.php:292 ../../mod/photos.php:802 -#: ../../mod/photos.php:1276 -msgid "Upload New Photos" -msgstr "Carica nuove foto" +#: ../../include/nav.php:163 +msgid "See all notifications" +msgstr "Vedi tutte le notifiche" -#: ../../include/profile_selectors.php:6 -msgid "Male" -msgstr "Maschio" +#: ../../include/nav.php:164 +msgid "Mark all system notifications seen" +msgstr "Segna come lette le notifiche di sistema" -#: ../../include/profile_selectors.php:6 -msgid "Female" -msgstr "Femmina" +#: ../../include/nav.php:166 +msgid "Mail" +msgstr "Messaggi" -#: ../../include/profile_selectors.php:6 -msgid "Currently Male" -msgstr "Al momento maschio" +#: ../../include/nav.php:166 +msgid "Private mail" +msgstr "Messaggi privati" -#: ../../include/profile_selectors.php:6 -msgid "Currently Female" -msgstr "Al momento femmina" +#: ../../include/nav.php:167 +msgid "See all private messages" +msgstr "Guarda tutti i messaggi privati" -#: ../../include/profile_selectors.php:6 -msgid "Mostly Male" -msgstr "Prevalentemente maschio" +#: ../../include/nav.php:168 +msgid "Mark all private messages seen" +msgstr "Segna come letti tutti i messaggi privati" -#: ../../include/profile_selectors.php:6 -msgid "Mostly Female" -msgstr "Prevalentemente femmina" +#: ../../include/nav.php:169 +msgid "Inbox" +msgstr "In arrivo" -#: ../../include/profile_selectors.php:6 -msgid "Transgender" -msgstr "Transgender" +#: ../../include/nav.php:170 +msgid "Outbox" +msgstr "Inviati" -#: ../../include/profile_selectors.php:6 -msgid "Intersex" -msgstr "Intersex" +#: ../../include/nav.php:171 ../../mod/message.php:24 +msgid "New Message" +msgstr "Nuovo messaggio" -#: ../../include/profile_selectors.php:6 -msgid "Transsexual" -msgstr "Transessuale" +#: ../../include/nav.php:174 ../../include/conversation.php:1461 +#: ../../mod/events.php:353 +msgid "Events" +msgstr "Eventi" -#: ../../include/profile_selectors.php:6 -msgid "Hermaphrodite" -msgstr "Ermafrodito" +#: ../../include/nav.php:174 +msgid "Event Calendar" +msgstr "Calendario" -#: ../../include/profile_selectors.php:6 -msgid "Neuter" -msgstr "Neutro" +#: ../../include/nav.php:175 +msgid "See all events" +msgstr "Guarda tutti gli eventi" -#: ../../include/profile_selectors.php:6 -msgid "Non-specific" -msgstr "Non specificato" +#: ../../include/nav.php:176 +msgid "Mark all events seen" +msgstr "Marca come letti tutti gli eventi" -#: ../../include/profile_selectors.php:6 -msgid "Other" -msgstr "Altro" +#: ../../include/nav.php:178 +msgid "Channel Select" +msgstr "Gestisci i canali" -#: ../../include/profile_selectors.php:6 -msgid "Undecided" -msgstr "Indeciso" +#: ../../include/nav.php:178 +msgid "Manage Your Channels" +msgstr "Gestisci i contatti dei tuoi canali" -#: ../../include/profile_selectors.php:23 -msgid "Males" -msgstr "Maschi" +#: ../../include/nav.php:180 ../../mod/settings.php:131 +#: ../../mod/admin.php:782 ../../mod/admin.php:987 +msgid "Settings" +msgstr "Impostazioni" -#: ../../include/profile_selectors.php:23 -msgid "Females" -msgstr "Femmine" +#: ../../include/nav.php:180 +msgid "Account/Channel Settings" +msgstr "Impostazioni account e canali" -#: ../../include/profile_selectors.php:23 -msgid "Gay" -msgstr "Gay" +#: ../../include/nav.php:182 ../../mod/connections.php:690 +msgid "Connections" +msgstr "Contatti" -#: ../../include/profile_selectors.php:23 -msgid "Lesbian" -msgstr "Lesbica" +#: ../../include/nav.php:182 +msgid "Manage/Edit Friends and Connections" +msgstr "Modifica amici e contatti" -#: ../../include/profile_selectors.php:23 -msgid "No Preference" -msgstr "Senza preferenza" +#: ../../include/nav.php:189 ../../mod/admin.php:111 +msgid "Admin" +msgstr "Amministrazione" -#: ../../include/profile_selectors.php:23 -msgid "Bisexual" -msgstr "Bisessuale" +#: ../../include/nav.php:189 +msgid "Site Setup and Configuration" +msgstr "Configurazione del sito" -#: ../../include/profile_selectors.php:23 -msgid "Autosexual" -msgstr "Autosessuale" +#: ../../include/nav.php:215 +msgid "Nothing new here" +msgstr "Niente di nuovo qui" -#: ../../include/profile_selectors.php:23 -msgid "Abstinent" -msgstr "Astinente" +#: ../../include/nav.php:220 +msgid "Please wait..." +msgstr "Attendere..." -#: ../../include/profile_selectors.php:23 -msgid "Virgin" -msgstr "Vergine" +#: ../../include/account.php:23 +msgid "Not a valid email address" +msgstr "Email non valida" -#: ../../include/profile_selectors.php:23 -msgid "Deviant" -msgstr "Deviato" +#: ../../include/account.php:25 +msgid "Your email domain is not among those allowed on this site" +msgstr "Il dominio della tua email attualmente non è permesso su questo sito" -#: ../../include/profile_selectors.php:23 -msgid "Fetish" -msgstr "Feticista" +#: ../../include/account.php:31 +msgid "Your email address is already registered at this site." +msgstr "La tua email è già registrata su questo sito." -#: ../../include/profile_selectors.php:23 -msgid "Oodles" -msgstr "Un sacco" +#: ../../include/account.php:64 +msgid "An invitation is required." +msgstr "È necessario un invito." -#: ../../include/profile_selectors.php:23 -msgid "Nonsexual" -msgstr "Asessuato" +#: ../../include/account.php:68 +msgid "Invitation could not be verified." +msgstr "L'invito non può essere verificato." -#: ../../include/profile_selectors.php:42 -msgid "Single" -msgstr "Single" +#: ../../include/account.php:118 +msgid "Please enter the required information." +msgstr "Inserisci le informazioni richieste." -#: ../../include/profile_selectors.php:42 -msgid "Lonely" -msgstr "Da solo" +#: ../../include/account.php:186 +msgid "Failed to store account information." +msgstr "Non è stato possibile salvare le informazioni del tuo account." -#: ../../include/profile_selectors.php:42 -msgid "Available" -msgstr "Disponibile" +#: ../../include/account.php:272 +#, php-format +msgid "Registration request at %s" +msgstr "Richiesta di registrazione su %s" -#: ../../include/profile_selectors.php:42 -msgid "Unavailable" -msgstr "Non disponibile" +#: ../../include/account.php:274 ../../include/account.php:301 +#: ../../include/account.php:358 +msgid "Administrator" +msgstr "Amministratore" -#: ../../include/profile_selectors.php:42 -msgid "Has crush" -msgstr "Ha una cotta" +#: ../../include/account.php:296 +msgid "your registration password" +msgstr "la password di registrazione" -#: ../../include/profile_selectors.php:42 -msgid "Infatuated" -msgstr "Infatuato/a" +#: ../../include/account.php:299 ../../include/account.php:356 +#, php-format +msgid "Registration details for %s" +msgstr "Dettagli della registrazione di %s" -#: ../../include/profile_selectors.php:42 -msgid "Dating" -msgstr "Disponibile a un incontro" +#: ../../include/account.php:365 +msgid "Account approved." +msgstr "Account approvato." -#: ../../include/profile_selectors.php:42 -msgid "Unfaithful" -msgstr "Infedele" +#: ../../include/account.php:399 +#, php-format +msgid "Registration revoked for %s" +msgstr "Registrazione revocata per %s" -#: ../../include/profile_selectors.php:42 -msgid "Sex Addict" -msgstr "Sesso-dipendente" +#: ../../include/conversation.php:117 ../../include/text.php:1609 +#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45 +msgid "photo" +msgstr "la foto" -#: ../../include/profile_selectors.php:42 -msgid "Friends/Benefits" -msgstr "Amici piccanti" +#: ../../include/conversation.php:120 ../../include/text.php:1612 +#: ../../mod/tagger.php:49 +msgid "event" +msgstr "l'evento" -#: ../../include/profile_selectors.php:42 -msgid "Casual" -msgstr "Casual" +#: ../../include/conversation.php:123 +msgid "channel" +msgstr "canale" -#: ../../include/profile_selectors.php:42 -msgid "Engaged" -msgstr "Impegnato" +#: ../../include/conversation.php:145 ../../include/text.php:1615 +#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53 +msgid "status" +msgstr "il messaggio di stato" -#: ../../include/profile_selectors.php:42 -msgid "Married" -msgstr "Sposato/a" +#: ../../include/conversation.php:147 ../../include/text.php:1617 +#: ../../mod/tagger.php:55 +msgid "comment" +msgstr "il commento" -#: ../../include/profile_selectors.php:42 -msgid "Imaginarily married" -msgstr "Sogna il matrimonio" +#: ../../include/conversation.php:161 ../../mod/like.php:134 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "A %1$s piace %3$s di %2$s" -#: ../../include/profile_selectors.php:42 -msgid "Partners" -msgstr "Partner" +#: ../../include/conversation.php:164 ../../mod/like.php:136 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" +msgstr "A %1$s non piace %3$s di %2$s" -#: ../../include/profile_selectors.php:42 -msgid "Cohabiting" -msgstr "Convivente" +#: ../../include/conversation.php:201 +#, php-format +msgid "%1$s is now connected with %2$s" +msgstr "%1$s adesso è connesso con %2$s" -#: ../../include/profile_selectors.php:42 -msgid "Common law" -msgstr "Matrimonio regolare" +#: ../../include/conversation.php:232 +#, php-format +msgid "%1$s poked %2$s" +msgstr "%1$s ha mandato un poke a %2$s" -#: ../../include/profile_selectors.php:42 -msgid "Happy" -msgstr "Felice" +#: ../../include/conversation.php:236 ../../include/text.php:776 +msgid "poked" +msgstr "ha ricevuto un poke" -#: ../../include/profile_selectors.php:42 -msgid "Not looking" -msgstr "Non in cerca" +#: ../../include/conversation.php:254 ../../mod/mood.php:63 +#, php-format +msgid "%1$s is currently %2$s" +msgstr "%1$s al momento è %2$s" -#: ../../include/profile_selectors.php:42 -msgid "Swinger" -msgstr "Scambista" +#: ../../include/conversation.php:658 +#, php-format +msgid "View %s's profile @ %s" +msgstr "Vedi il profilo di %s @ %s" -#: ../../include/profile_selectors.php:42 -msgid "Betrayed" -msgstr "Tradito/a" +#: ../../include/conversation.php:672 +msgid "Categories:" +msgstr "Categorie:" -#: ../../include/profile_selectors.php:42 -msgid "Separated" -msgstr "Separato/a" +#: ../../include/conversation.php:673 +msgid "Filed under:" +msgstr "Classificato come:" -#: ../../include/profile_selectors.php:42 -msgid "Unstable" -msgstr "Instabile" +#: ../../include/conversation.php:700 +msgid "View in context" +msgstr "Vedi nel contesto" -#: ../../include/profile_selectors.php:42 -msgid "Divorced" -msgstr "Divorziato/a" +#: ../../include/conversation.php:826 +msgid "remove" +msgstr "rimuovi" -#: ../../include/profile_selectors.php:42 -msgid "Imaginarily divorced" -msgstr "Sogna il divorzio" +#: ../../include/conversation.php:830 +msgid "Loading..." +msgstr "Caricamento in corso..." -#: ../../include/profile_selectors.php:42 -msgid "Widowed" -msgstr "Vedovo/a" +#: ../../include/conversation.php:831 +msgid "Delete Selected Items" +msgstr "Elimina gli oggetti selezionati" -#: ../../include/profile_selectors.php:42 -msgid "Uncertain" -msgstr "Incerto/a" +#: ../../include/conversation.php:922 +msgid "View Source" +msgstr "Vedi il sorgente" -#: ../../include/profile_selectors.php:42 -msgid "It's complicated" -msgstr "Relazione complicata" +#: ../../include/conversation.php:923 +msgid "Follow Thread" +msgstr "Segui la discussione" -#: ../../include/profile_selectors.php:42 -msgid "Don't care" -msgstr "Chi se ne frega" +#: ../../include/conversation.php:924 +msgid "View Status" +msgstr "Guarda il messaggio di stato" -#: ../../include/profile_selectors.php:42 -msgid "Ask me" -msgstr "Chiedimelo" +#: ../../include/conversation.php:926 +msgid "View Photos" +msgstr "Guarda le foto" -#: ../../include/attach.php:184 ../../include/attach.php:232 -msgid "Item was not found." -msgstr "Elemento non trovato." +#: ../../include/conversation.php:927 +msgid "Matrix Activity" +msgstr "Attività nella tua rete" -#: ../../include/attach.php:285 -msgid "No source file." -msgstr "Nessun file di origine." +#: ../../include/conversation.php:928 +msgid "Edit Contact" +msgstr "Modifica il contatto" -#: ../../include/attach.php:302 -msgid "Cannot locate file to replace" -msgstr "Il file da sostituire non è stato trovato" +#: ../../include/conversation.php:929 +msgid "Send PM" +msgstr "Invia messaggio privato" -#: ../../include/attach.php:320 -msgid "Cannot locate file to revise/update" -msgstr "Il file da aggiornare non è stato trovato" +#: ../../include/conversation.php:930 +msgid "Poke" +msgstr "Poke" -#: ../../include/attach.php:331 +#: ../../include/conversation.php:992 #, php-format -msgid "File exceeds size limit of %d" -msgstr "Il file supera la dimensione massima di %d" +msgid "%s likes this." +msgstr "Piace a %s." -#: ../../include/attach.php:342 +#: ../../include/conversation.php:992 #, php-format -msgid "You have reached your limit of %1$.0f Mbytes attachment storage." -msgstr "Hai raggiunto il limite complessivo di %1$.0f Mbytes per gli allegati." +msgid "%s doesn't like this." +msgstr "Non piace a %s." -#: ../../include/attach.php:424 -msgid "File upload failed. Possible system limit or action terminated." -msgstr "Caricamento file fallito, potrebbe aver superato i limiti o l'azione potrebbe essere stata interrotta." +#: ../../include/conversation.php:996 +#, php-format +msgid "%2$d people like this." +msgid_plural "%2$d people like this." +msgstr[0] "" +msgstr[1] "Piace a %2$d persone." -#: ../../include/attach.php:436 -msgid "Stored file could not be verified. Upload failed." -msgstr "Il file non può essere verificato. Caricamento fallito." +#: ../../include/conversation.php:998 +#, php-format +msgid "%2$d people don't like this." +msgid_plural "%2$d people don't like this." +msgstr[0] "" +msgstr[1] "Non piace a %2$d persone." -#: ../../include/attach.php:480 ../../include/attach.php:497 -msgid "Path not available." -msgstr "Percorso non disponibile." +#: ../../include/conversation.php:1004 +msgid "and" +msgstr "e" -#: ../../include/attach.php:544 -msgid "Empty pathname" -msgstr "Il percorso del file è vuoto" +#: ../../include/conversation.php:1007 +#, php-format +msgid ", and %d other people" +msgid_plural ", and %d other people" +msgstr[0] "" +msgstr[1] "e altre %d persone" -#: ../../include/attach.php:562 -msgid "duplicate filename or path" -msgstr "il file o percorso del file è duplicato" +#: ../../include/conversation.php:1008 +#, php-format +msgid "%s like this." +msgstr "Piace a %s." -#: ../../include/attach.php:584 -msgid "Path not found." -msgstr "Percorso del file non trovato." +#: ../../include/conversation.php:1008 +#, php-format +msgid "%s don't like this." +msgstr "Non piace a %s." -#: ../../include/attach.php:628 -msgid "mkdir failed." -msgstr "mkdir fallito." +#: ../../include/conversation.php:1058 +msgid "Visible to everybody" +msgstr "Visibile a tutti" -#: ../../include/attach.php:632 -msgid "database storage failed." -msgstr "scrittura su database fallita." +#: ../../include/conversation.php:1059 ../../mod/message.php:281 +#: ../../mod/message.php:417 +msgid "Please enter a link URL:" +msgstr "Inserisci l'indirizzo del link:" -#: ../../include/zot.php:542 -msgid "Invalid data packet" -msgstr "Dati non validi" +#: ../../include/conversation.php:1060 +msgid "Please enter a video link/URL:" +msgstr "Inserisci l'indirizzo del video:" -#: ../../include/zot.php:552 -msgid "Unable to verify channel signature" -msgstr "Impossibile verificare la firma elettronica del canale" +#: ../../include/conversation.php:1061 +msgid "Please enter an audio link/URL:" +msgstr "Inserisci l'indirizzo dell'audio:" -#: ../../include/zot.php:697 -#, php-format -msgid "Unable to verify site signature for %s" -msgstr "Impossibile verificare la firma elettronica del sito %s" +#: ../../include/conversation.php:1062 +msgid "Tag term:" +msgstr "Tag:" -#: ../../include/nav.php:72 ../../include/nav.php:87 ../../boot.php:1458 -msgid "Logout" -msgstr "Esci" +#: ../../include/conversation.php:1063 ../../mod/filer.php:35 +msgid "Save to Folder:" +msgstr "Salva nella cartella:" -#: ../../include/nav.php:72 ../../include/nav.php:87 -msgid "End this session" -msgstr "Chiudi questa sessione" +#: ../../include/conversation.php:1064 +msgid "Where are you right now?" +msgstr "Dove sei ora?" -#: ../../include/nav.php:75 ../../include/nav.php:121 -msgid "Home" -msgstr "Bacheca" +#: ../../include/conversation.php:1065 ../../mod/message.php:282 +#: ../../mod/message.php:418 ../../mod/editpost.php:52 +msgid "Expires YYYY-MM-DD HH:MM" +msgstr "Scadenza il AAAA-MM-GG OO:MM" -#: ../../include/nav.php:75 -msgid "Your posts and conversations" -msgstr "I tuoi articoli e conversazioni" +#: ../../include/conversation.php:1089 ../../mod/photos.php:1071 +msgid "Share" +msgstr "Condividi" -#: ../../include/nav.php:76 -msgid "Your profile page" -msgstr "Il tuo profilo" +#: ../../include/conversation.php:1091 +msgid "Page link title" +msgstr "Link del titolo" -#: ../../include/nav.php:78 -msgid "Edit Profiles" -msgstr "Modifica i profili" +#: ../../include/conversation.php:1093 ../../mod/message.php:329 +#: ../../mod/message.php:512 ../../mod/editlayout.php:101 +#: ../../mod/editwebpage.php:120 ../../mod/editpost.php:98 +#: ../../mod/editblock.php:115 +msgid "Upload photo" +msgstr "Carica foto" -#: ../../include/nav.php:78 -msgid "Manage/Edit Profiles" -msgstr "Gestisci e modifica i profili" +#: ../../include/conversation.php:1094 +msgid "upload photo" +msgstr "carica foto" -#: ../../include/nav.php:79 ../../mod/fbrowser.php:25 ../../boot.php:2239 -msgid "Photos" -msgstr "Foto" - -#: ../../include/nav.php:79 -msgid "Your photos" -msgstr "Le tue foto" +#: ../../include/conversation.php:1095 ../../mod/message.php:330 +#: ../../mod/message.php:513 ../../mod/editlayout.php:102 +#: ../../mod/editwebpage.php:121 ../../mod/editpost.php:99 +#: ../../mod/editblock.php:116 +msgid "Attach file" +msgstr "Allega file" -#: ../../include/nav.php:85 ../../boot.php:1459 -msgid "Login" -msgstr "Accedi" +#: ../../include/conversation.php:1096 +msgid "attach file" +msgstr "allega file" -#: ../../include/nav.php:85 -msgid "Sign in" -msgstr "Entra" +#: ../../include/conversation.php:1097 ../../mod/message.php:331 +#: ../../mod/message.php:514 ../../mod/editlayout.php:103 +#: ../../mod/editwebpage.php:122 ../../mod/editpost.php:100 +#: ../../mod/editblock.php:117 +msgid "Insert web link" +msgstr "Inserisci un indirizzo web" -#: ../../include/nav.php:102 -#, php-format -msgid "%s - click to logout" -msgstr "%s - clicca per uscire" +#: ../../include/conversation.php:1098 +msgid "web link" +msgstr "link web" -#: ../../include/nav.php:107 -msgid "Click to authenticate to your home hub" -msgstr "Clicca per autenticarti sul tuo server principale" +#: ../../include/conversation.php:1099 +msgid "Insert video link" +msgstr "Inserisci l'indirizzo di un video" -#: ../../include/nav.php:121 -msgid "Home Page" -msgstr "Bacheca" +#: ../../include/conversation.php:1100 +msgid "video link" +msgstr "link video" -#: ../../include/nav.php:125 ../../mod/register.php:195 ../../boot.php:1435 -msgid "Register" -msgstr "Iscriviti" +#: ../../include/conversation.php:1101 +msgid "Insert audio link" +msgstr "Inserisci l'indirizzo di un audio" -#: ../../include/nav.php:125 -msgid "Create an account" -msgstr "Crea un account" +#: ../../include/conversation.php:1102 +msgid "audio link" +msgstr "link audio" -#: ../../include/nav.php:130 ../../mod/help.php:45 ../../mod/help.php:49 -msgid "Help" -msgstr "Guida" +#: ../../include/conversation.php:1103 ../../mod/editlayout.php:107 +#: ../../mod/editwebpage.php:126 ../../mod/editpost.php:104 +#: ../../mod/editblock.php:121 +msgid "Set your location" +msgstr "La tua località" -#: ../../include/nav.php:130 -msgid "Help and documentation" -msgstr "Guida e documentazione" +#: ../../include/conversation.php:1104 +msgid "set location" +msgstr "la tua località" -#: ../../include/nav.php:133 -msgid "Apps" -msgstr "Apps" +#: ../../include/conversation.php:1105 ../../mod/editlayout.php:108 +#: ../../mod/editwebpage.php:127 ../../mod/editpost.php:105 +#: ../../mod/editblock.php:122 +msgid "Clear browser location" +msgstr "Rimuovi la località data dal browser" -#: ../../include/nav.php:133 -msgid "Addon applications, utilities, games" -msgstr "App, strumenti e giochi aggiuntivi" +#: ../../include/conversation.php:1106 +msgid "clear location" +msgstr "rimuovi la località" -#: ../../include/nav.php:135 -msgid "Search site content" -msgstr "Cerca nel sito" +#: ../../include/conversation.php:1108 ../../mod/editlayout.php:121 +#: ../../mod/editwebpage.php:142 ../../mod/editpost.php:118 +#: ../../mod/editblock.php:136 +msgid "Set title" +msgstr "Scegli un titolo" -#: ../../include/nav.php:138 ../../mod/directory.php:225 -msgid "Directory" -msgstr "Tutti i canali" +#: ../../include/conversation.php:1111 ../../mod/editlayout.php:123 +#: ../../mod/editwebpage.php:144 ../../mod/editpost.php:120 +#: ../../mod/editblock.php:138 +msgid "Categories (comma-separated list)" +msgstr "Categorie (separate da virgola)" -#: ../../include/nav.php:138 -msgid "Channel Locator" -msgstr "Ricerca canali" +#: ../../include/conversation.php:1113 ../../mod/editlayout.php:110 +#: ../../mod/editwebpage.php:129 ../../mod/editpost.php:107 +#: ../../mod/editblock.php:124 +msgid "Permission settings" +msgstr "Impostazioni permessi" -#: ../../include/nav.php:149 -msgid "Matrix" -msgstr "La tua rete" +#: ../../include/conversation.php:1114 +msgid "permissions" +msgstr "permessi" -#: ../../include/nav.php:149 -msgid "Your matrix" -msgstr "La tua rete" +#: ../../include/conversation.php:1122 ../../mod/editlayout.php:118 +#: ../../mod/editwebpage.php:137 ../../mod/editpost.php:115 +#: ../../mod/editblock.php:133 +msgid "Public post" +msgstr "Articolo pubblico" -#: ../../include/nav.php:150 -msgid "See all matrix notifications" -msgstr "Notifiche dalla tua rete" +#: ../../include/conversation.php:1124 ../../mod/editlayout.php:124 +#: ../../mod/editwebpage.php:145 ../../mod/editpost.php:121 +#: ../../mod/editblock.php:139 +msgid "Example: bob@example.com, mary@example.com" +msgstr "Per esempio: mario@esempio.com, simona@esempio.com" -#: ../../include/nav.php:151 -msgid "Mark all matrix notifications seen" -msgstr "Segna come lette le notifiche della tua rete" +#: ../../include/conversation.php:1137 ../../mod/message.php:336 +#: ../../mod/message.php:519 ../../mod/editlayout.php:134 +#: ../../mod/editwebpage.php:155 ../../mod/editpost.php:132 +#: ../../mod/editblock.php:149 +msgid "Set expiration date" +msgstr "Data di scadenza" -#: ../../include/nav.php:153 -msgid "Channel Home" -msgstr "Bacheca del canale" +#: ../../include/conversation.php:1364 +msgid "Commented Order" +msgstr "Ultimi commenti" -#: ../../include/nav.php:153 -msgid "Channel home" -msgstr "Bacheca del canale" +#: ../../include/conversation.php:1367 +msgid "Sort by Comment Date" +msgstr "Per data del commento" -#: ../../include/nav.php:154 -msgid "See all channel notifications" -msgstr "Guarda le notifiche dei canali" +#: ../../include/conversation.php:1370 +msgid "Posted Order" +msgstr "Ultimi articoli" -#: ../../include/nav.php:155 -msgid "Mark all channel notifications seen" -msgstr "Segna come lette le notifiche dei canali" +#: ../../include/conversation.php:1373 +msgid "Sort by Post Date" +msgstr "Per data di creazione" -#: ../../include/nav.php:158 -msgid "Intros" -msgstr "Richieste" +#: ../../include/conversation.php:1377 ../../mod/notifications.php:86 +msgid "Personal" +msgstr "Personali" -#: ../../include/nav.php:158 ../../mod/connections.php:585 -msgid "New Connections" -msgstr "Nuovi contatti" +#: ../../include/conversation.php:1380 +msgid "Posts that mention or involve you" +msgstr "Articoli che ti riguardano o ti menzionano" -#: ../../include/nav.php:159 -msgid "See all channel introductions" -msgstr "Guarda tutte le richieste di amicizia" +#: ../../include/conversation.php:1383 ../../mod/menu.php:57 +#: ../../mod/connections.php:552 +msgid "New" +msgstr "Novità" -#: ../../include/nav.php:162 -msgid "Notices" -msgstr "Notifiche" +#: ../../include/conversation.php:1386 +msgid "Activity Stream - by date" +msgstr "Elenco attività - per data" -#: ../../include/nav.php:162 ../../mod/notifications.php:218 -msgid "Notifications" -msgstr "Notifiche" +#: ../../include/conversation.php:1393 +msgid "Starred" +msgstr "Preferiti" -#: ../../include/nav.php:163 -msgid "See all notifications" -msgstr "Vedi tutte le notifiche" +#: ../../include/conversation.php:1396 +msgid "Favourite Posts" +msgstr "Articoli preferiti" -#: ../../include/nav.php:164 -msgid "Mark all system notifications seen" -msgstr "Segna come lette le notifiche di sistema" +#: ../../include/conversation.php:1403 +msgid "Spam" +msgstr "Spam" -#: ../../include/nav.php:166 -msgid "Mail" -msgstr "Messaggi" +#: ../../include/conversation.php:1406 +msgid "Posts flagged as SPAM" +msgstr "Articoli marcati come spam" -#: ../../include/nav.php:166 -msgid "Private mail" -msgstr "Messaggi privati" +#: ../../include/conversation.php:1436 +msgid "Channel" +msgstr "Canale" -#: ../../include/nav.php:167 -msgid "See all private messages" -msgstr "Guarda tutti i messaggi privati" +#: ../../include/conversation.php:1439 +msgid "Status Messages and Posts" +msgstr "Articoli e messaggi di stato" -#: ../../include/nav.php:168 -msgid "Mark all private messages seen" -msgstr "Segna come letti tutti i messaggi privati" +#: ../../include/conversation.php:1443 +msgid "About" +msgstr "Informazioni" -#: ../../include/nav.php:169 -msgid "Inbox" -msgstr "In arrivo" +#: ../../include/conversation.php:1446 +msgid "Profile Details" +msgstr "Dettagli del profilo" -#: ../../include/nav.php:170 -msgid "Outbox" -msgstr "Inviati" +#: ../../include/conversation.php:1464 +msgid "Events and Calendar" +msgstr "Calendario eventi" -#: ../../include/nav.php:171 ../../mod/message.php:24 -msgid "New Message" -msgstr "Nuovo messaggio" +#: ../../include/conversation.php:1469 +msgid "Webpages" +msgstr "Pagine web" -#: ../../include/nav.php:174 ../../mod/events.php:348 ../../boot.php:2250 -msgid "Events" -msgstr "Eventi" +#: ../../include/conversation.php:1472 +msgid "Manage Webpages" +msgstr "Gestisci le pagine web" -#: ../../include/nav.php:174 -msgid "Event Calendar" -msgstr "Calendario" +#: ../../include/auth.php:69 +msgid "Logged out." +msgstr "Uscita effettuata." -#: ../../include/nav.php:175 -msgid "See all events" -msgstr "Guarda tutti gli eventi" +#: ../../include/auth.php:181 +msgid "Failed authentication" +msgstr "Autenticazione fallita" -#: ../../include/nav.php:176 -msgid "Mark all events seen" -msgstr "Marca come letti tutti gli eventi" +#: ../../include/auth.php:190 +msgid "Login failed." +msgstr "Accesso fallito." -#: ../../include/nav.php:178 -msgid "Channel Select" -msgstr "Gestisci i canali" +#: ../../include/contact_widgets.php:14 +#, php-format +msgid "You have %1$.0f of %2$.0f allowed connections." +msgstr "Hai attivato %1$.0f delle %2$.0f connessioni permesse." -#: ../../include/nav.php:178 -msgid "Manage Your Channels" -msgstr "Gestisci i contatti dei tuoi canali" - -#: ../../include/nav.php:180 ../../mod/settings.php:131 -#: ../../mod/admin.php:782 ../../mod/admin.php:987 -msgid "Settings" -msgstr "Impostazioni" - -#: ../../include/nav.php:180 -msgid "Account/Channel Settings" -msgstr "Impostazioni account e canali" +#: ../../include/contact_widgets.php:20 +msgid "Add New Connection" +msgstr "Aggiungi un contatto" -#: ../../include/nav.php:182 ../../mod/connections.php:691 -msgid "Connections" -msgstr "Contatti" +#: ../../include/contact_widgets.php:21 +msgid "Enter the channel address" +msgstr "Scrivi l'indirizzo del canale" -#: ../../include/nav.php:182 -msgid "Manage/Edit Friends and Connections" -msgstr "Modifica amici e contatti" +#: ../../include/contact_widgets.php:22 +msgid "Example: bob@example.com, http://example.com/barbara" +msgstr "Per esempio: mario@pippo.it oppure http://pluto.com/barbara" -#: ../../include/nav.php:189 ../../mod/admin.php:111 -msgid "Admin" -msgstr "Amministrazione" +#: ../../include/contact_widgets.php:38 +#, php-format +msgid "%d invitation available" +msgid_plural "%d invitations available" +msgstr[0] "%d invito disponibile" +msgstr[1] "%d inviti disponibili" -#: ../../include/nav.php:189 -msgid "Site Setup and Configuration" -msgstr "Configurazione del sito" +#: ../../include/contact_widgets.php:44 +msgid "Find Channels" +msgstr "Ricerca canali" -#: ../../include/nav.php:215 -msgid "Nothing new here" -msgstr "Niente di nuovo qui" +#: ../../include/contact_widgets.php:45 +msgid "Enter name or interest" +msgstr "Scrivi un nome o un interesse" -#: ../../include/nav.php:220 -msgid "Please wait..." -msgstr "Attendere..." +#: ../../include/contact_widgets.php:46 +msgid "Connect/Follow" +msgstr "Entra in contatto/segui" -#: ../../include/account.php:23 -msgid "Not a valid email address" -msgstr "Email non valida" +#: ../../include/contact_widgets.php:47 +msgid "Examples: Robert Morgenstein, Fishing" +msgstr "Per esempio: Mario Rossi, Pesca" -#: ../../include/account.php:25 -msgid "Your email domain is not among those allowed on this site" -msgstr "Il dominio della tua email attualmente non è permesso su questo sito" +#: ../../include/contact_widgets.php:48 ../../mod/connections.php:696 +#: ../../mod/directory.php:221 ../../mod/directory.php:226 +msgid "Find" +msgstr "Cerca" -#: ../../include/account.php:31 -msgid "Your email address is already registered at this site." -msgstr "La tua email è già registrata su questo sito." +#: ../../include/contact_widgets.php:49 ../../mod/suggest.php:64 +msgid "Channel Suggestions" +msgstr "Canali suggeriti" -#: ../../include/account.php:64 -msgid "An invitation is required." -msgstr "È necessario un invito." +#: ../../include/contact_widgets.php:51 +msgid "Random Profile" +msgstr "Profilo casuale" -#: ../../include/account.php:68 -msgid "Invitation could not be verified." -msgstr "L'invito non può essere verificato." +#: ../../include/contact_widgets.php:52 +msgid "Invite Friends" +msgstr "Invita amici" -#: ../../include/account.php:118 -msgid "Please enter the required information." -msgstr "Inserisci le informazioni richieste." +#: ../../include/contact_widgets.php:79 ../../include/contact_widgets.php:113 +msgid "Everything" +msgstr "Tutto" -#: ../../include/account.php:186 -msgid "Failed to store account information." -msgstr "Non è stato possibile salvare le informazioni del tuo account." +#: ../../include/contact_widgets.php:110 ../../include/widgets.php:26 +msgid "Categories" +msgstr "Categorie" -#: ../../include/account.php:272 +#: ../../include/contact_widgets.php:143 #, php-format -msgid "Registration request at %s" -msgstr "Richiesta di registrazione su %s" +msgid "%d connection in common" +msgid_plural "%d connections in common" +msgstr[0] "%d contatto in comune" +msgstr[1] "%d contatti in comune" -#: ../../include/account.php:274 ../../include/account.php:301 -#: ../../include/account.php:358 -msgid "Administrator" -msgstr "Amministratore" +#: ../../include/page_widgets.php:6 +msgid "New Page" +msgstr "Nuova pagina web" -#: ../../include/account.php:296 -msgid "your registration password" -msgstr "la password di registrazione" +#: ../../include/text.php:315 +msgid "prev" +msgstr "prec" -#: ../../include/account.php:299 ../../include/account.php:356 -#, php-format -msgid "Registration details for %s" -msgstr "Dettagli della registrazione di %s" +#: ../../include/text.php:317 +msgid "first" +msgstr "inizio" -#: ../../include/account.php:365 -msgid "Account approved." -msgstr "Account approvato." +#: ../../include/text.php:346 +msgid "last" +msgstr "fine" -#: ../../include/account.php:399 -#, php-format -msgid "Registration revoked for %s" -msgstr "Registrazione revocata per %s" +#: ../../include/text.php:349 +msgid "next" +msgstr "succ" -#: ../../include/conversation.php:123 -msgid "channel" -msgstr "canale" +#: ../../include/text.php:361 +msgid "older" +msgstr "più recenti" -#: ../../include/conversation.php:161 ../../mod/like.php:134 -#, php-format -msgid "%1$s likes %2$s's %3$s" -msgstr "A %1$s piace %3$s di %2$s" +#: ../../include/text.php:363 +msgid "newer" +msgstr "più nuovi" -#: ../../include/conversation.php:164 ../../mod/like.php:136 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" -msgstr "A %1$s non piace %3$s di %2$s" +#: ../../include/text.php:654 +msgid "No connections" +msgstr "Nessun contatto" -#: ../../include/conversation.php:201 +#: ../../include/text.php:665 #, php-format -msgid "%1$s is now connected with %2$s" -msgstr "%1$s adesso è connesso con %2$s" +msgid "%d Connection" +msgid_plural "%d Connections" +msgstr[0] "%d contatto" +msgstr[1] "%d contatti" -#: ../../include/conversation.php:232 -#, php-format -msgid "%1$s poked %2$s" -msgstr "%1$s ha mandato un poke a %2$s" +#: ../../include/text.php:677 +msgid "View Connections" +msgstr "Elenco contatti" -#: ../../include/conversation.php:254 ../../mod/mood.php:63 -#, php-format -msgid "%1$s is currently %2$s" -msgstr "%1$s al momento è %2$s" +#: ../../include/text.php:738 ../../mod/filer.php:36 +msgid "Save" +msgstr "Salva" -#: ../../include/conversation.php:658 -#, php-format -msgid "View %s's profile @ %s" -msgstr "Vedi il profilo di %s @ %s" +#: ../../include/text.php:776 +msgid "poke" +msgstr "poke" -#: ../../include/conversation.php:672 -msgid "Categories:" -msgstr "Categorie:" +#: ../../include/text.php:777 +msgid "ping" +msgstr "ping" -#: ../../include/conversation.php:673 -msgid "Filed under:" -msgstr "Classificato come:" +#: ../../include/text.php:777 +msgid "pinged" +msgstr "ha ricevuto un ping" -#: ../../include/conversation.php:700 -msgid "View in context" -msgstr "Vedi nel contesto" +#: ../../include/text.php:778 +msgid "prod" +msgstr "prod" -#: ../../include/conversation.php:826 -msgid "remove" -msgstr "rimuovi" +#: ../../include/text.php:778 +msgid "prodded" +msgstr "ha ricevuto un prod" -#: ../../include/conversation.php:830 -msgid "Loading..." -msgstr "Caricamento in corso..." +#: ../../include/text.php:779 +msgid "slap" +msgstr "schiaffo" -#: ../../include/conversation.php:831 -msgid "Delete Selected Items" -msgstr "Elimina gli oggetti selezionati" +#: ../../include/text.php:779 +msgid "slapped" +msgstr "ha ricevuto uno schiaffo" -#: ../../include/conversation.php:922 -msgid "View Source" -msgstr "Vedi il sorgente" +#: ../../include/text.php:780 +msgid "finger" +msgstr "finger" -#: ../../include/conversation.php:923 -msgid "Follow Thread" -msgstr "Segui la discussione" +#: ../../include/text.php:780 +msgid "fingered" +msgstr "ha ricevuto un finger" -#: ../../include/conversation.php:927 -msgid "Matrix Activity" -msgstr "Attività nella tua rete" +#: ../../include/text.php:781 +msgid "rebuff" +msgstr "rifiuto" -#: ../../include/conversation.php:992 -#, php-format -msgid "%s likes this." -msgstr "Piace a %s." +#: ../../include/text.php:781 +msgid "rebuffed" +msgstr "ha ricevuto un rifiuto" -#: ../../include/conversation.php:992 -#, php-format -msgid "%s doesn't like this." -msgstr "Non piace a %s." +#: ../../include/text.php:793 +msgid "happy" +msgstr "allegro" -#: ../../include/conversation.php:996 -#, php-format -msgid "%2$d people like this." -msgid_plural "%2$d people like this." -msgstr[0] "" -msgstr[1] "Piace a %2$d persone." +#: ../../include/text.php:794 +msgid "sad" +msgstr "triste" -#: ../../include/conversation.php:998 -#, php-format -msgid "%2$d people don't like this." -msgid_plural "%2$d people don't like this." -msgstr[0] "" -msgstr[1] "Non piace a %2$d persone." +#: ../../include/text.php:795 +msgid "mellow" +msgstr "calmo" -#: ../../include/conversation.php:1004 -msgid "and" -msgstr "e" +#: ../../include/text.php:796 +msgid "tired" +msgstr "stanco" -#: ../../include/conversation.php:1007 -#, php-format -msgid ", and %d other people" -msgid_plural ", and %d other people" -msgstr[0] "" -msgstr[1] "e altre %d persone" +#: ../../include/text.php:797 +msgid "perky" +msgstr "vivace" -#: ../../include/conversation.php:1008 -#, php-format -msgid "%s like this." -msgstr "Piace a %s." +#: ../../include/text.php:798 +msgid "angry" +msgstr "arrabbiato" -#: ../../include/conversation.php:1008 -#, php-format -msgid "%s don't like this." -msgstr "Non piace a %s." +#: ../../include/text.php:799 +msgid "stupified" +msgstr "stordito" -#: ../../include/conversation.php:1058 -msgid "Visible to everybody" -msgstr "Visibile a tutti" +#: ../../include/text.php:800 +msgid "puzzled" +msgstr "confuso" -#: ../../include/conversation.php:1059 ../../mod/message.php:281 -#: ../../mod/message.php:417 -msgid "Please enter a link URL:" -msgstr "Inserisci l'indirizzo del link:" +#: ../../include/text.php:801 +msgid "interested" +msgstr "attento" -#: ../../include/conversation.php:1060 -msgid "Please enter a video link/URL:" -msgstr "Inserisci l'indirizzo del video:" +#: ../../include/text.php:802 +msgid "bitter" +msgstr "amaro" -#: ../../include/conversation.php:1061 -msgid "Please enter an audio link/URL:" -msgstr "Inserisci l'indirizzo dell'audio:" +#: ../../include/text.php:803 +msgid "cheerful" +msgstr "allegro" -#: ../../include/conversation.php:1062 -msgid "Tag term:" -msgstr "Tag:" +#: ../../include/text.php:804 +msgid "alive" +msgstr "vivace" -#: ../../include/conversation.php:1063 ../../mod/filer.php:35 -msgid "Save to Folder:" -msgstr "Salva nella cartella:" +#: ../../include/text.php:805 +msgid "annoyed" +msgstr "seccato" -#: ../../include/conversation.php:1064 -msgid "Where are you right now?" -msgstr "Dove sei ora?" +#: ../../include/text.php:806 +msgid "anxious" +msgstr "ansioso" -#: ../../include/conversation.php:1065 ../../mod/message.php:282 -#: ../../mod/message.php:418 ../../mod/editpost.php:52 -msgid "Expires YYYY-MM-DD HH:MM" -msgstr "Scadenza il AAAA-MM-GG OO:MM" +#: ../../include/text.php:807 +msgid "cranky" +msgstr "irritabile" -#: ../../include/conversation.php:1089 ../../mod/photos.php:1060 -msgid "Share" -msgstr "Condividi" +#: ../../include/text.php:808 +msgid "disturbed" +msgstr "turbato" -#: ../../include/conversation.php:1091 -msgid "Page link title" -msgstr "Link del titolo" +#: ../../include/text.php:809 +msgid "frustrated" +msgstr "frustrato" -#: ../../include/conversation.php:1093 ../../mod/message.php:329 -#: ../../mod/message.php:512 ../../mod/editlayout.php:101 -#: ../../mod/editwebpage.php:120 ../../mod/editpost.php:98 -#: ../../mod/editblock.php:115 -msgid "Upload photo" -msgstr "Carica foto" +#: ../../include/text.php:810 +msgid "motivated" +msgstr "motivato" -#: ../../include/conversation.php:1094 -msgid "upload photo" -msgstr "carica foto" +#: ../../include/text.php:811 +msgid "relaxed" +msgstr "rilassato" -#: ../../include/conversation.php:1095 ../../mod/message.php:330 -#: ../../mod/message.php:513 ../../mod/editlayout.php:102 -#: ../../mod/editwebpage.php:121 ../../mod/editpost.php:99 -#: ../../mod/editblock.php:116 -msgid "Attach file" -msgstr "Allega file" +#: ../../include/text.php:812 +msgid "surprised" +msgstr "sorpreso" -#: ../../include/conversation.php:1096 -msgid "attach file" -msgstr "allega file" +#: ../../include/text.php:976 +msgid "Monday" +msgstr "lunedì" -#: ../../include/conversation.php:1097 ../../mod/message.php:331 -#: ../../mod/message.php:514 ../../mod/editlayout.php:103 -#: ../../mod/editwebpage.php:122 ../../mod/editpost.php:100 -#: ../../mod/editblock.php:117 -msgid "Insert web link" -msgstr "Inserisci un indirizzo web" +#: ../../include/text.php:976 +msgid "Tuesday" +msgstr "martedì" -#: ../../include/conversation.php:1098 -msgid "web link" -msgstr "link web" +#: ../../include/text.php:976 +msgid "Wednesday" +msgstr "mercoledì" -#: ../../include/conversation.php:1099 -msgid "Insert video link" -msgstr "Inserisci l'indirizzo di un video" +#: ../../include/text.php:976 +msgid "Thursday" +msgstr "giovedì" -#: ../../include/conversation.php:1100 -msgid "video link" -msgstr "link video" +#: ../../include/text.php:976 +msgid "Friday" +msgstr "venerdì" -#: ../../include/conversation.php:1101 -msgid "Insert audio link" -msgstr "Inserisci l'indirizzo di un audio" +#: ../../include/text.php:976 +msgid "Saturday" +msgstr "sabato" -#: ../../include/conversation.php:1102 -msgid "audio link" -msgstr "link audio" +#: ../../include/text.php:976 +msgid "Sunday" +msgstr "domenica" -#: ../../include/conversation.php:1103 ../../mod/editlayout.php:107 -#: ../../mod/editwebpage.php:126 ../../mod/editpost.php:104 -#: ../../mod/editblock.php:121 -msgid "Set your location" -msgstr "La tua località" +#: ../../include/text.php:980 +msgid "January" +msgstr "gennaio" -#: ../../include/conversation.php:1104 -msgid "set location" -msgstr "la tua località" +#: ../../include/text.php:980 +msgid "February" +msgstr "febbraio" -#: ../../include/conversation.php:1105 ../../mod/editlayout.php:108 -#: ../../mod/editwebpage.php:127 ../../mod/editpost.php:105 -#: ../../mod/editblock.php:122 -msgid "Clear browser location" -msgstr "Rimuovi la località data dal browser" +#: ../../include/text.php:980 +msgid "March" +msgstr "marzo" -#: ../../include/conversation.php:1106 -msgid "clear location" -msgstr "rimuovi la località" +#: ../../include/text.php:980 +msgid "April" +msgstr "aprile" -#: ../../include/conversation.php:1108 ../../mod/editlayout.php:121 -#: ../../mod/editwebpage.php:142 ../../mod/editpost.php:118 -#: ../../mod/editblock.php:136 -msgid "Set title" -msgstr "Scegli un titolo" +#: ../../include/text.php:980 +msgid "May" +msgstr "maggio" -#: ../../include/conversation.php:1111 ../../mod/editlayout.php:123 -#: ../../mod/editwebpage.php:144 ../../mod/editpost.php:120 -#: ../../mod/editblock.php:138 -msgid "Categories (comma-separated list)" -msgstr "Categorie (separate da virgola)" +#: ../../include/text.php:980 +msgid "June" +msgstr "giugno" -#: ../../include/conversation.php:1113 ../../mod/editlayout.php:110 -#: ../../mod/editwebpage.php:129 ../../mod/editpost.php:107 -#: ../../mod/editblock.php:124 -msgid "Permission settings" -msgstr "Impostazioni permessi" +#: ../../include/text.php:980 +msgid "July" +msgstr "luglio" -#: ../../include/conversation.php:1114 -msgid "permissions" -msgstr "permessi" +#: ../../include/text.php:980 +msgid "August" +msgstr "agosto" -#: ../../include/conversation.php:1122 ../../mod/editlayout.php:118 -#: ../../mod/editwebpage.php:137 ../../mod/editpost.php:115 -#: ../../mod/editblock.php:133 -msgid "Public post" -msgstr "Articolo pubblico" +#: ../../include/text.php:980 +msgid "September" +msgstr "settembre" -#: ../../include/conversation.php:1124 ../../mod/editlayout.php:124 -#: ../../mod/editwebpage.php:145 ../../mod/editpost.php:121 -#: ../../mod/editblock.php:139 -msgid "Example: bob@example.com, mary@example.com" -msgstr "Per esempio: mario@esempio.com, simona@esempio.com" +#: ../../include/text.php:980 +msgid "October" +msgstr "ottobre" -#: ../../include/conversation.php:1137 ../../mod/message.php:336 -#: ../../mod/message.php:519 ../../mod/editlayout.php:134 -#: ../../mod/editwebpage.php:155 ../../mod/editpost.php:132 -#: ../../mod/editblock.php:149 -msgid "Set expiration date" -msgstr "Data di scadenza" +#: ../../include/text.php:980 +msgid "November" +msgstr "novembre" -#: ../../include/auth.php:67 -msgid "Logged out." -msgstr "Uscita effettuata." +#: ../../include/text.php:980 +msgid "December" +msgstr "dicembre" -#: ../../include/auth.php:179 -msgid "Failed authentication" -msgstr "Autenticazione fallita" +#: ../../include/text.php:1058 ../../mod/message.php:453 +msgid "unknown.???" +msgstr "sconosciuto???" -#: ../../include/auth.php:188 -msgid "Login failed." -msgstr "Accesso fallito." +#: ../../include/text.php:1059 ../../mod/message.php:454 +msgid "bytes" +msgstr "byte" -#: ../../include/contact_widgets.php:14 -#, php-format -msgid "You have %1$.0f of %2$.0f allowed connections." -msgstr "Hai attivato %1$.0f delle %2$.0f connessioni permesse." +#: ../../include/text.php:1094 +msgid "remove category" +msgstr "rimuovi la categoria" -#: ../../include/contact_widgets.php:20 -msgid "Add New Connection" -msgstr "Aggiungi un contatto" +#: ../../include/text.php:1116 +msgid "remove from file" +msgstr "rimuovi dal file" -#: ../../include/contact_widgets.php:21 -msgid "Enter the channel address" -msgstr "Scrivi l'indirizzo del canale" +#: ../../include/text.php:1170 ../../include/text.php:1182 +msgid "Click to open/close" +msgstr "Clicca per aprire/chiudere" -#: ../../include/contact_widgets.php:22 -msgid "Example: bob@example.com, http://example.com/barbara" -msgstr "Per esempio: mario@pippo.it oppure http://pluto.com/barbara" +#: ../../include/text.php:1358 ../../mod/events.php:331 +msgid "link to source" +msgstr "Link all'originale" -#: ../../include/contact_widgets.php:38 -#, php-format -msgid "%d invitation available" -msgid_plural "%d invitations available" -msgstr[0] "%d invito disponibile" -msgstr[1] "%d inviti disponibili" - -#: ../../include/contact_widgets.php:44 -msgid "Find Channels" -msgstr "Ricerca canali" - -#: ../../include/contact_widgets.php:45 -msgid "Enter name or interest" -msgstr "Scrivi un nome o un interesse" - -#: ../../include/contact_widgets.php:46 -msgid "Connect/Follow" -msgstr "Entra in contatto/segui" +#: ../../include/text.php:1377 +msgid "Select a page layout: " +msgstr "Scegli il layout della pagina:" -#: ../../include/contact_widgets.php:47 -msgid "Examples: Robert Morgenstein, Fishing" -msgstr "Per esempio: Mario Rossi, Pesca" +#: ../../include/text.php:1380 ../../include/text.php:1445 +msgid "default" +msgstr "predefinito" -#: ../../include/contact_widgets.php:48 ../../mod/connections.php:697 -#: ../../mod/directory.php:221 ../../mod/directory.php:226 -msgid "Find" -msgstr "Cerca" +#: ../../include/text.php:1416 +msgid "Page content type: " +msgstr "Contenuto della pagina:" -#: ../../include/contact_widgets.php:49 ../../mod/suggest.php:64 -msgid "Channel Suggestions" -msgstr "Canali suggeriti" +#: ../../include/text.php:1457 +msgid "Select an alternate language" +msgstr "Seleziona una lingua diversa" -#: ../../include/contact_widgets.php:51 -msgid "Random Profile" -msgstr "Profilo casuale" +#: ../../include/text.php:1622 +msgid "activity" +msgstr "l'attività" -#: ../../include/contact_widgets.php:52 -msgid "Invite Friends" -msgstr "Invita amici" +#: ../../include/text.php:1884 +msgid "Design" +msgstr "Design" -#: ../../include/contact_widgets.php:79 ../../include/contact_widgets.php:113 -msgid "Everything" -msgstr "Tutto" +#: ../../include/text.php:1886 +msgid "Blocks" +msgstr "Riquadri" -#: ../../include/contact_widgets.php:110 ../../include/widgets.php:26 -msgid "Categories" -msgstr "Categorie" +#: ../../include/text.php:1887 +msgid "Menus" +msgstr "Menù" -#: ../../include/contact_widgets.php:143 -#, php-format -msgid "%d connection in common" -msgid_plural "%d connections in common" -msgstr[0] "%d contatto in comune" -msgstr[1] "%d contatti in comune" +#: ../../include/text.php:1888 +msgid "Layouts" +msgstr "Layout" -#: ../../include/page_widgets.php:6 -msgid "New Page" -msgstr "Nuova pagina web" +#: ../../include/text.php:1889 +msgid "Pages" +msgstr "Pagine" #: ../../include/follow.php:21 msgid "Channel is blocked on this site." @@ -2735,15 +2665,15 @@ msgstr "ama" msgid "dislikes" msgstr "non ama" -#: ../../include/plugin.php:473 ../../include/plugin.php:475 +#: ../../include/plugin.php:475 ../../include/plugin.php:477 msgid "Click here to upgrade." msgstr "Clicca qui per aggiornare." -#: ../../include/plugin.php:481 +#: ../../include/plugin.php:483 msgid "This action exceeds the limits set by your subscription plan." msgstr "Questa operazione esce dai termini del tuo abbonamento." -#: ../../include/plugin.php:486 +#: ../../include/plugin.php:488 msgid "This action is not available under your subscription plan." msgstr "Questa operazione non è prevista dal tuo abbonamento." @@ -2752,6 +2682,233 @@ msgstr "Questa operazione non è prevista dal tuo abbonamento." msgid "Default" msgstr "Predefinito" +#: ../../include/identity.php:29 ../../mod/item.php:1148 +msgid "Unable to obtain identity information from database" +msgstr "Impossibile ottenere le informazioni di identificazione dal database" + +#: ../../include/identity.php:62 +msgid "Empty name" +msgstr "Nome vuoto" + +#: ../../include/identity.php:64 +msgid "Name too long" +msgstr "Nome troppo lungo" + +#: ../../include/identity.php:132 +msgid "No account identifier" +msgstr "Account senza identificativo" + +#: ../../include/identity.php:142 +msgid "Nickname is required." +msgstr "Il nome dell'account è obbligatorio." + +#: ../../include/identity.php:156 +msgid "" +"Nickname has unsupported characters or is already being used on this site." +msgstr "Il nome dell'account è già in uso oppure ha dei caratteri non supportati." + +#: ../../include/identity.php:215 +msgid "Unable to retrieve created identity" +msgstr "Impossibile caricare l'identità creata" + +#: ../../include/identity.php:273 +msgid "Default Profile" +msgstr "Profilo predefinito" + +#: ../../include/identity.php:465 +msgid "Requested channel is not available." +msgstr "Il canale che cerchi non è disponibile." + +#: ../../include/identity.php:477 +msgid " Sorry, you don't have the permission to view this profile. " +msgstr "Purtroppo non hai il permesso di vedere questo profilo." + +#: ../../include/identity.php:512 ../../mod/webpages.php:8 +#: ../../mod/connect.php:13 ../../mod/layouts.php:8 +#: ../../mod/filestorage.php:8 ../../mod/blocks.php:10 +#: ../../mod/profile.php:16 +msgid "Requested profile is not available." +msgstr "Il profilo richiesto non è disponibile." + +#: ../../include/identity.php:627 ../../mod/profiles.php:624 +msgid "Change profile photo" +msgstr "Cambia la foto del profilo" + +#: ../../include/identity.php:633 +msgid "Profiles" +msgstr "Profili" + +#: ../../include/identity.php:633 +msgid "Manage/edit profiles" +msgstr "Gestisci/modifica i profili" + +#: ../../include/identity.php:634 ../../mod/profiles.php:625 +msgid "Create New Profile" +msgstr "Crea un nuovo profilo" + +#: ../../include/identity.php:637 +msgid "Edit Profile" +msgstr "Modifica il profilo" + +#: ../../include/identity.php:648 ../../mod/profiles.php:636 +msgid "Profile Image" +msgstr "Immagine del profilo" + +#: ../../include/identity.php:651 ../../mod/profiles.php:639 +msgid "visible to everybody" +msgstr "visibile a tutti" + +#: ../../include/identity.php:652 ../../mod/profiles.php:640 +msgid "Edit visibility" +msgstr "Cambia la visibilità" + +#: ../../include/identity.php:665 ../../include/identity.php:883 +#: ../../mod/directory.php:175 +msgid "Gender:" +msgstr "Sesso:" + +#: ../../include/identity.php:666 ../../include/identity.php:903 +#: ../../mod/directory.php:177 +msgid "Status:" +msgstr "Stato:" + +#: ../../include/identity.php:667 ../../include/identity.php:914 +#: ../../mod/directory.php:179 +msgid "Homepage:" +msgstr "Home page:" + +#: ../../include/identity.php:730 ../../include/identity.php:810 +#: ../../mod/ping.php:230 +msgid "g A l F d" +msgstr "g A l d F" + +#: ../../include/identity.php:731 ../../include/identity.php:811 +msgid "F d" +msgstr "d F" + +#: ../../include/identity.php:776 ../../include/identity.php:851 +#: ../../mod/ping.php:252 +msgid "[today]" +msgstr "[oggi]" + +#: ../../include/identity.php:788 +msgid "Birthday Reminders" +msgstr "Promemoria compleanni" + +#: ../../include/identity.php:789 +msgid "Birthdays this week:" +msgstr "Compleanni questa settimana:" + +#: ../../include/identity.php:844 +msgid "[No description]" +msgstr "[Nessuna descrizione]" + +#: ../../include/identity.php:862 +msgid "Event Reminders" +msgstr "Promemoria" + +#: ../../include/identity.php:863 +msgid "Events this week:" +msgstr "Eventi di questa settimana:" + +#: ../../include/identity.php:873 ../../include/identity.php:984 +#: ../../mod/profperm.php:112 +msgid "Profile" +msgstr "Profilo" + +#: ../../include/identity.php:881 ../../mod/settings.php:1013 +msgid "Full Name:" +msgstr "Nome completo:" + +#: ../../include/identity.php:888 +msgid "j F, Y" +msgstr "j F Y" + +#: ../../include/identity.php:889 +msgid "j F" +msgstr "j F" + +#: ../../include/identity.php:896 +msgid "Birthday:" +msgstr "Compleanno:" + +#: ../../include/identity.php:900 +msgid "Age:" +msgstr "Età:" + +#: ../../include/identity.php:909 +#, php-format +msgid "for %1$d %2$s" +msgstr "per %1$d %2$s" + +#: ../../include/identity.php:912 ../../mod/profiles.php:549 +msgid "Sexual Preference:" +msgstr "Preferenze sessuali:" + +#: ../../include/identity.php:916 ../../mod/profiles.php:551 +msgid "Hometown:" +msgstr "Città dove vivo:" + +#: ../../include/identity.php:918 +msgid "Tags:" +msgstr "Tag:" + +#: ../../include/identity.php:920 ../../mod/profiles.php:552 +msgid "Political Views:" +msgstr "Orientamento politico:" + +#: ../../include/identity.php:922 +msgid "Religion:" +msgstr "Religione:" + +#: ../../include/identity.php:924 ../../mod/directory.php:181 +msgid "About:" +msgstr "Informazioni:" + +#: ../../include/identity.php:926 +msgid "Hobbies/Interests:" +msgstr "Interessi e hobby:" + +#: ../../include/identity.php:928 ../../mod/profiles.php:555 +msgid "Likes:" +msgstr "Mi piace:" + +#: ../../include/identity.php:930 ../../mod/profiles.php:556 +msgid "Dislikes:" +msgstr "Non mi piace:" + +#: ../../include/identity.php:933 +msgid "Contact information and Social Networks:" +msgstr "Contatti e social network:" + +#: ../../include/identity.php:935 +msgid "Musical interests:" +msgstr "Gusti musicali:" + +#: ../../include/identity.php:937 +msgid "Books, literature:" +msgstr "Libri, letteratura:" + +#: ../../include/identity.php:939 +msgid "Television:" +msgstr "Televisione:" + +#: ../../include/identity.php:941 +msgid "Film/dance/culture/entertainment:" +msgstr "Film, danza, cultura, intrattenimento:" + +#: ../../include/identity.php:943 +msgid "Love/Romance:" +msgstr "Amore:" + +#: ../../include/identity.php:945 +msgid "Work/employment:" +msgstr "Lavoro:" + +#: ../../include/identity.php:947 +msgid "School/education:" +msgstr "Scuola:" + #: ../../include/security.php:49 msgid "Welcome " msgstr "Ciao" @@ -2775,25 +2932,25 @@ msgstr "L'identificativo di sicurezza del modulo che hai riempito non è corrett msgid "Permission denied" msgstr "Permesso negato" -#: ../../include/items.php:3546 ../../mod/admin.php:150 +#: ../../include/items.php:3350 ../../mod/admin.php:150 #: ../../mod/admin.php:727 ../../mod/admin.php:930 ../../mod/viewsrc.php:18 #: ../../mod/home.php:64 ../../mod/display.php:32 msgid "Item not found." msgstr "Elemento non trovato." -#: ../../include/items.php:3729 +#: ../../include/items.php:3533 msgid "Archives" msgstr "Archivi" -#: ../../include/items.php:3895 ../../mod/group.php:44 ../../mod/group.php:146 +#: ../../include/items.php:3699 ../../mod/group.php:44 ../../mod/group.php:146 msgid "Collection not found." msgstr "Insieme non trovato." -#: ../../include/items.php:3911 ../../mod/network.php:469 +#: ../../include/items.php:3715 ../../mod/network.php:288 msgid "Group is empty" msgstr "L'insieme è vuoto" -#: ../../include/items.php:3927 +#: ../../include/items.php:3731 msgid "Connection not found." msgstr "Contatto non trovato." @@ -2837,72 +2994,72 @@ msgstr "Contatti in comune" msgid "No connections in common." msgstr "Nessun contatto in comune." -#: ../../mod/events.php:66 +#: ../../mod/events.php:71 msgid "Event title and start time are required." msgstr "Sono necessari il titolo e l'ora d'inizio dell'evento." -#: ../../mod/events.php:281 +#: ../../mod/events.php:286 msgid "l, F j" msgstr "l j F" -#: ../../mod/events.php:303 +#: ../../mod/events.php:308 msgid "Edit event" msgstr "Modifica l'evento" -#: ../../mod/events.php:349 +#: ../../mod/events.php:354 msgid "Create New Event" msgstr "Crea un nuovo evento" -#: ../../mod/events.php:350 +#: ../../mod/events.php:355 msgid "Previous" msgstr "Precendente" -#: ../../mod/events.php:351 ../../mod/setup.php:256 +#: ../../mod/events.php:356 ../../mod/setup.php:256 msgid "Next" msgstr "Successivo" -#: ../../mod/events.php:425 +#: ../../mod/events.php:428 msgid "hour:minute" msgstr "ora:minuti" -#: ../../mod/events.php:435 +#: ../../mod/events.php:447 msgid "Event details" msgstr "Dettagli evento" -#: ../../mod/events.php:436 +#: ../../mod/events.php:448 #, php-format msgid "Format is %s %s. Starting date and Title are required." msgstr "Il formato è %s %s. L'inizio e il titolo sono obbligatori." -#: ../../mod/events.php:438 +#: ../../mod/events.php:450 msgid "Event Starts:" msgstr "Inizio:" -#: ../../mod/events.php:438 ../../mod/events.php:452 +#: ../../mod/events.php:450 ../../mod/events.php:464 msgid "Required" msgstr "Obbligatorio" -#: ../../mod/events.php:441 +#: ../../mod/events.php:453 msgid "Finish date/time is not known or not relevant" msgstr "La data/ora di fine non è rilevante" -#: ../../mod/events.php:443 +#: ../../mod/events.php:455 msgid "Event Finishes:" msgstr "Fine:" -#: ../../mod/events.php:446 +#: ../../mod/events.php:458 msgid "Adjust for viewer timezone" msgstr "Adatta al fuso orario di chi legge" -#: ../../mod/events.php:448 +#: ../../mod/events.php:460 msgid "Description:" msgstr "Descrizione:" -#: ../../mod/events.php:452 +#: ../../mod/events.php:464 msgid "Title:" msgstr "Titolo:" -#: ../../mod/events.php:454 +#: ../../mod/events.php:466 msgid "Share this event" msgstr "Condividi questo evento" @@ -3034,12 +3191,6 @@ msgstr "Amici di %s" msgid "No friends to display." msgstr "Nessun amico da visualizzare." -#: ../../mod/webpages.php:8 ../../mod/connect.php:13 ../../mod/layouts.php:8 -#: ../../mod/filestorage.php:8 ../../mod/blocks.php:10 ../../mod/profile.php:8 -#: ../../boot.php:1640 -msgid "Requested profile is not available." -msgstr "Il profilo richiesto non è disponibile." - #: ../../mod/webpages.php:104 ../../mod/layouts.php:105 #: ../../mod/blocks.php:96 msgid "View" @@ -3063,21 +3214,17 @@ msgid "" " and/or create new posts for you?" msgstr "Vuoi autorizzare questa app ad accedere ai messaggi e ai contatti o creare nuovi messaggi per te?" -#: ../../mod/api.php:105 ../../mod/settings.php:1009 -#: ../../mod/settings.php:1014 ../../mod/settings.php:1037 -#: ../../mod/settings.php:1039 ../../mod/settings.php:1040 -#: ../../mod/settings.php:1041 ../../mod/profiles.php:506 +#: ../../mod/api.php:105 ../../mod/settings.php:967 ../../mod/settings.php:972 +#: ../../mod/profiles.php:506 msgid "Yes" msgstr "Si" -#: ../../mod/api.php:106 ../../mod/settings.php:1009 -#: ../../mod/settings.php:1014 ../../mod/settings.php:1037 -#: ../../mod/settings.php:1039 ../../mod/settings.php:1040 -#: ../../mod/settings.php:1041 ../../mod/profiles.php:507 +#: ../../mod/api.php:106 ../../mod/settings.php:967 ../../mod/settings.php:972 +#: ../../mod/profiles.php:507 msgid "No" msgstr "No" -#: ../../mod/lastpost.php:16 ../../mod/channel.php:16 +#: ../../mod/lastpost.php:16 ../../mod/channel.php:25 msgid "You must be logged in to see this page." msgstr "Devi aver effettuato l'accesso per vedere questa pagina." @@ -3094,11 +3241,11 @@ msgid "Invalid item." msgstr "Elemento non valido." #: ../../mod/page.php:47 ../../mod/chanview.php:78 ../../mod/home.php:51 -#: ../../mod/magic.php:95 ../../mod/wall_upload.php:35 +#: ../../mod/wall_upload.php:35 msgid "Channel not found." msgstr "Canale non trovato." -#: ../../mod/page.php:83 ../../mod/help.php:56 ../../mod/display.php:92 +#: ../../mod/page.php:83 ../../mod/help.php:56 ../../mod/display.php:100 #: ../../index.php:229 msgid "Page not found." msgstr "Pagina non trovata." @@ -3502,421 +3649,389 @@ msgstr "Permessi predefiniti (avanzato)" msgid "Premium Channel Settings" msgstr "Canale premium - impostazioni" -#: ../../mod/settings.php:171 +#: ../../mod/settings.php:173 msgid "Name is required" msgstr "Il nome è obbligatorio" -#: ../../mod/settings.php:175 +#: ../../mod/settings.php:177 msgid "Key and Secret are required" msgstr "Chiave e Segreto sono richiesti" -#: ../../mod/settings.php:179 ../../mod/settings.php:677 +#: ../../mod/settings.php:181 ../../mod/settings.php:635 msgid "Update" msgstr "Aggiorna" -#: ../../mod/settings.php:292 +#: ../../mod/settings.php:294 msgid "Passwords do not match. Password unchanged." msgstr "Le password non corrispondono. Password non cambiata." -#: ../../mod/settings.php:296 +#: ../../mod/settings.php:298 msgid "Empty passwords are not allowed. Password unchanged." msgstr "Le password non possono essere vuote. Password non cambiata." -#: ../../mod/settings.php:309 +#: ../../mod/settings.php:311 msgid "Password changed." msgstr "Password cambiata." -#: ../../mod/settings.php:311 +#: ../../mod/settings.php:313 msgid "Password update failed. Please try again." msgstr "Aggiornamento password fallito. Prova ancora." -#: ../../mod/settings.php:325 +#: ../../mod/settings.php:327 msgid "Not valid email." msgstr "Email non valida." -#: ../../mod/settings.php:328 +#: ../../mod/settings.php:330 msgid "Protected email address. Cannot change to that email." msgstr "È un indirizzo email riservato. Non puoi sceglierlo." -#: ../../mod/settings.php:337 +#: ../../mod/settings.php:339 msgid "System failure storing new email. Please try again." msgstr "Errore di sistema. Non è stato possibile memorizzare il tuo messaggio, riprova per favore." -#: ../../mod/settings.php:579 +#: ../../mod/settings.php:537 msgid "Settings updated." msgstr "Impostazioni aggiornate." -#: ../../mod/settings.php:650 ../../mod/settings.php:676 -#: ../../mod/settings.php:712 +#: ../../mod/settings.php:608 ../../mod/settings.php:634 +#: ../../mod/settings.php:670 msgid "Add application" msgstr "Aggiungi una app" -#: ../../mod/settings.php:652 ../../mod/settings.php:678 +#: ../../mod/settings.php:610 ../../mod/settings.php:636 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/fbrowser.php:82 #: ../../mod/fbrowser.php:117 msgid "Cancel" msgstr "Annulla" -#: ../../mod/settings.php:653 ../../mod/settings.php:679 +#: ../../mod/settings.php:611 ../../mod/settings.php:637 #: ../../mod/admin.php:686 ../../mod/crepair.php:148 msgid "Name" msgstr "Nome" -#: ../../mod/settings.php:653 +#: ../../mod/settings.php:611 msgid "Name of application" msgstr "Nome dell'applicazione" -#: ../../mod/settings.php:654 ../../mod/settings.php:680 +#: ../../mod/settings.php:612 ../../mod/settings.php:638 msgid "Consumer Key" msgstr "Consumer Key" -#: ../../mod/settings.php:654 ../../mod/settings.php:655 +#: ../../mod/settings.php:612 ../../mod/settings.php:613 msgid "Automatically generated - change if desired. Max length 20" msgstr "Generato automaticamente - è possibile cambiarlo. Lunghezza massima 20" -#: ../../mod/settings.php:655 ../../mod/settings.php:681 +#: ../../mod/settings.php:613 ../../mod/settings.php:639 msgid "Consumer Secret" msgstr "Consumer Secret" -#: ../../mod/settings.php:656 ../../mod/settings.php:682 +#: ../../mod/settings.php:614 ../../mod/settings.php:640 msgid "Redirect" msgstr "Redirect" -#: ../../mod/settings.php:656 +#: ../../mod/settings.php:614 msgid "" "Redirect URI - leave blank unless your application specifically requires " "this" msgstr "URI ridirezionato - lasciare bianco se non richiesto specificamente dall'applicazione." -#: ../../mod/settings.php:657 ../../mod/settings.php:683 +#: ../../mod/settings.php:615 ../../mod/settings.php:641 msgid "Icon url" msgstr "Url icona" -#: ../../mod/settings.php:657 +#: ../../mod/settings.php:615 msgid "Optional" msgstr "Opzionale" -#: ../../mod/settings.php:668 +#: ../../mod/settings.php:626 msgid "You can't edit this application." msgstr "Non puoi modificare questa applicazione." -#: ../../mod/settings.php:711 +#: ../../mod/settings.php:669 msgid "Connected Apps" msgstr "App connesse" -#: ../../mod/settings.php:715 +#: ../../mod/settings.php:673 msgid "Client key starts with" msgstr "La client key inizia con" -#: ../../mod/settings.php:716 +#: ../../mod/settings.php:674 msgid "No name" msgstr "Nessun nome" -#: ../../mod/settings.php:717 +#: ../../mod/settings.php:675 msgid "Remove authorization" msgstr "Revoca l'autorizzazione" -#: ../../mod/settings.php:728 +#: ../../mod/settings.php:686 msgid "No feature settings configured" msgstr "Non ci sono funzionalità aggiuntive personalizzabili" -#: ../../mod/settings.php:736 +#: ../../mod/settings.php:694 msgid "Feature Settings" msgstr "Impostazioni aggiuntive" -#: ../../mod/settings.php:759 +#: ../../mod/settings.php:717 msgid "Account Settings" msgstr "Impostazioni account" -#: ../../mod/settings.php:760 +#: ../../mod/settings.php:718 msgid "Password Settings" msgstr "Impostazioni password" -#: ../../mod/settings.php:761 +#: ../../mod/settings.php:719 msgid "New Password:" msgstr "Nuova password:" -#: ../../mod/settings.php:762 +#: ../../mod/settings.php:720 msgid "Confirm:" msgstr "Conferma:" -#: ../../mod/settings.php:762 +#: ../../mod/settings.php:720 msgid "Leave password fields blank unless changing" msgstr "Lascia questi campi in bianco per non cambiare la password" -#: ../../mod/settings.php:764 ../../mod/settings.php:1063 +#: ../../mod/settings.php:722 ../../mod/settings.php:1014 msgid "Email Address:" msgstr "Indirizzo email:" -#: ../../mod/settings.php:765 +#: ../../mod/settings.php:723 msgid "Remove Account" msgstr "Elimina l'account" -#: ../../mod/settings.php:766 +#: ../../mod/settings.php:724 msgid "Warning: This action is permanent and cannot be reversed." msgstr "Attenzione: questa azione è permanente e non potrà più essere annullata." -#: ../../mod/settings.php:782 +#: ../../mod/settings.php:740 msgid "Off" msgstr "Off" -#: ../../mod/settings.php:782 +#: ../../mod/settings.php:740 msgid "On" msgstr "On" -#: ../../mod/settings.php:789 +#: ../../mod/settings.php:747 msgid "Additional Features" msgstr "Funzionalità aggiuntive" -#: ../../mod/settings.php:814 +#: ../../mod/settings.php:772 msgid "Connector Settings" msgstr "Impostazioni del connettore" -#: ../../mod/settings.php:844 ../../mod/admin.php:369 +#: ../../mod/settings.php:802 ../../mod/admin.php:369 msgid "No special theme for mobile devices" msgstr "Nessun tema per dispositivi mobili" -#: ../../mod/settings.php:884 +#: ../../mod/settings.php:842 msgid "Display Settings" msgstr "Impostazioni grafiche" -#: ../../mod/settings.php:890 +#: ../../mod/settings.php:848 msgid "Display Theme:" msgstr "Tema per monitor:" -#: ../../mod/settings.php:891 +#: ../../mod/settings.php:849 msgid "Mobile Theme:" msgstr "Tema per dispositivi mobili:" -#: ../../mod/settings.php:892 +#: ../../mod/settings.php:850 msgid "Update browser every xx seconds" msgstr "Aggiorna il browser ogni x secondi" -#: ../../mod/settings.php:892 +#: ../../mod/settings.php:850 msgid "Minimum of 10 seconds, no maximum" msgstr "Minimo 10 secondi, nessun limite massimo" -#: ../../mod/settings.php:893 +#: ../../mod/settings.php:851 msgid "Maximum number of conversations to load at any time:" msgstr "Massimo numero di conversazioni da mostrare ogni volta:" -#: ../../mod/settings.php:893 +#: ../../mod/settings.php:851 msgid "Maximum of 100 items" msgstr "Massimo 100" -#: ../../mod/settings.php:894 +#: ../../mod/settings.php:852 msgid "Don't show emoticons" msgstr "Non mostrare le emoticons" -#: ../../mod/settings.php:930 +#: ../../mod/settings.php:888 msgid "Nobody except yourself" msgstr "Nessuno tranne te" -#: ../../mod/settings.php:931 +#: ../../mod/settings.php:889 msgid "Only those you specifically allow" msgstr "Solo chi riceve il mio permesso" -#: ../../mod/settings.php:932 +#: ../../mod/settings.php:890 msgid "Anybody in your address book" msgstr "Chiunque tra i miei contatti" -#: ../../mod/settings.php:933 +#: ../../mod/settings.php:891 msgid "Anybody on this website" msgstr "Chiunque su questo sito" -#: ../../mod/settings.php:934 +#: ../../mod/settings.php:892 msgid "Anybody in this network" msgstr "Chiunque su Red" -#: ../../mod/settings.php:935 +#: ../../mod/settings.php:893 msgid "Anybody on the internet" msgstr "Chiunque su internet" -#: ../../mod/settings.php:1009 +#: ../../mod/settings.php:967 msgid "Publish your default profile in the network directory" msgstr "Pubblica il mio profilo predefinito sull'elenco pubblico dei canali" -#: ../../mod/settings.php:1014 +#: ../../mod/settings.php:972 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "Vuoi essere suggerito come potenziale amico ai nuovi membri?" -#: ../../mod/settings.php:1018 ../../mod/profile_photo.php:298 +#: ../../mod/settings.php:976 ../../mod/profile_photo.php:298 msgid "or" msgstr "o" -#: ../../mod/settings.php:1023 +#: ../../mod/settings.php:981 msgid "Your channel address is" msgstr "L'indirizzo del tuo canale è" -#: ../../mod/settings.php:1034 -msgid "Automatically expire posts after this many days:" -msgstr "Gli articoli scadono automaticamente dopo questo numero di giorni:" +#: ../../mod/settings.php:1003 +msgid "Channel Settings" +msgstr "Impostazioni del canale" -#: ../../mod/settings.php:1034 -msgid "If empty, posts will not expire. Expired posts will be deleted" -msgstr "Se lasci vuoto, i messaggi non scadranno mai. I messaggi scaduti saranno eliminati." +#: ../../mod/settings.php:1012 +msgid "Basic Settings" +msgstr "Impostazioni di base" -#: ../../mod/settings.php:1035 -msgid "Advanced expiration settings" -msgstr "Impostazioni avanzate di scandenza" - -#: ../../mod/settings.php:1036 -msgid "Advanced Expiration" -msgstr "Scadenza" - -#: ../../mod/settings.php:1037 -msgid "Expire posts:" -msgstr "Fai scadere gli articoli:" - -#: ../../mod/settings.php:1039 -msgid "Expire starred posts:" -msgstr "Fai scadere gli articoli preferiti:" - -#: ../../mod/settings.php:1040 -msgid "Expire photos:" -msgstr "Fai scadere le foto:" - -#: ../../mod/settings.php:1041 -msgid "Only expire posts by others:" -msgstr "Fai scadere solo gli articoli scritti da altri:" - -#: ../../mod/settings.php:1052 -msgid "Channel Settings" -msgstr "Impostazioni del canale" - -#: ../../mod/settings.php:1061 -msgid "Basic Settings" -msgstr "Impostazioni di base" - -#: ../../mod/settings.php:1064 +#: ../../mod/settings.php:1015 msgid "Your Timezone:" msgstr "Il tuo fuso orario:" -#: ../../mod/settings.php:1065 +#: ../../mod/settings.php:1016 msgid "Default Post Location:" msgstr "Località predefinita:" -#: ../../mod/settings.php:1066 +#: ../../mod/settings.php:1017 msgid "Use Browser Location:" msgstr "Usa la località rilevata dal browser:" -#: ../../mod/settings.php:1068 +#: ../../mod/settings.php:1019 msgid "Adult Content" msgstr "Contenuto per adulti" -#: ../../mod/settings.php:1068 +#: ../../mod/settings.php:1019 msgid "This channel publishes adult content." msgstr "Questo canale pubblica contenuto per adulti." -#: ../../mod/settings.php:1070 +#: ../../mod/settings.php:1021 msgid "Security and Privacy Settings" msgstr "Impostazioni di sicurezza e privacy" -#: ../../mod/settings.php:1072 +#: ../../mod/settings.php:1023 msgid "Quick Privacy Settings:" msgstr "Impostazioni veloci della privacy:" -#: ../../mod/settings.php:1073 +#: ../../mod/settings.php:1024 msgid "Very Public - extremely permissive" msgstr "Tutto pubblico - molto permissivo" -#: ../../mod/settings.php:1074 +#: ../../mod/settings.php:1025 msgid "Typical - default public, privacy when desired" msgstr "Normale - tutto sarà pubblico tranne quel che vorrai tu" -#: ../../mod/settings.php:1075 +#: ../../mod/settings.php:1026 msgid "Private - default private, rarely open or public" msgstr "Privato - i contenuti saranno privati ma, se vorrai, alcuni potrai renderli pubblici" -#: ../../mod/settings.php:1076 +#: ../../mod/settings.php:1027 msgid "Blocked - default blocked to/from everybody" msgstr "Bloccato - non ci saranno interazioni con altri a meno che tu non voglia" -#: ../../mod/settings.php:1079 +#: ../../mod/settings.php:1030 msgid "Maximum Friend Requests/Day:" msgstr "Numero massimo giornaliero di richieste di amicizia:" -#: ../../mod/settings.php:1079 +#: ../../mod/settings.php:1030 msgid "May reduce spam activity" msgstr "Serve e ridurre lo spam" -#: ../../mod/settings.php:1080 +#: ../../mod/settings.php:1031 msgid "Default Post Permissions" msgstr "Permessi predefiniti per gli articoli" -#: ../../mod/settings.php:1081 +#: ../../mod/settings.php:1032 msgid "(click to open/close)" msgstr "(clicca per aprire/chiudere)" -#: ../../mod/settings.php:1094 +#: ../../mod/settings.php:1043 msgid "Maximum private messages per day from unknown people:" msgstr "Numero massimo giornaliero di messaggi privati da utenti sconosciuti:" -#: ../../mod/settings.php:1094 +#: ../../mod/settings.php:1043 msgid "Useful to reduce spamming" msgstr "Serve e ridurre lo spam" -#: ../../mod/settings.php:1097 +#: ../../mod/settings.php:1046 msgid "Notification Settings" msgstr "Impostazioni di notifica" -#: ../../mod/settings.php:1098 +#: ../../mod/settings.php:1047 msgid "By default post a status message when:" msgstr "Pubblica un messaggio di stato quando:" -#: ../../mod/settings.php:1099 +#: ../../mod/settings.php:1048 msgid "accepting a friend request" msgstr "accetto una nuova amicizia" -#: ../../mod/settings.php:1100 +#: ../../mod/settings.php:1049 msgid "joining a forum/community" msgstr "entro a far parte di un forum" -#: ../../mod/settings.php:1101 +#: ../../mod/settings.php:1050 msgid "making an interesting profile change" msgstr "faccio un cambiamento interessante al mio profilo" -#: ../../mod/settings.php:1102 +#: ../../mod/settings.php:1051 msgid "Send a notification email when:" msgstr "Invia una email di notifica quando:" -#: ../../mod/settings.php:1103 +#: ../../mod/settings.php:1052 msgid "You receive an introduction" msgstr "Ricevi una richiesta di amicizia" -#: ../../mod/settings.php:1104 +#: ../../mod/settings.php:1053 msgid "Your introductions are confirmed" msgstr "Le tue richieste di amicizia sono state accettate" -#: ../../mod/settings.php:1105 +#: ../../mod/settings.php:1054 msgid "Someone writes on your profile wall" msgstr "Qualcuno scrive sulla tua bacheca" -#: ../../mod/settings.php:1106 +#: ../../mod/settings.php:1055 msgid "Someone writes a followup comment" msgstr "Qualcuno scrive un commento a un tuo articolo" -#: ../../mod/settings.php:1107 +#: ../../mod/settings.php:1056 msgid "You receive a private message" msgstr "Ricevi un messaggio privato" -#: ../../mod/settings.php:1108 +#: ../../mod/settings.php:1057 msgid "You receive a friend suggestion" msgstr "Ti viene suggerito un amico" -#: ../../mod/settings.php:1109 +#: ../../mod/settings.php:1058 msgid "You are tagged in a post" msgstr "Sei taggato in un articolo" -#: ../../mod/settings.php:1110 +#: ../../mod/settings.php:1059 msgid "You are poked/prodded/etc. in a post" msgstr "Ricevi un poke in un articolo" -#: ../../mod/settings.php:1113 +#: ../../mod/settings.php:1062 msgid "Advanced Account/Page Type Settings" msgstr "Impostazioni avanzate" -#: ../../mod/settings.php:1114 +#: ../../mod/settings.php:1063 msgid "Change the behaviour of this account for special situations" msgstr "Cambia il funzionamento di questo account in situazioni particolari" @@ -3930,7 +4045,7 @@ msgstr "Accesso pubblico negato." msgid "No connections." msgstr "Nessun contatto." -#: ../../mod/viewconnections.php:69 ../../mod/nogroup.php:40 +#: ../../mod/viewconnections.php:69 #, php-format msgid "Visit %s's profile [%s]" msgstr "Visita il profilo di %s [%s]" @@ -4727,8 +4842,8 @@ msgid "Could not create collection." msgstr "Impossibile creare l'insieme." #: ../../mod/group.php:60 -msgid "Collection name changed." -msgstr "Il nome dell'insieme di canali è stato cambiato." +msgid "Collection updated." +msgstr "Insieme aggiornato." #: ../../mod/group.php:92 msgid "Create a collection of channels." @@ -4766,7 +4881,7 @@ msgstr "Tutti i canali connessi" msgid "Click on a channel to add or remove." msgstr "Clicca su un canale per aggiungerlo o rimuoverlo." -#: ../../mod/search.php:20 ../../mod/network.php:164 +#: ../../mod/search.php:20 ../../mod/network.php:113 msgid "Remove term" msgstr "Rimuovi termine" @@ -4778,11 +4893,11 @@ msgstr "Impossibile ottenere informazioni sul proprietario della pagina." msgid "Album not found." msgstr "Album non trovato." -#: ../../mod/photos.php:125 ../../mod/photos.php:780 +#: ../../mod/photos.php:125 ../../mod/photos.php:791 msgid "Delete Album" msgstr "Elimina album" -#: ../../mod/photos.php:165 ../../mod/photos.php:1041 +#: ../../mod/photos.php:165 ../../mod/photos.php:1052 msgid "Delete Photo" msgstr "Elimina foto" @@ -4813,97 +4928,97 @@ msgstr "Hai usato %1$.2f Mb di %2$.2f Mb disponibili per le foto." msgid "You have used %1$.2f Mbytes of photo storage." msgstr "Hai usato %1$.2f Mb di spazio per le foto." -#: ../../mod/photos.php:707 +#: ../../mod/photos.php:718 msgid "Upload Photos" msgstr "Carica foto" -#: ../../mod/photos.php:711 ../../mod/photos.php:775 +#: ../../mod/photos.php:722 ../../mod/photos.php:786 msgid "New album name: " msgstr "Nome del nuovo album: " -#: ../../mod/photos.php:712 +#: ../../mod/photos.php:723 msgid "or existing album name: " msgstr "o nome di un album esistente: " -#: ../../mod/photos.php:713 +#: ../../mod/photos.php:724 msgid "Do not show a status post for this upload" msgstr "Non creare un messaggio di stato per questo caricamento" -#: ../../mod/photos.php:715 ../../mod/photos.php:1036 +#: ../../mod/photos.php:726 ../../mod/photos.php:1047 msgid "Permissions" msgstr "Permessi" -#: ../../mod/photos.php:764 ../../mod/photos.php:786 ../../mod/photos.php:1212 -#: ../../mod/photos.php:1227 +#: ../../mod/photos.php:775 ../../mod/photos.php:797 ../../mod/photos.php:1223 +#: ../../mod/photos.php:1238 msgid "Contact Photos" msgstr "Foto dei contatti" -#: ../../mod/photos.php:790 +#: ../../mod/photos.php:801 msgid "Edit Album" msgstr "Modifica album" -#: ../../mod/photos.php:796 +#: ../../mod/photos.php:807 msgid "Show Newest First" msgstr "Prima i più recenti" -#: ../../mod/photos.php:798 +#: ../../mod/photos.php:809 msgid "Show Oldest First" msgstr "Prima i più vecchi" -#: ../../mod/photos.php:842 ../../mod/photos.php:1259 +#: ../../mod/photos.php:853 ../../mod/photos.php:1270 msgid "View Photo" msgstr "Guarda la foto" -#: ../../mod/photos.php:886 +#: ../../mod/photos.php:897 msgid "Permission denied. Access to this item may be restricted." msgstr "Permesso negato. L'accesso a questo elemento può essere stato limitato." -#: ../../mod/photos.php:888 +#: ../../mod/photos.php:899 msgid "Photo not available" msgstr "Foto non disponibile" -#: ../../mod/photos.php:946 +#: ../../mod/photos.php:957 msgid "Use as profile photo" msgstr "Usa come foto del profilo" -#: ../../mod/photos.php:970 +#: ../../mod/photos.php:981 msgid "View Full Size" msgstr "Vedi nelle dimensioni originali" -#: ../../mod/photos.php:1024 +#: ../../mod/photos.php:1035 msgid "Edit photo" msgstr "Modifica la foto" -#: ../../mod/photos.php:1026 +#: ../../mod/photos.php:1037 msgid "Rotate CW (right)" msgstr "Ruota (senso orario)" -#: ../../mod/photos.php:1027 +#: ../../mod/photos.php:1038 msgid "Rotate CCW (left)" msgstr "Ruota (senso antiorario)" -#: ../../mod/photos.php:1029 +#: ../../mod/photos.php:1040 msgid "New album name" msgstr "Nuovo nome dell'album" -#: ../../mod/photos.php:1032 +#: ../../mod/photos.php:1043 msgid "Caption" msgstr "Titolo" -#: ../../mod/photos.php:1034 +#: ../../mod/photos.php:1045 msgid "Add a Tag" msgstr "Aggiungi tag" -#: ../../mod/photos.php:1038 +#: ../../mod/photos.php:1049 msgid "" "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Per esempio: @luca, @Maria_Bianchi, @bob@example.com, #California, #camping" -#: ../../mod/photos.php:1265 +#: ../../mod/photos.php:1276 msgid "View Album" msgstr "Guarda l'album" -#: ../../mod/photos.php:1274 +#: ../../mod/photos.php:1285 msgid "Recent Photos" msgstr "Foto recenti" @@ -4915,14 +5030,6 @@ msgstr "ti ha inviato un messaggio privato" msgid "added your channel" msgstr "ha aggiunto il tuo canale" -#: ../../mod/ping.php:230 ../../boot.php:1858 ../../boot.php:1938 -msgid "g A l F d" -msgstr "g A l d F" - -#: ../../mod/ping.php:252 ../../boot.php:1904 ../../boot.php:1979 -msgid "[today]" -msgstr "[oggi]" - #: ../../mod/ping.php:262 msgid "posted an event" msgstr "ha creato un evento" @@ -4955,11 +5062,6 @@ msgstr "Gestione menù" msgid "Drop" msgstr "Elimina" -#: ../../mod/menu.php:57 ../../mod/network.php:321 -#: ../../mod/connections.php:552 -msgid "New" -msgstr "Novità" - #: ../../mod/menu.php:58 msgid "Create a new menu" msgstr "Crea un nuovo menù" @@ -5143,91 +5245,51 @@ msgstr "Inserisci l'indirizzo del tuo canale (ad esempio lucia@esempio.com)" msgid "Authenticate" msgstr "Autenticazione" -#: ../../mod/network.php:302 -msgid "Commented Order" -msgstr "Ultimi commenti" - -#: ../../mod/network.php:305 -msgid "Sort by Comment Date" -msgstr "Per data del commento" - -#: ../../mod/network.php:308 -msgid "Posted Order" -msgstr "Ultimi articoli" - -#: ../../mod/network.php:311 -msgid "Sort by Post Date" -msgstr "Per data di creazione" - -#: ../../mod/network.php:315 ../../mod/notifications.php:86 -msgid "Personal" -msgstr "Personali" - -#: ../../mod/network.php:318 -msgid "Posts that mention or involve you" -msgstr "Articoli che ti riguardano o ti menzionano" - -#: ../../mod/network.php:324 -msgid "Activity Stream - by date" -msgstr "Elenco attività - per data" - -#: ../../mod/network.php:331 -msgid "Starred" -msgstr "Preferiti" - -#: ../../mod/network.php:334 -msgid "Favourite Posts" -msgstr "Articoli preferiti" - -#: ../../mod/network.php:341 -msgid "Spam" -msgstr "Spam" - -#: ../../mod/network.php:344 -msgid "Posts flagged as SPAM" -msgstr "Articoli marcati come spam" +#: ../../mod/network.php:172 +msgid "No such group" +msgstr "Impossibile trovare l'insieme" -#: ../../mod/network.php:384 +#: ../../mod/network.php:212 msgid "Refresh" msgstr "Aggiorna" -#: ../../mod/network.php:385 ../../mod/connections.php:404 +#: ../../mod/network.php:213 ../../mod/connections.php:404 msgid "Me" msgstr "Io" -#: ../../mod/network.php:386 ../../mod/connections.php:406 +#: ../../mod/network.php:214 ../../mod/connections.php:406 msgid "Best Friends" msgstr "Buoni amici" -#: ../../mod/network.php:388 +#: ../../mod/network.php:216 msgid "Co-workers" msgstr "Colleghi" -#: ../../mod/network.php:389 ../../mod/connections.php:408 +#: ../../mod/network.php:217 ../../mod/connections.php:408 msgid "Former Friends" msgstr "Ex amici" -#: ../../mod/network.php:390 ../../mod/connections.php:409 +#: ../../mod/network.php:218 ../../mod/connections.php:409 msgid "Acquaintances" msgstr "Conoscenti" -#: ../../mod/network.php:391 +#: ../../mod/network.php:219 msgid "Everybody" msgstr "Tutti" -#: ../../mod/network.php:408 +#: ../../mod/network.php:234 msgid "Search Results For:" msgstr "Cerca risultati con:" -#: ../../mod/network.php:453 -msgid "No such group" -msgstr "Impossibile trovare l'insieme" +#: ../../mod/network.php:296 +msgid "Collection: " +msgstr "Insieme:" -#: ../../mod/network.php:484 +#: ../../mod/network.php:309 msgid "Connection: " msgstr "Connessione:" -#: ../../mod/network.php:487 +#: ../../mod/network.php:312 msgid "Invalid connection." msgstr "Connessione non valida." @@ -5248,7 +5310,7 @@ msgstr "Impossibile aggiornare il contatto." #: ../../mod/intro.php:56 msgid "Introductions and Connection Requests" -msgstr "Richieste per entrare in contatto" +msgstr "Richieste di entrare in contatto" #: ../../mod/intro.php:67 msgid "No pending introductions." @@ -5278,693 +5340,688 @@ msgstr "se possibile" msgid "Discard" msgstr "Rifiuta" -#: ../../mod/connections.php:67 -msgid "Could not access contact record." -msgstr "Non è possibile accedere alle informazioni sul contatto." +#: ../../mod/post.php:222 +msgid "" +"Remote authentication blocked. You are logged into this site locally. Please" +" logout and retry." +msgstr "L'autenticazione remota non è disponibile. Hai accesso solamente a questo sito. Puoi provare ad uscire per tentare di nuovo." -#: ../../mod/connections.php:81 -msgid "Could not locate selected profile." -msgstr "Non riesco a trovare il profilo selezionato." +#: ../../mod/post.php:251 +#, php-format +msgid "Welcome %s. Remote authentication successful." +msgstr "Ciao %s. La tua autenticazione da remoto è avvenuta con successo." -#: ../../mod/connections.php:124 -msgid "Failed to update connection record." -msgstr "Impossibile aggiornare le informazioni del contatto." +#: ../../mod/dirsearch.php:21 +msgid "This site is not a directory server" +msgstr "Questo sito non fornisce l'elenco generale dei canali" -#: ../../mod/connections.php:219 -msgid "Could not access address book record." -msgstr "Impossibile accedere alle informazioni della rubrica." +#: ../../mod/lockview.php:34 +msgid "Remote privacy information not available." +msgstr "Le informazioni remote sulla privacy non sono disponibili." -#: ../../mod/connections.php:233 -msgid "Refresh failed - channel is currently unavailable." -msgstr "Il canale non è disponibile - impossibile aggiornare." +#: ../../mod/lockview.php:43 +msgid "Visible to:" +msgstr "Visibile a:" -#: ../../mod/connections.php:240 -msgid "Channel has been unblocked" -msgstr "Il canale è stato sbloccato" +#: ../../mod/magic.php:63 +msgid "Hub not found." +msgstr "Server non trovato." -#: ../../mod/connections.php:241 -msgid "Channel has been blocked" -msgstr "Il canale è stato bloccato" +#: ../../mod/profiles.php:18 ../../mod/profiles.php:138 +#: ../../mod/profiles.php:179 ../../mod/profiles.php:486 +msgid "Profile not found." +msgstr "Profilo non trovato." -#: ../../mod/connections.php:245 ../../mod/connections.php:257 -#: ../../mod/connections.php:269 ../../mod/connections.php:281 -#: ../../mod/connections.php:296 -msgid "Unable to set address book parameters." -msgstr "Impossibile impostare i parametri della rubrica." +#: ../../mod/profiles.php:38 +msgid "Profile deleted." +msgstr "Profilo eliminato." -#: ../../mod/connections.php:252 -msgid "Channel has been unignored" -msgstr "Il canale non sarà più ignorato" +#: ../../mod/profiles.php:56 ../../mod/profiles.php:92 +msgid "Profile-" +msgstr "Profilo-" -#: ../../mod/connections.php:253 -msgid "Channel has been ignored" -msgstr "Il canale sarà ignorato" +#: ../../mod/profiles.php:77 ../../mod/profiles.php:120 +msgid "New profile created." +msgstr "Il nuovo profilo è stato creato." -#: ../../mod/connections.php:264 -msgid "Channel has been unarchived" -msgstr "Il canale non è più archiviato" +#: ../../mod/profiles.php:98 +msgid "Profile unavailable to clone." +msgstr "Impossibile duplicare il profilo." -#: ../../mod/connections.php:265 -msgid "Channel has been archived" -msgstr "Il canale è stato archiviato" +#: ../../mod/profiles.php:189 +msgid "Profile Name is required." +msgstr "Il nome del profilo è obbligatorio ." -#: ../../mod/connections.php:276 -msgid "Channel has been unhidden" -msgstr "Il canale non è più nascosto" +#: ../../mod/profiles.php:317 +msgid "Marital Status" +msgstr "Stato sentimentale" -#: ../../mod/connections.php:277 -msgid "Channel has been hidden" -msgstr "Il canale è stato nascosto" +#: ../../mod/profiles.php:321 +msgid "Romantic Partner" +msgstr "Partner affettivo" -#: ../../mod/connections.php:291 -msgid "Channel has been approved" -msgstr "Il canale è stato approvato" +#: ../../mod/profiles.php:325 +msgid "Likes" +msgstr "Cosa gli piace" -#: ../../mod/connections.php:292 -msgid "Channel has been unapproved" -msgstr "Il canale non è più approvato" +#: ../../mod/profiles.php:329 +msgid "Dislikes" +msgstr "Cosa non gli piace" -#: ../../mod/connections.php:310 -msgid "Contact has been removed." -msgstr "Il contatto è stato rimosso." +#: ../../mod/profiles.php:333 +msgid "Work/Employment" +msgstr "Lavoro/impiego" -#: ../../mod/connections.php:330 -#, php-format -msgid "View %s's profile" -msgstr "Guarda il profilo di %s" +#: ../../mod/profiles.php:336 +msgid "Religion" +msgstr "Religione" -#: ../../mod/connections.php:334 -msgid "Refresh Permissions" -msgstr "Aggiorna i permessi" +#: ../../mod/profiles.php:340 +msgid "Political Views" +msgstr "Orientamento politico" -#: ../../mod/connections.php:337 -msgid "Fetch updated permissions" -msgstr "Scarica i permessi aggiornati" +#: ../../mod/profiles.php:344 +msgid "Gender" +msgstr "Sesso" -#: ../../mod/connections.php:341 -msgid "Recent Activity" -msgstr "Attività recenti" +#: ../../mod/profiles.php:348 +msgid "Sexual Preference" +msgstr "Preferenze sessuali" -#: ../../mod/connections.php:344 -msgid "View recent posts and comments" -msgstr "Leggi i post recenti e i commenti" +#: ../../mod/profiles.php:352 +msgid "Homepage" +msgstr "Home page" -#: ../../mod/connections.php:351 -msgid "Block or Unblock this connection" -msgstr "Per bloccare o meno questo contatto" +#: ../../mod/profiles.php:356 +msgid "Interests" +msgstr "Interessi" -#: ../../mod/connections.php:355 ../../mod/connections.php:491 -msgid "Unignore" -msgstr "Non ignorare" +#: ../../mod/profiles.php:360 +msgid "Address" +msgstr "Indirizzo" -#: ../../mod/connections.php:358 -msgid "Ignore or Unignore this connection" -msgstr "Per ignorare o meno questo contatto" +#: ../../mod/profiles.php:367 ../../mod/pubsites.php:31 +msgid "Location" +msgstr "Luogo attuale" -#: ../../mod/connections.php:361 -msgid "Unarchive" -msgstr "Non archiviare" +#: ../../mod/profiles.php:450 +msgid "Profile updated." +msgstr "Profilo aggiornato." -#: ../../mod/connections.php:361 -msgid "Archive" -msgstr "Archivia" +#: ../../mod/profiles.php:505 +msgid "Hide your contact/friend list from viewers of this profile?" +msgstr "Nascondi la tua lista di contatti/amici ai visitatori di questo profilo?" -#: ../../mod/connections.php:364 -msgid "Archive or Unarchive this connection" -msgstr "Per archiviare o meno questo contatto" +#: ../../mod/profiles.php:528 +msgid "Edit Profile Details" +msgstr "Modifica i dettagli del profilo" -#: ../../mod/connections.php:367 -msgid "Unhide" -msgstr "Non nascondere" +#: ../../mod/profiles.php:530 +msgid "View this profile" +msgstr "Guarda questo profilo" -#: ../../mod/connections.php:367 -msgid "Hide" -msgstr "Nascondi" +#: ../../mod/profiles.php:531 +msgid "Change Profile Photo" +msgstr "Cambia la foto del profilo" -#: ../../mod/connections.php:370 -msgid "Hide or Unhide this connection" -msgstr "Per nascondere o meno questo contatto" +#: ../../mod/profiles.php:532 +msgid "Create a new profile using these settings" +msgstr "Crea un nuovo profilo usando queste impostazioni" -#: ../../mod/connections.php:377 -msgid "Delete this connection" -msgstr "Elimina questo contatto" - -#: ../../mod/connections.php:410 -msgid "Unknown" -msgstr "Sconosciuto" - -#: ../../mod/connections.php:420 ../../mod/connections.php:449 -msgid "Approve this connection" -msgstr "Approva questo contatto" - -#: ../../mod/connections.php:420 -msgid "Accept connection to allow communication" -msgstr "Entra in contatto per poter comunicare" +#: ../../mod/profiles.php:533 +msgid "Clone this profile" +msgstr "Clona questo profilo" -#: ../../mod/connections.php:436 -msgid "Automatic Permissions Settings" -msgstr "Permessi predefiniti" +#: ../../mod/profiles.php:534 +msgid "Delete this profile" +msgstr "Elimina questo profilo" -#: ../../mod/connections.php:436 -#, php-format -msgid "Connections: settings for %s" -msgstr "Contatti: impostazioni per %s" +#: ../../mod/profiles.php:535 +msgid "Profile Name:" +msgstr "Nome del profilo:" -#: ../../mod/connections.php:440 -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 "Hai ricevuto da un canale una richiesta di entrare in contatto, se prosegui la richiesta sarà approvata e saranno applicati i permessi mostrati. Lascia questa pagina se non vuoi proseguire." +#: ../../mod/profiles.php:536 +msgid "Your Full Name:" +msgstr "Il tuo nome completo:" -#: ../../mod/connections.php:442 -msgid "Slide to adjust your degree of friendship" -msgstr "Trascina per restringere il grado di amicizia da mostrare" +#: ../../mod/profiles.php:537 +msgid "Title/Description:" +msgstr "Titolo/descrizione:" -#: ../../mod/connections.php:448 -msgid "inherited" -msgstr "derivato" +#: ../../mod/profiles.php:538 +msgid "Your Gender:" +msgstr "Sesso:" -#: ../../mod/connections.php:450 -msgid "Connection has no individual permissions!" -msgstr "Non hai assegnato permessi individuali a questo contatto!" +#: ../../mod/profiles.php:539 +#, php-format +msgid "Birthday (%s):" +msgstr "Compleanno (%s):" -#: ../../mod/connections.php:451 -msgid "" -"This may be appropriate based on your privacy " -"settings, though you may wish to review the \"Advanced Permissions\"." -msgstr "Questo corrisponde alle tue impostazioni di privacy, ma puoi anche dare un'occhiata ai 'Permessi avanzati' per opzioni più dettagliate." +#: ../../mod/profiles.php:540 +msgid "Street Address:" +msgstr "Indirizzo (via/piazza):" -#: ../../mod/connections.php:453 -msgid "Profile Visibility" -msgstr "Visibilità del profilo" +#: ../../mod/profiles.php:541 +msgid "Locality/City:" +msgstr "Località:" -#: ../../mod/connections.php:454 -#, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." -msgstr "Seleziona il profilo che vuoi mostrare a %s quando visita il tuo profilo in modo sicuro." +#: ../../mod/profiles.php:542 +msgid "Postal/Zip Code:" +msgstr "CAP:" -#: ../../mod/connections.php:455 -msgid "Contact Information / Notes" -msgstr "Informazioni e annotazioni sul contatto" +#: ../../mod/profiles.php:543 +msgid "Country:" +msgstr "Nazione:" -#: ../../mod/connections.php:456 -msgid "Edit contact notes" -msgstr "Modifica le informazioni sul contatto" +#: ../../mod/profiles.php:544 +msgid "Region/State:" +msgstr "Regione/stato:" -#: ../../mod/connections.php:458 -msgid "Their Settings" -msgstr "Permessi concessi a te" +#: ../../mod/profiles.php:545 +msgid "♥ Marital Status:" +msgstr "♥ Stato sentimentale:" -#: ../../mod/connections.php:459 -msgid "My Settings" -msgstr "I permessi che concedo" +#: ../../mod/profiles.php:546 +msgid "Who: (if applicable)" +msgstr "Con chi: (se possibile)" -#: ../../mod/connections.php:461 -msgid "Forum Members" -msgstr "Membro di un forum" +#: ../../mod/profiles.php:547 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "Per esempio: cathy123, Cathy Williams, cathy@example.com" -#: ../../mod/connections.php:462 -msgid "Soapbox" -msgstr "Comunicati e annunci" +#: ../../mod/profiles.php:548 +msgid "Since [date]:" +msgstr "dal [data]:" -#: ../../mod/connections.php:463 -msgid "Full Sharing" -msgstr "Condivisione totale" +#: ../../mod/profiles.php:550 +msgid "Homepage URL:" +msgstr "Indirizzo home page:" -#: ../../mod/connections.php:464 -msgid "Cautious Sharing" -msgstr "Condivisione prudente" +#: ../../mod/profiles.php:553 +msgid "Religious Views:" +msgstr "Orientamento religioso:" -#: ../../mod/connections.php:465 -msgid "Follow Only" -msgstr "Follower" +#: ../../mod/profiles.php:554 +msgid "Keywords:" +msgstr "Parole chiave, tag:" -#: ../../mod/connections.php:466 -msgid "Individual Permissions" -msgstr "Permessi individuali" +#: ../../mod/profiles.php:557 +msgid "Example: fishing photography software" +msgstr "Per esempio: pesca fotografia programmazione" -#: ../../mod/connections.php:467 -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 "Alcuni permessi derivano dalle impostazioni di privacy, che hanno una priorità maggiore. Cambiarli in questa pagina non avrà alcun effetto." +#: ../../mod/profiles.php:558 +msgid "Used in directory listings" +msgstr "Visibile nell'elenco pubblico di canali" -#: ../../mod/connections.php:468 -msgid "Advanced Permissions" -msgstr "Permessi avanzati" +#: ../../mod/profiles.php:559 +msgid "Tell us about yourself..." +msgstr "Raccontaci di te..." -#: ../../mod/connections.php:469 -msgid "Quick Links" -msgstr "Impostazioni veloci" +#: ../../mod/profiles.php:560 +msgid "Hobbies/Interests" +msgstr "Hobby/interessi" -#: ../../mod/connections.php:473 -#, php-format -msgid "Visit %s's profile - %s" -msgstr "Guarda il profilo di %s - %s" +#: ../../mod/profiles.php:561 +msgid "Contact information and Social Networks" +msgstr "Contatti personali e i tuoi social network" -#: ../../mod/connections.php:474 -msgid "Block/Unblock contact" -msgstr "Blocca/sblocca contatto" +#: ../../mod/profiles.php:562 +msgid "My other channels" +msgstr "I miei altri canali" -#: ../../mod/connections.php:475 -msgid "Ignore contact" -msgstr "Ignora il contatto" +#: ../../mod/profiles.php:563 +msgid "Musical interests" +msgstr "Interessi musicali" -#: ../../mod/connections.php:476 -msgid "Repair URL settings" -msgstr "Ripara le impostazioni URL" +#: ../../mod/profiles.php:564 +msgid "Books, literature" +msgstr "Libri, letteratura" -#: ../../mod/connections.php:477 -msgid "View conversations" -msgstr "Leggi le conversazioni" +#: ../../mod/profiles.php:565 +msgid "Television" +msgstr "Televisione" -#: ../../mod/connections.php:479 -msgid "Delete contact" -msgstr "Elimina contatto" +#: ../../mod/profiles.php:566 +msgid "Film/dance/culture/entertainment" +msgstr "Film/danza/cultura/intrattenimento" -#: ../../mod/connections.php:482 -msgid "Last update:" -msgstr "Ultimo aggiornamento:" +#: ../../mod/profiles.php:567 +msgid "Love/romance" +msgstr "Amore" -#: ../../mod/connections.php:484 -msgid "Update public posts" -msgstr "Aggiorna gli articoli pubblici" +#: ../../mod/profiles.php:568 +msgid "Work/employment" +msgstr "Lavoro/impiego" -#: ../../mod/connections.php:486 -msgid "Update now" -msgstr "Aggiorna adesso" +#: ../../mod/profiles.php:569 +msgid "School/education" +msgstr "Scuola/educazione" -#: ../../mod/connections.php:492 -msgid "Currently blocked" -msgstr "Attualmente bloccato" +#: ../../mod/profiles.php:574 +msgid "" +"This is your public profile.
      It may " +"be visible to anybody using the internet." +msgstr "Questo è il tuo profilo publico.
      Potrebbe essere visto da chiunque attraverso internet." -#: ../../mod/connections.php:493 -msgid "Currently ignored" -msgstr "Attualmente ignorato" +#: ../../mod/profiles.php:584 ../../mod/directory.php:160 +msgid "Age: " +msgstr "Età:" -#: ../../mod/connections.php:494 -msgid "Currently archived" -msgstr "Attualmente archiviato" +#: ../../mod/profiles.php:623 +msgid "Edit/Manage Profiles" +msgstr "Modifica/gestisci i profili" -#: ../../mod/connections.php:495 -msgid "Currently pending" -msgstr "Attualmente da approvare" +#: ../../mod/new_channel.php:107 +msgid "Add a Channel" +msgstr "Aggiungi un canale" -#: ../../mod/connections.php:496 +#: ../../mod/new_channel.php:108 msgid "" -"Replies/likes to your public posts may still be visible" -msgstr "Le risposte ai tuoi articoli pubblici potrebbero restare comunque visibili" +"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 "I contenuti che pubblichi finiscono in un \"canale\". Un canale può essere usato per mantenere un tuo profilo personale, per avere un blog, per creare forum di discussione o gruppi di interesse, per pagine di celebrità e molto altro. Puoi creare quanti canali vuoi a meno di limiti dati dal gestore del sito." -#: ../../mod/connections.php:532 ../../mod/connections.php:604 -msgid "Blocked" -msgstr "Bloccati" +#: ../../mod/new_channel.php:111 +msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" " +msgstr "Per esempio: \"Mario Rossi\", \"Lisa e le sue ricette\", \"Il campionato\", \"Il gruppo di escursionismo\"" -#: ../../mod/connections.php:537 ../../mod/connections.php:611 -msgid "Ignored" -msgstr "Ignorati" +#: ../../mod/new_channel.php:112 +msgid "Choose a short nickname" +msgstr "Scegli un nome breve" -#: ../../mod/connections.php:542 ../../mod/connections.php:625 -msgid "Hidden" -msgstr "Nascosti" +#: ../../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 "Il nome breve sarà usato per creare un indirizzo facile da ricordare per il tuo canale (simile a una email). Così potrai condividerlo e gli altri potranno trovarti." -#: ../../mod/connections.php:547 ../../mod/connections.php:618 -msgid "Archived" -msgstr "Archiviati" +#: ../../mod/new_channel.php:114 +msgid "Or import an existing channel from another location" +msgstr "Oppure importa un tuo canale esistente da un altro server/hub" -#: ../../mod/connections.php:558 -msgid "All" -msgstr "Tutti" +#: ../../mod/connections.php:67 +msgid "Could not access contact record." +msgstr "Non è possibile accedere alle informazioni sul contatto." -#: ../../mod/connections.php:579 -msgid "Suggestions" -msgstr "Suggerimenti" +#: ../../mod/connections.php:81 +msgid "Could not locate selected profile." +msgstr "Non riesco a trovare il profilo selezionato." -#: ../../mod/connections.php:582 -msgid "Suggest new connections" -msgstr "Suggerisci nuovi contatti" +#: ../../mod/connections.php:124 +msgid "Failed to update connection record." +msgstr "Impossibile aggiornare le informazioni del contatto." -#: ../../mod/connections.php:588 -msgid "Show pending (new) connections" -msgstr "Richieste per entrare in contatto" +#: ../../mod/connections.php:219 +msgid "Could not access address book record." +msgstr "Impossibile accedere alle informazioni della rubrica." -#: ../../mod/connections.php:591 -msgid "All Connections" -msgstr "Tutti i contatti" +#: ../../mod/connections.php:233 +msgid "Refresh failed - channel is currently unavailable." +msgstr "Il canale non è disponibile - impossibile aggiornare." -#: ../../mod/connections.php:594 -msgid "Show all connections" -msgstr "Mostra tutti i contatti" +#: ../../mod/connections.php:240 +msgid "Channel has been unblocked" +msgstr "Il canale è stato sbloccato" -#: ../../mod/connections.php:597 -msgid "Unblocked" -msgstr "Non bloccati" +#: ../../mod/connections.php:241 +msgid "Channel has been blocked" +msgstr "Il canale è stato bloccato" -#: ../../mod/connections.php:600 -msgid "Only show unblocked connections" -msgstr "Mostra solo i contatti non bloccati" +#: ../../mod/connections.php:245 ../../mod/connections.php:257 +#: ../../mod/connections.php:269 ../../mod/connections.php:281 +#: ../../mod/connections.php:296 +msgid "Unable to set address book parameters." +msgstr "Impossibile impostare i parametri della rubrica." -#: ../../mod/connections.php:607 -msgid "Only show blocked connections" -msgstr "Mostra solo i contatti bloccati" +#: ../../mod/connections.php:252 +msgid "Channel has been unignored" +msgstr "Il canale non sarà più ignorato" -#: ../../mod/connections.php:614 -msgid "Only show ignored connections" -msgstr "Mostra solo i contatti ignorati" +#: ../../mod/connections.php:253 +msgid "Channel has been ignored" +msgstr "Il canale sarà ignorato" -#: ../../mod/connections.php:621 -msgid "Only show archived connections" -msgstr "Mostra solo i contatti archiviati" +#: ../../mod/connections.php:264 +msgid "Channel has been unarchived" +msgstr "Il canale non è più archiviato" -#: ../../mod/connections.php:628 -msgid "Only show hidden connections" -msgstr "Mostra solo i contatti nascosti" +#: ../../mod/connections.php:265 +msgid "Channel has been archived" +msgstr "Il canale è stato archiviato" -#: ../../mod/connections.php:670 -#, php-format -msgid "%1$s [%2$s]" -msgstr "%1$s [%2$s]" +#: ../../mod/connections.php:276 +msgid "Channel has been unhidden" +msgstr "Il canale non è più nascosto" -#: ../../mod/connections.php:671 ../../mod/nogroup.php:41 -msgid "Edit contact" -msgstr "Modifica il contatto" +#: ../../mod/connections.php:277 +msgid "Channel has been hidden" +msgstr "Il canale è stato nascosto" -#: ../../mod/connections.php:695 -msgid "Search your connections" -msgstr "Cerca tra i contatti" +#: ../../mod/connections.php:291 +msgid "Channel has been approved" +msgstr "Il canale è stato approvato" -#: ../../mod/connections.php:696 -msgid "Finding: " -msgstr "Ricerca: " +#: ../../mod/connections.php:292 +msgid "Channel has been unapproved" +msgstr "Il canale non è più approvato" -#: ../../mod/dirsearch.php:21 -msgid "This site is not a directory server" -msgstr "Questo sito non fornisce l'elenco generale dei canali" +#: ../../mod/connections.php:310 +msgid "Contact has been removed." +msgstr "Il contatto è stato rimosso." -#: ../../mod/lockview.php:34 -msgid "Remote privacy information not available." -msgstr "Le informazioni remote sulla privacy non sono disponibili." +#: ../../mod/connections.php:330 +#, php-format +msgid "View %s's profile" +msgstr "Guarda il profilo di %s" -#: ../../mod/lockview.php:43 -msgid "Visible to:" -msgstr "Visibile a:" +#: ../../mod/connections.php:334 +msgid "Refresh Permissions" +msgstr "Aggiorna i permessi" -#: ../../mod/profiles.php:18 ../../mod/profiles.php:138 -#: ../../mod/profiles.php:179 ../../mod/profiles.php:486 -msgid "Profile not found." -msgstr "Profilo non trovato." +#: ../../mod/connections.php:337 +msgid "Fetch updated permissions" +msgstr "Scarica i permessi aggiornati" -#: ../../mod/profiles.php:38 -msgid "Profile deleted." -msgstr "Profilo eliminato." +#: ../../mod/connections.php:341 +msgid "Recent Activity" +msgstr "Attività recenti" -#: ../../mod/profiles.php:56 ../../mod/profiles.php:92 -msgid "Profile-" -msgstr "Profilo-" +#: ../../mod/connections.php:344 +msgid "View recent posts and comments" +msgstr "Leggi i post recenti e i commenti" -#: ../../mod/profiles.php:77 ../../mod/profiles.php:120 -msgid "New profile created." -msgstr "Il nuovo profilo è stato creato." +#: ../../mod/connections.php:351 +msgid "Block or Unblock this connection" +msgstr "Per bloccare o meno questo contatto" -#: ../../mod/profiles.php:98 -msgid "Profile unavailable to clone." -msgstr "Impossibile duplicare il profilo." +#: ../../mod/connections.php:355 ../../mod/connections.php:491 +msgid "Unignore" +msgstr "Non ignorare" -#: ../../mod/profiles.php:189 -msgid "Profile Name is required." -msgstr "Il nome del profilo è obbligatorio ." +#: ../../mod/connections.php:358 +msgid "Ignore or Unignore this connection" +msgstr "Per ignorare o meno questo contatto" -#: ../../mod/profiles.php:317 -msgid "Marital Status" -msgstr "Stato sentimentale" +#: ../../mod/connections.php:361 +msgid "Unarchive" +msgstr "Non archiviare" -#: ../../mod/profiles.php:321 -msgid "Romantic Partner" -msgstr "Partner affettivo" +#: ../../mod/connections.php:361 +msgid "Archive" +msgstr "Archivia" -#: ../../mod/profiles.php:325 -msgid "Likes" -msgstr "Cosa gli piace" +#: ../../mod/connections.php:364 +msgid "Archive or Unarchive this connection" +msgstr "Per archiviare o meno questo contatto" -#: ../../mod/profiles.php:329 -msgid "Dislikes" -msgstr "Cosa non gli piace" +#: ../../mod/connections.php:367 +msgid "Unhide" +msgstr "Non nascondere" -#: ../../mod/profiles.php:333 -msgid "Work/Employment" -msgstr "Lavoro/impiego" +#: ../../mod/connections.php:367 +msgid "Hide" +msgstr "Nascondi" -#: ../../mod/profiles.php:336 -msgid "Religion" -msgstr "Religione" +#: ../../mod/connections.php:370 +msgid "Hide or Unhide this connection" +msgstr "Per nascondere o meno questo contatto" -#: ../../mod/profiles.php:340 -msgid "Political Views" -msgstr "Orientamento politico" +#: ../../mod/connections.php:377 +msgid "Delete this connection" +msgstr "Elimina questo contatto" -#: ../../mod/profiles.php:344 -msgid "Gender" -msgstr "Sesso" +#: ../../mod/connections.php:410 +msgid "Unknown" +msgstr "Sconosciuto" -#: ../../mod/profiles.php:348 -msgid "Sexual Preference" -msgstr "Preferenze sessuali" +#: ../../mod/connections.php:420 ../../mod/connections.php:449 +msgid "Approve this connection" +msgstr "Approva questo contatto" -#: ../../mod/profiles.php:352 -msgid "Homepage" -msgstr "Home page" +#: ../../mod/connections.php:420 +msgid "Accept connection to allow communication" +msgstr "Entra in contatto per poter comunicare" -#: ../../mod/profiles.php:356 -msgid "Interests" -msgstr "Interessi" +#: ../../mod/connections.php:436 +msgid "Automatic Permissions Settings" +msgstr "Permessi predefiniti" -#: ../../mod/profiles.php:360 -msgid "Address" -msgstr "Indirizzo" +#: ../../mod/connections.php:436 +#, php-format +msgid "Connections: settings for %s" +msgstr "Contatti: impostazioni per %s" -#: ../../mod/profiles.php:367 ../../mod/pubsites.php:31 -msgid "Location" -msgstr "Luogo attuale" +#: ../../mod/connections.php:440 +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 "Hai ricevuto da un canale una richiesta di entrare in contatto, se prosegui la richiesta sarà approvata e saranno applicati i permessi mostrati. Lascia questa pagina se non vuoi proseguire." -#: ../../mod/profiles.php:450 -msgid "Profile updated." -msgstr "Profilo aggiornato." +#: ../../mod/connections.php:442 +msgid "Slide to adjust your degree of friendship" +msgstr "Trascina per restringere il grado di amicizia da mostrare" -#: ../../mod/profiles.php:505 -msgid "Hide your contact/friend list from viewers of this profile?" -msgstr "Nascondi la tua lista di contatti/amici ai visitatori di questo profilo?" +#: ../../mod/connections.php:448 +msgid "inherited" +msgstr "derivato" -#: ../../mod/profiles.php:528 -msgid "Edit Profile Details" -msgstr "Modifica i dettagli del profilo" +#: ../../mod/connections.php:450 +msgid "Connection has no individual permissions!" +msgstr "Non hai assegnato permessi individuali a questo contatto!" -#: ../../mod/profiles.php:530 -msgid "View this profile" -msgstr "Guarda questo profilo" +#: ../../mod/connections.php:451 +msgid "" +"This may be appropriate based on your privacy " +"settings, though you may wish to review the \"Advanced Permissions\"." +msgstr "Questo corrisponde alle tue impostazioni di privacy, ma puoi anche dare un'occhiata ai 'Permessi avanzati' per opzioni più dettagliate." -#: ../../mod/profiles.php:531 -msgid "Change Profile Photo" -msgstr "Cambia la foto del profilo" +#: ../../mod/connections.php:453 +msgid "Profile Visibility" +msgstr "Visibilità del profilo" -#: ../../mod/profiles.php:532 -msgid "Create a new profile using these settings" -msgstr "Crea un nuovo profilo usando queste impostazioni" +#: ../../mod/connections.php:454 +#, php-format +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." +msgstr "Seleziona il profilo che vuoi mostrare a %s quando visita il tuo profilo in modo sicuro." -#: ../../mod/profiles.php:533 -msgid "Clone this profile" -msgstr "Clona questo profilo" +#: ../../mod/connections.php:455 +msgid "Contact Information / Notes" +msgstr "Informazioni e annotazioni sul contatto" -#: ../../mod/profiles.php:534 -msgid "Delete this profile" -msgstr "Elimina questo profilo" +#: ../../mod/connections.php:456 +msgid "Edit contact notes" +msgstr "Modifica le informazioni sul contatto" -#: ../../mod/profiles.php:535 -msgid "Profile Name:" -msgstr "Nome del profilo:" +#: ../../mod/connections.php:458 +msgid "Their Settings" +msgstr "Permessi concessi a te" -#: ../../mod/profiles.php:536 -msgid "Your Full Name:" -msgstr "Il tuo nome completo:" +#: ../../mod/connections.php:459 +msgid "My Settings" +msgstr "I permessi che concedo" -#: ../../mod/profiles.php:537 -msgid "Title/Description:" -msgstr "Titolo/descrizione:" +#: ../../mod/connections.php:461 +msgid "Forum Members" +msgstr "Membro di un forum" -#: ../../mod/profiles.php:538 -msgid "Your Gender:" -msgstr "Sesso:" +#: ../../mod/connections.php:462 +msgid "Soapbox" +msgstr "Comunicati e annunci" -#: ../../mod/profiles.php:539 -#, php-format -msgid "Birthday (%s):" -msgstr "Compleanno (%s):" +#: ../../mod/connections.php:463 +msgid "Full Sharing" +msgstr "Condivisione totale" -#: ../../mod/profiles.php:540 -msgid "Street Address:" -msgstr "Indirizzo (via/piazza):" +#: ../../mod/connections.php:464 +msgid "Cautious Sharing" +msgstr "Condivisione prudente" -#: ../../mod/profiles.php:541 -msgid "Locality/City:" -msgstr "Località:" +#: ../../mod/connections.php:465 +msgid "Follow Only" +msgstr "Follower" -#: ../../mod/profiles.php:542 -msgid "Postal/Zip Code:" -msgstr "CAP:" +#: ../../mod/connections.php:466 +msgid "Individual Permissions" +msgstr "Permessi individuali" -#: ../../mod/profiles.php:543 -msgid "Country:" -msgstr "Nazione:" +#: ../../mod/connections.php:467 +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 "Alcuni permessi derivano dalle impostazioni di privacy, che hanno una priorità maggiore. Cambiarli in questa pagina non avrà alcun effetto." -#: ../../mod/profiles.php:544 -msgid "Region/State:" -msgstr "Regione/stato:" +#: ../../mod/connections.php:468 +msgid "Advanced Permissions" +msgstr "Permessi avanzati" -#: ../../mod/profiles.php:545 -msgid "♥ Marital Status:" -msgstr "♥ Stato sentimentale:" +#: ../../mod/connections.php:469 +msgid "Quick Links" +msgstr "Impostazioni veloci" -#: ../../mod/profiles.php:546 -msgid "Who: (if applicable)" -msgstr "Con chi: (se possibile)" +#: ../../mod/connections.php:473 +#, php-format +msgid "Visit %s's profile - %s" +msgstr "Guarda il profilo di %s - %s" -#: ../../mod/profiles.php:547 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" -msgstr "Per esempio: cathy123, Cathy Williams, cathy@example.com" +#: ../../mod/connections.php:474 +msgid "Block/Unblock contact" +msgstr "Blocca/sblocca contatto" -#: ../../mod/profiles.php:548 -msgid "Since [date]:" -msgstr "dal [data]:" +#: ../../mod/connections.php:475 +msgid "Ignore contact" +msgstr "Ignora il contatto" -#: ../../mod/profiles.php:550 -msgid "Homepage URL:" -msgstr "Indirizzo home page:" +#: ../../mod/connections.php:476 +msgid "Repair URL settings" +msgstr "Ripara le impostazioni URL" + +#: ../../mod/connections.php:477 +msgid "View conversations" +msgstr "Leggi le conversazioni" -#: ../../mod/profiles.php:553 -msgid "Religious Views:" -msgstr "Orientamento religioso:" +#: ../../mod/connections.php:479 +msgid "Delete contact" +msgstr "Elimina contatto" -#: ../../mod/profiles.php:554 -msgid "Keywords:" -msgstr "Parole chiave, tag:" +#: ../../mod/connections.php:482 +msgid "Last update:" +msgstr "Ultimo aggiornamento:" -#: ../../mod/profiles.php:557 -msgid "Example: fishing photography software" -msgstr "Per esempio: pesca fotografia programmazione" +#: ../../mod/connections.php:484 +msgid "Update public posts" +msgstr "Aggiorna gli articoli pubblici" -#: ../../mod/profiles.php:558 -msgid "Used in directory listings" -msgstr "Visibile nell'elenco pubblico di canali" +#: ../../mod/connections.php:486 +msgid "Update now" +msgstr "Aggiorna adesso" -#: ../../mod/profiles.php:559 -msgid "Tell us about yourself..." -msgstr "Raccontaci di te..." +#: ../../mod/connections.php:492 +msgid "Currently blocked" +msgstr "Attualmente bloccato" -#: ../../mod/profiles.php:560 -msgid "Hobbies/Interests" -msgstr "Hobby/interessi" +#: ../../mod/connections.php:493 +msgid "Currently ignored" +msgstr "Attualmente ignorato" -#: ../../mod/profiles.php:561 -msgid "Contact information and Social Networks" -msgstr "Contatti personali e i tuoi social network" +#: ../../mod/connections.php:494 +msgid "Currently archived" +msgstr "Attualmente archiviato" -#: ../../mod/profiles.php:562 -msgid "My other channels" -msgstr "I miei altri canali" +#: ../../mod/connections.php:495 +msgid "Currently pending" +msgstr "Attualmente da approvare" -#: ../../mod/profiles.php:563 -msgid "Musical interests" -msgstr "Interessi musicali" +#: ../../mod/connections.php:496 +msgid "" +"Replies/likes to your public posts may still be visible" +msgstr "Le risposte ai tuoi articoli pubblici potrebbero restare comunque visibili" -#: ../../mod/profiles.php:564 -msgid "Books, literature" -msgstr "Libri, letteratura" +#: ../../mod/connections.php:532 ../../mod/connections.php:604 +msgid "Blocked" +msgstr "Bloccati" -#: ../../mod/profiles.php:565 -msgid "Television" -msgstr "Televisione" +#: ../../mod/connections.php:537 ../../mod/connections.php:611 +msgid "Ignored" +msgstr "Ignorati" -#: ../../mod/profiles.php:566 -msgid "Film/dance/culture/entertainment" -msgstr "Film/danza/cultura/intrattenimento" +#: ../../mod/connections.php:542 ../../mod/connections.php:625 +msgid "Hidden" +msgstr "Nascosti" -#: ../../mod/profiles.php:567 -msgid "Love/romance" -msgstr "Amore" +#: ../../mod/connections.php:547 ../../mod/connections.php:618 +msgid "Archived" +msgstr "Archiviati" -#: ../../mod/profiles.php:568 -msgid "Work/employment" -msgstr "Lavoro/impiego" +#: ../../mod/connections.php:558 +msgid "All" +msgstr "Tutti" -#: ../../mod/profiles.php:569 -msgid "School/education" -msgstr "Scuola/educazione" +#: ../../mod/connections.php:579 +msgid "Suggestions" +msgstr "Suggerimenti" -#: ../../mod/profiles.php:574 -msgid "" -"This is your public profile.
      It may " -"be visible to anybody using the internet." -msgstr "Questo è il tuo profilo publico.
      Potrebbe essere visto da chiunque attraverso internet." +#: ../../mod/connections.php:582 +msgid "Suggest new connections" +msgstr "Suggerisci nuovi contatti" -#: ../../mod/profiles.php:584 ../../mod/directory.php:160 -msgid "Age: " -msgstr "Età:" +#: ../../mod/connections.php:588 +msgid "Show pending (new) connections" +msgstr "Richieste di entrare in contatto" -#: ../../mod/profiles.php:623 -msgid "Edit/Manage Profiles" -msgstr "Modifica/gestisci i profili" +#: ../../mod/connections.php:591 +msgid "All Connections" +msgstr "Tutti i contatti" -#: ../../mod/profiles.php:624 ../../boot.php:1755 -msgid "Change profile photo" -msgstr "Cambia la foto del profilo" +#: ../../mod/connections.php:594 +msgid "Show all connections" +msgstr "Mostra tutti i contatti" -#: ../../mod/profiles.php:625 ../../boot.php:1762 -msgid "Create New Profile" -msgstr "Crea un nuovo profilo" +#: ../../mod/connections.php:597 +msgid "Unblocked" +msgstr "Non bloccati" -#: ../../mod/profiles.php:636 ../../boot.php:1776 -msgid "Profile Image" -msgstr "Immagine del profilo" +#: ../../mod/connections.php:600 +msgid "Only show unblocked connections" +msgstr "Mostra solo i contatti non bloccati" -#: ../../mod/profiles.php:639 ../../boot.php:1779 -msgid "visible to everybody" -msgstr "visibile a tutti" +#: ../../mod/connections.php:607 +msgid "Only show blocked connections" +msgstr "Mostra solo i contatti bloccati" -#: ../../mod/profiles.php:640 ../../boot.php:1780 -msgid "Edit visibility" -msgstr "Cambia la visibilità" +#: ../../mod/connections.php:614 +msgid "Only show ignored connections" +msgstr "Mostra solo i contatti ignorati" -#: ../../mod/new_channel.php:107 -msgid "Add a Channel" -msgstr "Aggiungi un canale" +#: ../../mod/connections.php:621 +msgid "Only show archived connections" +msgstr "Mostra solo i contatti archiviati" -#: ../../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 "I contenuti che pubblichi finiscono in un \"canale\". Un canale può essere usato per mantenere un tuo profilo personale, per avere un blog, per creare forum di discussione o gruppi di interesse, per pagine di celebrità e molto altro. Puoi creare quanti canali vuoi a meno di limiti dati dal gestore del sito." +#: ../../mod/connections.php:628 +msgid "Only show hidden connections" +msgstr "Mostra solo i contatti nascosti" -#: ../../mod/new_channel.php:111 -msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" " -msgstr "Per esempio: \"Mario Rossi\", \"Lisa e le sue ricette\", \"Il campionato\", \"Il gruppo di escursionismo\"" +#: ../../mod/connections.php:670 +#, php-format +msgid "%1$s [%2$s]" +msgstr "%1$s [%2$s]" -#: ../../mod/new_channel.php:112 -msgid "Choose a short nickname" -msgstr "Scegli un nome breve" +#: ../../mod/connections.php:671 +msgid "Edit contact" +msgstr "Modifica il contatto" -#: ../../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 "Il nome breve sarà usato per creare un indirizzo facile da ricordare per il tuo canale (simile a una email). Così potrai condividerlo e gli altri potranno trovarti." +#: ../../mod/connections.php:694 +msgid "Search your connections" +msgstr "Cerca tra i contatti" -#: ../../mod/new_channel.php:114 -msgid "Or import an existing channel from another location" -msgstr "Oppure importa un tuo canale esistente da un altro server/hub" +#: ../../mod/connections.php:695 +msgid "Finding: " +msgstr "Ricerca: " #: ../../mod/filestorage.php:35 msgid "Permission Denied." @@ -6010,7 +6067,7 @@ msgid "" "Password reset failed." msgstr "La richiesta non può essere verificata (potresti averla già usata precedentemente). La password non può essere reimpostata." -#: ../../mod/lostpass.php:85 ../../boot.php:1469 +#: ../../mod/lostpass.php:85 ../../boot.php:1450 msgid "Password Reset" msgstr "Reimposta la password" @@ -6084,19 +6141,19 @@ msgstr "Impossibile clonare il canale. L'importazione è fallita." msgid "Cloned channel not found. Import failed." msgstr "Impossibile trovare il canale clonato. L'importazione è fallita." -#: ../../mod/import.php:356 +#: ../../mod/import.php:358 msgid "Import completed." msgstr "L'importazione è terminata con successo!" -#: ../../mod/import.php:369 +#: ../../mod/import.php:371 msgid "You must be logged in to use this feature." msgstr "Per questa funzionalità devi aver effettuato l'accesso." -#: ../../mod/import.php:374 +#: ../../mod/import.php:376 msgid "Import Channel" msgstr "Importa un canale" -#: ../../mod/import.php:375 +#: ../../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 " @@ -6104,27 +6161,27 @@ msgid "" "be imported. Importation of content is not yet available." msgstr "Usa questo modulo per importare un tuo canale da un altro server/hub. Puoi scaricare i dati identificativi del canale direttamente dall'altro server/hub oppure tramite un file che hai esportato. Saranno importati solamente l'identità e i contatti. L'importazione dei contenuti non è ancora disponibile." -#: ../../mod/import.php:376 +#: ../../mod/import.php:378 msgid "File to Upload" msgstr "File da caricare" -#: ../../mod/import.php:377 +#: ../../mod/import.php:379 msgid "Or provide the old server/hub details" msgstr "Oppure fornisci i dettagli del vecchio server/hub" -#: ../../mod/import.php:378 +#: ../../mod/import.php:380 msgid "Your old identity address (xyz@example.com)" msgstr "Il tuo vecchio identificativo (per esempio pippo@esempio.com)" -#: ../../mod/import.php:379 +#: ../../mod/import.php:381 msgid "Your old login email address" msgstr "L'email che usavi per accedere sul vecchio server" -#: ../../mod/import.php:380 +#: ../../mod/import.php:382 msgid "Your old login password" msgstr "La password per il vecchio server" -#: ../../mod/import.php:381 +#: ../../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" @@ -6132,7 +6189,7 @@ msgid "" "primary location for files, photos, and media." msgstr "Per ciascuna opzione, scegli se vuoi rendere questo server il tuo indirizzo primario, oppure se preferisci che lo rimanga il vecchio. Potrai pubblicare da entrambi i server, ma solamente uno sarà marcato come primario per i tuoi file, foto, ecc." -#: ../../mod/import.php:382 +#: ../../mod/import.php:384 msgid "Make this hub my primary location" msgstr "Rendi questo server il mio indirizzo primario" @@ -6173,19 +6230,19 @@ msgstr "Totale voti" msgid "Average Rating" msgstr "Media" -#: ../../mod/match.php:12 +#: ../../mod/match.php:16 msgid "Profile Match" msgstr "Profili corrispondenti" -#: ../../mod/match.php:20 +#: ../../mod/match.php:24 msgid "No keywords to match. Please add keywords to your default profile." msgstr "Nessuna parola chiave per le ricerche. Aggiungi parole chiave al tuo profilo predefinito." -#: ../../mod/match.php:57 +#: ../../mod/match.php:61 msgid "is interested in:" msgstr "interessi personali:" -#: ../../mod/match.php:65 +#: ../../mod/match.php:69 msgid "No matches" msgstr "Nessun risultato" @@ -6290,10 +6347,6 @@ msgstr "Inserisci audio Vorbis [.ogg]" msgid "Delete Layout" msgstr "Elimina il layout" -#: ../../mod/nogroup.php:58 -msgid "Contacts who are not members of a group" -msgstr "Contatti che non sono in nessun insieme" - #: ../../mod/profile_photo.php:54 msgid "Image uploaded but image cropping failed." msgstr "L'immagine è stata caricata, ma il non è stato possibile ritagliarla." @@ -6441,7 +6494,7 @@ msgstr "Fan/Ammiratore" #: ../../mod/notifications.php:194 msgid "Friend/Connect Request" -msgstr "Richiesta per entrare in contatto" +msgstr "Richiesta di entrare in contatto" #: ../../mod/notifications.php:194 msgid "New Follower" @@ -6528,7 +6581,7 @@ msgstr "Inviato!" msgid "Item is not editable" msgstr "L'elemento non è modificabile" -#: ../../mod/profile.php:111 +#: ../../mod/profile.php:112 msgid "Access to this profile has been restricted." msgstr "L'accesso a questo profilo è stato limitato." @@ -6556,7 +6609,7 @@ msgstr "Rendi privato questo articolo" msgid "Wall Photos" msgstr "Foto della bacheca" -#: ../../mod/channel.php:120 +#: ../../mod/channel.php:107 msgid "Insufficient permissions. Request redirected to profile page." msgstr "Permessi insufficienti. Sarà visualizzata la pagina del profilo." @@ -6792,17 +6845,6 @@ msgstr "Ripeti la password per verifica" msgid "Please login." msgstr "Accedi." -#: ../../mod/post.php:119 -msgid "" -"Remote authentication blocked. You are logged into this site locally. Please" -" logout and retry." -msgstr "L'autenticazione remota non è disponibile. Hai accesso solamente a questo sito. Puoi provare ad uscire per tentare di nuovo." - -#: ../../mod/post.php:132 -#, php-format -msgid "Welcome %s. Remote authentication successful." -msgstr "Ciao %s. La tua autenticazione da remoto è avvenuta con successo." - #: ../../mod/removeme.php:49 msgid "Remove This Channel" msgstr "Elimina questo canale" @@ -7104,113 +7146,41 @@ msgstr "Immagine dell'intestazione" msgid "Header image only on profile pages" msgstr "È possibile mettere un'immagine solo nell'intestazione dei profili" -#: ../../boot.php:1274 +#: ../../boot.php:1255 #, php-format msgid "Update %s failed. See error logs." msgstr "%s: aggiornamento fallito. Controlla i log di errore." -#: ../../boot.php:1277 +#: ../../boot.php:1258 #, php-format msgid "Update Error at %s" msgstr "Errore di aggiornamento su %s" -#: ../../boot.php:1434 +#: ../../boot.php:1415 msgid "" "Create an account to access services and applications within the Red Matrix" msgstr "Registrati per accedere ai servizi e alle applicazioni di Red Matrix" -#: ../../boot.php:1462 +#: ../../boot.php:1443 msgid "Password" msgstr "Password" -#: ../../boot.php:1463 +#: ../../boot.php:1444 msgid "Remember me" msgstr "Resta connesso" -#: ../../boot.php:1468 +#: ../../boot.php:1449 msgid "Forgot your password?" msgstr "Hai dimenticato la password?" -#: ../../boot.php:1533 +#: ../../boot.php:1514 msgid "permission denied" msgstr "permesso negato" -#: ../../boot.php:1534 +#: ../../boot.php:1515 msgid "Got Zot?" msgstr "Hai Zot?" -#: ../../boot.php:1593 -msgid "Requested channel is not available." -msgstr "Il canale che cerchi non è disponibile." - -#: ../../boot.php:1605 -msgid " Sorry, you don't have the permission to view this profile. " -msgstr "Purtroppo non hai il permesso di vedere questo profilo." - -#: ../../boot.php:1761 -msgid "Profiles" -msgstr "Profili" - -#: ../../boot.php:1761 -msgid "Manage/edit profiles" -msgstr "Gestisci/modifica i profili" - -#: ../../boot.php:1765 -msgid "Edit Profile" -msgstr "Modifica il profilo" - -#: ../../boot.php:1859 ../../boot.php:1939 -msgid "F d" -msgstr "d F" - -#: ../../boot.php:1916 -msgid "Birthday Reminders" -msgstr "Promemoria compleanni" - -#: ../../boot.php:1917 -msgid "Birthdays this week:" -msgstr "Compleanni questa settimana:" - -#: ../../boot.php:1972 -msgid "[No description]" -msgstr "[Nessuna descrizione]" - -#: ../../boot.php:1990 -msgid "Event Reminders" -msgstr "Promemoria" - -#: ../../boot.php:1991 -msgid "Events this week:" -msgstr "Eventi di questa settimana:" - -#: ../../boot.php:2225 -msgid "Channel" -msgstr "Canale" - -#: ../../boot.php:2228 -msgid "Status Messages and Posts" -msgstr "Articoli e messaggi di stato" - -#: ../../boot.php:2232 -msgid "About" -msgstr "Informazioni" - -#: ../../boot.php:2235 -msgid "Profile Details" -msgstr "Dettagli del profilo" - -#: ../../boot.php:2253 -msgid "Events and Calendar" -msgstr "Calendario eventi" - -#: ../../boot.php:2258 -msgid "Webpages" -msgstr "Pagine web" - -#: ../../boot.php:2261 -msgid "Manage Webpages" -msgstr "Gestisci le pagine web" - -#: ../../boot.php:2546 +#: ../../boot.php:1902 msgid "toggle mobile" msgstr "attiva/disattiva versione mobile" diff --git a/view/it/strings.php b/view/it/strings.php index 7068289b1..dde964c00 100644 --- a/view/it/strings.php +++ b/view/it/strings.php @@ -97,13 +97,6 @@ $a->strings["Encrypt text"] = "Crittografia del testo"; $a->strings["Connect"] = "Entra in contatto/segui"; $a->strings["New window"] = "Nuova finestra"; $a->strings["Open the selected location in a different window or browser tab"] = "Apri l'indirizzo selezionato in una nuova scheda o finestra"; -$a->strings["Poke"] = "Poke"; -$a->strings["View Status"] = "Guarda il messaggio di stato"; -$a->strings["View Profile"] = "Profilo"; -$a->strings["View Photos"] = "Guarda le foto"; -$a->strings["Network Posts"] = "Articoli dalla tua rete"; -$a->strings["Edit Contact"] = "Modifica il contatto"; -$a->strings["Send PM"] = "Invia messaggio privato"; $a->strings["Unknown | Not categorised"] = "Sconosciuto | Senza categoria"; $a->strings["Block immediately"] = "Blocca subito"; $a->strings["Shady, spammer, self-marketer"] = "Spammer o dedito al marketing"; @@ -237,130 +230,9 @@ $a->strings["No recipient provided."] = "Devi scegliere un destinatario."; $a->strings["[no subject]"] = "[nessun titolo]"; $a->strings["Unable to determine sender."] = "Impossibile determinare il mittente."; $a->strings["Stored post could not be verified."] = "Non è stato possibile verificare l'articolo inserito."; -$a->strings["view full size"] = "guarda nelle dimensioni reali"; $a->strings["Profile Photos"] = "Foto del profilo"; -$a->strings["Profile"] = "Profilo"; -$a->strings["Full Name:"] = "Nome completo:"; -$a->strings["Gender:"] = "Sesso:"; -$a->strings["j F, Y"] = "j F Y"; -$a->strings["j F"] = "j F"; -$a->strings["Birthday:"] = "Compleanno:"; -$a->strings["Age:"] = "Età:"; -$a->strings["Status:"] = "Stato:"; -$a->strings["for %1\$d %2\$s"] = "per %1\$d %2\$s"; -$a->strings["Sexual Preference:"] = "Preferenze sessuali:"; -$a->strings["Homepage:"] = "Home page:"; -$a->strings["Hometown:"] = "Città dove vivo:"; -$a->strings["Tags:"] = "Tag:"; -$a->strings["Political Views:"] = "Orientamento politico:"; -$a->strings["Religion:"] = "Religione:"; -$a->strings["About:"] = "Informazioni:"; -$a->strings["Hobbies/Interests:"] = "Interessi e hobby:"; -$a->strings["Likes:"] = "Mi piace:"; -$a->strings["Dislikes:"] = "Non mi piace:"; -$a->strings["Contact information and Social Networks:"] = "Contatti e social network:"; -$a->strings["Musical interests:"] = "Gusti musicali:"; -$a->strings["Books, literature:"] = "Libri, letteratura:"; -$a->strings["Television:"] = "Televisione:"; -$a->strings["Film/dance/culture/entertainment:"] = "Film, danza, cultura, intrattenimento:"; -$a->strings["Love/Romance:"] = "Amore:"; -$a->strings["Work/employment:"] = "Lavoro:"; -$a->strings["School/education:"] = "Scuola:"; -$a->strings["prev"] = "prec"; -$a->strings["first"] = "inizio"; -$a->strings["last"] = "fine"; -$a->strings["next"] = "succ"; -$a->strings["older"] = "più recenti"; -$a->strings["newer"] = "più nuovi"; -$a->strings["No connections"] = "Nessun contatto"; -$a->strings["%d Connection"] = array( - 0 => "%d contatto", - 1 => "%d contatti", -); -$a->strings["View Connections"] = "Elenco contatti"; -$a->strings["Search"] = "Cerca"; -$a->strings["Save"] = "Salva"; -$a->strings["poke"] = "poke"; -$a->strings["poked"] = "ha ricevuto un poke"; -$a->strings["ping"] = "ping"; -$a->strings["pinged"] = "ha ricevuto un ping"; -$a->strings["prod"] = "prod"; -$a->strings["prodded"] = "ha ricevuto un prod"; -$a->strings["slap"] = "schiaffo"; -$a->strings["slapped"] = "ha ricevuto uno schiaffo"; -$a->strings["finger"] = "finger"; -$a->strings["fingered"] = "ha ricevuto un finger"; -$a->strings["rebuff"] = "rifiuto"; -$a->strings["rebuffed"] = "ha ricevuto un rifiuto"; -$a->strings["happy"] = "allegro"; -$a->strings["sad"] = "triste"; -$a->strings["mellow"] = "calmo"; -$a->strings["tired"] = "stanco"; -$a->strings["perky"] = "vivace"; -$a->strings["angry"] = "arrabbiato"; -$a->strings["stupified"] = "stordito"; -$a->strings["puzzled"] = "confuso"; -$a->strings["interested"] = "attento"; -$a->strings["bitter"] = "amaro"; -$a->strings["cheerful"] = "allegro"; -$a->strings["alive"] = "vivace"; -$a->strings["annoyed"] = "seccato"; -$a->strings["anxious"] = "ansioso"; -$a->strings["cranky"] = "irritabile"; -$a->strings["disturbed"] = "turbato"; -$a->strings["frustrated"] = "frustrato"; -$a->strings["motivated"] = "motivato"; -$a->strings["relaxed"] = "rilassato"; -$a->strings["surprised"] = "sorpreso"; -$a->strings["Monday"] = "lunedì"; -$a->strings["Tuesday"] = "martedì"; -$a->strings["Wednesday"] = "mercoledì"; -$a->strings["Thursday"] = "giovedì"; -$a->strings["Friday"] = "venerdì"; -$a->strings["Saturday"] = "sabato"; -$a->strings["Sunday"] = "domenica"; -$a->strings["January"] = "gennaio"; -$a->strings["February"] = "febbraio"; -$a->strings["March"] = "marzo"; -$a->strings["April"] = "aprile"; -$a->strings["May"] = "maggio"; -$a->strings["June"] = "giugno"; -$a->strings["July"] = "luglio"; -$a->strings["August"] = "agosto"; -$a->strings["September"] = "settembre"; -$a->strings["October"] = "ottobre"; -$a->strings["November"] = "novembre"; -$a->strings["December"] = "dicembre"; -$a->strings["unknown.???"] = "sconosciuto???"; -$a->strings["bytes"] = "byte"; -$a->strings["remove category"] = "rimuovi la categoria"; -$a->strings["remove from file"] = "rimuovi dal file"; -$a->strings["Click to open/close"] = "Clicca per aprire/chiudere"; -$a->strings["link to source"] = "Link all'originale"; -$a->strings["Select a page layout: "] = "Scegli il layout della pagina:"; -$a->strings["default"] = "predefinito"; -$a->strings["Page content type: "] = "Contenuto della pagina:"; -$a->strings["Select an alternate language"] = "Seleziona una lingua diversa"; -$a->strings["photo"] = "la foto"; -$a->strings["event"] = "l'evento"; -$a->strings["status"] = "il messaggio di stato"; -$a->strings["comment"] = "il commento"; -$a->strings["activity"] = "l'attività"; -$a->strings["Design"] = "Design"; -$a->strings["Blocks"] = "Riquadri"; -$a->strings["Menus"] = "Menù"; -$a->strings["Layouts"] = "Layout"; -$a->strings["Pages"] = "Pagine"; $a->strings["Public Timeline"] = "Diario pubblico"; -$a->strings["Unable to obtain identity information from database"] = "Impossibile ottenere le informazioni di identificazione dal database"; -$a->strings["Empty name"] = "Nome vuoto"; -$a->strings["Name too long"] = "Nome troppo lungo"; -$a->strings["No account identifier"] = "Account senza identificativo"; -$a->strings["Nickname is required."] = "Il nome dell'account è obbligatorio."; -$a->strings["Nickname has unsupported characters or is already being used on this site."] = "Il nome dell'account è già in uso oppure ha dei caratteri non supportati."; -$a->strings["Unable to retrieve created identity"] = "Impossibile caricare l'identità creata"; -$a->strings["Default Profile"] = "Profilo predefinito"; -$a->strings["Friends"] = "Amici"; +$a->strings["view full size"] = "guarda nelle dimensioni reali"; $a->strings["Image/photo"] = "Immagine"; $a->strings["Encrypted content"] = "Contenuto crittografato"; $a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s ha scritto %2\$s seguente %3\$s"; @@ -413,6 +285,7 @@ $a->strings["Infatuated"] = "Infatuato/a"; $a->strings["Dating"] = "Disponibile a un incontro"; $a->strings["Unfaithful"] = "Infedele"; $a->strings["Sex Addict"] = "Sesso-dipendente"; +$a->strings["Friends"] = "Amici"; $a->strings["Friends/Benefits"] = "Amici piccanti"; $a->strings["Casual"] = "Casual"; $a->strings["Engaged"] = "Impegnato"; @@ -455,6 +328,7 @@ $a->strings["Logout"] = "Esci"; $a->strings["End this session"] = "Chiudi questa sessione"; $a->strings["Home"] = "Bacheca"; $a->strings["Your posts and conversations"] = "I tuoi articoli e conversazioni"; +$a->strings["View Profile"] = "Profilo"; $a->strings["Your profile page"] = "Il tuo profilo"; $a->strings["Edit Profiles"] = "Modifica i profili"; $a->strings["Manage/Edit Profiles"] = "Gestisci e modifica i profili"; @@ -471,6 +345,7 @@ $a->strings["Help"] = "Guida"; $a->strings["Help and documentation"] = "Guida e documentazione"; $a->strings["Apps"] = "Apps"; $a->strings["Addon applications, utilities, games"] = "App, strumenti e giochi aggiuntivi"; +$a->strings["Search"] = "Cerca"; $a->strings["Search site content"] = "Cerca nel sito"; $a->strings["Directory"] = "Tutti i canali"; $a->strings["Channel Locator"] = "Ricerca canali"; @@ -523,11 +398,16 @@ $a->strings["your registration password"] = "la password di registrazione"; $a->strings["Registration details for %s"] = "Dettagli della registrazione di %s"; $a->strings["Account approved."] = "Account approvato."; $a->strings["Registration revoked for %s"] = "Registrazione revocata per %s"; +$a->strings["photo"] = "la foto"; +$a->strings["event"] = "l'evento"; $a->strings["channel"] = "canale"; +$a->strings["status"] = "il messaggio di stato"; +$a->strings["comment"] = "il commento"; $a->strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s piace %3\$s di %2\$s"; $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "A %1\$s non piace %3\$s di %2\$s"; $a->strings["%1\$s is now connected with %2\$s"] = "%1\$s adesso è connesso con %2\$s"; $a->strings["%1\$s poked %2\$s"] = "%1\$s ha mandato un poke a %2\$s"; +$a->strings["poked"] = "ha ricevuto un poke"; $a->strings["%1\$s is currently %2\$s"] = "%1\$s al momento è %2\$s"; $a->strings["View %s's profile @ %s"] = "Vedi il profilo di %s @ %s"; $a->strings["Categories:"] = "Categorie:"; @@ -538,7 +418,12 @@ $a->strings["Loading..."] = "Caricamento in corso..."; $a->strings["Delete Selected Items"] = "Elimina gli oggetti selezionati"; $a->strings["View Source"] = "Vedi il sorgente"; $a->strings["Follow Thread"] = "Segui la discussione"; +$a->strings["View Status"] = "Guarda il messaggio di stato"; +$a->strings["View Photos"] = "Guarda le foto"; $a->strings["Matrix Activity"] = "Attività nella tua rete"; +$a->strings["Edit Contact"] = "Modifica il contatto"; +$a->strings["Send PM"] = "Invia messaggio privato"; +$a->strings["Poke"] = "Poke"; $a->strings["%s likes this."] = "Piace a %s."; $a->strings["%s doesn't like this."] = "Non piace a %s."; $a->strings["%2\$d people like this."] = array( @@ -587,6 +472,25 @@ $a->strings["permissions"] = "permessi"; $a->strings["Public post"] = "Articolo pubblico"; $a->strings["Example: bob@example.com, mary@example.com"] = "Per esempio: mario@esempio.com, simona@esempio.com"; $a->strings["Set expiration date"] = "Data di scadenza"; +$a->strings["Commented Order"] = "Ultimi commenti"; +$a->strings["Sort by Comment Date"] = "Per data del commento"; +$a->strings["Posted Order"] = "Ultimi articoli"; +$a->strings["Sort by Post Date"] = "Per data di creazione"; +$a->strings["Personal"] = "Personali"; +$a->strings["Posts that mention or involve you"] = "Articoli che ti riguardano o ti menzionano"; +$a->strings["New"] = "Novità"; +$a->strings["Activity Stream - by date"] = "Elenco attività - per data"; +$a->strings["Starred"] = "Preferiti"; +$a->strings["Favourite Posts"] = "Articoli preferiti"; +$a->strings["Spam"] = "Spam"; +$a->strings["Posts flagged as SPAM"] = "Articoli marcati come spam"; +$a->strings["Channel"] = "Canale"; +$a->strings["Status Messages and Posts"] = "Articoli e messaggi di stato"; +$a->strings["About"] = "Informazioni"; +$a->strings["Profile Details"] = "Dettagli del profilo"; +$a->strings["Events and Calendar"] = "Calendario eventi"; +$a->strings["Webpages"] = "Pagine web"; +$a->strings["Manage Webpages"] = "Gestisci le pagine web"; $a->strings["Logged out."] = "Uscita effettuata."; $a->strings["Failed authentication"] = "Autenticazione fallita"; $a->strings["Login failed."] = "Accesso fallito."; @@ -613,6 +517,85 @@ $a->strings["%d connection in common"] = array( 1 => "%d contatti in comune", ); $a->strings["New Page"] = "Nuova pagina web"; +$a->strings["prev"] = "prec"; +$a->strings["first"] = "inizio"; +$a->strings["last"] = "fine"; +$a->strings["next"] = "succ"; +$a->strings["older"] = "più recenti"; +$a->strings["newer"] = "più nuovi"; +$a->strings["No connections"] = "Nessun contatto"; +$a->strings["%d Connection"] = array( + 0 => "%d contatto", + 1 => "%d contatti", +); +$a->strings["View Connections"] = "Elenco contatti"; +$a->strings["Save"] = "Salva"; +$a->strings["poke"] = "poke"; +$a->strings["ping"] = "ping"; +$a->strings["pinged"] = "ha ricevuto un ping"; +$a->strings["prod"] = "prod"; +$a->strings["prodded"] = "ha ricevuto un prod"; +$a->strings["slap"] = "schiaffo"; +$a->strings["slapped"] = "ha ricevuto uno schiaffo"; +$a->strings["finger"] = "finger"; +$a->strings["fingered"] = "ha ricevuto un finger"; +$a->strings["rebuff"] = "rifiuto"; +$a->strings["rebuffed"] = "ha ricevuto un rifiuto"; +$a->strings["happy"] = "allegro"; +$a->strings["sad"] = "triste"; +$a->strings["mellow"] = "calmo"; +$a->strings["tired"] = "stanco"; +$a->strings["perky"] = "vivace"; +$a->strings["angry"] = "arrabbiato"; +$a->strings["stupified"] = "stordito"; +$a->strings["puzzled"] = "confuso"; +$a->strings["interested"] = "attento"; +$a->strings["bitter"] = "amaro"; +$a->strings["cheerful"] = "allegro"; +$a->strings["alive"] = "vivace"; +$a->strings["annoyed"] = "seccato"; +$a->strings["anxious"] = "ansioso"; +$a->strings["cranky"] = "irritabile"; +$a->strings["disturbed"] = "turbato"; +$a->strings["frustrated"] = "frustrato"; +$a->strings["motivated"] = "motivato"; +$a->strings["relaxed"] = "rilassato"; +$a->strings["surprised"] = "sorpreso"; +$a->strings["Monday"] = "lunedì"; +$a->strings["Tuesday"] = "martedì"; +$a->strings["Wednesday"] = "mercoledì"; +$a->strings["Thursday"] = "giovedì"; +$a->strings["Friday"] = "venerdì"; +$a->strings["Saturday"] = "sabato"; +$a->strings["Sunday"] = "domenica"; +$a->strings["January"] = "gennaio"; +$a->strings["February"] = "febbraio"; +$a->strings["March"] = "marzo"; +$a->strings["April"] = "aprile"; +$a->strings["May"] = "maggio"; +$a->strings["June"] = "giugno"; +$a->strings["July"] = "luglio"; +$a->strings["August"] = "agosto"; +$a->strings["September"] = "settembre"; +$a->strings["October"] = "ottobre"; +$a->strings["November"] = "novembre"; +$a->strings["December"] = "dicembre"; +$a->strings["unknown.???"] = "sconosciuto???"; +$a->strings["bytes"] = "byte"; +$a->strings["remove category"] = "rimuovi la categoria"; +$a->strings["remove from file"] = "rimuovi dal file"; +$a->strings["Click to open/close"] = "Clicca per aprire/chiudere"; +$a->strings["link to source"] = "Link all'originale"; +$a->strings["Select a page layout: "] = "Scegli il layout della pagina:"; +$a->strings["default"] = "predefinito"; +$a->strings["Page content type: "] = "Contenuto della pagina:"; +$a->strings["Select an alternate language"] = "Seleziona una lingua diversa"; +$a->strings["activity"] = "l'attività"; +$a->strings["Design"] = "Design"; +$a->strings["Blocks"] = "Riquadri"; +$a->strings["Menus"] = "Menù"; +$a->strings["Layouts"] = "Layout"; +$a->strings["Pages"] = "Pagine"; $a->strings["Channel is blocked on this site."] = "Il canale è bloccato per questo sito."; $a->strings["Channel location missing."] = "Manca l'indirizzo del canale."; $a->strings["Channel discovery failed. Website may be down or misconfigured."] = "La ricerca del canale è fallita. Il sito potrebbe avere problemi o una configurazione sbagliata."; @@ -653,6 +636,60 @@ $a->strings["Click here to upgrade."] = "Clicca qui per aggiornare."; $a->strings["This action exceeds the limits set by your subscription plan."] = "Questa operazione esce dai termini del tuo abbonamento."; $a->strings["This action is not available under your subscription plan."] = "Questa operazione non è prevista dal tuo abbonamento."; $a->strings["Default"] = "Predefinito"; +$a->strings["Unable to obtain identity information from database"] = "Impossibile ottenere le informazioni di identificazione dal database"; +$a->strings["Empty name"] = "Nome vuoto"; +$a->strings["Name too long"] = "Nome troppo lungo"; +$a->strings["No account identifier"] = "Account senza identificativo"; +$a->strings["Nickname is required."] = "Il nome dell'account è obbligatorio."; +$a->strings["Nickname has unsupported characters or is already being used on this site."] = "Il nome dell'account è già in uso oppure ha dei caratteri non supportati."; +$a->strings["Unable to retrieve created identity"] = "Impossibile caricare l'identità creata"; +$a->strings["Default Profile"] = "Profilo predefinito"; +$a->strings["Requested channel is not available."] = "Il canale che cerchi non è disponibile."; +$a->strings[" Sorry, you don't have the permission to view this profile. "] = "Purtroppo non hai il permesso di vedere questo profilo."; +$a->strings["Requested profile is not available."] = "Il profilo richiesto non è disponibile."; +$a->strings["Change profile photo"] = "Cambia la foto del profilo"; +$a->strings["Profiles"] = "Profili"; +$a->strings["Manage/edit profiles"] = "Gestisci/modifica i profili"; +$a->strings["Create New Profile"] = "Crea un nuovo profilo"; +$a->strings["Edit Profile"] = "Modifica il profilo"; +$a->strings["Profile Image"] = "Immagine del profilo"; +$a->strings["visible to everybody"] = "visibile a tutti"; +$a->strings["Edit visibility"] = "Cambia la visibilità"; +$a->strings["Gender:"] = "Sesso:"; +$a->strings["Status:"] = "Stato:"; +$a->strings["Homepage:"] = "Home page:"; +$a->strings["g A l F d"] = "g A l d F"; +$a->strings["F d"] = "d F"; +$a->strings["[today]"] = "[oggi]"; +$a->strings["Birthday Reminders"] = "Promemoria compleanni"; +$a->strings["Birthdays this week:"] = "Compleanni questa settimana:"; +$a->strings["[No description]"] = "[Nessuna descrizione]"; +$a->strings["Event Reminders"] = "Promemoria"; +$a->strings["Events this week:"] = "Eventi di questa settimana:"; +$a->strings["Profile"] = "Profilo"; +$a->strings["Full Name:"] = "Nome completo:"; +$a->strings["j F, Y"] = "j F Y"; +$a->strings["j F"] = "j F"; +$a->strings["Birthday:"] = "Compleanno:"; +$a->strings["Age:"] = "Età:"; +$a->strings["for %1\$d %2\$s"] = "per %1\$d %2\$s"; +$a->strings["Sexual Preference:"] = "Preferenze sessuali:"; +$a->strings["Hometown:"] = "Città dove vivo:"; +$a->strings["Tags:"] = "Tag:"; +$a->strings["Political Views:"] = "Orientamento politico:"; +$a->strings["Religion:"] = "Religione:"; +$a->strings["About:"] = "Informazioni:"; +$a->strings["Hobbies/Interests:"] = "Interessi e hobby:"; +$a->strings["Likes:"] = "Mi piace:"; +$a->strings["Dislikes:"] = "Non mi piace:"; +$a->strings["Contact information and Social Networks:"] = "Contatti e social network:"; +$a->strings["Musical interests:"] = "Gusti musicali:"; +$a->strings["Books, literature:"] = "Libri, letteratura:"; +$a->strings["Television:"] = "Televisione:"; +$a->strings["Film/dance/culture/entertainment:"] = "Film, danza, cultura, intrattenimento:"; +$a->strings["Love/Romance:"] = "Amore:"; +$a->strings["Work/employment:"] = "Lavoro:"; +$a->strings["School/education:"] = "Scuola:"; $a->strings["Welcome "] = "Ciao"; $a->strings["Please upload a profile photo."] = "Carica una foto per il profilo!"; $a->strings["Welcome back "] = "Ciao, è bello rivederti"; @@ -721,7 +758,6 @@ $a->strings["Click the [Register] link on the following page to join."] = "Fai c $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"] = "Per saperne di più sul progetto Red Matrix e sul perché potrebbe cambiare internet per come la conosciamo, visita http://getzot.com"; $a->strings["Friends of %s"] = "Amici di %s"; $a->strings["No friends to display."] = "Nessun amico da visualizzare."; -$a->strings["Requested profile is not available."] = "Il profilo richiesto non è disponibile."; $a->strings["View"] = "Guarda"; $a->strings["Authorize application connection"] = "Autorizza la app"; $a->strings["Return to your app and insert this Securty Code:"] = "Torna alla app e inserisci questo codice di sicurezza:"; @@ -881,14 +917,6 @@ $a->strings["Publish your default profile in the network directory"] = "Pubblica $a->strings["Allow us to suggest you as a potential friend to new members?"] = "Vuoi essere suggerito come potenziale amico ai nuovi membri?"; $a->strings["or"] = "o"; $a->strings["Your channel address is"] = "L'indirizzo del tuo canale è"; -$a->strings["Automatically expire posts after this many days:"] = "Gli articoli scadono automaticamente dopo questo numero di giorni:"; -$a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Se lasci vuoto, i messaggi non scadranno mai. I messaggi scaduti saranno eliminati."; -$a->strings["Advanced expiration settings"] = "Impostazioni avanzate di scandenza"; -$a->strings["Advanced Expiration"] = "Scadenza"; -$a->strings["Expire posts:"] = "Fai scadere gli articoli:"; -$a->strings["Expire starred posts:"] = "Fai scadere gli articoli preferiti:"; -$a->strings["Expire photos:"] = "Fai scadere le foto:"; -$a->strings["Only expire posts by others:"] = "Fai scadere solo gli articoli scritti da altri:"; $a->strings["Channel Settings"] = "Impostazioni del canale"; $a->strings["Basic Settings"] = "Impostazioni di base"; $a->strings["Your Timezone:"] = "Il tuo fuso orario:"; @@ -1116,7 +1144,7 @@ $a->strings["Edit Menu Element"] = "Modifica l'elemento del menù"; $a->strings["Modify"] = "Modifica"; $a->strings["Collection created."] = "L'insieme di canali è stato creato."; $a->strings["Could not create collection."] = "Impossibile creare l'insieme."; -$a->strings["Collection name changed."] = "Il nome dell'insieme di canali è stato cambiato."; +$a->strings["Collection updated."] = "Insieme aggiornato."; $a->strings["Create a collection of channels."] = "Crea un insieme di canali."; $a->strings["Collection Name: "] = "Nome del'insieme:"; $a->strings["Members are visible to other channels"] = "I membri saranno visibili agli altri canali"; @@ -1162,8 +1190,6 @@ $a->strings["View Album"] = "Guarda l'album"; $a->strings["Recent Photos"] = "Foto recenti"; $a->strings["sent you a private message"] = "ti ha inviato un messaggio privato"; $a->strings["added your channel"] = "ha aggiunto il tuo canale"; -$a->strings["g A l F d"] = "g A l d F"; -$a->strings["[today]"] = "[oggi]"; $a->strings["posted an event"] = "ha creato un evento"; $a->strings["- select -"] = "- scegli -"; $a->strings["Menu updated."] = "Menù aggiornato."; @@ -1172,7 +1198,6 @@ $a->strings["Menu created."] = "Menù creato."; $a->strings["Unable to create menu."] = "Impossibile creare il menù."; $a->strings["Manage Menus"] = "Gestione menù"; $a->strings["Drop"] = "Elimina"; -$a->strings["New"] = "Novità"; $a->strings["Create a new menu"] = "Crea un nuovo menù"; $a->strings["Delete this menu"] = "Elimina questo menù"; $a->strings["Edit menu contents"] = "Modifica i contenuti del menù"; @@ -1218,17 +1243,7 @@ $a->strings["Not Found"] = "Non disponibile"; $a->strings["Remote Authentication"] = "Autenticazione a distanza"; $a->strings["Enter your channel address (e.g. channel@example.com)"] = "Inserisci l'indirizzo del tuo canale (ad esempio lucia@esempio.com)"; $a->strings["Authenticate"] = "Autenticazione"; -$a->strings["Commented Order"] = "Ultimi commenti"; -$a->strings["Sort by Comment Date"] = "Per data del commento"; -$a->strings["Posted Order"] = "Ultimi articoli"; -$a->strings["Sort by Post Date"] = "Per data di creazione"; -$a->strings["Personal"] = "Personali"; -$a->strings["Posts that mention or involve you"] = "Articoli che ti riguardano o ti menzionano"; -$a->strings["Activity Stream - by date"] = "Elenco attività - per data"; -$a->strings["Starred"] = "Preferiti"; -$a->strings["Favourite Posts"] = "Articoli preferiti"; -$a->strings["Spam"] = "Spam"; -$a->strings["Posts flagged as SPAM"] = "Articoli marcati come spam"; +$a->strings["No such group"] = "Impossibile trovare l'insieme"; $a->strings["Refresh"] = "Aggiorna"; $a->strings["Me"] = "Io"; $a->strings["Best Friends"] = "Buoni amici"; @@ -1237,19 +1252,91 @@ $a->strings["Former Friends"] = "Ex amici"; $a->strings["Acquaintances"] = "Conoscenti"; $a->strings["Everybody"] = "Tutti"; $a->strings["Search Results For:"] = "Cerca risultati con:"; -$a->strings["No such group"] = "Impossibile trovare l'insieme"; +$a->strings["Collection: "] = "Insieme:"; $a->strings["Connection: "] = "Connessione:"; $a->strings["Invalid connection."] = "Connessione non valida."; $a->strings["Ignore"] = "Ignora"; $a->strings["Connection updated."] = "Contatto aggiornato."; $a->strings["Connection update failed."] = "Impossibile aggiornare il contatto."; -$a->strings["Introductions and Connection Requests"] = "Richieste per entrare in contatto"; +$a->strings["Introductions and Connection Requests"] = "Richieste di entrare in contatto"; $a->strings["No pending introductions."] = "Nessuna richiesta in attesa."; $a->strings["System error. Please try again later."] = "Errore di sistema. Riprovare più tardi."; $a->strings["Hide this contact from others"] = "Nascondi questo contatto agli altri"; $a->strings["Post a new friend activity"] = "Pubblica sulla bacheca che hai un nuovo contatto"; $a->strings["if applicable"] = "se possibile"; $a->strings["Discard"] = "Rifiuta"; +$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "L'autenticazione remota non è disponibile. Hai accesso solamente a questo sito. Puoi provare ad uscire per tentare di nuovo."; +$a->strings["Welcome %s. Remote authentication successful."] = "Ciao %s. La tua autenticazione da remoto è avvenuta con successo."; +$a->strings["This site is not a directory server"] = "Questo sito non fornisce l'elenco generale dei canali"; +$a->strings["Remote privacy information not available."] = "Le informazioni remote sulla privacy non sono disponibili."; +$a->strings["Visible to:"] = "Visibile a:"; +$a->strings["Hub not found."] = "Server non trovato."; +$a->strings["Profile not found."] = "Profilo non trovato."; +$a->strings["Profile deleted."] = "Profilo eliminato."; +$a->strings["Profile-"] = "Profilo-"; +$a->strings["New profile created."] = "Il nuovo profilo è stato creato."; +$a->strings["Profile unavailable to clone."] = "Impossibile duplicare il profilo."; +$a->strings["Profile Name is required."] = "Il nome del profilo è obbligatorio ."; +$a->strings["Marital Status"] = "Stato sentimentale"; +$a->strings["Romantic Partner"] = "Partner affettivo"; +$a->strings["Likes"] = "Cosa gli piace"; +$a->strings["Dislikes"] = "Cosa non gli piace"; +$a->strings["Work/Employment"] = "Lavoro/impiego"; +$a->strings["Religion"] = "Religione"; +$a->strings["Political Views"] = "Orientamento politico"; +$a->strings["Gender"] = "Sesso"; +$a->strings["Sexual Preference"] = "Preferenze sessuali"; +$a->strings["Homepage"] = "Home page"; +$a->strings["Interests"] = "Interessi"; +$a->strings["Address"] = "Indirizzo"; +$a->strings["Location"] = "Luogo attuale"; +$a->strings["Profile updated."] = "Profilo aggiornato."; +$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Nascondi la tua lista di contatti/amici ai visitatori di questo profilo?"; +$a->strings["Edit Profile Details"] = "Modifica i dettagli del profilo"; +$a->strings["View this profile"] = "Guarda questo profilo"; +$a->strings["Change Profile Photo"] = "Cambia la foto del profilo"; +$a->strings["Create a new profile using these settings"] = "Crea un nuovo profilo usando queste impostazioni"; +$a->strings["Clone this profile"] = "Clona questo profilo"; +$a->strings["Delete this profile"] = "Elimina questo profilo"; +$a->strings["Profile Name:"] = "Nome del profilo:"; +$a->strings["Your Full Name:"] = "Il tuo nome completo:"; +$a->strings["Title/Description:"] = "Titolo/descrizione:"; +$a->strings["Your Gender:"] = "Sesso:"; +$a->strings["Birthday (%s):"] = "Compleanno (%s):"; +$a->strings["Street Address:"] = "Indirizzo (via/piazza):"; +$a->strings["Locality/City:"] = "Località:"; +$a->strings["Postal/Zip Code:"] = "CAP:"; +$a->strings["Country:"] = "Nazione:"; +$a->strings["Region/State:"] = "Regione/stato:"; +$a->strings["♥ Marital Status:"] = "♥ Stato sentimentale:"; +$a->strings["Who: (if applicable)"] = "Con chi: (se possibile)"; +$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Per esempio: cathy123, Cathy Williams, cathy@example.com"; +$a->strings["Since [date]:"] = "dal [data]:"; +$a->strings["Homepage URL:"] = "Indirizzo home page:"; +$a->strings["Religious Views:"] = "Orientamento religioso:"; +$a->strings["Keywords:"] = "Parole chiave, tag:"; +$a->strings["Example: fishing photography software"] = "Per esempio: pesca fotografia programmazione"; +$a->strings["Used in directory listings"] = "Visibile nell'elenco pubblico di canali"; +$a->strings["Tell us about yourself..."] = "Raccontaci di te..."; +$a->strings["Hobbies/Interests"] = "Hobby/interessi"; +$a->strings["Contact information and Social Networks"] = "Contatti personali e i tuoi social network"; +$a->strings["My other channels"] = "I miei altri canali"; +$a->strings["Musical interests"] = "Interessi musicali"; +$a->strings["Books, literature"] = "Libri, letteratura"; +$a->strings["Television"] = "Televisione"; +$a->strings["Film/dance/culture/entertainment"] = "Film/danza/cultura/intrattenimento"; +$a->strings["Love/romance"] = "Amore"; +$a->strings["Work/employment"] = "Lavoro/impiego"; +$a->strings["School/education"] = "Scuola/educazione"; +$a->strings["This is your public profile.
      It may be visible to anybody using the internet."] = "Questo è il tuo profilo publico.
      Potrebbe essere visto da chiunque attraverso internet."; +$a->strings["Age: "] = "Età:"; +$a->strings["Edit/Manage Profiles"] = "Modifica/gestisci i profili"; +$a->strings["Add a Channel"] = "Aggiungi un canale"; +$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."] = "I contenuti che pubblichi finiscono in un \"canale\". Un canale può essere usato per mantenere un tuo profilo personale, per avere un blog, per creare forum di discussione o gruppi di interesse, per pagine di celebrità e molto altro. Puoi creare quanti canali vuoi a meno di limiti dati dal gestore del sito."; +$a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = "Per esempio: \"Mario Rossi\", \"Lisa e le sue ricette\", \"Il campionato\", \"Il gruppo di escursionismo\""; +$a->strings["Choose a short nickname"] = "Scegli un nome breve"; +$a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Il nome breve sarà usato per creare un indirizzo facile da ricordare per il tuo canale (simile a una email). Così potrai condividerlo e gli altri potranno trovarti."; +$a->strings["Or import an existing channel from another location"] = "Oppure importa un tuo canale esistente da un altro server/hub"; $a->strings["Could not access contact record."] = "Non è possibile accedere alle informazioni sul contatto."; $a->strings["Could not locate selected profile."] = "Non riesco a trovare il profilo selezionato."; $a->strings["Failed to update connection record."] = "Impossibile aggiornare le informazioni del contatto."; @@ -1328,7 +1415,7 @@ $a->strings["Archived"] = "Archiviati"; $a->strings["All"] = "Tutti"; $a->strings["Suggestions"] = "Suggerimenti"; $a->strings["Suggest new connections"] = "Suggerisci nuovi contatti"; -$a->strings["Show pending (new) connections"] = "Richieste per entrare in contatto"; +$a->strings["Show pending (new) connections"] = "Richieste di entrare in contatto"; $a->strings["All Connections"] = "Tutti i contatti"; $a->strings["Show all connections"] = "Mostra tutti i contatti"; $a->strings["Unblocked"] = "Non bloccati"; @@ -1341,80 +1428,6 @@ $a->strings["%1\$s [%2\$s]"] = "%1\$s [%2\$s]"; $a->strings["Edit contact"] = "Modifica il contatto"; $a->strings["Search your connections"] = "Cerca tra i contatti"; $a->strings["Finding: "] = "Ricerca: "; -$a->strings["This site is not a directory server"] = "Questo sito non fornisce l'elenco generale dei canali"; -$a->strings["Remote privacy information not available."] = "Le informazioni remote sulla privacy non sono disponibili."; -$a->strings["Visible to:"] = "Visibile a:"; -$a->strings["Profile not found."] = "Profilo non trovato."; -$a->strings["Profile deleted."] = "Profilo eliminato."; -$a->strings["Profile-"] = "Profilo-"; -$a->strings["New profile created."] = "Il nuovo profilo è stato creato."; -$a->strings["Profile unavailable to clone."] = "Impossibile duplicare il profilo."; -$a->strings["Profile Name is required."] = "Il nome del profilo è obbligatorio ."; -$a->strings["Marital Status"] = "Stato sentimentale"; -$a->strings["Romantic Partner"] = "Partner affettivo"; -$a->strings["Likes"] = "Cosa gli piace"; -$a->strings["Dislikes"] = "Cosa non gli piace"; -$a->strings["Work/Employment"] = "Lavoro/impiego"; -$a->strings["Religion"] = "Religione"; -$a->strings["Political Views"] = "Orientamento politico"; -$a->strings["Gender"] = "Sesso"; -$a->strings["Sexual Preference"] = "Preferenze sessuali"; -$a->strings["Homepage"] = "Home page"; -$a->strings["Interests"] = "Interessi"; -$a->strings["Address"] = "Indirizzo"; -$a->strings["Location"] = "Luogo attuale"; -$a->strings["Profile updated."] = "Profilo aggiornato."; -$a->strings["Hide your contact/friend list from viewers of this profile?"] = "Nascondi la tua lista di contatti/amici ai visitatori di questo profilo?"; -$a->strings["Edit Profile Details"] = "Modifica i dettagli del profilo"; -$a->strings["View this profile"] = "Guarda questo profilo"; -$a->strings["Change Profile Photo"] = "Cambia la foto del profilo"; -$a->strings["Create a new profile using these settings"] = "Crea un nuovo profilo usando queste impostazioni"; -$a->strings["Clone this profile"] = "Clona questo profilo"; -$a->strings["Delete this profile"] = "Elimina questo profilo"; -$a->strings["Profile Name:"] = "Nome del profilo:"; -$a->strings["Your Full Name:"] = "Il tuo nome completo:"; -$a->strings["Title/Description:"] = "Titolo/descrizione:"; -$a->strings["Your Gender:"] = "Sesso:"; -$a->strings["Birthday (%s):"] = "Compleanno (%s):"; -$a->strings["Street Address:"] = "Indirizzo (via/piazza):"; -$a->strings["Locality/City:"] = "Località:"; -$a->strings["Postal/Zip Code:"] = "CAP:"; -$a->strings["Country:"] = "Nazione:"; -$a->strings["Region/State:"] = "Regione/stato:"; -$a->strings["♥ Marital Status:"] = "♥ Stato sentimentale:"; -$a->strings["Who: (if applicable)"] = "Con chi: (se possibile)"; -$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Per esempio: cathy123, Cathy Williams, cathy@example.com"; -$a->strings["Since [date]:"] = "dal [data]:"; -$a->strings["Homepage URL:"] = "Indirizzo home page:"; -$a->strings["Religious Views:"] = "Orientamento religioso:"; -$a->strings["Keywords:"] = "Parole chiave, tag:"; -$a->strings["Example: fishing photography software"] = "Per esempio: pesca fotografia programmazione"; -$a->strings["Used in directory listings"] = "Visibile nell'elenco pubblico di canali"; -$a->strings["Tell us about yourself..."] = "Raccontaci di te..."; -$a->strings["Hobbies/Interests"] = "Hobby/interessi"; -$a->strings["Contact information and Social Networks"] = "Contatti personali e i tuoi social network"; -$a->strings["My other channels"] = "I miei altri canali"; -$a->strings["Musical interests"] = "Interessi musicali"; -$a->strings["Books, literature"] = "Libri, letteratura"; -$a->strings["Television"] = "Televisione"; -$a->strings["Film/dance/culture/entertainment"] = "Film/danza/cultura/intrattenimento"; -$a->strings["Love/romance"] = "Amore"; -$a->strings["Work/employment"] = "Lavoro/impiego"; -$a->strings["School/education"] = "Scuola/educazione"; -$a->strings["This is your public profile.
      It may be visible to anybody using the internet."] = "Questo è il tuo profilo publico.
      Potrebbe essere visto da chiunque attraverso internet."; -$a->strings["Age: "] = "Età:"; -$a->strings["Edit/Manage Profiles"] = "Modifica/gestisci i profili"; -$a->strings["Change profile photo"] = "Cambia la foto del profilo"; -$a->strings["Create New Profile"] = "Crea un nuovo profilo"; -$a->strings["Profile Image"] = "Immagine del profilo"; -$a->strings["visible to everybody"] = "visibile a tutti"; -$a->strings["Edit visibility"] = "Cambia la visibilità"; -$a->strings["Add a Channel"] = "Aggiungi un canale"; -$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."] = "I contenuti che pubblichi finiscono in un \"canale\". Un canale può essere usato per mantenere un tuo profilo personale, per avere un blog, per creare forum di discussione o gruppi di interesse, per pagine di celebrità e molto altro. Puoi creare quanti canali vuoi a meno di limiti dati dal gestore del sito."; -$a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = "Per esempio: \"Mario Rossi\", \"Lisa e le sue ricette\", \"Il campionato\", \"Il gruppo di escursionismo\""; -$a->strings["Choose a short nickname"] = "Scegli un nome breve"; -$a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Il nome breve sarà usato per creare un indirizzo facile da ricordare per il tuo canale (simile a una email). Così potrai condividerlo e gli altri potranno trovarti."; -$a->strings["Or import an existing channel from another location"] = "Oppure importa un tuo canale esistente da un altro server/hub"; $a->strings["Permission Denied."] = "Permesso negato."; $a->strings["Permission denied. VS."] = "Permesso negato."; $a->strings["Download"] = "Scaricamento dati"; @@ -1489,7 +1502,6 @@ $a->strings["Insert YouTube video"] = "Inserisci video da YouTube"; $a->strings["Insert Vorbis [.ogg] video"] = "Inserisci video Vorbis [.ogg]"; $a->strings["Insert Vorbis [.ogg] audio"] = "Inserisci audio Vorbis [.ogg]"; $a->strings["Delete Layout"] = "Elimina il layout"; -$a->strings["Contacts who are not members of a group"] = "Contatti che non sono in nessun insieme"; $a->strings["Image uploaded but image cropping failed."] = "L'immagine è stata caricata, ma il non è stato possibile ritagliarla."; $a->strings["Image resize failed."] = "Il ridimensionamento dell'immagine è fallito."; $a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = "Ricarica la pagina con shift+F5 o cancella la cache del browser se la nuova foto non viene mostrata immediatamente."; @@ -1525,7 +1537,7 @@ $a->strings["Approve as: "] = "Approva come: "; $a->strings["Friend"] = "Amico"; $a->strings["Sharer"] = "Sharer"; $a->strings["Fan/Admirer"] = "Fan/Ammiratore"; -$a->strings["Friend/Connect Request"] = "Richiesta per entrare in contatto"; +$a->strings["Friend/Connect Request"] = "Richiesta di entrare in contatto"; $a->strings["New Follower"] = "Nuovo follower"; $a->strings["No introductions."] = "Nessuna richiesta di amicizia."; $a->strings["%s liked %s's post"] = "A %s è piaciuto l'articolo di %s"; @@ -1605,8 +1617,6 @@ $a->strings["Your email address"] = "Il tuo indirizzo email"; $a->strings["Choose a password"] = "Scegli una password"; $a->strings["Please re-enter your password"] = "Ripeti la password per verifica"; $a->strings["Please login."] = "Accedi."; -$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "L'autenticazione remota non è disponibile. Hai accesso solamente a questo sito. Puoi provare ad uscire per tentare di nuovo."; -$a->strings["Welcome %s. Remote authentication successful."] = "Ciao %s. La tua autenticazione da remoto è avvenuta con successo."; $a->strings["Remove This Channel"] = "Elimina questo canale"; $a->strings["This will completely remove this channel from the network. Once this has been done it is not recoverable."] = "Questo comando rimuoverà completamente il canale che stai usando. Una volta fatto non sarà più possibile ripristinarlo."; $a->strings["Please enter your password for verification:"] = "Inserisci la tua password per verifica:"; @@ -1687,22 +1697,4 @@ $a->strings["Remember me"] = "Resta connesso"; $a->strings["Forgot your password?"] = "Hai dimenticato la password?"; $a->strings["permission denied"] = "permesso negato"; $a->strings["Got Zot?"] = "Hai Zot?"; -$a->strings["Requested channel is not available."] = "Il canale che cerchi non è disponibile."; -$a->strings[" Sorry, you don't have the permission to view this profile. "] = "Purtroppo non hai il permesso di vedere questo profilo."; -$a->strings["Profiles"] = "Profili"; -$a->strings["Manage/edit profiles"] = "Gestisci/modifica i profili"; -$a->strings["Edit Profile"] = "Modifica il profilo"; -$a->strings["F d"] = "d F"; -$a->strings["Birthday Reminders"] = "Promemoria compleanni"; -$a->strings["Birthdays this week:"] = "Compleanni questa settimana:"; -$a->strings["[No description]"] = "[Nessuna descrizione]"; -$a->strings["Event Reminders"] = "Promemoria"; -$a->strings["Events this week:"] = "Eventi di questa settimana:"; -$a->strings["Channel"] = "Canale"; -$a->strings["Status Messages and Posts"] = "Articoli e messaggi di stato"; -$a->strings["About"] = "Informazioni"; -$a->strings["Profile Details"] = "Dettagli del profilo"; -$a->strings["Events and Calendar"] = "Calendario eventi"; -$a->strings["Webpages"] = "Pagine web"; -$a->strings["Manage Webpages"] = "Gestisci le pagine web"; $a->strings["toggle mobile"] = "attiva/disattiva versione mobile"; -- 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
      -

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

      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
       
      file  contactgroup.php
       
      file  crepair.php
       
      file  delegate.php
       
      file  directory.php
       
      file  group.php
       
      file  hcard.php
       
      file  help.php
       
      file  home.php
       
      file  import.php
       
      file  intro.php
       
      file  invite.php
       
      file  item.php
       
      file  lastpost.php
       
      file  layouts.php
       
      file  like.php
       
      file  new_channel.php
       
      file  notes.php
       
      file  notifications.php
       
      file  notify.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_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+util
      -

      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
      -

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

      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
      -

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

      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
      + + + + + + + + + + + + + + + + + +
      head_remove_css ( $src,
       $media = 'screen' 
      )
      +
      + +
      + + +
      +
      + + + + + + + + +
      head_remove_js ( $src)
      +
      +
      @@ -566,6 +614,23 @@ Functions
      + + + + + + +
      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
    -

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

    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
    -

    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
    -

    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 10ef0cd997cd5e391b30c4342be40cf66710cf38 Mon Sep 17 00:00:00 2001 From: "p.tacconi" Date: Wed, 18 Dec 2013 15:19:02 +0100 Subject: corrections to italian translation --- view/it/messages.po | 2510 ++++++++++++++++++++++++--------------------------- view/it/strings.php | 263 +++--- 2 files changed, 1291 insertions(+), 1482 deletions(-) diff --git a/view/it/messages.po b/view/it/messages.po index 693e76cee..14d92e170 100644 --- a/view/it/messages.po +++ b/view/it/messages.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: Red Matrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-06 00:02-0800\n" -"PO-Revision-Date: 2013-12-10 16:05+0000\n" +"POT-Creation-Date: 2013-12-13 00:04-0800\n" +"PO-Revision-Date: 2013-12-18 14:07+0000\n" "Last-Translator: tuscanhobbit Pa \n" "Language-Team: Italian (http://www.transifex.com/projects/p/red-matrix/language/it/)\n" "MIME-Version: 1.0\n" @@ -58,6 +58,34 @@ msgstr "Guarda %2$s di %1$s " msgid "%1$s has an updated %2$s, changing %3$s." msgstr "%1$s ha aggiornato %2$s cambiando %3$s." +#: ../../include/dir_fns.php:15 +msgid "Sort Options" +msgstr "Opzioni di ordinamento" + +#: ../../include/dir_fns.php:16 +msgid "Alphabetic" +msgstr "Alfabetico" + +#: ../../include/dir_fns.php:17 +msgid "Reverse Alphabetic" +msgstr "Alfabetico inverso" + +#: ../../include/dir_fns.php:18 +msgid "Newest to Oldest" +msgstr "Dal più nuovo al più vecchio" + +#: ../../include/dir_fns.php:30 +msgid "Enable Safe Search" +msgstr "Abilita SafeSearch" + +#: ../../include/dir_fns.php:32 +msgid "Disable Safe Search" +msgstr "Disabilita SafeSearch" + +#: ../../include/dir_fns.php:34 +msgid "Safe Mode" +msgstr "Modalità SafeSearch" + #: ../../include/enotify.php:40 msgid "Red Matrix Notification" msgstr "Notifica di Red Matrix" @@ -254,21 +282,21 @@ msgid "Private Message" msgstr "Messaggio privato" #: ../../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 "Modifica" -#: ../../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 "Elimina" -#: ../../include/ItemObject.php:113 ../../include/conversation.php:627 +#: ../../include/ItemObject.php:113 ../../include/conversation.php:631 msgid "Select" msgstr "Seleziona" @@ -292,7 +320,7 @@ msgstr "Attiva/disattiva preferito" msgid "starred" msgstr "preferito" -#: ../../include/ItemObject.php:160 ../../include/conversation.php:638 +#: ../../include/ItemObject.php:160 ../../include/conversation.php:642 msgid "Message is verified" msgstr "Messaggio verificato" @@ -345,20 +373,20 @@ msgstr "Da bacheca a bacheca" msgid "via Wall-To-Wall:" msgstr "da bacheca a bacheca:" -#: ../../include/ItemObject.php:216 ../../include/conversation.php:682 +#: ../../include/ItemObject.php:216 ../../include/conversation.php:686 #, php-format msgid " from %s" msgstr " da %s" -#: ../../include/ItemObject.php:219 ../../include/conversation.php:685 +#: ../../include/ItemObject.php:219 ../../include/conversation.php:689 #, php-format msgid "last edited: %s" msgstr "ultima modifica: %s" -#: ../../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 "Attendere" @@ -371,7 +399,7 @@ msgstr[0] "%d commento" msgstr[1] "%d commenti" #: ../../include/ItemObject.php:268 ../../include/js_strings.php:7 -#: ../../include/contact_widgets.php:148 +#: ../../include/contact_widgets.php:124 msgid "show more" msgstr "mostra tutto" @@ -385,22 +413,21 @@ msgstr "Questo sei tu" msgid "Comment" msgstr "Commento" -#: ../../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 @@ -439,24 +466,24 @@ msgstr "Link" msgid "Video" msgstr "Video" -#: ../../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 "Anteprima" -#: ../../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 "Crittografia del testo" -#: ../../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 "Entra in contatto/segui" +msgstr "Entra in contatto" #: ../../include/Contact.php:103 msgid "New window" @@ -466,6 +493,128 @@ msgstr "Nuova finestra" msgid "Open the selected location in a different window or browser tab" msgstr "Apri l'indirizzo selezionato in una nuova scheda o finestra" +#: ../../include/widgets.php:5 +msgid "Displays a full channel profile" +msgstr "Mostra il profilo completo del canale" + +#: ../../include/widgets.php:6 +msgid "Tag cloud of webpage categories" +msgstr "Nuvola dei tag" + +#: ../../include/widgets.php:7 +msgid "List and filter by collection" +msgstr "Filtra per insiemi di canali" + +#: ../../include/widgets.php:8 +msgid "Show a couple of channel suggestion" +msgstr "Mostra i canali suggeriti" + +#: ../../include/widgets.php:9 +msgid "Provide a channel follow form" +msgstr "Mostra il link connettersi al canale" + +#: ../../include/widgets.php:39 ../../include/contact_widgets.php:86 +msgid "Categories" +msgstr "Categorie" + +#: ../../include/widgets.php:98 ../../mod/suggest.php:60 +msgid "Ignore/Hide" +msgstr "Ignora/nascondi" + +#: ../../include/widgets.php:104 ../../mod/connections.php:583 +msgid "Suggestions" +msgstr "Suggerimenti" + +#: ../../include/widgets.php:105 +msgid "See more..." +msgstr "Altro..." + +#: ../../include/widgets.php:127 +#, php-format +msgid "You have %1$.0f of %2$.0f allowed connections." +msgstr "Hai attivato %1$.0f delle %2$.0f connessioni permesse." + +#: ../../include/widgets.php:133 +msgid "Add New Connection" +msgstr "Aggiungi un contatto" + +#: ../../include/widgets.php:134 +msgid "Enter the channel address" +msgstr "Scrivi l'indirizzo del canale" + +#: ../../include/widgets.php:135 +msgid "Example: bob@example.com, http://example.com/barbara" +msgstr "Per esempio: mario@pippo.it oppure http://pluto.com/barbara" + +#: ../../include/widgets.php:152 +msgid "Notes" +msgstr "Note" + +#: ../../include/widgets.php:154 ../../include/text.php:738 +#: ../../include/text.php:752 ../../mod/filer.php:36 +msgid "Save" +msgstr "Salva" + +#: ../../include/widgets.php:224 ../../mod/search.php:20 +msgid "Remove term" +msgstr "Rimuovi termine" + +#: ../../include/widgets.php:233 ../../include/features.php:48 +#: ../../mod/search.php:17 +msgid "Saved Searches" +msgstr "Ricerche salvate" + +#: ../../include/widgets.php:234 ../../include/group.php:290 +msgid "add" +msgstr "aggiungi" + +#: ../../include/widgets.php:264 ../../include/features.php:62 +#: ../../include/contact_widgets.php:52 +msgid "Saved Folders" +msgstr "Cartelle salvate" + +#: ../../include/widgets.php:267 ../../include/contact_widgets.php:55 +#: ../../include/contact_widgets.php:89 +msgid "Everything" +msgstr "Tutto" + +#: ../../include/widgets.php:299 ../../include/items.php:3550 +msgid "Archives" +msgstr "Archivi" + +#: ../../include/widgets.php:351 +msgid "Refresh" +msgstr "Aggiorna" + +#: ../../include/widgets.php:352 ../../mod/connections.php:408 +msgid "Me" +msgstr "Io" + +#: ../../include/widgets.php:353 ../../mod/connections.php:410 +msgid "Best Friends" +msgstr "Buoni amici" + +#: ../../include/widgets.php:354 ../../include/profile_selectors.php:42 +#: ../../include/identity.php:298 ../../mod/connections.php:411 +msgid "Friends" +msgstr "Amici" + +#: ../../include/widgets.php:355 +msgid "Co-workers" +msgstr "Colleghi" + +#: ../../include/widgets.php:356 ../../mod/connections.php:412 +msgid "Former Friends" +msgstr "Ex amici" + +#: ../../include/widgets.php:357 ../../mod/connections.php:413 +msgid "Acquaintances" +msgstr "Conoscenti" + +#: ../../include/widgets.php:358 +msgid "Everybody" +msgstr "Tutti" + #: ../../include/contact_selectors.php:30 msgid "Unknown | Not categorised" msgstr "Sconosciuto | Senza categoria" @@ -526,8 +675,8 @@ msgstr "OStatus" msgid "RSS/Atom" msgstr "RSS/Atom" -#: ../../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 "Email" @@ -643,225 +792,13 @@ msgstr "Inizio:" #: ../../include/event.php:30 ../../include/bb2diaspora.php:447 msgid "Finishes:" -msgstr "Fine:" - -#: ../../include/event.php:40 ../../include/identity.php:663 -#: ../../include/bb2diaspora.php:455 ../../mod/events.php:462 -#: ../../mod/directory.php:173 -msgid "Location:" -msgstr "Luogo:" - -#: ../../include/features.php:21 -msgid "General Features" -msgstr "Funzionalità generali" - -#: ../../include/features.php:23 -msgid "Content Expiration" -msgstr "Scadenza" - -#: ../../include/features.php:23 -msgid "Remove posts/comments and/or private messages at a future time" -msgstr "Elimina gli articoli, i commenti o i messaggi privati dopo che è trascorso del tempo" - -#: ../../include/features.php:24 -msgid "Multiple Profiles" -msgstr "Profili multipli" - -#: ../../include/features.php:24 -msgid "Ability to create multiple profiles" -msgstr "Abilitazione a creare profili multipli" - -#: ../../include/features.php:25 -msgid "Web Pages" -msgstr "Pagine web" - -#: ../../include/features.php:25 -msgid "Provide managed web pages on your channel" -msgstr "Attiva la creazione di pagine web sul tuo canale" - -#: ../../include/features.php:26 -msgid "Enhanced Photo Albums" -msgstr "Album fotografici avanzati" - -#: ../../include/features.php:26 -msgid "Enable photo album with enhanced features" -msgstr "Abilita gli album fotografici con funzionalità avanzate" - -#: ../../include/features.php:28 -msgid "Extended Identity Sharing" -msgstr "Condivisione avanzata dell'identità" - -#: ../../include/features.php:28 ../../include/js_strings.php:30 -msgid " " -msgstr " " - -#: ../../include/features.php:29 -msgid "Expert Mode" -msgstr "Modalità esperto" - -#: ../../include/features.php:29 -msgid "Enable Expert Mode to provide advanced configuration options" -msgstr "Abilita la modalità esperto per vedere le opzioni di configurazione avanzate" - -#: ../../include/features.php:30 -msgid "Premium Channel" -msgstr "Canale premium" - -#: ../../include/features.php:30 -msgid "" -"Allows you to set restrictions and terms on those that connect with your " -"channel" -msgstr "Ti permette di imporre delle restrizioni e dei termini d'uso a chi segue il canale" - -#: ../../include/features.php:35 -msgid "Post Composition Features" -msgstr "Modalità di scrittura articoli" - -#: ../../include/features.php:36 -msgid "Richtext Editor" -msgstr "Editor grafico" - -#: ../../include/features.php:36 -msgid "Enable richtext editor" -msgstr "Abilita l'editor grafico" - -#: ../../include/features.php:37 -msgid "Post Preview" -msgstr "Anteprima articolo" - -#: ../../include/features.php:37 -msgid "Allow previewing posts and comments before publishing them" -msgstr "Abilita l'anteprima degli articoli e dei commenti prima di pubblicarli" - -#: ../../include/features.php:38 ../../mod/settings.php:120 -#: ../../mod/sources.php:67 -msgid "Channel Sources" -msgstr "Sorgenti del canale" - -#: ../../include/features.php:38 -msgid "Automatically import channel content from other channels or feeds" -msgstr "Importa automaticamente il contenuto del canale da altri canali o feed" - -#: ../../include/features.php:39 -msgid "Even More Encryption" -msgstr "Crittografia addizionale" - -#: ../../include/features.php:39 -msgid "Allow encryption of content end-to-end with a shared secret key" -msgstr "Abilita la crittografia dei contenuti tra il mittente e i destinatari con una chiave segreta" - -#: ../../include/features.php:44 -msgid "Network and Stream Filtering" -msgstr "Filtraggio dei contenuti" - -#: ../../include/features.php:45 -msgid "Search by Date" -msgstr "Ricerca per data" - -#: ../../include/features.php:45 -msgid "Ability to select posts by date ranges" -msgstr "Per selezionare gli articoli in un intervallo tra date" - -#: ../../include/features.php:46 -msgid "Collections Filter" -msgstr "Filtra per insiemi di canali" - -#: ../../include/features.php:46 -msgid "Enable widget to display Network posts only from selected collections" -msgstr "Mostra il riquadro per filtrare gli articoli di certi insiemi di canali" - -#: ../../include/features.php:47 ../../mod/search.php:17 -#: ../../mod/network.php:122 -msgid "Saved Searches" -msgstr "Ricerche salvate" - -#: ../../include/features.php:47 -msgid "Save search terms for re-use" -msgstr "Salva i termini delle ricerche per poterle ripetere" - -#: ../../include/features.php:48 -msgid "Network Personal Tab" -msgstr "Attività personale" - -#: ../../include/features.php:48 -msgid "Enable tab to display only Network posts that you've interacted on" -msgstr "Abilita il link per mostrare solamente i contenuti con cui hai interagito" - -#: ../../include/features.php:49 -msgid "Network New Tab" -msgstr "Contenuti nuovi" - -#: ../../include/features.php:49 -msgid "Enable tab to display all new Network activity" -msgstr "Abilita il link per visualizzare solo i nuovi contenuti" - -#: ../../include/features.php:50 -msgid "Affinity Tool" -msgstr "Filtro per affinità" - -#: ../../include/features.php:50 -msgid "Filter stream activity by depth of relationships" -msgstr "Permette di selezionare i contenuti in base al livello di amicizia" - -#: ../../include/features.php:55 -msgid "Post/Comment Tools" -msgstr "Gestione articoli e commenti" - -#: ../../include/features.php:57 -msgid "Edit Sent Posts" -msgstr "Modifica gli articoli già inviati" - -#: ../../include/features.php:57 -msgid "Edit and correct posts and comments after sending" -msgstr "Modifica e correggi gli articoli o i commenti anche dopo l'invio" - -#: ../../include/features.php:58 -msgid "Tagging" -msgstr "Tag" - -#: ../../include/features.php:58 -msgid "Ability to tag existing posts" -msgstr "Permetti l'aggiunta di tag su articoli già esistenti" - -#: ../../include/features.php:59 -msgid "Post Categories" -msgstr "Categorie degli articoli" - -#: ../../include/features.php:59 -msgid "Add categories to your posts" -msgstr "Abilita le categorie per i tuoi articoli" - -#: ../../include/features.php:60 ../../include/contact_widgets.php:76 -msgid "Saved Folders" -msgstr "Cartelle salvate" - -#: ../../include/features.php:60 -msgid "Ability to file posts under folders" -msgstr "Abilita la raccolta dei tuoi articoli in cartelle" - -#: ../../include/features.php:61 -msgid "Dislike Posts" -msgstr "Non mi piace" - -#: ../../include/features.php:61 -msgid "Ability to dislike posts/comments" -msgstr "Abilità la funzionalità \"non mi piace\" per i tuoi articoli" - -#: ../../include/features.php:62 -msgid "Star Posts" -msgstr "Articoli stella (preferiti)" - -#: ../../include/features.php:62 -msgid "Ability to mark special posts with a star indicator" -msgstr "Mostra la stella per scegliere gli articoli preferiti" - -#: ../../include/features.php:63 -msgid "Tag Cloud" -msgstr "Nuvola di tag" +msgstr "Fine:" -#: ../../include/features.php:63 -msgid "Provide a personal tag cloud on your channel page" -msgstr "Mostra la nuvola dei tag che usi di più sulla pagina del tuo canale" +#: ../../include/event.php:40 ../../include/identity.php:664 +#: ../../include/bb2diaspora.php:455 ../../mod/events.php:463 +#: ../../mod/directory.php:174 +msgid "Location:" +msgstr "Luogo:" #: ../../include/group.php:25 msgid "" @@ -874,7 +811,7 @@ msgstr "È stato ripristinato un insieme con lo stesso nome che era stato elimin msgid "Default privacy group for new contacts" msgstr "Insieme predefinito per i nuovi canali che aggiungi" -#: ../../include/group.php:242 ../../mod/admin.php:695 +#: ../../include/group.php:242 ../../mod/admin.php:698 msgid "All Channels" msgstr "Tutti i canali" @@ -898,10 +835,6 @@ msgstr "Crea un nuovo insieme" msgid "Channels not in any collection" msgstr "Canali che non sono in un insieme" -#: ../../include/group.php:290 ../../mod/network.php:123 -msgid "add" -msgstr "aggiungi" - #: ../../include/js_strings.php:5 msgid "Delete this item?" msgstr "Eliminare questo elemento?" @@ -995,6 +928,10 @@ msgstr "circa un anno" msgid "%d years" msgstr "%d anni" +#: ../../include/js_strings.php:30 ../../include/features.php:29 +msgid " " +msgstr " " + #: ../../include/js_strings.php:31 msgid "timeago.numbers" msgstr "timeago.numbers" @@ -1017,8 +954,8 @@ msgstr "Non è stato possibile verificare l'articolo inserito." #: ../../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 +#: ../../mod/profile_photo.php:78 ../../mod/profile_photo.php:225 +#: ../../mod/profile_photo.php:336 msgid "Profile Photos" msgstr "Foto del profilo" @@ -1060,6 +997,221 @@ msgstr "Contenuti incorporati" msgid "Embedding disabled" msgstr "Contenuti incorporati - funzione disabilitata" +#: ../../include/features.php:21 +msgid "General Features" +msgstr "Funzionalità generali" + +#: ../../include/features.php:23 +msgid "Content Expiration" +msgstr "Scadenza" + +#: ../../include/features.php:23 +msgid "Remove posts/comments and/or private messages at a future time" +msgstr "Elimina gli articoli, i commenti o i messaggi privati dopo che è trascorso del tempo" + +#: ../../include/features.php:24 +msgid "Multiple Profiles" +msgstr "Profili multipli" + +#: ../../include/features.php:24 +msgid "Ability to create multiple profiles" +msgstr "Abilitazione a creare profili multipli" + +#: ../../include/features.php:25 +msgid "Web Pages" +msgstr "Pagine web" + +#: ../../include/features.php:25 +msgid "Provide managed web pages on your channel" +msgstr "Attiva la creazione di pagine web sul tuo canale" + +#: ../../include/features.php:26 +msgid "Private Notes" +msgstr "Note private" + +#: ../../include/features.php:26 +msgid "Enables a tool to store notes and reminders" +msgstr "Abilita il riquadro per scrivere annotazioni" + +#: ../../include/features.php:27 +msgid "Enhanced Photo Albums" +msgstr "Album fotografici avanzati" + +#: ../../include/features.php:27 +msgid "Enable photo album with enhanced features" +msgstr "Abilita gli album fotografici con funzionalità avanzate" + +#: ../../include/features.php:29 +msgid "Extended Identity Sharing" +msgstr "Condivisione avanzata dell'identità" + +#: ../../include/features.php:30 +msgid "Expert Mode" +msgstr "Modalità esperto" + +#: ../../include/features.php:30 +msgid "Enable Expert Mode to provide advanced configuration options" +msgstr "Abilita la modalità esperto per vedere le opzioni di configurazione avanzate" + +#: ../../include/features.php:31 +msgid "Premium Channel" +msgstr "Canale premium" + +#: ../../include/features.php:31 +msgid "" +"Allows you to set restrictions and terms on those that connect with your " +"channel" +msgstr "Ti permette di imporre delle restrizioni e dei termini d'uso a chi segue il canale" + +#: ../../include/features.php:36 +msgid "Post Composition Features" +msgstr "Modalità di scrittura articoli" + +#: ../../include/features.php:37 +msgid "Richtext Editor" +msgstr "Editor grafico" + +#: ../../include/features.php:37 +msgid "Enable richtext editor" +msgstr "Abilita l'editor grafico" + +#: ../../include/features.php:38 +msgid "Post Preview" +msgstr "Anteprima articolo" + +#: ../../include/features.php:38 +msgid "Allow previewing posts and comments before publishing them" +msgstr "Abilita l'anteprima degli articoli e dei commenti prima di pubblicarli" + +#: ../../include/features.php:39 ../../mod/settings.php:120 +#: ../../mod/sources.php:67 +msgid "Channel Sources" +msgstr "Sorgenti del canale" + +#: ../../include/features.php:39 +msgid "Automatically import channel content from other channels or feeds" +msgstr "Importa automaticamente il contenuto del canale da altri canali o feed" + +#: ../../include/features.php:40 +msgid "Even More Encryption" +msgstr "Crittografia addizionale" + +#: ../../include/features.php:40 +msgid "Allow encryption of content end-to-end with a shared secret key" +msgstr "Abilita la crittografia dei contenuti tra il mittente e i destinatari con una chiave segreta" + +#: ../../include/features.php:45 +msgid "Network and Stream Filtering" +msgstr "Filtraggio dei contenuti" + +#: ../../include/features.php:46 +msgid "Search by Date" +msgstr "Ricerca per data" + +#: ../../include/features.php:46 +msgid "Ability to select posts by date ranges" +msgstr "Per selezionare gli articoli in un intervallo tra date" + +#: ../../include/features.php:47 +msgid "Collections Filter" +msgstr "Filtra per insiemi di canali" + +#: ../../include/features.php:47 +msgid "Enable widget to display Network posts only from selected collections" +msgstr "Mostra il riquadro per filtrare gli articoli di certi insiemi di canali" + +#: ../../include/features.php:48 +msgid "Save search terms for re-use" +msgstr "Salva i termini delle ricerche per poterle ripetere" + +#: ../../include/features.php:49 +msgid "Network Personal Tab" +msgstr "Attività personale" + +#: ../../include/features.php:49 +msgid "Enable tab to display only Network posts that you've interacted on" +msgstr "Abilita il link per mostrare solamente i contenuti con cui hai interagito" + +#: ../../include/features.php:50 +msgid "Network New Tab" +msgstr "Contenuti nuovi" + +#: ../../include/features.php:50 +msgid "Enable tab to display all new Network activity" +msgstr "Abilita il link per visualizzare solo i nuovi contenuti" + +#: ../../include/features.php:51 +msgid "Affinity Tool" +msgstr "Filtro per affinità" + +#: ../../include/features.php:51 +msgid "Filter stream activity by depth of relationships" +msgstr "Permette di selezionare i contenuti in base al livello di amicizia" + +#: ../../include/features.php:52 +msgid "Suggest Channels" +msgstr "Suggerisci canali" + +#: ../../include/features.php:52 +msgid "Show channel suggestions" +msgstr "Mostra alcuni canali che potrebbero interessarti" + +#: ../../include/features.php:57 +msgid "Post/Comment Tools" +msgstr "Gestione articoli e commenti" + +#: ../../include/features.php:59 +msgid "Edit Sent Posts" +msgstr "Modifica gli articoli già inviati" + +#: ../../include/features.php:59 +msgid "Edit and correct posts and comments after sending" +msgstr "Modifica e correggi gli articoli o i commenti anche dopo l'invio" + +#: ../../include/features.php:60 +msgid "Tagging" +msgstr "Tag" + +#: ../../include/features.php:60 +msgid "Ability to tag existing posts" +msgstr "Permetti l'aggiunta di tag su articoli già esistenti" + +#: ../../include/features.php:61 +msgid "Post Categories" +msgstr "Categorie degli articoli" + +#: ../../include/features.php:61 +msgid "Add categories to your posts" +msgstr "Abilita le categorie per i tuoi articoli" + +#: ../../include/features.php:62 +msgid "Ability to file posts under folders" +msgstr "Abilita la raccolta dei tuoi articoli in cartelle" + +#: ../../include/features.php:63 +msgid "Dislike Posts" +msgstr "Non mi piace" + +#: ../../include/features.php:63 +msgid "Ability to dislike posts/comments" +msgstr "Abilità la funzionalità \"non mi piace\" per i tuoi articoli" + +#: ../../include/features.php:64 +msgid "Star Posts" +msgstr "Articoli stella (preferiti)" + +#: ../../include/features.php:64 +msgid "Ability to mark special posts with a star indicator" +msgstr "Mostra la stella per scegliere gli articoli preferiti" + +#: ../../include/features.php:65 +msgid "Tag Cloud" +msgstr "Nuvola di tag" + +#: ../../include/features.php:65 +msgid "Provide a personal tag cloud on your channel page" +msgstr "Mostra la nuvola dei tag che usi di più sulla pagina del tuo canale" + #: ../../include/notify.php:23 msgid "created a new post" msgstr "Ha creato un nuovo articolo" @@ -1074,30 +1226,29 @@ msgstr "ha commentato l'articolo di %s" #: ../../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 "Permesso negato." @@ -1110,7 +1261,7 @@ msgstr "L'immagine supera il limite massimo di %lu bytes" msgid "Image file is empty." msgstr "Il file dell'immagine è vuoto." -#: ../../include/photos.php:124 ../../mod/profile_photo.php:157 +#: ../../include/photos.php:124 ../../mod/profile_photo.php:147 msgid "Unable to process image" msgstr "Impossibile elaborare l'immagine" @@ -1118,7 +1269,7 @@ msgstr "Impossibile elaborare l'immagine" msgid "Photo storage failed." msgstr "Impossibile caricare la foto." -#: ../../include/photos.php:288 ../../include/conversation.php:1453 +#: ../../include/photos.php:288 ../../include/conversation.php:1457 msgid "Photo Albums" msgstr "Album foto" @@ -1271,11 +1422,6 @@ msgstr "Infedele" msgid "Sex Addict" msgstr "Sesso-dipendente" -#: ../../include/profile_selectors.php:42 ../../include/identity.php:298 -#: ../../mod/network.php:215 ../../mod/connections.php:407 -msgid "Friends" -msgstr "Amici" - #: ../../include/profile_selectors.php:42 msgid "Friends/Benefits" msgstr "Amici piccanti" @@ -1447,8 +1593,8 @@ msgstr "Bacheca" msgid "Your posts and conversations" msgstr "I tuoi articoli e conversazioni" -#: ../../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 "Profilo" @@ -1464,7 +1610,7 @@ msgstr "Modifica i profili" msgid "Manage/Edit Profiles" msgstr "Gestisci e modifica i profili" -#: ../../include/nav.php:79 ../../include/conversation.php:1450 +#: ../../include/nav.php:79 ../../include/conversation.php:1454 #: ../../mod/fbrowser.php:25 msgid "Photos" msgstr "Foto" @@ -1519,7 +1665,7 @@ msgid "Addon applications, utilities, games" msgstr "App, strumenti e giochi aggiuntivi" #: ../../include/nav.php:135 ../../include/text.php:736 -#: ../../mod/search.php:96 +#: ../../include/text.php:750 ../../mod/search.php:96 msgid "Search" msgstr "Cerca" @@ -1527,7 +1673,7 @@ msgstr "Cerca" msgid "Search site content" msgstr "Cerca nel sito" -#: ../../include/nav.php:138 ../../mod/directory.php:225 +#: ../../include/nav.php:138 ../../mod/directory.php:228 msgid "Directory" msgstr "Tutti i canali" @@ -1544,142 +1690,162 @@ msgid "Your matrix" msgstr "La tua rete" #: ../../include/nav.php:150 -msgid "See all matrix notifications" -msgstr "Notifiche dalla tua rete" - -#: ../../include/nav.php:151 msgid "Mark all matrix notifications seen" msgstr "Segna come lette le notifiche della tua rete" -#: ../../include/nav.php:153 +#: ../../include/nav.php:152 msgid "Channel Home" msgstr "Bacheca del canale" -#: ../../include/nav.php:153 +#: ../../include/nav.php:152 msgid "Channel home" msgstr "Bacheca del canale" -#: ../../include/nav.php:154 -msgid "See all channel notifications" -msgstr "Guarda le notifiche dei canali" - -#: ../../include/nav.php:155 +#: ../../include/nav.php:153 msgid "Mark all channel notifications seen" msgstr "Segna come lette le notifiche dei canali" -#: ../../include/nav.php:158 +#: ../../include/nav.php:156 msgid "Intros" msgstr "Richieste" -#: ../../include/nav.php:158 ../../mod/connections.php:585 +#: ../../include/nav.php:156 ../../mod/connections.php:589 msgid "New Connections" msgstr "Nuovi contatti" #: ../../include/nav.php:159 -msgid "See all channel introductions" -msgstr "Guarda tutte le richieste di amicizia" - -#: ../../include/nav.php:162 msgid "Notices" msgstr "Notifiche" -#: ../../include/nav.php:162 ../../mod/notifications.php:218 +#: ../../include/nav.php:159 msgid "Notifications" msgstr "Notifiche" -#: ../../include/nav.php:163 +#: ../../include/nav.php:160 msgid "See all notifications" msgstr "Vedi tutte le notifiche" -#: ../../include/nav.php:164 +#: ../../include/nav.php:161 msgid "Mark all system notifications seen" msgstr "Segna come lette le notifiche di sistema" -#: ../../include/nav.php:166 +#: ../../include/nav.php:163 msgid "Mail" msgstr "Messaggi" -#: ../../include/nav.php:166 +#: ../../include/nav.php:163 msgid "Private mail" msgstr "Messaggi privati" -#: ../../include/nav.php:167 +#: ../../include/nav.php:164 msgid "See all private messages" msgstr "Guarda tutti i messaggi privati" -#: ../../include/nav.php:168 +#: ../../include/nav.php:165 msgid "Mark all private messages seen" msgstr "Segna come letti tutti i messaggi privati" -#: ../../include/nav.php:169 +#: ../../include/nav.php:166 msgid "Inbox" msgstr "In arrivo" -#: ../../include/nav.php:170 +#: ../../include/nav.php:167 msgid "Outbox" msgstr "Inviati" -#: ../../include/nav.php:171 ../../mod/message.php:24 +#: ../../include/nav.php:168 ../../mod/message.php:24 msgid "New Message" msgstr "Nuovo messaggio" -#: ../../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 "Eventi" -#: ../../include/nav.php:174 +#: ../../include/nav.php:171 msgid "Event Calendar" msgstr "Calendario" -#: ../../include/nav.php:175 +#: ../../include/nav.php:172 msgid "See all events" msgstr "Guarda tutti gli eventi" -#: ../../include/nav.php:176 +#: ../../include/nav.php:173 msgid "Mark all events seen" msgstr "Marca come letti tutti gli eventi" -#: ../../include/nav.php:178 +#: ../../include/nav.php:175 msgid "Channel Select" msgstr "Gestisci i canali" -#: ../../include/nav.php:178 +#: ../../include/nav.php:175 msgid "Manage Your Channels" msgstr "Gestisci i contatti dei tuoi canali" -#: ../../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 "Impostazioni" -#: ../../include/nav.php:180 +#: ../../include/nav.php:177 msgid "Account/Channel Settings" msgstr "Impostazioni account e canali" -#: ../../include/nav.php:182 ../../mod/connections.php:690 +#: ../../include/nav.php:179 ../../mod/connections.php:694 msgid "Connections" msgstr "Contatti" -#: ../../include/nav.php:182 +#: ../../include/nav.php:179 msgid "Manage/Edit Friends and Connections" msgstr "Modifica amici e contatti" -#: ../../include/nav.php:189 ../../mod/admin.php:111 +#: ../../include/nav.php:186 ../../mod/admin.php:111 msgid "Admin" msgstr "Amministrazione" -#: ../../include/nav.php:189 -msgid "Site Setup and Configuration" -msgstr "Configurazione del sito" +#: ../../include/nav.php:186 +msgid "Site Setup and Configuration" +msgstr "Configurazione del sito" + +#: ../../include/nav.php:212 +msgid "Nothing new here" +msgstr "Niente di nuovo qui" + +#: ../../include/nav.php:217 +msgid "Please wait..." +msgstr "Attendere..." + +#: ../../include/taxonomy.php:210 +msgid "Tags" +msgstr "Tag" + +#: ../../include/taxonomy.php:224 +msgid "Keywords" +msgstr "Parole chiave" + +#: ../../include/taxonomy.php:249 +msgid "have" +msgstr "ho" + +#: ../../include/taxonomy.php:249 +msgid "has" +msgstr "ha" + +#: ../../include/taxonomy.php:250 +msgid "want" +msgstr "voglio" + +#: ../../include/taxonomy.php:250 +msgid "wants" +msgstr "vuole" -#: ../../include/nav.php:215 -msgid "Nothing new here" -msgstr "Niente di nuovo qui" +#: ../../include/taxonomy.php:251 +msgid "likes" +msgstr "ama" -#: ../../include/nav.php:220 -msgid "Please wait..." -msgstr "Attendere..." +#: ../../include/taxonomy.php:252 +msgid "dislikes" +msgstr "non ama" #: ../../include/account.php:23 msgid "Not a valid email address" @@ -1737,12 +1903,12 @@ msgstr "Account approvato." msgid "Registration revoked for %s" msgstr "Registrazione revocata per %s" -#: ../../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 "la foto" -#: ../../include/conversation.php:120 ../../include/text.php:1612 +#: ../../include/conversation.php:120 ../../include/text.php:1624 #: ../../mod/tagger.php:49 msgid "event" msgstr "l'evento" @@ -1751,12 +1917,12 @@ msgstr "l'evento" msgid "channel" msgstr "canale" -#: ../../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 "il messaggio di stato" -#: ../../include/conversation.php:147 ../../include/text.php:1617 +#: ../../include/conversation.php:147 ../../include/text.php:1629 #: ../../mod/tagger.php:55 msgid "comment" msgstr "il commento" @@ -1776,352 +1942,352 @@ msgstr "A %1$s non piace %3$s di %2$s" msgid "%1$s is now connected with %2$s" msgstr "%1$s adesso è connesso con %2$s" -#: ../../include/conversation.php:232 +#: ../../include/conversation.php:236 #, php-format msgid "%1$s poked %2$s" msgstr "%1$s ha mandato un poke a %2$s" -#: ../../include/conversation.php:236 ../../include/text.php:776 +#: ../../include/conversation.php:240 ../../include/text.php:790 msgid "poked" msgstr "ha ricevuto un poke" -#: ../../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 "%1$s al momento è %2$s" -#: ../../include/conversation.php:658 +#: ../../include/conversation.php:662 #, php-format msgid "View %s's profile @ %s" msgstr "Vedi il profilo di %s @ %s" -#: ../../include/conversation.php:672 +#: ../../include/conversation.php:676 msgid "Categories:" msgstr "Categorie:" -#: ../../include/conversation.php:673 +#: ../../include/conversation.php:677 msgid "Filed under:" msgstr "Classificato come:" -#: ../../include/conversation.php:700 +#: ../../include/conversation.php:704 msgid "View in context" msgstr "Vedi nel contesto" -#: ../../include/conversation.php:826 +#: ../../include/conversation.php:830 msgid "remove" msgstr "rimuovi" -#: ../../include/conversation.php:830 +#: ../../include/conversation.php:834 msgid "Loading..." msgstr "Caricamento in corso..." -#: ../../include/conversation.php:831 +#: ../../include/conversation.php:835 msgid "Delete Selected Items" msgstr "Elimina gli oggetti selezionati" -#: ../../include/conversation.php:922 +#: ../../include/conversation.php:926 msgid "View Source" msgstr "Vedi il sorgente" -#: ../../include/conversation.php:923 +#: ../../include/conversation.php:927 msgid "Follow Thread" msgstr "Segui la discussione" -#: ../../include/conversation.php:924 +#: ../../include/conversation.php:928 msgid "View Status" msgstr "Guarda il messaggio di stato" -#: ../../include/conversation.php:926 +#: ../../include/conversation.php:930 msgid "View Photos" msgstr "Guarda le foto" -#: ../../include/conversation.php:927 +#: ../../include/conversation.php:931 msgid "Matrix Activity" msgstr "Attività nella tua rete" -#: ../../include/conversation.php:928 +#: ../../include/conversation.php:932 msgid "Edit Contact" msgstr "Modifica il contatto" -#: ../../include/conversation.php:929 +#: ../../include/conversation.php:933 msgid "Send PM" msgstr "Invia messaggio privato" -#: ../../include/conversation.php:930 +#: ../../include/conversation.php:934 msgid "Poke" msgstr "Poke" -#: ../../include/conversation.php:992 +#: ../../include/conversation.php:996 #, php-format msgid "%s likes this." msgstr "Piace a %s." -#: ../../include/conversation.php:992 +#: ../../include/conversation.php:996 #, php-format msgid "%s doesn't like this." msgstr "Non piace a %s." -#: ../../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] "Piace a %2$d persone." -#: ../../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] "Non piace a %2$d persone." -#: ../../include/conversation.php:1004 +#: ../../include/conversation.php:1008 msgid "and" msgstr "e" -#: ../../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] "e altre %d persone" -#: ../../include/conversation.php:1008 +#: ../../include/conversation.php:1012 #, php-format msgid "%s like this." msgstr "Piace a %s." -#: ../../include/conversation.php:1008 +#: ../../include/conversation.php:1012 #, php-format msgid "%s don't like this." msgstr "Non piace a %s." -#: ../../include/conversation.php:1058 +#: ../../include/conversation.php:1062 msgid "Visible to everybody" msgstr "Visibile a tutti" -#: ../../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 "Inserisci l'indirizzo del link:" -#: ../../include/conversation.php:1060 +#: ../../include/conversation.php:1064 msgid "Please enter a video link/URL:" msgstr "Inserisci l'indirizzo del video:" -#: ../../include/conversation.php:1061 +#: ../../include/conversation.php:1065 msgid "Please enter an audio link/URL:" msgstr "Inserisci l'indirizzo dell'audio:" -#: ../../include/conversation.php:1062 +#: ../../include/conversation.php:1066 msgid "Tag term:" msgstr "Tag:" -#: ../../include/conversation.php:1063 ../../mod/filer.php:35 +#: ../../include/conversation.php:1067 ../../mod/filer.php:35 msgid "Save to Folder:" msgstr "Salva nella cartella:" -#: ../../include/conversation.php:1064 +#: ../../include/conversation.php:1068 msgid "Where are you right now?" msgstr "Dove sei ora?" -#: ../../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 "Scadenza il AAAA-MM-GG OO:MM" -#: ../../include/conversation.php:1089 ../../mod/photos.php:1071 +#: ../../include/conversation.php:1093 ../../mod/photos.php:1071 msgid "Share" msgstr "Condividi" -#: ../../include/conversation.php:1091 +#: ../../include/conversation.php:1095 ../../mod/editwebpage.php:139 msgid "Page link title" msgstr "Link del titolo" -#: ../../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 "Carica foto" -#: ../../include/conversation.php:1094 +#: ../../include/conversation.php:1098 msgid "upload photo" msgstr "carica foto" -#: ../../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 "Allega file" -#: ../../include/conversation.php:1096 +#: ../../include/conversation.php:1100 msgid "attach file" msgstr "allega file" -#: ../../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 "Inserisci un indirizzo web" -#: ../../include/conversation.php:1098 +#: ../../include/conversation.php:1102 msgid "web link" msgstr "link web" -#: ../../include/conversation.php:1099 +#: ../../include/conversation.php:1103 msgid "Insert video link" msgstr "Inserisci l'indirizzo di un video" -#: ../../include/conversation.php:1100 +#: ../../include/conversation.php:1104 msgid "video link" msgstr "link video" -#: ../../include/conversation.php:1101 +#: ../../include/conversation.php:1105 msgid "Insert audio link" msgstr "Inserisci l'indirizzo di un audio" -#: ../../include/conversation.php:1102 +#: ../../include/conversation.php:1106 msgid "audio link" msgstr "link audio" -#: ../../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 "La tua località" -#: ../../include/conversation.php:1104 +#: ../../include/conversation.php:1108 msgid "set location" msgstr "la tua località" -#: ../../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 "Rimuovi la località data dal browser" -#: ../../include/conversation.php:1106 +#: ../../include/conversation.php:1110 msgid "clear location" msgstr "rimuovi la località" -#: ../../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 "Scegli un titolo" -#: ../../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 "Categorie (separate da virgola)" -#: ../../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 "Impostazioni permessi" -#: ../../include/conversation.php:1114 +#: ../../include/conversation.php:1118 msgid "permissions" msgstr "permessi" -#: ../../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 "Articolo pubblico" -#: ../../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 "Per esempio: mario@esempio.com, simona@esempio.com" -#: ../../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 "Data di scadenza" -#: ../../include/conversation.php:1364 +#: ../../include/conversation.php:1368 msgid "Commented Order" msgstr "Ultimi commenti" -#: ../../include/conversation.php:1367 +#: ../../include/conversation.php:1371 msgid "Sort by Comment Date" msgstr "Per data del commento" -#: ../../include/conversation.php:1370 +#: ../../include/conversation.php:1374 msgid "Posted Order" msgstr "Ultimi articoli" -#: ../../include/conversation.php:1373 +#: ../../include/conversation.php:1377 msgid "Sort by Post Date" msgstr "Per data di creazione" -#: ../../include/conversation.php:1377 ../../mod/notifications.php:86 +#: ../../include/conversation.php:1381 msgid "Personal" msgstr "Personali" -#: ../../include/conversation.php:1380 +#: ../../include/conversation.php:1384 msgid "Posts that mention or involve you" msgstr "Articoli che ti riguardano o ti menzionano" -#: ../../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 "Novità" -#: ../../include/conversation.php:1386 +#: ../../include/conversation.php:1390 msgid "Activity Stream - by date" msgstr "Elenco attività - per data" -#: ../../include/conversation.php:1393 +#: ../../include/conversation.php:1397 msgid "Starred" msgstr "Preferiti" -#: ../../include/conversation.php:1396 +#: ../../include/conversation.php:1400 msgid "Favourite Posts" msgstr "Articoli preferiti" -#: ../../include/conversation.php:1403 +#: ../../include/conversation.php:1407 msgid "Spam" msgstr "Spam" -#: ../../include/conversation.php:1406 +#: ../../include/conversation.php:1410 msgid "Posts flagged as SPAM" msgstr "Articoli marcati come spam" -#: ../../include/conversation.php:1436 +#: ../../include/conversation.php:1440 msgid "Channel" msgstr "Canale" -#: ../../include/conversation.php:1439 +#: ../../include/conversation.php:1443 msgid "Status Messages and Posts" msgstr "Articoli e messaggi di stato" -#: ../../include/conversation.php:1443 +#: ../../include/conversation.php:1447 msgid "About" msgstr "Informazioni" -#: ../../include/conversation.php:1446 +#: ../../include/conversation.php:1450 msgid "Profile Details" msgstr "Dettagli del profilo" -#: ../../include/conversation.php:1464 +#: ../../include/conversation.php:1468 msgid "Events and Calendar" msgstr "Calendario eventi" -#: ../../include/conversation.php:1469 +#: ../../include/conversation.php:1473 msgid "Webpages" msgstr "Pagine web" -#: ../../include/conversation.php:1472 +#: ../../include/conversation.php:1476 msgid "Manage Webpages" msgstr "Gestisci le pagine web" @@ -2139,70 +2305,45 @@ msgstr "Accesso fallito." #: ../../include/contact_widgets.php:14 #, php-format -msgid "You have %1$.0f of %2$.0f allowed connections." -msgstr "Hai attivato %1$.0f delle %2$.0f connessioni permesse." - -#: ../../include/contact_widgets.php:20 -msgid "Add New Connection" -msgstr "Aggiungi un contatto" - -#: ../../include/contact_widgets.php:21 -msgid "Enter the channel address" -msgstr "Scrivi l'indirizzo del canale" - -#: ../../include/contact_widgets.php:22 -msgid "Example: bob@example.com, http://example.com/barbara" -msgstr "Per esempio: mario@pippo.it oppure http://pluto.com/barbara" - -#: ../../include/contact_widgets.php:38 -#, php-format msgid "%d invitation available" msgid_plural "%d invitations available" msgstr[0] "%d invito disponibile" msgstr[1] "%d inviti disponibili" -#: ../../include/contact_widgets.php:44 +#: ../../include/contact_widgets.php:20 msgid "Find Channels" msgstr "Ricerca canali" -#: ../../include/contact_widgets.php:45 +#: ../../include/contact_widgets.php:21 msgid "Enter name or interest" msgstr "Scrivi un nome o un interesse" -#: ../../include/contact_widgets.php:46 +#: ../../include/contact_widgets.php:22 msgid "Connect/Follow" -msgstr "Entra in contatto/segui" +msgstr "Entra in contatto" -#: ../../include/contact_widgets.php:47 +#: ../../include/contact_widgets.php:23 msgid "Examples: Robert Morgenstein, Fishing" msgstr "Per esempio: Mario Rossi, Pesca" -#: ../../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 "Cerca" -#: ../../include/contact_widgets.php:49 ../../mod/suggest.php:64 +#: ../../include/contact_widgets.php:25 ../../mod/suggest.php:66 msgid "Channel Suggestions" msgstr "Canali suggeriti" -#: ../../include/contact_widgets.php:51 +#: ../../include/contact_widgets.php:27 msgid "Random Profile" msgstr "Profilo casuale" -#: ../../include/contact_widgets.php:52 +#: ../../include/contact_widgets.php:28 msgid "Invite Friends" msgstr "Invita amici" -#: ../../include/contact_widgets.php:79 ../../include/contact_widgets.php:113 -msgid "Everything" -msgstr "Tutto" - -#: ../../include/contact_widgets.php:110 ../../include/widgets.php:26 -msgid "Categories" -msgstr "Categorie" - -#: ../../include/contact_widgets.php:143 +#: ../../include/contact_widgets.php:119 #, php-format msgid "%d connection in common" msgid_plural "%d connections in common" @@ -2252,274 +2393,282 @@ msgstr[1] "%d contatti" msgid "View Connections" msgstr "Elenco contatti" -#: ../../include/text.php:738 ../../mod/filer.php:36 -msgid "Save" -msgstr "Salva" - -#: ../../include/text.php:776 +#: ../../include/text.php:790 msgid "poke" msgstr "poke" -#: ../../include/text.php:777 +#: ../../include/text.php:791 msgid "ping" msgstr "ping" -#: ../../include/text.php:777 +#: ../../include/text.php:791 msgid "pinged" msgstr "ha ricevuto un ping" -#: ../../include/text.php:778 +#: ../../include/text.php:792 msgid "prod" msgstr "prod" -#: ../../include/text.php:778 +#: ../../include/text.php:792 msgid "prodded" msgstr "ha ricevuto un prod" -#: ../../include/text.php:779 +#: ../../include/text.php:793 msgid "slap" msgstr "schiaffo" -#: ../../include/text.php:779 +#: ../../include/text.php:793 msgid "slapped" msgstr "ha ricevuto uno schiaffo" -#: ../../include/text.php:780 +#: ../../include/text.php:794 msgid "finger" msgstr "finger" -#: ../../include/text.php:780 +#: ../../include/text.php:794 msgid "fingered" msgstr "ha ricevuto un finger" -#: ../../include/text.php:781 +#: ../../include/text.php:795 msgid "rebuff" msgstr "rifiuto" -#: ../../include/text.php:781 +#: ../../include/text.php:795 msgid "rebuffed" msgstr "ha ricevuto un rifiuto" -#: ../../include/text.php:793 +#: ../../include/text.php:807 msgid "happy" msgstr "allegro" -#: ../../include/text.php:794 +#: ../../include/text.php:808 msgid "sad" msgstr "triste" -#: ../../include/text.php:795 +#: ../../include/text.php:809 msgid "mellow" msgstr "calmo" -#: ../../include/text.php:796 +#: ../../include/text.php:810 msgid "tired" msgstr "stanco" -#: ../../include/text.php:797 +#: ../../include/text.php:811 msgid "perky" msgstr "vivace" -#: ../../include/text.php:798 +#: ../../include/text.php:812 msgid "angry" msgstr "arrabbiato" -#: ../../include/text.php:799 +#: ../../include/text.php:813 msgid "stupified" msgstr "stordito" -#: ../../include/text.php:800 +#: ../../include/text.php:814 msgid "puzzled" msgstr "confuso" -#: ../../include/text.php:801 +#: ../../include/text.php:815 msgid "interested" msgstr "attento" -#: ../../include/text.php:802 +#: ../../include/text.php:816 msgid "bitter" msgstr "amaro" -#: ../../include/text.php:803 +#: ../../include/text.php:817 msgid "cheerful" msgstr "allegro" -#: ../../include/text.php:804 +#: ../../include/text.php:818 msgid "alive" msgstr "vivace" -#: ../../include/text.php:805 +#: ../../include/text.php:819 msgid "annoyed" msgstr "seccato" -#: ../../include/text.php:806 +#: ../../include/text.php:820 msgid "anxious" msgstr "ansioso" -#: ../../include/text.php:807 +#: ../../include/text.php:821 msgid "cranky" msgstr "irritabile" -#: ../../include/text.php:808 +#: ../../include/text.php:822 msgid "disturbed" msgstr "turbato" -#: ../../include/text.php:809 +#: ../../include/text.php:823 msgid "frustrated" msgstr "frustrato" -#: ../../include/text.php:810 +#: ../../include/text.php:824 msgid "motivated" msgstr "motivato" -#: ../../include/text.php:811 +#: ../../include/text.php:825 msgid "relaxed" msgstr "rilassato" -#: ../../include/text.php:812 +#: ../../include/text.php:826 msgid "surprised" msgstr "sorpreso" -#: ../../include/text.php:976 +#: ../../include/text.php:988 msgid "Monday" msgstr "lunedì" -#: ../../include/text.php:976 +#: ../../include/text.php:988 msgid "Tuesday" msgstr "martedì" -#: ../../include/text.php:976 +#: ../../include/text.php:988 msgid "Wednesday" msgstr "mercoledì" -#: ../../include/text.php:976 +#: ../../include/text.php:988 msgid "Thursday" msgstr "giovedì" -#: ../../include/text.php:976 +#: ../../include/text.php:988 msgid "Friday" msgstr "venerdì" -#: ../../include/text.php:976 +#: ../../include/text.php:988 msgid "Saturday" msgstr "sabato" -#: ../../include/text.php:976 +#: ../../include/text.php:988 msgid "Sunday" msgstr "domenica" -#: ../../include/text.php:980 +#: ../../include/text.php:992 msgid "January" msgstr "gennaio" -#: ../../include/text.php:980 +#: ../../include/text.php:992 msgid "February" msgstr "febbraio" -#: ../../include/text.php:980 +#: ../../include/text.php:992 msgid "March" msgstr "marzo" -#: ../../include/text.php:980 +#: ../../include/text.php:992 msgid "April" msgstr "aprile" -#: ../../include/text.php:980 +#: ../../include/text.php:992 msgid "May" msgstr "maggio" -#: ../../include/text.php:980 +#: ../../include/text.php:992 msgid "June" msgstr "giugno" -#: ../../include/text.php:980 +#: ../../include/text.php:992 msgid "July" msgstr "luglio" -#: ../../include/text.php:980 +#: ../../include/text.php:992 msgid "August" msgstr "agosto" -#: ../../include/text.php:980 +#: ../../include/text.php:992 msgid "September" msgstr "settembre" -#: ../../include/text.php:980 +#: ../../include/text.php:992 msgid "October" msgstr "ottobre" -#: ../../include/text.php:980 +#: ../../include/text.php:992 msgid "November" msgstr "novembre" -#: ../../include/text.php:980 +#: ../../include/text.php:992 msgid "December" msgstr "dicembre" -#: ../../include/text.php:1058 ../../mod/message.php:453 +#: ../../include/text.php:1070 msgid "unknown.???" msgstr "sconosciuto???" -#: ../../include/text.php:1059 ../../mod/message.php:454 +#: ../../include/text.php:1071 msgid "bytes" msgstr "byte" -#: ../../include/text.php:1094 +#: ../../include/text.php:1106 msgid "remove category" msgstr "rimuovi la categoria" -#: ../../include/text.php:1116 +#: ../../include/text.php:1128 msgid "remove from file" msgstr "rimuovi dal file" -#: ../../include/text.php:1170 ../../include/text.php:1182 +#: ../../include/text.php:1182 ../../include/text.php:1194 msgid "Click to open/close" msgstr "Clicca per aprire/chiudere" -#: ../../include/text.php:1358 ../../mod/events.php:331 +#: ../../include/text.php:1370 ../../mod/events.php:332 msgid "link to source" msgstr "Link all'originale" -#: ../../include/text.php:1377 +#: ../../include/text.php:1389 msgid "Select a page layout: " msgstr "Scegli il layout della pagina:" -#: ../../include/text.php:1380 ../../include/text.php:1445 +#: ../../include/text.php:1392 ../../include/text.php:1457 msgid "default" msgstr "predefinito" -#: ../../include/text.php:1416 +#: ../../include/text.php:1428 msgid "Page content type: " msgstr "Contenuto della pagina:" -#: ../../include/text.php:1457 +#: ../../include/text.php:1469 msgid "Select an alternate language" msgstr "Seleziona una lingua diversa" -#: ../../include/text.php:1622 +#: ../../include/text.php:1634 msgid "activity" msgstr "l'attività" -#: ../../include/text.php:1884 +#: ../../include/text.php:1896 msgid "Design" msgstr "Design" -#: ../../include/text.php:1886 +#: ../../include/text.php:1898 msgid "Blocks" msgstr "Riquadri" -#: ../../include/text.php:1887 +#: ../../include/text.php:1899 msgid "Menus" msgstr "Menù" -#: ../../include/text.php:1888 +#: ../../include/text.php:1900 msgid "Layouts" msgstr "Layout" -#: ../../include/text.php:1889 +#: ../../include/text.php:1901 msgid "Pages" msgstr "Pagine" +#: ../../include/plugin.php:475 ../../include/plugin.php:477 +msgid "Click here to upgrade." +msgstr "Clicca qui per aggiornare." + +#: ../../include/plugin.php:483 +msgid "This action exceeds the limits set by your subscription plan." +msgstr "Questa operazione esce dai termini del tuo abbonamento." + +#: ../../include/plugin.php:488 +msgid "This action is not available under your subscription plan." +msgstr "Questa operazione non è prevista dal tuo abbonamento." + #: ../../include/follow.php:21 msgid "Channel is blocked on this site." msgstr "Il canale è bloccato per questo sito." @@ -2574,7 +2723,7 @@ msgstr "Può vedere le mie pagine web \"pubbliche\"" #: ../../include/permissions.php:21 msgid "Can send me their channel stream and posts" -msgstr "Può mostrarmi i contenuti del canale e gli articoli" +msgstr "Seguo i contenuti e gli articoli del suo canale" #: ../../include/permissions.php:22 msgid "Can post on my channel page (\"wall\")" @@ -2633,56 +2782,12 @@ msgid "" "Extremely advanced. Leave this alone unless you know what you are doing" msgstr "Impostazione pericolosa - lasciare il valore predefinito se non si è assolutamente sicuri" -#: ../../include/taxonomy.php:210 -msgid "Tags" -msgstr "Tag" - -#: ../../include/taxonomy.php:224 -msgid "Keywords" -msgstr "Parole chiave" - -#: ../../include/taxonomy.php:249 -msgid "have" -msgstr "ho" - -#: ../../include/taxonomy.php:249 -msgid "has" -msgstr "ha" - -#: ../../include/taxonomy.php:250 -msgid "want" -msgstr "voglio" - -#: ../../include/taxonomy.php:250 -msgid "wants" -msgstr "vuole" - -#: ../../include/taxonomy.php:251 -msgid "likes" -msgstr "ama" - -#: ../../include/taxonomy.php:252 -msgid "dislikes" -msgstr "non ama" - -#: ../../include/plugin.php:475 ../../include/plugin.php:477 -msgid "Click here to upgrade." -msgstr "Clicca qui per aggiornare." - -#: ../../include/plugin.php:483 -msgid "This action exceeds the limits set by your subscription plan." -msgstr "Questa operazione esce dai termini del tuo abbonamento." - -#: ../../include/plugin.php:488 -msgid "This action is not available under your subscription plan." -msgstr "Questa operazione non è prevista dal tuo abbonamento." - #: ../../include/comanche.php:35 ../../view/theme/redbasic/php/config.php:62 #: ../../view/theme/apw/php/config.php:176 msgid "Default" msgstr "Predefinito" -#: ../../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 "Impossibile ottenere le informazioni di identificazione dal database" @@ -2730,7 +2835,7 @@ msgstr "Purtroppo non hai il permesso di vedere questo profilo." msgid "Requested profile is not available." msgstr "Il profilo richiesto non è disponibile." -#: ../../include/identity.php:627 ../../mod/profiles.php:624 +#: ../../include/identity.php:627 ../../mod/profiles.php:613 msgid "Change profile photo" msgstr "Cambia la foto del profilo" @@ -2742,7 +2847,7 @@ msgstr "Profili" msgid "Manage/edit profiles" msgstr "Gestisci/modifica i profili" -#: ../../include/identity.php:634 ../../mod/profiles.php:625 +#: ../../include/identity.php:634 ../../mod/profiles.php:614 msgid "Create New Profile" msgstr "Crea un nuovo profilo" @@ -2750,162 +2855,162 @@ msgstr "Crea un nuovo profilo" msgid "Edit Profile" msgstr "Modifica il profilo" -#: ../../include/identity.php:648 ../../mod/profiles.php:636 +#: ../../include/identity.php:648 ../../mod/profiles.php:625 msgid "Profile Image" msgstr "Immagine del profilo" -#: ../../include/identity.php:651 ../../mod/profiles.php:639 +#: ../../include/identity.php:651 ../../mod/profiles.php:628 msgid "visible to everybody" msgstr "visibile a tutti" -#: ../../include/identity.php:652 ../../mod/profiles.php:640 +#: ../../include/identity.php:652 ../../mod/profiles.php:629 msgid "Edit visibility" msgstr "Cambia la visibilità" -#: ../../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 "Sesso:" -#: ../../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 "Stato:" -#: ../../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 "Home page:" -#: ../../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 "g A l d F" -#: ../../include/identity.php:731 ../../include/identity.php:811 +#: ../../include/identity.php:736 ../../include/identity.php:816 msgid "F d" msgstr "d F" -#: ../../include/identity.php:776 ../../include/identity.php:851 +#: ../../include/identity.php:781 ../../include/identity.php:856 #: ../../mod/ping.php:252 msgid "[today]" msgstr "[oggi]" -#: ../../include/identity.php:788 +#: ../../include/identity.php:793 msgid "Birthday Reminders" msgstr "Promemoria compleanni" -#: ../../include/identity.php:789 +#: ../../include/identity.php:794 msgid "Birthdays this week:" msgstr "Compleanni questa settimana:" -#: ../../include/identity.php:844 +#: ../../include/identity.php:849 msgid "[No description]" msgstr "[Nessuna descrizione]" -#: ../../include/identity.php:862 +#: ../../include/identity.php:867 msgid "Event Reminders" msgstr "Promemoria" -#: ../../include/identity.php:863 +#: ../../include/identity.php:868 msgid "Events this week:" msgstr "Eventi di questa settimana:" -#: ../../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 "Profilo" -#: ../../include/identity.php:881 ../../mod/settings.php:1013 +#: ../../include/identity.php:889 ../../mod/settings.php:1013 msgid "Full Name:" msgstr "Nome completo:" -#: ../../include/identity.php:888 +#: ../../include/identity.php:896 msgid "j F, Y" msgstr "j F Y" -#: ../../include/identity.php:889 +#: ../../include/identity.php:897 msgid "j F" msgstr "j F" -#: ../../include/identity.php:896 +#: ../../include/identity.php:904 msgid "Birthday:" msgstr "Compleanno:" -#: ../../include/identity.php:900 +#: ../../include/identity.php:908 msgid "Age:" msgstr "Età:" -#: ../../include/identity.php:909 +#: ../../include/identity.php:917 #, php-format msgid "for %1$d %2$s" msgstr "per %1$d %2$s" -#: ../../include/identity.php:912 ../../mod/profiles.php:549 +#: ../../include/identity.php:920 ../../mod/profiles.php:538 msgid "Sexual Preference:" msgstr "Preferenze sessuali:" -#: ../../include/identity.php:916 ../../mod/profiles.php:551 +#: ../../include/identity.php:924 ../../mod/profiles.php:540 msgid "Hometown:" msgstr "Città dove vivo:" -#: ../../include/identity.php:918 +#: ../../include/identity.php:926 msgid "Tags:" msgstr "Tag:" -#: ../../include/identity.php:920 ../../mod/profiles.php:552 +#: ../../include/identity.php:928 ../../mod/profiles.php:541 msgid "Political Views:" msgstr "Orientamento politico:" -#: ../../include/identity.php:922 +#: ../../include/identity.php:930 msgid "Religion:" msgstr "Religione:" -#: ../../include/identity.php:924 ../../mod/directory.php:181 +#: ../../include/identity.php:932 ../../mod/directory.php:182 msgid "About:" msgstr "Informazioni:" -#: ../../include/identity.php:926 +#: ../../include/identity.php:934 msgid "Hobbies/Interests:" msgstr "Interessi e hobby:" -#: ../../include/identity.php:928 ../../mod/profiles.php:555 +#: ../../include/identity.php:936 ../../mod/profiles.php:544 msgid "Likes:" msgstr "Mi piace:" -#: ../../include/identity.php:930 ../../mod/profiles.php:556 +#: ../../include/identity.php:938 ../../mod/profiles.php:545 msgid "Dislikes:" msgstr "Non mi piace:" -#: ../../include/identity.php:933 +#: ../../include/identity.php:941 msgid "Contact information and Social Networks:" msgstr "Contatti e social network:" -#: ../../include/identity.php:935 +#: ../../include/identity.php:943 msgid "Musical interests:" msgstr "Gusti musicali:" -#: ../../include/identity.php:937 +#: ../../include/identity.php:945 msgid "Books, literature:" msgstr "Libri, letteratura:" -#: ../../include/identity.php:939 +#: ../../include/identity.php:947 msgid "Television:" msgstr "Televisione:" -#: ../../include/identity.php:941 +#: ../../include/identity.php:949 msgid "Film/dance/culture/entertainment:" msgstr "Film, danza, cultura, intrattenimento:" -#: ../../include/identity.php:943 +#: ../../include/identity.php:951 msgid "Love/Romance:" msgstr "Amore:" -#: ../../include/identity.php:945 +#: ../../include/identity.php:953 msgid "Work/employment:" msgstr "Lavoro:" -#: ../../include/identity.php:947 +#: ../../include/identity.php:955 msgid "School/education:" msgstr "Scuola:" @@ -2928,138 +3033,116 @@ msgid "" msgstr "L'identificativo di sicurezza del modulo che hai riempito non è corretto. Probabilmente è accaduto perché la pagina è stata tenuta aperta troppo a lungo (ore?) prima di inviare il contenuto." #: ../../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 "Permesso negato" -#: ../../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 "Elemento non trovato." -#: ../../include/items.php:3533 -msgid "Archives" -msgstr "Archivi" - -#: ../../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 "Insieme non trovato." -#: ../../include/items.php:3715 ../../mod/network.php:288 -msgid "Group is empty" -msgstr "L'insieme è vuoto" - -#: ../../include/items.php:3731 -msgid "Connection not found." -msgstr "Contatto non trovato." - -#: ../../include/dir_fns.php:15 -msgid "Sort Options" -msgstr "Opzioni di ordinamento" - -#: ../../include/dir_fns.php:16 -msgid "Alphabetic" -msgstr "Alfabetico" - -#: ../../include/dir_fns.php:17 -msgid "Reverse Alphabetic" -msgstr "Alfabetico inverso" - -#: ../../include/dir_fns.php:18 -msgid "Newest to Oldest" -msgstr "Dal più nuovo al più vecchio" +#: ../../include/items.php:3733 +msgid "Collection is empty." +msgstr "L'insieme di canali è vuoto." -#: ../../include/dir_fns.php:29 -msgid "Enable Safe Search" -msgstr "Abilita SafeSearch" +#: ../../include/items.php:3740 +#, php-format +msgid "Collection: %s" +msgstr "Insieme: %s" -#: ../../include/dir_fns.php:31 -msgid "Disable Safe Search" -msgstr "Disabilita SafeSearch" +#: ../../include/items.php:3751 +#, php-format +msgid "Connection: %s" +msgstr "Contatto: %s" -#: ../../include/dir_fns.php:33 -msgid "Safe Mode" -msgstr "Modalità SafeSearch" +#: ../../include/items.php:3754 +msgid "Connection not found." +msgstr "Contatto non trovato." #: ../../mod/common.php:10 msgid "No channel." msgstr "Nessun canale." -#: ../../mod/common.php:47 +#: ../../mod/common.php:39 msgid "Common connections" msgstr "Contatti in comune" -#: ../../mod/common.php:52 +#: ../../mod/common.php:44 msgid "No connections in common." msgstr "Nessun contatto in comune." -#: ../../mod/events.php:71 +#: ../../mod/events.php:72 msgid "Event title and start time are required." msgstr "Sono necessari il titolo e l'ora d'inizio dell'evento." -#: ../../mod/events.php:286 +#: ../../mod/events.php:287 msgid "l, F j" msgstr "l j F" -#: ../../mod/events.php:308 +#: ../../mod/events.php:309 msgid "Edit event" msgstr "Modifica l'evento" -#: ../../mod/events.php:354 +#: ../../mod/events.php:355 msgid "Create New Event" msgstr "Crea un nuovo evento" -#: ../../mod/events.php:355 +#: ../../mod/events.php:356 msgid "Previous" msgstr "Precendente" -#: ../../mod/events.php:356 ../../mod/setup.php:256 +#: ../../mod/events.php:357 ../../mod/setup.php:256 msgid "Next" msgstr "Successivo" -#: ../../mod/events.php:428 +#: ../../mod/events.php:429 msgid "hour:minute" msgstr "ora:minuti" -#: ../../mod/events.php:447 +#: ../../mod/events.php:448 msgid "Event details" msgstr "Dettagli evento" -#: ../../mod/events.php:448 +#: ../../mod/events.php:449 #, php-format msgid "Format is %s %s. Starting date and Title are required." msgstr "Il formato è %s %s. L'inizio e il titolo sono obbligatori." -#: ../../mod/events.php:450 +#: ../../mod/events.php:451 msgid "Event Starts:" msgstr "Inizio:" -#: ../../mod/events.php:450 ../../mod/events.php:464 +#: ../../mod/events.php:451 ../../mod/events.php:465 msgid "Required" msgstr "Obbligatorio" -#: ../../mod/events.php:453 +#: ../../mod/events.php:454 msgid "Finish date/time is not known or not relevant" msgstr "La data/ora di fine non è rilevante" -#: ../../mod/events.php:455 +#: ../../mod/events.php:456 msgid "Event Finishes:" msgstr "Fine:" -#: ../../mod/events.php:458 +#: ../../mod/events.php:459 msgid "Adjust for viewer timezone" msgstr "Adatta al fuso orario di chi legge" -#: ../../mod/events.php:460 +#: ../../mod/events.php:461 msgid "Description:" msgstr "Descrizione:" -#: ../../mod/events.php:464 +#: ../../mod/events.php:465 msgid "Title:" msgstr "Titolo:" -#: ../../mod/events.php:466 +#: ../../mod/events.php:467 msgid "Share this event" msgstr "Condividi questo evento" @@ -3146,7 +3229,7 @@ msgid "Enter email addresses, one per line:" msgstr "Inserisci gli indirizzi email, uno per riga:" #: ../../mod/invite.php:141 ../../mod/message.php:326 -#: ../../mod/message.php:508 +#: ../../mod/message.php:476 msgid "Your message:" msgstr "Il tuo messaggio:" @@ -3191,7 +3274,7 @@ msgstr "Amici di %s" msgid "No friends to display." msgstr "Nessun amico da visualizzare." -#: ../../mod/webpages.php:104 ../../mod/layouts.php:105 +#: ../../mod/webpages.php:121 ../../mod/layouts.php:105 #: ../../mod/blocks.php:96 msgid "View" msgstr "Guarda" @@ -3215,19 +3298,15 @@ msgid "" msgstr "Vuoi autorizzare questa app ad accedere ai messaggi e ai contatti o creare nuovi messaggi per te?" #: ../../mod/api.php:105 ../../mod/settings.php:967 ../../mod/settings.php:972 -#: ../../mod/profiles.php:506 +#: ../../mod/profiles.php:495 msgid "Yes" msgstr "Si" #: ../../mod/api.php:106 ../../mod/settings.php:967 ../../mod/settings.php:972 -#: ../../mod/profiles.php:507 +#: ../../mod/profiles.php:496 msgid "No" msgstr "No" -#: ../../mod/lastpost.php:16 ../../mod/channel.php:25 -msgid "You must be logged in to see this page." -msgstr "Devi aver effettuato l'accesso per vedere questa pagina." - #: ../../mod/apps.php:8 msgid "No installed applications." msgstr "Nessuna app installata." @@ -3705,7 +3784,7 @@ msgid "Cancel" msgstr "Annulla" #: ../../mod/settings.php:611 ../../mod/settings.php:637 -#: ../../mod/admin.php:686 ../../mod/crepair.php:148 +#: ../../mod/admin.php:689 msgid "Name" msgstr "Nome" @@ -3819,7 +3898,7 @@ msgstr "Funzionalità aggiuntive" msgid "Connector Settings" msgstr "Impostazioni del connettore" -#: ../../mod/settings.php:802 ../../mod/admin.php:369 +#: ../../mod/settings.php:802 ../../mod/admin.php:371 msgid "No special theme for mobile devices" msgstr "Nessun tema per dispositivi mobili" @@ -3887,7 +3966,7 @@ msgstr "Pubblica il mio profilo predefinito sull'elenco pubblico dei canali" msgid "Allow us to suggest you as a potential friend to new members?" msgstr "Vuoi essere suggerito come potenziale amico ai nuovi membri?" -#: ../../mod/settings.php:976 ../../mod/profile_photo.php:298 +#: ../../mod/settings.php:976 ../../mod/profile_photo.php:288 msgid "or" msgstr "o" @@ -3959,7 +4038,7 @@ msgstr "Serve e ridurre lo spam" msgid "Default Post Permissions" msgstr "Permessi predefiniti per gli articoli" -#: ../../mod/settings.php:1032 +#: ../../mod/settings.php:1032 ../../mod/mitem.php:137 ../../mod/mitem.php:180 msgid "(click to open/close)" msgstr "(clicca per aprire/chiudere)" @@ -4035,22 +4114,22 @@ msgstr "Impostazioni avanzate" msgid "Change the behaviour of this account for special situations" msgstr "Cambia il funzionamento di questo account in situazioni particolari" -#: ../../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 "Accesso pubblico negato." -#: ../../mod/viewconnections.php:57 +#: ../../mod/viewconnections.php:43 msgid "No connections." msgstr "Nessun contatto." -#: ../../mod/viewconnections.php:69 +#: ../../mod/viewconnections.php:55 #, php-format msgid "Visit %s's profile [%s]" msgstr "Visita il profilo di %s [%s]" -#: ../../mod/viewconnections.php:84 +#: ../../mod/viewconnections.php:70 msgid "View Connnections" msgstr "Guarda i contatti" @@ -4207,23 +4286,23 @@ msgstr "Impossibile rimuovere la sorgente." msgid "Theme settings updated." msgstr "Le impostazioni del tema sono state aggiornate." -#: ../../mod/admin.php:87 ../../mod/admin.php:417 +#: ../../mod/admin.php:87 ../../mod/admin.php:419 msgid "Site" msgstr "Sito" -#: ../../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 "Utenti" -#: ../../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 "Plugin" -#: ../../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 "Temi" -#: ../../mod/admin.php:91 ../../mod/admin.php:475 +#: ../../mod/admin.php:91 ../../mod/admin.php:478 msgid "Server" msgstr "Server" @@ -4231,7 +4310,7 @@ msgstr "Server" msgid "DB updates" msgstr "Aggiornamenti al DB" -#: ../../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 "Log" @@ -4247,9 +4326,9 @@ msgstr "Registrazioni in attesa" msgid "Message queues" msgstr "Messaggi in attesa di recapito" -#: ../../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 "Amministrazione" @@ -4261,7 +4340,7 @@ msgstr "Riepilogo" msgid "Registered users" msgstr "Utenti registrati" -#: ../../mod/admin.php:198 ../../mod/admin.php:478 +#: ../../mod/admin.php:198 ../../mod/admin.php:481 msgid "Pending registrations" msgstr "Registrazioni da approvare" @@ -4269,567 +4348,581 @@ msgstr "Registrazioni da approvare" msgid "Version" msgstr "Versione" -#: ../../mod/admin.php:201 ../../mod/admin.php:479 +#: ../../mod/admin.php:201 ../../mod/admin.php:482 msgid "Active plugins" msgstr "Plugin attivi" -#: ../../mod/admin.php:340 +#: ../../mod/admin.php:342 msgid "Site settings updated." msgstr "Impostazioni del sito aggiornate." -#: ../../mod/admin.php:371 +#: ../../mod/admin.php:373 msgid "No special theme for accessibility" msgstr "Nessun tema speciale per l'accessibilità" -#: ../../mod/admin.php:396 +#: ../../mod/admin.php:398 msgid "Closed" msgstr "Chiusa" -#: ../../mod/admin.php:397 +#: ../../mod/admin.php:399 msgid "Requires approval" msgstr "Richiede l'approvazione" -#: ../../mod/admin.php:398 +#: ../../mod/admin.php:400 msgid "Open" msgstr "Aperta" -#: ../../mod/admin.php:403 +#: ../../mod/admin.php:405 msgid "Private" msgstr "Privato" -#: ../../mod/admin.php:404 +#: ../../mod/admin.php:406 msgid "Paid Access" msgstr "Servizio a pagamento" -#: ../../mod/admin.php:405 +#: ../../mod/admin.php:407 msgid "Free Access" msgstr "Servizio gratuito" -#: ../../mod/admin.php:406 +#: ../../mod/admin.php:408 msgid "Tiered Access" msgstr "Accesso multilivello" -#: ../../mod/admin.php:419 ../../mod/register.php:180 +#: ../../mod/admin.php:421 ../../mod/register.php:180 msgid "Registration" msgstr "Registrazione" -#: ../../mod/admin.php:420 +#: ../../mod/admin.php:422 msgid "File upload" msgstr "Caricamento file" -#: ../../mod/admin.php:421 +#: ../../mod/admin.php:423 msgid "Policies" msgstr "Politiche" -#: ../../mod/admin.php:422 +#: ../../mod/admin.php:424 msgid "Advanced" msgstr "Avanzate" -#: ../../mod/admin.php:426 +#: ../../mod/admin.php:428 msgid "Site name" msgstr "Nome del sito" -#: ../../mod/admin.php:427 +#: ../../mod/admin.php:429 msgid "Banner/Logo" msgstr "Banner o logo" -#: ../../mod/admin.php:428 +#: ../../mod/admin.php:430 msgid "System language" msgstr "Lingua di sistema" -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:431 msgid "System theme" msgstr "Tema di sistema" -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:431 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "Il tema di sistema può essere cambiato dai profili dei singoli utenti - Cambia le impostazioni del tema" -#: ../../mod/admin.php:430 +#: ../../mod/admin.php:432 msgid "Mobile system theme" msgstr "Tema di sistema per dispositivi mobili" -#: ../../mod/admin.php:430 +#: ../../mod/admin.php:432 msgid "Theme for mobile devices" msgstr "Tema per i dispositivi mobili" -#: ../../mod/admin.php:431 +#: ../../mod/admin.php:433 msgid "Accessibility system theme" msgstr "Tema di sistema ad alta accessibilità" -#: ../../mod/admin.php:431 +#: ../../mod/admin.php:433 msgid "Accessibility theme" msgstr "Tema ad alta accessibilità" -#: ../../mod/admin.php:432 +#: ../../mod/admin.php:434 msgid "Channel to use for this website's static pages" msgstr "Canale da usare per le pagine statiche di questo sito" -#: ../../mod/admin.php:432 +#: ../../mod/admin.php:434 msgid "Site Channel" msgstr "Canale del sito" -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:436 msgid "Maximum image size" msgstr "Dimensione massima immagini" -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:436 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "Massima dimensione in byte delle immagini caricate. Il default è 0, cioè nessun limite." -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:437 msgid "Register policy" msgstr "Politica di registrazione" -#: ../../mod/admin.php:436 +#: ../../mod/admin.php:438 msgid "Access policy" msgstr "Tipo di accesso" -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:439 msgid "Register text" msgstr "Testo diregistrazione" -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:439 msgid "Will be displayed prominently on the registration page." msgstr "Sarà mostrato ben visibile nella pagina di registrazione." -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:440 msgid "Accounts abandoned after x days" msgstr "Account abbandonati dopo X giorni" -#: ../../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 "Eviterà di sprecare risorse di sistema controllando se i siti esterni hanno account abbandonati. Immettere 0 per non imporre nessun limite di tempo." -#: ../../mod/admin.php:439 +#: ../../mod/admin.php:441 msgid "Allowed friend domains" msgstr "Domini fidati e consentiti" -#: ../../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 "Elenco separato da virglola dei domini che possono stabilire amicizie con questo sito. Sono accettati caratteri jolly. Lascia vuoto per accettare connessioni da qualsiasi dominio." -#: ../../mod/admin.php:440 +#: ../../mod/admin.php:442 msgid "Allowed email domains" msgstr "Domini email consentiti" -#: ../../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 "Elenco separato da virgola dei domini permessi come indirizzi email in fase di registrazione. Sono accettati caratteri jolly. Lascia vuoto per accettare qualsiasi dominio." -#: ../../mod/admin.php:441 +#: ../../mod/admin.php:443 msgid "Block public" msgstr "Blocca pagine pubbliche" -#: ../../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 "Seleziona per impedire di vedere le pagine personali di questo sito a chi non ha effettuato l'accesso." -#: ../../mod/admin.php:442 +#: ../../mod/admin.php:444 msgid "Force publish" msgstr "Forza la publicazione del profilo" -#: ../../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 "Seleziona per mostrare nell'elenco dei canali del sito tutti i profili registrati." -#: ../../mod/admin.php:444 +#: ../../mod/admin.php:445 +msgid "No login on Homepage" +msgstr "Non mostrare il login sulla homepage" + +#: ../../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 "Per nascondere la possibilità di fare login ai visitatori (per esempio, quando il contenuto della homepage del sito è alimentato dal canale)." + +#: ../../mod/admin.php:447 msgid "Proxy user" msgstr "Utente proxy" -#: ../../mod/admin.php:445 +#: ../../mod/admin.php:448 msgid "Proxy URL" msgstr "URL proxy" -#: ../../mod/admin.php:446 +#: ../../mod/admin.php:449 msgid "Network timeout" msgstr "Timeout rete" -#: ../../mod/admin.php:446 +#: ../../mod/admin.php:449 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "Valore in secondi. Imposta a 0 per illimitato (sconsigliato)." -#: ../../mod/admin.php:447 +#: ../../mod/admin.php:450 msgid "Delivery interval" msgstr "Recapito ritardato" -#: ../../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 "RItarda il processo di recapito di questo numero di secondi per ridurre il carico di sistema. Consigliati: 4-5 secondi per hosting condiviso, 2-3 per i VPS, 0-1 per grandi server dedicati." -#: ../../mod/admin.php:448 +#: ../../mod/admin.php:451 msgid "Poll interval" msgstr "Intervallo di polling" -#: ../../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 "Ritarda i processi di polling in background di questo numero di secondi per ridurre il carico del sistema. Se 0, verrà usato lo stesso valore del 'Recapito ritardato'." -#: ../../mod/admin.php:449 +#: ../../mod/admin.php:452 msgid "Maximum Load Average" msgstr "Carico massimo medio" -#: ../../mod/admin.php:449 +#: ../../mod/admin.php:452 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "Carico di sistema massimo perché i processi di recapito e polling siano ritardati - il valore predefinito è 50." -#: ../../mod/admin.php:466 +#: ../../mod/admin.php:469 msgid "No server found" msgstr "Server non trovato" -#: ../../mod/admin.php:473 ../../mod/admin.php:695 +#: ../../mod/admin.php:476 ../../mod/admin.php:698 msgid "ID" msgstr "ID" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:476 msgid "for channel" msgstr "per canale" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:476 msgid "on server" msgstr "sul server" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:476 msgid "Status" msgstr "Stato" -#: ../../mod/admin.php:493 +#: ../../mod/admin.php:496 msgid "Update has been marked successful" msgstr "L'aggiornamento è stato marcato come eseguito." -#: ../../mod/admin.php:503 +#: ../../mod/admin.php:506 #, php-format msgid "Executing %s failed. Check system logs." msgstr "Fallita l'esecuzione di %s. Maggiori informazioni sui log di sistema." -#: ../../mod/admin.php:506 +#: ../../mod/admin.php:509 #, php-format msgid "Update %s was successfully applied." msgstr "L'aggiornamento %s è terminato correttamente." -#: ../../mod/admin.php:510 +#: ../../mod/admin.php:513 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "L'aggiornamento %s non ha dato risposta. Impossibile determinare se è terminato correttamente." -#: ../../mod/admin.php:513 +#: ../../mod/admin.php:516 #, php-format msgid "Update function %s could not be found." msgstr "Impossibile trovare la funzione di aggiornamento %s" -#: ../../mod/admin.php:528 +#: ../../mod/admin.php:531 msgid "No failed updates." msgstr "Nessun aggiornamento fallito." -#: ../../mod/admin.php:532 +#: ../../mod/admin.php:535 msgid "Failed Updates" msgstr "Aggiornamenti falliti." -#: ../../mod/admin.php:534 +#: ../../mod/admin.php:537 msgid "Mark success (if update was manually applied)" msgstr "Marca come eseguito (se applicato manualmente)." -#: ../../mod/admin.php:535 +#: ../../mod/admin.php:538 msgid "Attempt to execute this update step automatically" msgstr "Tenta di eseguire in automatico questo passaggio dell'aggiornamento." -#: ../../mod/admin.php:561 +#: ../../mod/admin.php:564 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "%s utente bloccato/sbloccato" msgstr[1] "%s utenti bloccati/sbloccati" -#: ../../mod/admin.php:568 +#: ../../mod/admin.php:571 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "%s utente cancellato" msgstr[1] "%s utenti cancellati" -#: ../../mod/admin.php:599 +#: ../../mod/admin.php:602 msgid "Account not found" msgstr "Account non trovato" -#: ../../mod/admin.php:610 +#: ../../mod/admin.php:613 #, php-format msgid "User '%s' deleted" msgstr "Utente '%s' eliminato" -#: ../../mod/admin.php:619 +#: ../../mod/admin.php:622 #, php-format msgid "User '%s' unblocked" msgstr "Utente '%s' sbloccato" -#: ../../mod/admin.php:619 +#: ../../mod/admin.php:622 #, php-format msgid "User '%s' blocked" msgstr "Utente '%s' bloccato" -#: ../../mod/admin.php:684 +#: ../../mod/admin.php:687 msgid "select all" msgstr "seleziona tutti" -#: ../../mod/admin.php:685 +#: ../../mod/admin.php:688 msgid "User registrations waiting for confirm" msgstr "Richieste di registrazione in attesa di conferma" -#: ../../mod/admin.php:686 +#: ../../mod/admin.php:689 msgid "Request date" msgstr "Data richiesta" -#: ../../mod/admin.php:687 +#: ../../mod/admin.php:690 msgid "No registrations." msgstr "Nessuna registrazione." -#: ../../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 "Approva" -#: ../../mod/admin.php:689 +#: ../../mod/admin.php:692 msgid "Deny" msgstr "Nega" -#: ../../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 "Blocca" -#: ../../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 "Sblocca" -#: ../../mod/admin.php:695 +#: ../../mod/admin.php:698 msgid "Register date" msgstr "Data registrazione" -#: ../../mod/admin.php:695 +#: ../../mod/admin.php:698 msgid "Last login" msgstr "Ultimo accesso" -#: ../../mod/admin.php:695 +#: ../../mod/admin.php:698 msgid "Expires" msgstr "Scadenza" -#: ../../mod/admin.php:695 +#: ../../mod/admin.php:698 msgid "Service Class" msgstr "Service Class" -#: ../../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 "Gli utenti selezionati saranno eliminati!\\n\\nTutto quello che gli utenti hanno pubblicato su questo sito sarà permanentemente eliminato!\\n\\nConfermi?" -#: ../../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 "L'utente {0} sarà eliminato!\\n\\nTutto quello che ha pubblicato su questo sito sarà permanentemente eliminato!\\n\\nConfermi?" -#: ../../mod/admin.php:739 +#: ../../mod/admin.php:742 #, php-format msgid "Plugin %s disabled." msgstr "Plugin %s non attivo." -#: ../../mod/admin.php:743 +#: ../../mod/admin.php:746 #, php-format msgid "Plugin %s enabled." msgstr "Plugin %s attivo." -#: ../../mod/admin.php:753 ../../mod/admin.php:955 +#: ../../mod/admin.php:756 ../../mod/admin.php:958 msgid "Disable" msgstr "Disattiva" -#: ../../mod/admin.php:755 ../../mod/admin.php:957 +#: ../../mod/admin.php:758 ../../mod/admin.php:960 msgid "Enable" msgstr "Attiva" -#: ../../mod/admin.php:781 ../../mod/admin.php:986 +#: ../../mod/admin.php:784 ../../mod/admin.php:989 msgid "Toggle" msgstr "Attiva/disattiva" -#: ../../mod/admin.php:789 ../../mod/admin.php:996 +#: ../../mod/admin.php:792 ../../mod/admin.php:999 msgid "Author: " msgstr "Autore:" -#: ../../mod/admin.php:790 ../../mod/admin.php:997 +#: ../../mod/admin.php:793 ../../mod/admin.php:1000 msgid "Maintainer: " msgstr "Gestore:" -#: ../../mod/admin.php:919 +#: ../../mod/admin.php:922 msgid "No themes found." msgstr "Nessun tema trovato." -#: ../../mod/admin.php:978 +#: ../../mod/admin.php:981 msgid "Screenshot" msgstr "Istantanea dello schermo" -#: ../../mod/admin.php:1026 +#: ../../mod/admin.php:1029 msgid "[Experimental]" msgstr "[Sperimentale]" -#: ../../mod/admin.php:1027 +#: ../../mod/admin.php:1030 msgid "[Unsupported]" msgstr "[Non supportato]" -#: ../../mod/admin.php:1054 +#: ../../mod/admin.php:1057 msgid "Log settings updated." msgstr "Impostazioni di log aggiornate." -#: ../../mod/admin.php:1110 +#: ../../mod/admin.php:1113 msgid "Clear" msgstr "Pulisci" -#: ../../mod/admin.php:1116 +#: ../../mod/admin.php:1119 msgid "Debugging" msgstr "Debugging" -#: ../../mod/admin.php:1117 +#: ../../mod/admin.php:1120 msgid "Log file" msgstr "File di log" -#: ../../mod/admin.php:1117 +#: ../../mod/admin.php:1120 msgid "" "Must be writable by web server. Relative to your Red top-level directory." msgstr "Deve essere scrivibile dal web server. È relativa alla cartella dove è installato Red." -#: ../../mod/admin.php:1118 +#: ../../mod/admin.php:1121 msgid "Log level" msgstr "Livello di log" -#: ../../mod/mitem.php:13 ../../mod/menu.php:87 +#: ../../mod/mitem.php:14 ../../mod/menu.php:87 msgid "Menu not found." msgstr "Menù non trovato." -#: ../../mod/mitem.php:66 +#: ../../mod/mitem.php:47 msgid "Menu element updated." msgstr "L'elemento del menù è stato aggiornato." -#: ../../mod/mitem.php:70 +#: ../../mod/mitem.php:51 msgid "Unable to update menu element." msgstr "Non è possibile aggiornare l'elemento del menù." -#: ../../mod/mitem.php:76 +#: ../../mod/mitem.php:57 msgid "Menu element added." msgstr "Elemento aggiunto al menù." -#: ../../mod/mitem.php:80 +#: ../../mod/mitem.php:61 msgid "Unable to add menu element." msgstr "Impossibile aggiungere l'elemento al menù." -#: ../../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 "Non trovato." -#: ../../mod/mitem.php:116 +#: ../../mod/mitem.php:99 msgid "Manage Menu Elements" msgstr "Gestione elementi del menù" -#: ../../mod/mitem.php:119 +#: ../../mod/mitem.php:102 msgid "Edit menu" msgstr "Modifica il menù" -#: ../../mod/mitem.php:122 +#: ../../mod/mitem.php:105 msgid "Edit element" msgstr "Modifica l'elemento" -#: ../../mod/mitem.php:123 +#: ../../mod/mitem.php:106 msgid "Drop element" msgstr "Elimina l'elemento" -#: ../../mod/mitem.php:124 +#: ../../mod/mitem.php:107 msgid "New element" msgstr "Nuovo elemento" -#: ../../mod/mitem.php:125 +#: ../../mod/mitem.php:108 msgid "Edit this menu container" msgstr "Modifica il contenitore del menù" -#: ../../mod/mitem.php:126 +#: ../../mod/mitem.php:109 msgid "Add menu element" msgstr "Aggiungi un elemento al menù" -#: ../../mod/mitem.php:127 +#: ../../mod/mitem.php:110 msgid "Delete this menu item" msgstr "Elimina questo elemento del menù" -#: ../../mod/mitem.php:128 +#: ../../mod/mitem.php:111 msgid "Edit this menu item" msgstr "Modifica questo elemento del menù" -#: ../../mod/mitem.php:141 +#: ../../mod/mitem.php:134 msgid "New Menu Element" msgstr "Nuovo elemento del menù" -#: ../../mod/mitem.php:143 ../../mod/mitem.php:184 +#: ../../mod/mitem.php:136 ../../mod/mitem.php:179 +msgid "Menu Item Permissions" +msgstr "Permessi del menu" + +#: ../../mod/mitem.php:139 ../../mod/mitem.php:183 msgid "Link text" msgstr "Testo del link" -#: ../../mod/mitem.php:144 ../../mod/mitem.php:185 +#: ../../mod/mitem.php:140 ../../mod/mitem.php:184 msgid "URL of link" msgstr "Indirizzo del link" -#: ../../mod/mitem.php:145 ../../mod/mitem.php:186 +#: ../../mod/mitem.php:141 ../../mod/mitem.php:185 msgid "Use Red magic-auth if available" msgstr "Usa l'autenticazione magica di Red, se disponibile" -#: ../../mod/mitem.php:146 ../../mod/mitem.php:187 +#: ../../mod/mitem.php:142 ../../mod/mitem.php:186 msgid "Open link in new window" msgstr "Apri il link in una nuova finestra" -#: ../../mod/mitem.php:148 ../../mod/mitem.php:189 +#: ../../mod/mitem.php:144 ../../mod/mitem.php:188 msgid "Order in list" msgstr "Ordine dell'elenco" -#: ../../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 "I numeri più alti andranno in fondo all'elenco" -#: ../../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 "Crea" -#: ../../mod/mitem.php:161 +#: ../../mod/mitem.php:157 msgid "Menu item not found." msgstr "L'elemento del menù non è stato trovato." -#: ../../mod/mitem.php:170 +#: ../../mod/mitem.php:166 msgid "Menu item deleted." msgstr "L'elemento del menù è stato eliminato." -#: ../../mod/mitem.php:172 +#: ../../mod/mitem.php:168 msgid "Menu item could not be deleted." msgstr "L'elemento del menù non può essere eliminato." -#: ../../mod/mitem.php:181 +#: ../../mod/mitem.php:177 msgid "Edit Menu Element" msgstr "Modifica l'elemento del menù" -#: ../../mod/mitem.php:190 ../../mod/menu.php:107 +#: ../../mod/mitem.php:189 ../../mod/menu.php:107 msgid "Modify" msgstr "Modifica" @@ -4881,10 +4974,6 @@ msgstr "Tutti i canali connessi" msgid "Click on a channel to add or remove." msgstr "Clicca su un canale per aggiungerlo o rimuoverlo." -#: ../../mod/search.php:20 ../../mod/network.php:113 -msgid "Remove term" -msgstr "Rimuovi termine" - #: ../../mod/photos.php:83 msgid "Page owner information could not be retrieved." msgstr "Impossibile ottenere informazioni sul proprietario della pagina." @@ -5139,7 +5228,7 @@ msgstr "Impossibile verificare il canale richiesto." msgid "Selected channel has private message restrictions. Send failed." msgstr "Il canale ha delle regole restrittive per la ricezione dei messaggi privati. Invio fallito." -#: ../../mod/message.php:223 ../../mod/notifications.php:101 +#: ../../mod/message.php:223 msgid "Messages" msgstr "Messaggi" @@ -5159,11 +5248,11 @@ msgstr "Messaggio revocato." msgid "Send Private Message" msgstr "Invia un messaggio privato" -#: ../../mod/message.php:317 ../../mod/message.php:503 +#: ../../mod/message.php:317 ../../mod/message.php:471 msgid "To:" msgstr "A:" -#: ../../mod/message.php:322 ../../mod/message.php:505 +#: ../../mod/message.php:322 ../../mod/message.php:473 msgid "Subject:" msgstr "Oggetto:" @@ -5171,7 +5260,7 @@ msgstr "Oggetto:" msgid "No messages." msgstr "Nessun messaggio." -#: ../../mod/message.php:375 ../../mod/message.php:472 +#: ../../mod/message.php:375 ../../mod/message.php:440 msgid "Delete message" msgstr "Elimina il messaggio" @@ -5183,36 +5272,32 @@ msgstr "D d M Y - G:i" msgid "Message not found." msgstr "Messaggio non trovato." -#: ../../mod/message.php:473 +#: ../../mod/message.php:441 msgid "Recall message" msgstr "Revoca il messaggio" -#: ../../mod/message.php:475 +#: ../../mod/message.php:443 msgid "Message has been recalled." msgstr "Il messaggio è stato revocato." -#: ../../mod/message.php:492 +#: ../../mod/message.php:460 msgid "Private Conversation" msgstr "Conversazione privata" -#: ../../mod/message.php:496 +#: ../../mod/message.php:464 msgid "Delete conversation" msgstr "Elimina la conversazione" -#: ../../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 "Non è disponibile alcun sistema per comunicare in modo sicuro. Puoi verificare se eventualmente è possibile rispondere dalla pagina del profilo del mittente." -#: ../../mod/message.php:502 +#: ../../mod/message.php:470 msgid "Send Reply" msgstr "Invia la risposta" -#: ../../mod/hcard.php:10 -msgid "No profile" -msgstr "Nessun profilo" - #: ../../mod/layouts.php:52 msgid "Layout Help" msgstr "Guida al layout" @@ -5245,101 +5330,30 @@ msgstr "Inserisci l'indirizzo del tuo canale (ad esempio lucia@esempio.com)" msgid "Authenticate" msgstr "Autenticazione" -#: ../../mod/network.php:172 +#: ../../mod/network.php:79 msgid "No such group" msgstr "Impossibile trovare l'insieme" -#: ../../mod/network.php:212 -msgid "Refresh" -msgstr "Aggiorna" - -#: ../../mod/network.php:213 ../../mod/connections.php:404 -msgid "Me" -msgstr "Io" - -#: ../../mod/network.php:214 ../../mod/connections.php:406 -msgid "Best Friends" -msgstr "Buoni amici" - -#: ../../mod/network.php:216 -msgid "Co-workers" -msgstr "Colleghi" - -#: ../../mod/network.php:217 ../../mod/connections.php:408 -msgid "Former Friends" -msgstr "Ex amici" - -#: ../../mod/network.php:218 ../../mod/connections.php:409 -msgid "Acquaintances" -msgstr "Conoscenti" - -#: ../../mod/network.php:219 -msgid "Everybody" -msgstr "Tutti" - -#: ../../mod/network.php:234 +#: ../../mod/network.php:118 msgid "Search Results For:" msgstr "Cerca risultati con:" -#: ../../mod/network.php:296 +#: ../../mod/network.php:172 +msgid "Collection is empty" +msgstr "L'insieme di canali è vuoto" + +#: ../../mod/network.php:180 msgid "Collection: " msgstr "Insieme:" -#: ../../mod/network.php:309 +#: ../../mod/network.php:193 msgid "Connection: " msgstr "Connessione:" -#: ../../mod/network.php:312 +#: ../../mod/network.php:196 msgid "Invalid connection." msgstr "Connessione non valida." -#: ../../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 "Ignora" - -#: ../../mod/intro.php:29 ../../mod/connections.php:122 -msgid "Connection updated." -msgstr "Contatto aggiornato." - -#: ../../mod/intro.php:31 -msgid "Connection update failed." -msgstr "Impossibile aggiornare il contatto." - -#: ../../mod/intro.php:56 -msgid "Introductions and Connection Requests" -msgstr "Richieste di entrare in contatto" - -#: ../../mod/intro.php:67 -msgid "No pending introductions." -msgstr "Nessuna richiesta in attesa." - -#: ../../mod/intro.php:72 -msgid "System error. Please try again later." -msgstr "Errore di sistema. Riprovare più tardi." - -#: ../../mod/intro.php:95 ../../mod/connections.php:496 -#: ../../mod/notifications.php:155 ../../mod/notifications.php:202 -msgid "Hide this contact from others" -msgstr "Nascondi questo contatto agli altri" - -#: ../../mod/intro.php:96 ../../mod/notifications.php:156 -#: ../../mod/notifications.php:203 -msgid "Post a new friend activity" -msgstr "Pubblica sulla bacheca che hai un nuovo contatto" - -#: ../../mod/intro.php:96 ../../mod/notifications.php:156 -#: ../../mod/notifications.php:203 -msgid "if applicable" -msgstr "se possibile" - -#: ../../mod/intro.php:101 ../../mod/notifications.php:35 -#: ../../mod/notifications.php:163 ../../mod/notifications.php:209 -msgid "Discard" -msgstr "Rifiuta" - #: ../../mod/post.php:222 msgid "" "Remote authentication blocked. You are logged into this site locally. Please" @@ -5368,7 +5382,7 @@ msgid "Hub not found." msgstr "Server non trovato." #: ../../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 "Profilo non trovato." @@ -5388,226 +5402,226 @@ msgstr "Il nuovo profilo è stato creato." msgid "Profile unavailable to clone." msgstr "Impossibile duplicare il profilo." -#: ../../mod/profiles.php:189 +#: ../../mod/profiles.php:178 msgid "Profile Name is required." msgstr "Il nome del profilo è obbligatorio ." -#: ../../mod/profiles.php:317 +#: ../../mod/profiles.php:306 msgid "Marital Status" msgstr "Stato sentimentale" -#: ../../mod/profiles.php:321 +#: ../../mod/profiles.php:310 msgid "Romantic Partner" msgstr "Partner affettivo" -#: ../../mod/profiles.php:325 +#: ../../mod/profiles.php:314 msgid "Likes" msgstr "Cosa gli piace" -#: ../../mod/profiles.php:329 +#: ../../mod/profiles.php:318 msgid "Dislikes" msgstr "Cosa non gli piace" -#: ../../mod/profiles.php:333 +#: ../../mod/profiles.php:322 msgid "Work/Employment" msgstr "Lavoro/impiego" -#: ../../mod/profiles.php:336 +#: ../../mod/profiles.php:325 msgid "Religion" msgstr "Religione" -#: ../../mod/profiles.php:340 +#: ../../mod/profiles.php:329 msgid "Political Views" msgstr "Orientamento politico" -#: ../../mod/profiles.php:344 +#: ../../mod/profiles.php:333 msgid "Gender" msgstr "Sesso" -#: ../../mod/profiles.php:348 +#: ../../mod/profiles.php:337 msgid "Sexual Preference" msgstr "Preferenze sessuali" -#: ../../mod/profiles.php:352 +#: ../../mod/profiles.php:341 msgid "Homepage" msgstr "Home page" -#: ../../mod/profiles.php:356 +#: ../../mod/profiles.php:345 msgid "Interests" msgstr "Interessi" -#: ../../mod/profiles.php:360 +#: ../../mod/profiles.php:349 msgid "Address" msgstr "Indirizzo" -#: ../../mod/profiles.php:367 ../../mod/pubsites.php:31 +#: ../../mod/profiles.php:356 ../../mod/pubsites.php:31 msgid "Location" msgstr "Luogo attuale" -#: ../../mod/profiles.php:450 +#: ../../mod/profiles.php:439 msgid "Profile updated." msgstr "Profilo aggiornato." -#: ../../mod/profiles.php:505 +#: ../../mod/profiles.php:494 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "Nascondi la tua lista di contatti/amici ai visitatori di questo profilo?" -#: ../../mod/profiles.php:528 +#: ../../mod/profiles.php:517 msgid "Edit Profile Details" msgstr "Modifica i dettagli del profilo" -#: ../../mod/profiles.php:530 +#: ../../mod/profiles.php:519 msgid "View this profile" msgstr "Guarda questo profilo" -#: ../../mod/profiles.php:531 +#: ../../mod/profiles.php:520 msgid "Change Profile Photo" msgstr "Cambia la foto del profilo" -#: ../../mod/profiles.php:532 +#: ../../mod/profiles.php:521 msgid "Create a new profile using these settings" msgstr "Crea un nuovo profilo usando queste impostazioni" -#: ../../mod/profiles.php:533 +#: ../../mod/profiles.php:522 msgid "Clone this profile" msgstr "Clona questo profilo" -#: ../../mod/profiles.php:534 +#: ../../mod/profiles.php:523 msgid "Delete this profile" msgstr "Elimina questo profilo" -#: ../../mod/profiles.php:535 +#: ../../mod/profiles.php:524 msgid "Profile Name:" msgstr "Nome del profilo:" -#: ../../mod/profiles.php:536 +#: ../../mod/profiles.php:525 msgid "Your Full Name:" msgstr "Il tuo nome completo:" -#: ../../mod/profiles.php:537 +#: ../../mod/profiles.php:526 msgid "Title/Description:" msgstr "Titolo/descrizione:" -#: ../../mod/profiles.php:538 +#: ../../mod/profiles.php:527 msgid "Your Gender:" msgstr "Sesso:" -#: ../../mod/profiles.php:539 +#: ../../mod/profiles.php:528 #, php-format msgid "Birthday (%s):" msgstr "Compleanno (%s):" -#: ../../mod/profiles.php:540 +#: ../../mod/profiles.php:529 msgid "Street Address:" msgstr "Indirizzo (via/piazza):" -#: ../../mod/profiles.php:541 +#: ../../mod/profiles.php:530 msgid "Locality/City:" msgstr "Località:" -#: ../../mod/profiles.php:542 +#: ../../mod/profiles.php:531 msgid "Postal/Zip Code:" msgstr "CAP:" -#: ../../mod/profiles.php:543 +#: ../../mod/profiles.php:532 msgid "Country:" msgstr "Nazione:" -#: ../../mod/profiles.php:544 +#: ../../mod/profiles.php:533 msgid "Region/State:" msgstr "Regione/stato:" -#: ../../mod/profiles.php:545 +#: ../../mod/profiles.php:534 msgid "♥ Marital Status:" msgstr "♥ Stato sentimentale:" -#: ../../mod/profiles.php:546 +#: ../../mod/profiles.php:535 msgid "Who: (if applicable)" msgstr "Con chi: (se possibile)" -#: ../../mod/profiles.php:547 +#: ../../mod/profiles.php:536 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "Per esempio: cathy123, Cathy Williams, cathy@example.com" -#: ../../mod/profiles.php:548 +#: ../../mod/profiles.php:537 msgid "Since [date]:" msgstr "dal [data]:" -#: ../../mod/profiles.php:550 +#: ../../mod/profiles.php:539 msgid "Homepage URL:" msgstr "Indirizzo home page:" -#: ../../mod/profiles.php:553 +#: ../../mod/profiles.php:542 msgid "Religious Views:" msgstr "Orientamento religioso:" -#: ../../mod/profiles.php:554 +#: ../../mod/profiles.php:543 msgid "Keywords:" msgstr "Parole chiave, tag:" -#: ../../mod/profiles.php:557 +#: ../../mod/profiles.php:546 msgid "Example: fishing photography software" msgstr "Per esempio: pesca fotografia programmazione" -#: ../../mod/profiles.php:558 +#: ../../mod/profiles.php:547 msgid "Used in directory listings" msgstr "Visibile nell'elenco pubblico di canali" -#: ../../mod/profiles.php:559 +#: ../../mod/profiles.php:548 msgid "Tell us about yourself..." msgstr "Raccontaci di te..." -#: ../../mod/profiles.php:560 +#: ../../mod/profiles.php:549 msgid "Hobbies/Interests" msgstr "Hobby/interessi" -#: ../../mod/profiles.php:561 +#: ../../mod/profiles.php:550 msgid "Contact information and Social Networks" msgstr "Contatti personali e i tuoi social network" -#: ../../mod/profiles.php:562 +#: ../../mod/profiles.php:551 msgid "My other channels" msgstr "I miei altri canali" -#: ../../mod/profiles.php:563 +#: ../../mod/profiles.php:552 msgid "Musical interests" msgstr "Interessi musicali" -#: ../../mod/profiles.php:564 +#: ../../mod/profiles.php:553 msgid "Books, literature" msgstr "Libri, letteratura" -#: ../../mod/profiles.php:565 +#: ../../mod/profiles.php:554 msgid "Television" msgstr "Televisione" -#: ../../mod/profiles.php:566 +#: ../../mod/profiles.php:555 msgid "Film/dance/culture/entertainment" msgstr "Film/danza/cultura/intrattenimento" -#: ../../mod/profiles.php:567 +#: ../../mod/profiles.php:556 msgid "Love/romance" msgstr "Amore" -#: ../../mod/profiles.php:568 +#: ../../mod/profiles.php:557 msgid "Work/employment" msgstr "Lavoro/impiego" -#: ../../mod/profiles.php:569 +#: ../../mod/profiles.php:558 msgid "School/education" msgstr "Scuola/educazione" -#: ../../mod/profiles.php:574 +#: ../../mod/profiles.php:563 msgid "" "This is your public profile.
    It may " "be visible to anybody using the internet." msgstr "Questo è il tuo profilo publico.
    Potrebbe essere visto da chiunque attraverso internet." -#: ../../mod/profiles.php:584 ../../mod/directory.php:160 +#: ../../mod/profiles.php:573 ../../mod/directory.php:161 msgid "Age: " msgstr "Età:" -#: ../../mod/profiles.php:623 +#: ../../mod/profiles.php:612 msgid "Edit/Manage Profiles" msgstr "Modifica/gestisci i profili" @@ -5641,385 +5655,394 @@ msgstr "Il nome breve sarà usato per creare un indirizzo facile da ricordare pe msgid "Or import an existing channel from another location" msgstr "Oppure importa un tuo canale esistente da un altro server/hub" -#: ../../mod/connections.php:67 +#: ../../mod/connections.php:71 msgid "Could not access contact record." msgstr "Non è possibile accedere alle informazioni sul contatto." -#: ../../mod/connections.php:81 +#: ../../mod/connections.php:85 msgid "Could not locate selected profile." msgstr "Non riesco a trovare il profilo selezionato." -#: ../../mod/connections.php:124 +#: ../../mod/connections.php:126 +msgid "Connection updated." +msgstr "Contatto aggiornato." + +#: ../../mod/connections.php:128 msgid "Failed to update connection record." msgstr "Impossibile aggiornare le informazioni del contatto." -#: ../../mod/connections.php:219 +#: ../../mod/connections.php:223 msgid "Could not access address book record." msgstr "Impossibile accedere alle informazioni della rubrica." -#: ../../mod/connections.php:233 +#: ../../mod/connections.php:237 msgid "Refresh failed - channel is currently unavailable." msgstr "Il canale non è disponibile - impossibile aggiornare." -#: ../../mod/connections.php:240 +#: ../../mod/connections.php:244 msgid "Channel has been unblocked" msgstr "Il canale è stato sbloccato" -#: ../../mod/connections.php:241 +#: ../../mod/connections.php:245 msgid "Channel has been blocked" msgstr "Il canale è stato bloccato" -#: ../../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 "Impossibile impostare i parametri della rubrica." -#: ../../mod/connections.php:252 +#: ../../mod/connections.php:256 msgid "Channel has been unignored" msgstr "Il canale non sarà più ignorato" -#: ../../mod/connections.php:253 +#: ../../mod/connections.php:257 msgid "Channel has been ignored" msgstr "Il canale sarà ignorato" -#: ../../mod/connections.php:264 +#: ../../mod/connections.php:268 msgid "Channel has been unarchived" msgstr "Il canale non è più archiviato" -#: ../../mod/connections.php:265 +#: ../../mod/connections.php:269 msgid "Channel has been archived" msgstr "Il canale è stato archiviato" -#: ../../mod/connections.php:276 +#: ../../mod/connections.php:280 msgid "Channel has been unhidden" msgstr "Il canale non è più nascosto" -#: ../../mod/connections.php:277 +#: ../../mod/connections.php:281 msgid "Channel has been hidden" msgstr "Il canale è stato nascosto" -#: ../../mod/connections.php:291 +#: ../../mod/connections.php:295 msgid "Channel has been approved" msgstr "Il canale è stato approvato" -#: ../../mod/connections.php:292 +#: ../../mod/connections.php:296 msgid "Channel has been unapproved" msgstr "Il canale non è più approvato" -#: ../../mod/connections.php:310 +#: ../../mod/connections.php:314 msgid "Contact has been removed." msgstr "Il contatto è stato rimosso." -#: ../../mod/connections.php:330 +#: ../../mod/connections.php:334 #, php-format msgid "View %s's profile" msgstr "Guarda il profilo di %s" -#: ../../mod/connections.php:334 +#: ../../mod/connections.php:338 msgid "Refresh Permissions" msgstr "Aggiorna i permessi" -#: ../../mod/connections.php:337 +#: ../../mod/connections.php:341 msgid "Fetch updated permissions" msgstr "Scarica i permessi aggiornati" -#: ../../mod/connections.php:341 +#: ../../mod/connections.php:345 msgid "Recent Activity" msgstr "Attività recenti" -#: ../../mod/connections.php:344 +#: ../../mod/connections.php:348 msgid "View recent posts and comments" msgstr "Leggi i post recenti e i commenti" -#: ../../mod/connections.php:351 +#: ../../mod/connections.php:355 msgid "Block or Unblock this connection" msgstr "Per bloccare o meno questo contatto" -#: ../../mod/connections.php:355 ../../mod/connections.php:491 +#: ../../mod/connections.php:359 ../../mod/connections.php:495 msgid "Unignore" msgstr "Non ignorare" -#: ../../mod/connections.php:358 +#: ../../mod/connections.php:359 ../../mod/connections.php:495 +#: ../../mod/notifications.php:51 +msgid "Ignore" +msgstr "Ignora" + +#: ../../mod/connections.php:362 msgid "Ignore or Unignore this connection" msgstr "Per ignorare o meno questo contatto" -#: ../../mod/connections.php:361 +#: ../../mod/connections.php:365 msgid "Unarchive" msgstr "Non archiviare" -#: ../../mod/connections.php:361 +#: ../../mod/connections.php:365 msgid "Archive" msgstr "Archivia" -#: ../../mod/connections.php:364 +#: ../../mod/connections.php:368 msgid "Archive or Unarchive this connection" msgstr "Per archiviare o meno questo contatto" -#: ../../mod/connections.php:367 +#: ../../mod/connections.php:371 msgid "Unhide" msgstr "Non nascondere" -#: ../../mod/connections.php:367 +#: ../../mod/connections.php:371 msgid "Hide" msgstr "Nascondi" -#: ../../mod/connections.php:370 +#: ../../mod/connections.php:374 msgid "Hide or Unhide this connection" msgstr "Per nascondere o meno questo contatto" -#: ../../mod/connections.php:377 +#: ../../mod/connections.php:381 msgid "Delete this connection" msgstr "Elimina questo contatto" -#: ../../mod/connections.php:410 +#: ../../mod/connections.php:414 msgid "Unknown" msgstr "Sconosciuto" -#: ../../mod/connections.php:420 ../../mod/connections.php:449 +#: ../../mod/connections.php:424 ../../mod/connections.php:453 msgid "Approve this connection" msgstr "Approva questo contatto" -#: ../../mod/connections.php:420 +#: ../../mod/connections.php:424 msgid "Accept connection to allow communication" msgstr "Entra in contatto per poter comunicare" -#: ../../mod/connections.php:436 +#: ../../mod/connections.php:440 msgid "Automatic Permissions Settings" msgstr "Permessi predefiniti" -#: ../../mod/connections.php:436 +#: ../../mod/connections.php:440 #, php-format msgid "Connections: settings for %s" msgstr "Contatti: impostazioni per %s" -#: ../../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 "Hai ricevuto da un canale una richiesta di entrare in contatto, se prosegui la richiesta sarà approvata e saranno applicati i permessi mostrati. Lascia questa pagina se non vuoi proseguire." -#: ../../mod/connections.php:442 +#: ../../mod/connections.php:446 msgid "Slide to adjust your degree of friendship" msgstr "Trascina per restringere il grado di amicizia da mostrare" -#: ../../mod/connections.php:448 +#: ../../mod/connections.php:452 msgid "inherited" msgstr "derivato" -#: ../../mod/connections.php:450 +#: ../../mod/connections.php:454 msgid "Connection has no individual permissions!" msgstr "Non hai assegnato permessi individuali a questo contatto!" -#: ../../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 "Questo corrisponde alle tue impostazioni di privacy, ma puoi anche dare un'occhiata ai 'Permessi avanzati' per opzioni più dettagliate." -#: ../../mod/connections.php:453 +#: ../../mod/connections.php:457 msgid "Profile Visibility" msgstr "Visibilità del profilo" -#: ../../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 "Seleziona il profilo che vuoi mostrare a %s quando visita il tuo profilo in modo sicuro." -#: ../../mod/connections.php:455 +#: ../../mod/connections.php:459 msgid "Contact Information / Notes" msgstr "Informazioni e annotazioni sul contatto" -#: ../../mod/connections.php:456 +#: ../../mod/connections.php:460 msgid "Edit contact notes" msgstr "Modifica le informazioni sul contatto" -#: ../../mod/connections.php:458 +#: ../../mod/connections.php:462 msgid "Their Settings" msgstr "Permessi concessi a te" -#: ../../mod/connections.php:459 +#: ../../mod/connections.php:463 msgid "My Settings" msgstr "I permessi che concedo" -#: ../../mod/connections.php:461 +#: ../../mod/connections.php:465 msgid "Forum Members" msgstr "Membro di un forum" -#: ../../mod/connections.php:462 +#: ../../mod/connections.php:466 msgid "Soapbox" msgstr "Comunicati e annunci" -#: ../../mod/connections.php:463 +#: ../../mod/connections.php:467 msgid "Full Sharing" msgstr "Condivisione totale" -#: ../../mod/connections.php:464 +#: ../../mod/connections.php:468 msgid "Cautious Sharing" msgstr "Condivisione prudente" -#: ../../mod/connections.php:465 +#: ../../mod/connections.php:469 msgid "Follow Only" msgstr "Follower" -#: ../../mod/connections.php:466 +#: ../../mod/connections.php:470 msgid "Individual Permissions" msgstr "Permessi individuali" -#: ../../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 "Alcuni permessi derivano dalle impostazioni di privacy, che hanno una priorità maggiore. Cambiarli in questa pagina non avrà alcun effetto." -#: ../../mod/connections.php:468 +#: ../../mod/connections.php:472 msgid "Advanced Permissions" msgstr "Permessi avanzati" -#: ../../mod/connections.php:469 +#: ../../mod/connections.php:473 msgid "Quick Links" msgstr "Impostazioni veloci" -#: ../../mod/connections.php:473 +#: ../../mod/connections.php:477 #, php-format msgid "Visit %s's profile - %s" msgstr "Guarda il profilo di %s - %s" -#: ../../mod/connections.php:474 +#: ../../mod/connections.php:478 msgid "Block/Unblock contact" msgstr "Blocca/sblocca contatto" -#: ../../mod/connections.php:475 +#: ../../mod/connections.php:479 msgid "Ignore contact" msgstr "Ignora il contatto" -#: ../../mod/connections.php:476 +#: ../../mod/connections.php:480 msgid "Repair URL settings" msgstr "Ripara le impostazioni URL" -#: ../../mod/connections.php:477 +#: ../../mod/connections.php:481 msgid "View conversations" msgstr "Leggi le conversazioni" -#: ../../mod/connections.php:479 +#: ../../mod/connections.php:483 msgid "Delete contact" msgstr "Elimina contatto" -#: ../../mod/connections.php:482 +#: ../../mod/connections.php:486 msgid "Last update:" msgstr "Ultimo aggiornamento:" -#: ../../mod/connections.php:484 +#: ../../mod/connections.php:488 msgid "Update public posts" msgstr "Aggiorna gli articoli pubblici" -#: ../../mod/connections.php:486 +#: ../../mod/connections.php:490 msgid "Update now" msgstr "Aggiorna adesso" -#: ../../mod/connections.php:492 +#: ../../mod/connections.php:496 msgid "Currently blocked" msgstr "Attualmente bloccato" -#: ../../mod/connections.php:493 +#: ../../mod/connections.php:497 msgid "Currently ignored" msgstr "Attualmente ignorato" -#: ../../mod/connections.php:494 +#: ../../mod/connections.php:498 msgid "Currently archived" msgstr "Attualmente archiviato" -#: ../../mod/connections.php:495 +#: ../../mod/connections.php:499 msgid "Currently pending" msgstr "Attualmente da approvare" -#: ../../mod/connections.php:496 +#: ../../mod/connections.php:500 +msgid "Hide this contact from others" +msgstr "Nascondi questo contatto agli altri" + +#: ../../mod/connections.php:500 msgid "" "Replies/likes to your public posts may still be visible" msgstr "Le risposte ai tuoi articoli pubblici potrebbero restare comunque visibili" -#: ../../mod/connections.php:532 ../../mod/connections.php:604 +#: ../../mod/connections.php:536 ../../mod/connections.php:608 msgid "Blocked" msgstr "Bloccati" -#: ../../mod/connections.php:537 ../../mod/connections.php:611 +#: ../../mod/connections.php:541 ../../mod/connections.php:615 msgid "Ignored" msgstr "Ignorati" -#: ../../mod/connections.php:542 ../../mod/connections.php:625 +#: ../../mod/connections.php:546 ../../mod/connections.php:629 msgid "Hidden" msgstr "Nascosti" -#: ../../mod/connections.php:547 ../../mod/connections.php:618 +#: ../../mod/connections.php:551 ../../mod/connections.php:622 msgid "Archived" msgstr "Archiviati" -#: ../../mod/connections.php:558 +#: ../../mod/connections.php:562 msgid "All" msgstr "Tutti" -#: ../../mod/connections.php:579 -msgid "Suggestions" -msgstr "Suggerimenti" - -#: ../../mod/connections.php:582 +#: ../../mod/connections.php:586 msgid "Suggest new connections" msgstr "Suggerisci nuovi contatti" -#: ../../mod/connections.php:588 +#: ../../mod/connections.php:592 msgid "Show pending (new) connections" -msgstr "Richieste di entrare in contatto" +msgstr "Richieste di contatto in attesa" -#: ../../mod/connections.php:591 +#: ../../mod/connections.php:595 msgid "All Connections" msgstr "Tutti i contatti" -#: ../../mod/connections.php:594 +#: ../../mod/connections.php:598 msgid "Show all connections" msgstr "Mostra tutti i contatti" -#: ../../mod/connections.php:597 +#: ../../mod/connections.php:601 msgid "Unblocked" msgstr "Non bloccati" -#: ../../mod/connections.php:600 +#: ../../mod/connections.php:604 msgid "Only show unblocked connections" msgstr "Mostra solo i contatti non bloccati" -#: ../../mod/connections.php:607 +#: ../../mod/connections.php:611 msgid "Only show blocked connections" msgstr "Mostra solo i contatti bloccati" -#: ../../mod/connections.php:614 +#: ../../mod/connections.php:618 msgid "Only show ignored connections" msgstr "Mostra solo i contatti ignorati" -#: ../../mod/connections.php:621 +#: ../../mod/connections.php:625 msgid "Only show archived connections" msgstr "Mostra solo i contatti archiviati" -#: ../../mod/connections.php:628 +#: ../../mod/connections.php:632 msgid "Only show hidden connections" msgstr "Mostra solo i contatti nascosti" -#: ../../mod/connections.php:670 +#: ../../mod/connections.php:674 #, php-format msgid "%1$s [%2$s]" msgstr "%1$s [%2$s]" -#: ../../mod/connections.php:671 +#: ../../mod/connections.php:675 msgid "Edit contact" msgstr "Modifica il contatto" -#: ../../mod/connections.php:694 +#: ../../mod/connections.php:698 msgid "Search your connections" msgstr "Cerca tra i contatti" -#: ../../mod/connections.php:695 +#: ../../mod/connections.php:699 msgid "Finding: " msgstr "Ricerca: " @@ -6246,71 +6269,6 @@ msgstr "interessi personali:" msgid "No matches" msgstr "Nessun risultato" -#: ../../mod/crepair.php:102 -msgid "Contact settings applied." -msgstr "Contatto modificato." - -#: ../../mod/crepair.php:104 -msgid "Contact update failed." -msgstr "Le modifiche al contatto non sono state salvate." - -#: ../../mod/crepair.php:129 ../../mod/fsuggest.php:20 -#: ../../mod/fsuggest.php:92 -msgid "Contact not found." -msgstr "Contatto non trovato." - -#: ../../mod/crepair.php:135 -msgid "Repair Contact Settings" -msgstr "Ripara le impostazioni del contatto" - -#: ../../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 "ATTENZIONE: Queste sono impostazioni avanzate e se inserisci informazioni errate le tue comunicazioni con questo contatto potrebbero non funzionare più" - -#: ../../mod/crepair.php:138 -msgid "" -"Please use your browser 'Back' button now if you are " -"uncertain what to do on this page." -msgstr "Clicca adesso il tasto 'Indietro' del browser se non hai la certezza assoluta di quel che stai facendo." - -#: ../../mod/crepair.php:144 -msgid "Return to contact editor" -msgstr "Ritorna alla modifica del contatto" - -#: ../../mod/crepair.php:149 -msgid "Account Nickname" -msgstr "Nome utente" - -#: ../../mod/crepair.php:150 -msgid "@Tagname - overrides Name/Nickname" -msgstr "@TagName - sostituirà il nome utente" - -#: ../../mod/crepair.php:151 -msgid "Account URL" -msgstr "URL dell'utente" - -#: ../../mod/crepair.php:152 -msgid "Friend Request URL" -msgstr "URL di richiesta amicizia" - -#: ../../mod/crepair.php:153 -msgid "Friend Confirm URL" -msgstr "URL di conferma amicizia" - -#: ../../mod/crepair.php:154 -msgid "Notification Endpoint URL" -msgstr "URL per le notifiche" - -#: ../../mod/crepair.php:155 -msgid "Poll/Feed URL" -msgstr "URL del feed" - -#: ../../mod/crepair.php:156 -msgid "New photo from this URL" -msgstr "Nuova foto da questo URL" - #: ../../mod/zfinger.php:23 msgid "invalid target signature" msgstr "la firma riscontrata non è valida" @@ -6319,7 +6277,7 @@ msgstr "la firma riscontrata non è valida" msgid "Channel added." msgstr "Canale aggiunto." -#: ../../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 "Elemento non trovato" @@ -6328,17 +6286,17 @@ msgstr "Elemento non trovato" msgid "Edit Layout" msgstr "Modifica il layout" -#: ../../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 "Inserisci video da YouTube" -#: ../../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 "Inserisci video Vorbis [.ogg]" -#: ../../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 "Inserisci audio Vorbis [.ogg]" @@ -6347,87 +6305,87 @@ msgstr "Inserisci audio Vorbis [.ogg]" msgid "Delete Layout" msgstr "Elimina il layout" -#: ../../mod/profile_photo.php:54 +#: ../../mod/profile_photo.php:44 msgid "Image uploaded but image cropping failed." msgstr "L'immagine è stata caricata, ma il non è stato possibile ritagliarla." -#: ../../mod/profile_photo.php:107 +#: ../../mod/profile_photo.php:97 msgid "Image resize failed." msgstr "Il ridimensionamento dell'immagine è fallito." -#: ../../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 "Ricarica la pagina con shift+F5 o cancella la cache del browser se la nuova foto non viene mostrata immediatamente." -#: ../../mod/profile_photo.php:173 +#: ../../mod/profile_photo.php:163 #, php-format msgid "Image exceeds size limit of %d" msgstr "La dimensione dell'immagine supera il limite di %d" -#: ../../mod/profile_photo.php:182 +#: ../../mod/profile_photo.php:172 msgid "Unable to process image." msgstr "Impossibile elaborare l'immagine." -#: ../../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 "Foto non disponibile." -#: ../../mod/profile_photo.php:291 +#: ../../mod/profile_photo.php:281 msgid "Upload File:" msgstr "Carica un file:" -#: ../../mod/profile_photo.php:292 +#: ../../mod/profile_photo.php:282 msgid "Select a profile:" msgstr "Seleziona un profilo:" -#: ../../mod/profile_photo.php:293 +#: ../../mod/profile_photo.php:283 msgid "Upload Profile Photo" msgstr "Carica la foto del profilo" -#: ../../mod/profile_photo.php:294 +#: ../../mod/profile_photo.php:284 msgid "Upload" msgstr "Carica" -#: ../../mod/profile_photo.php:298 +#: ../../mod/profile_photo.php:288 msgid "skip this step" msgstr "salta questo passaggio" -#: ../../mod/profile_photo.php:298 +#: ../../mod/profile_photo.php:288 msgid "select a photo from your photo albums" msgstr "seleziona una foto dai tuoi album" -#: ../../mod/profile_photo.php:312 +#: ../../mod/profile_photo.php:302 msgid "Crop Image" msgstr "Ritaglia immagine" -#: ../../mod/profile_photo.php:313 +#: ../../mod/profile_photo.php:303 msgid "Please adjust the image cropping for optimum viewing." msgstr "Ritaglia l'immagine per migliorarne la visualizzazione." -#: ../../mod/profile_photo.php:315 +#: ../../mod/profile_photo.php:305 msgid "Done Editing" msgstr "Modifica terminata" -#: ../../mod/profile_photo.php:350 +#: ../../mod/profile_photo.php:340 msgid "Image uploaded successfully." msgstr "Immagine caricata con successo." -#: ../../mod/profile_photo.php:352 +#: ../../mod/profile_photo.php:342 msgid "Image upload failed." msgstr "Il caricamento dell'immagine è fallito." -#: ../../mod/profile_photo.php:361 +#: ../../mod/profile_photo.php:351 #, php-format msgid "Image size reduction [%s] failed." msgstr "Il ridimensionamento del'immagine [%s] è fallito." -#: ../../mod/editwebpage.php:87 +#: ../../mod/editwebpage.php:106 msgid "Edit Webpage" msgstr "Modifica la pagina web" -#: ../../mod/editwebpage.php:162 +#: ../../mod/editwebpage.php:188 msgid "Delete Webpage" msgstr "Elimina la pagina web" @@ -6435,136 +6393,18 @@ msgstr "Elimina la pagina web" msgid "Invalid request identifier." msgstr "L'identificativo della richiesta non è valido." -#: ../../mod/notifications.php:76 -msgid "System" -msgstr "Sistema" - -#: ../../mod/notifications.php:96 -msgid "Introductions" -msgstr "Richieste di amicizia" - -#: ../../mod/notifications.php:121 -msgid "Show Ignored Requests" -msgstr "Mostra le richieste ignorate" - -#: ../../mod/notifications.php:121 -msgid "Hide Ignored Requests" -msgstr "Nascondi le richieste ignorate" - -#: ../../mod/notifications.php:147 ../../mod/notifications.php:193 -msgid "Notification type: " -msgstr "Tipo di notifica: " - -#: ../../mod/notifications.php:148 -msgid "Friend Suggestion" -msgstr "Suggerimento di amicizia" - -#: ../../mod/notifications.php:150 -#, php-format -msgid "suggested by %s" -msgstr "suggerito da %s" - -#: ../../mod/notifications.php:179 -msgid "Claims to be known to you: " -msgstr "Dice di conoscerti: " - -#: ../../mod/notifications.php:179 -msgid "yes" -msgstr "si" - -#: ../../mod/notifications.php:179 -msgid "no" -msgstr "no" - -#: ../../mod/notifications.php:186 -msgid "Approve as: " -msgstr "Approva come: " - -#: ../../mod/notifications.php:187 -msgid "Friend" -msgstr "Amico" - -#: ../../mod/notifications.php:188 -msgid "Sharer" -msgstr "Sharer" - -#: ../../mod/notifications.php:188 -msgid "Fan/Admirer" -msgstr "Fan/Ammiratore" - -#: ../../mod/notifications.php:194 -msgid "Friend/Connect Request" -msgstr "Richiesta di entrare in contatto" - -#: ../../mod/notifications.php:194 -msgid "New Follower" -msgstr "Nuovo follower" - -#: ../../mod/notifications.php:215 -msgid "No introductions." -msgstr "Nessuna richiesta di amicizia." - -#: ../../mod/notifications.php:257 ../../mod/notifications.php:382 -#: ../../mod/notifications.php:465 -#, php-format -msgid "%s liked %s's post" -msgstr "A %s è piaciuto l'articolo di %s" - -#: ../../mod/notifications.php:266 ../../mod/notifications.php:391 -#: ../../mod/notifications.php:474 -#, php-format -msgid "%s disliked %s's post" -msgstr "A %s non è piaciuto l'articolo di %s" - -#: ../../mod/notifications.php:280 ../../mod/notifications.php:405 -#: ../../mod/notifications.php:488 -#, php-format -msgid "%s is now friends with %s" -msgstr "%s è ora amico di %s" - -#: ../../mod/notifications.php:287 ../../mod/notifications.php:412 -#, php-format -msgid "%s created a new post" -msgstr "%s ha creato un nuovo articolo" - -#: ../../mod/notifications.php:288 ../../mod/notifications.php:413 -#: ../../mod/notifications.php:497 -#, php-format -msgid "%s commented on %s's post" -msgstr "%s ha commentato l'articolo di %s" - -#: ../../mod/notifications.php:302 -msgid "No more network notifications." -msgstr "Non ci sono nuove notifiche dalla rete." - -#: ../../mod/notifications.php:306 -msgid "Network Notifications" -msgstr "Notifiche dalla rete" +#: ../../mod/notifications.php:35 +msgid "Discard" +msgstr "Rifiuta" -#: ../../mod/notifications.php:332 ../../mod/notify.php:54 +#: ../../mod/notifications.php:93 ../../mod/notify.php:54 msgid "No more system notifications." msgstr "Non ci sono nuove notifiche di sistema." -#: ../../mod/notifications.php:336 ../../mod/notify.php:58 +#: ../../mod/notifications.php:97 ../../mod/notify.php:58 msgid "System Notifications" msgstr "Notifiche di sistema" -#: ../../mod/notifications.php:427 -msgid "No more personal notifications." -msgstr "Non ci sono nuove notifiche personali." - -#: ../../mod/notifications.php:431 -msgid "Personal Notifications" -msgstr "Notifiche personali" - -#: ../../mod/notifications.php:504 -msgid "No more home notifications." -msgstr "Non ci sono nuove notifiche dalla bacheca." - -#: ../../mod/notifications.php:508 -msgid "Home Notifications" -msgstr "Notifiche dalla bacheca" - #: ../../mod/blocks.php:65 msgid "Block Name" msgstr "Nome del riquadro" @@ -6581,7 +6421,7 @@ msgstr "Inviato!" msgid "Item is not editable" msgstr "L'elemento non è modificabile" -#: ../../mod/profile.php:112 +#: ../../mod/profile.php:64 ../../mod/profile.php:72 msgid "Access to this profile has been restricted." msgstr "L'accesso a questo profilo è stato limitato." @@ -6605,11 +6445,15 @@ msgstr "Scegli cosa vuoi inviare al destinatario" msgid "Make this post private" msgstr "Rendi privato questo articolo" -#: ../../mod/wall_upload.php:41 ../../mod/item.php:1074 +#: ../../mod/wall_upload.php:41 ../../mod/item.php:1077 msgid "Wall Photos" msgstr "Foto della bacheca" -#: ../../mod/channel.php:107 +#: ../../mod/channel.php:25 +msgid "You must be logged in to see this page." +msgstr "Devi aver effettuato l'accesso per vedere questa pagina." + +#: ../../mod/channel.php:83 msgid "Insufficient permissions. Request redirected to profile page." msgstr "Permessi insufficienti. Sarà visualizzata la pagina del profilo." @@ -6629,6 +6473,10 @@ msgstr "Nessun risultato." msgid "Files" msgstr "Elenco file" +#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92 +msgid "Contact not found." +msgstr "Contatto non trovato." + #: ../../mod/fsuggest.php:63 msgid "Friend suggestion sent." msgstr "Suggerimento di amicizia inviato." @@ -6650,23 +6498,23 @@ msgstr "Modifica il riquadro" msgid "Delete Block" msgstr "Elimina il riquadro" -#: ../../mod/profperm.php:34 ../../mod/profperm.php:64 +#: ../../mod/profperm.php:25 ../../mod/profperm.php:55 msgid "Invalid profile identifier." msgstr "Indentificativo del profilo non valido." -#: ../../mod/profperm.php:110 +#: ../../mod/profperm.php:101 msgid "Profile Visibility Editor" msgstr "Modifica la visibilità del profilo" -#: ../../mod/profperm.php:114 +#: ../../mod/profperm.php:105 msgid "Click on a contact to add or remove." msgstr "Clicca su un contatto per aggiungerlo o rimuoverlo." -#: ../../mod/profperm.php:123 +#: ../../mod/profperm.php:114 msgid "Visible To" msgstr "Visibile a" -#: ../../mod/profperm.php:139 +#: ../../mod/profperm.php:130 msgid "All Contacts (with secure profile access)" msgstr "Tutti i contatti (con accesso fidato al profilo)" @@ -6686,12 +6534,12 @@ msgstr "I contenuti eseguibili non sono permessi su questo canale." msgid "System error. Post not saved." msgstr "Errore di sistema. Articolo non salvato." -#: ../../mod/item.php:1153 +#: ../../mod/item.php:1156 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "Hai raggiunto il limite massimo di %1$.0f articoli sulla pagina principale." -#: ../../mod/item.php:1159 +#: ../../mod/item.php:1162 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "Hai raggiunto il limite massimo di %1$.0f pagine web." @@ -6739,16 +6587,12 @@ msgid "" "librelist - dot com" msgstr "Per consigli, ringraziamenti, donazioni, ecc. - scrivi a \"redmatrix\" at librelist - dot com" -#: ../../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 "Nessun suggerimento disponibile. Se questo è un sito nuovo, riprova tra 24 ore." -#: ../../mod/suggest.php:58 -msgid "Ignore/Hide" -msgstr "Ignora/nascondi" - #: ../../mod/pubsites.php:22 msgid "Public Sites" msgstr "Siti pubblici" @@ -6873,23 +6717,23 @@ msgstr "L'impostazione predefinita è che sia eliminata solo l'istanza del canal msgid "Remove My Account" msgstr "Elimina il mio account" -#: ../../mod/directory.php:163 +#: ../../mod/directory.php:164 msgid "Gender: " msgstr "Sesso:" -#: ../../mod/directory.php:222 +#: ../../mod/directory.php:225 msgid "Finding:" msgstr "Ricerca:" -#: ../../mod/directory.php:230 +#: ../../mod/directory.php:233 msgid "next page" msgstr "pagina succ." -#: ../../mod/directory.php:230 +#: ../../mod/directory.php:233 msgid "previous page" msgstr "pagina prec." -#: ../../mod/directory.php:237 +#: ../../mod/directory.php:240 msgid "No entries (some entries may be hidden)." msgstr "Nessun risultato (qualcosa potrebbe essere nascosto)." @@ -7181,6 +7025,6 @@ msgstr "permesso negato" msgid "Got Zot?" msgstr "Hai Zot?" -#: ../../boot.php:1902 +#: ../../boot.php:1907 msgid "toggle mobile" msgstr "attiva/disattiva versione mobile" diff --git a/view/it/strings.php b/view/it/strings.php index dde964c00..5a3279eda 100644 --- a/view/it/strings.php +++ b/view/it/strings.php @@ -12,6 +12,13 @@ $a->strings["public profile"] = "profilo pubblico"; $a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s ha cambiato %2\$s in “%3\$s”"; $a->strings["Visit %1\$s's %2\$s"] = "Guarda %2\$s di %1\$s "; $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s ha aggiornato %2\$s cambiando %3\$s."; +$a->strings["Sort Options"] = "Opzioni di ordinamento"; +$a->strings["Alphabetic"] = "Alfabetico"; +$a->strings["Reverse Alphabetic"] = "Alfabetico inverso"; +$a->strings["Newest to Oldest"] = "Dal più nuovo al più vecchio"; +$a->strings["Enable Safe Search"] = "Abilita SafeSearch"; +$a->strings["Disable Safe Search"] = "Disabilita SafeSearch"; +$a->strings["Safe Mode"] = "Modalità SafeSearch"; $a->strings["Red Matrix Notification"] = "Notifica di Red Matrix"; $a->strings["redmatrix"] = "redmatrix"; $a->strings["Thank You,"] = "Grazie,"; @@ -94,9 +101,38 @@ $a->strings["Link"] = "Link"; $a->strings["Video"] = "Video"; $a->strings["Preview"] = "Anteprima"; $a->strings["Encrypt text"] = "Crittografia del testo"; -$a->strings["Connect"] = "Entra in contatto/segui"; +$a->strings["Connect"] = "Entra in contatto"; $a->strings["New window"] = "Nuova finestra"; $a->strings["Open the selected location in a different window or browser tab"] = "Apri l'indirizzo selezionato in una nuova scheda o finestra"; +$a->strings["Displays a full channel profile"] = "Mostra il profilo completo del canale"; +$a->strings["Tag cloud of webpage categories"] = "Nuvola dei tag"; +$a->strings["List and filter by collection"] = "Filtra per insiemi di canali"; +$a->strings["Show a couple of channel suggestion"] = "Mostra i canali suggeriti"; +$a->strings["Provide a channel follow form"] = "Mostra il link connettersi al canale"; +$a->strings["Categories"] = "Categorie"; +$a->strings["Ignore/Hide"] = "Ignora/nascondi"; +$a->strings["Suggestions"] = "Suggerimenti"; +$a->strings["See more..."] = "Altro..."; +$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Hai attivato %1$.0f delle %2$.0f connessioni permesse."; +$a->strings["Add New Connection"] = "Aggiungi un contatto"; +$a->strings["Enter the channel address"] = "Scrivi l'indirizzo del canale"; +$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Per esempio: mario@pippo.it oppure http://pluto.com/barbara"; +$a->strings["Notes"] = "Note"; +$a->strings["Save"] = "Salva"; +$a->strings["Remove term"] = "Rimuovi termine"; +$a->strings["Saved Searches"] = "Ricerche salvate"; +$a->strings["add"] = "aggiungi"; +$a->strings["Saved Folders"] = "Cartelle salvate"; +$a->strings["Everything"] = "Tutto"; +$a->strings["Archives"] = "Archivi"; +$a->strings["Refresh"] = "Aggiorna"; +$a->strings["Me"] = "Io"; +$a->strings["Best Friends"] = "Buoni amici"; +$a->strings["Friends"] = "Amici"; +$a->strings["Co-workers"] = "Colleghi"; +$a->strings["Former Friends"] = "Ex amici"; +$a->strings["Acquaintances"] = "Conoscenti"; +$a->strings["Everybody"] = "Tutti"; $a->strings["Unknown | Not categorised"] = "Sconosciuto | Senza categoria"; $a->strings["Block immediately"] = "Blocca subito"; $a->strings["Shady, spammer, self-marketer"] = "Spammer o dedito al marketing"; @@ -142,6 +178,52 @@ $a->strings["l F d, Y \\@ g:i A"] = "l d F Y \\@ G:i"; $a->strings["Starts:"] = "Inizio:"; $a->strings["Finishes:"] = "Fine:"; $a->strings["Location:"] = "Luogo:"; +$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."] = "È stato ripristinato un insieme con lo stesso nome che era stato eliminato in precedenza. I permessi già presenti potrebbero rimanere validi per i nuovi canali. Se non vuoi che ciò accada, devi creare un altro insieme con un nome diverso."; +$a->strings["Default privacy group for new contacts"] = "Insieme predefinito per i nuovi canali che aggiungi"; +$a->strings["All Channels"] = "Tutti i canali"; +$a->strings["edit"] = "modifica"; +$a->strings["Collections"] = "Insiemi di canali"; +$a->strings["Edit collection"] = "Modifica l'insieme di canali"; +$a->strings["Create a new collection"] = "Crea un nuovo insieme"; +$a->strings["Channels not in any collection"] = "Canali che non sono in un insieme"; +$a->strings["Delete this item?"] = "Eliminare questo elemento?"; +$a->strings["show fewer"] = "riduci"; +$a->strings["Password too short"] = "Password troppo corta"; +$a->strings["Passwords do not match"] = "Le password non corrispondono"; +$a->strings["everybody"] = "tutti"; +$a->strings["Secret Passphrase"] = "Chiave segreta"; +$a->strings["Passphrase hint"] = "Suggerimento per la chiave segreta"; +$a->strings["timeago.prefixAgo"] = "timeago.prefixAgo"; +$a->strings["timeago.suffixAgo"] = "timeago.suffixAgo"; +$a->strings["ago"] = "fa"; +$a->strings["from now"] = "da adesso"; +$a->strings["less than a minute"] = "meno di un minuto"; +$a->strings["about a minute"] = "circa un minuto"; +$a->strings["%d minutes"] = "%d minuti"; +$a->strings["about an hour"] = "circa un’ora"; +$a->strings["about %d hours"] = "circa %d ore"; +$a->strings["a day"] = "un giorno"; +$a->strings["%d days"] = "%d giorni"; +$a->strings["about a month"] = "circa un mese"; +$a->strings["%d months"] = "%d mesi"; +$a->strings["about a year"] = "circa un anno"; +$a->strings["%d years"] = "%d anni"; +$a->strings[" "] = " "; +$a->strings["timeago.numbers"] = "timeago.numbers"; +$a->strings["No recipient provided."] = "Devi scegliere un destinatario."; +$a->strings["[no subject]"] = "[nessun titolo]"; +$a->strings["Unable to determine sender."] = "Impossibile determinare il mittente."; +$a->strings["Stored post could not be verified."] = "Non è stato possibile verificare l'articolo inserito."; +$a->strings["Profile Photos"] = "Foto del profilo"; +$a->strings["Public Timeline"] = "Diario pubblico"; +$a->strings["view full size"] = "guarda nelle dimensioni reali"; +$a->strings["Image/photo"] = "Immagine"; +$a->strings["Encrypted content"] = "Contenuto crittografato"; +$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s ha scritto %2\$s seguente %3\$s"; +$a->strings["post"] = "l'articolo"; +$a->strings["$1 wrote:"] = "$1 ha scritto:"; +$a->strings["Embedded content"] = "Contenuti incorporati"; +$a->strings["Embedding disabled"] = "Contenuti incorporati - funzione disabilitata"; $a->strings["General Features"] = "Funzionalità generali"; $a->strings["Content Expiration"] = "Scadenza"; $a->strings["Remove posts/comments and/or private messages at a future time"] = "Elimina gli articoli, i commenti o i messaggi privati dopo che è trascorso del tempo"; @@ -149,10 +231,11 @@ $a->strings["Multiple Profiles"] = "Profili multipli"; $a->strings["Ability to create multiple profiles"] = "Abilitazione a creare profili multipli"; $a->strings["Web Pages"] = "Pagine web"; $a->strings["Provide managed web pages on your channel"] = "Attiva la creazione di pagine web sul tuo canale"; +$a->strings["Private Notes"] = "Note private"; +$a->strings["Enables a tool to store notes and reminders"] = "Abilita il riquadro per scrivere annotazioni"; $a->strings["Enhanced Photo Albums"] = "Album fotografici avanzati"; $a->strings["Enable photo album with enhanced features"] = "Abilita gli album fotografici con funzionalità avanzate"; $a->strings["Extended Identity Sharing"] = "Condivisione avanzata dell'identità"; -$a->strings[" "] = " "; $a->strings["Expert Mode"] = "Modalità esperto"; $a->strings["Enable Expert Mode to provide advanced configuration options"] = "Abilita la modalità esperto per vedere le opzioni di configurazione avanzate"; $a->strings["Premium Channel"] = "Canale premium"; @@ -171,7 +254,6 @@ $a->strings["Search by Date"] = "Ricerca per data"; $a->strings["Ability to select posts by date ranges"] = "Per selezionare gli articoli in un intervallo tra date"; $a->strings["Collections Filter"] = "Filtra per insiemi di canali"; $a->strings["Enable widget to display Network posts only from selected collections"] = "Mostra il riquadro per filtrare gli articoli di certi insiemi di canali"; -$a->strings["Saved Searches"] = "Ricerche salvate"; $a->strings["Save search terms for re-use"] = "Salva i termini delle ricerche per poterle ripetere"; $a->strings["Network Personal Tab"] = "Attività personale"; $a->strings["Enable tab to display only Network posts that you've interacted on"] = "Abilita il link per mostrare solamente i contenuti con cui hai interagito"; @@ -179,6 +261,8 @@ $a->strings["Network New Tab"] = "Contenuti nuovi"; $a->strings["Enable tab to display all new Network activity"] = "Abilita il link per visualizzare solo i nuovi contenuti"; $a->strings["Affinity Tool"] = "Filtro per affinità"; $a->strings["Filter stream activity by depth of relationships"] = "Permette di selezionare i contenuti in base al livello di amicizia"; +$a->strings["Suggest Channels"] = "Suggerisci canali"; +$a->strings["Show channel suggestions"] = "Mostra alcuni canali che potrebbero interessarti"; $a->strings["Post/Comment Tools"] = "Gestione articoli e commenti"; $a->strings["Edit Sent Posts"] = "Modifica gli articoli già inviati"; $a->strings["Edit and correct posts and comments after sending"] = "Modifica e correggi gli articoli o i commenti anche dopo l'invio"; @@ -186,7 +270,6 @@ $a->strings["Tagging"] = "Tag"; $a->strings["Ability to tag existing posts"] = "Permetti l'aggiunta di tag su articoli già esistenti"; $a->strings["Post Categories"] = "Categorie degli articoli"; $a->strings["Add categories to your posts"] = "Abilita le categorie per i tuoi articoli"; -$a->strings["Saved Folders"] = "Cartelle salvate"; $a->strings["Ability to file posts under folders"] = "Abilita la raccolta dei tuoi articoli in cartelle"; $a->strings["Dislike Posts"] = "Non mi piace"; $a->strings["Ability to dislike posts/comments"] = "Abilità la funzionalità \"non mi piace\" per i tuoi articoli"; @@ -194,52 +277,6 @@ $a->strings["Star Posts"] = "Articoli stella (preferiti)"; $a->strings["Ability to mark special posts with a star indicator"] = "Mostra la stella per scegliere gli articoli preferiti"; $a->strings["Tag Cloud"] = "Nuvola di tag"; $a->strings["Provide a personal tag cloud on your channel page"] = "Mostra la nuvola dei tag che usi di più sulla pagina del tuo canale"; -$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."] = "È stato ripristinato un insieme con lo stesso nome che era stato eliminato in precedenza. I permessi già presenti potrebbero rimanere validi per i nuovi canali. Se non vuoi che ciò accada, devi creare un altro insieme con un nome diverso."; -$a->strings["Default privacy group for new contacts"] = "Insieme predefinito per i nuovi canali che aggiungi"; -$a->strings["All Channels"] = "Tutti i canali"; -$a->strings["edit"] = "modifica"; -$a->strings["Collections"] = "Insiemi di canali"; -$a->strings["Edit collection"] = "Modifica l'insieme di canali"; -$a->strings["Create a new collection"] = "Crea un nuovo insieme"; -$a->strings["Channels not in any collection"] = "Canali che non sono in un insieme"; -$a->strings["add"] = "aggiungi"; -$a->strings["Delete this item?"] = "Eliminare questo elemento?"; -$a->strings["show fewer"] = "riduci"; -$a->strings["Password too short"] = "Password troppo corta"; -$a->strings["Passwords do not match"] = "Le password non corrispondono"; -$a->strings["everybody"] = "tutti"; -$a->strings["Secret Passphrase"] = "Chiave segreta"; -$a->strings["Passphrase hint"] = "Suggerimento per la chiave segreta"; -$a->strings["timeago.prefixAgo"] = "timeago.prefixAgo"; -$a->strings["timeago.suffixAgo"] = "timeago.suffixAgo"; -$a->strings["ago"] = "fa"; -$a->strings["from now"] = "da adesso"; -$a->strings["less than a minute"] = "meno di un minuto"; -$a->strings["about a minute"] = "circa un minuto"; -$a->strings["%d minutes"] = "%d minuti"; -$a->strings["about an hour"] = "circa un’ora"; -$a->strings["about %d hours"] = "circa %d ore"; -$a->strings["a day"] = "un giorno"; -$a->strings["%d days"] = "%d giorni"; -$a->strings["about a month"] = "circa un mese"; -$a->strings["%d months"] = "%d mesi"; -$a->strings["about a year"] = "circa un anno"; -$a->strings["%d years"] = "%d anni"; -$a->strings["timeago.numbers"] = "timeago.numbers"; -$a->strings["No recipient provided."] = "Devi scegliere un destinatario."; -$a->strings["[no subject]"] = "[nessun titolo]"; -$a->strings["Unable to determine sender."] = "Impossibile determinare il mittente."; -$a->strings["Stored post could not be verified."] = "Non è stato possibile verificare l'articolo inserito."; -$a->strings["Profile Photos"] = "Foto del profilo"; -$a->strings["Public Timeline"] = "Diario pubblico"; -$a->strings["view full size"] = "guarda nelle dimensioni reali"; -$a->strings["Image/photo"] = "Immagine"; -$a->strings["Encrypted content"] = "Contenuto crittografato"; -$a->strings["%1\$s wrote the following %2\$s %3\$s"] = "%1\$s ha scritto %2\$s seguente %3\$s"; -$a->strings["post"] = "l'articolo"; -$a->strings["$1 wrote:"] = "$1 ha scritto:"; -$a->strings["Embedded content"] = "Contenuti incorporati"; -$a->strings["Embedding disabled"] = "Contenuti incorporati - funzione disabilitata"; $a->strings["created a new post"] = "Ha creato un nuovo articolo"; $a->strings["commented on %s's post"] = "ha commentato l'articolo di %s"; $a->strings["Permission denied."] = "Permesso negato."; @@ -285,7 +322,6 @@ $a->strings["Infatuated"] = "Infatuato/a"; $a->strings["Dating"] = "Disponibile a un incontro"; $a->strings["Unfaithful"] = "Infedele"; $a->strings["Sex Addict"] = "Sesso-dipendente"; -$a->strings["Friends"] = "Amici"; $a->strings["Friends/Benefits"] = "Amici piccanti"; $a->strings["Casual"] = "Casual"; $a->strings["Engaged"] = "Impegnato"; @@ -351,15 +387,12 @@ $a->strings["Directory"] = "Tutti i canali"; $a->strings["Channel Locator"] = "Ricerca canali"; $a->strings["Matrix"] = "La tua rete"; $a->strings["Your matrix"] = "La tua rete"; -$a->strings["See all matrix notifications"] = "Notifiche dalla tua rete"; $a->strings["Mark all matrix notifications seen"] = "Segna come lette le notifiche della tua rete"; $a->strings["Channel Home"] = "Bacheca del canale"; $a->strings["Channel home"] = "Bacheca del canale"; -$a->strings["See all channel notifications"] = "Guarda le notifiche dei canali"; $a->strings["Mark all channel notifications seen"] = "Segna come lette le notifiche dei canali"; $a->strings["Intros"] = "Richieste"; $a->strings["New Connections"] = "Nuovi contatti"; -$a->strings["See all channel introductions"] = "Guarda tutte le richieste di amicizia"; $a->strings["Notices"] = "Notifiche"; $a->strings["Notifications"] = "Notifiche"; $a->strings["See all notifications"] = "Vedi tutte le notifiche"; @@ -385,6 +418,14 @@ $a->strings["Admin"] = "Amministrazione"; $a->strings["Site Setup and Configuration"] = "Configurazione del sito"; $a->strings["Nothing new here"] = "Niente di nuovo qui"; $a->strings["Please wait..."] = "Attendere..."; +$a->strings["Tags"] = "Tag"; +$a->strings["Keywords"] = "Parole chiave"; +$a->strings["have"] = "ho"; +$a->strings["has"] = "ha"; +$a->strings["want"] = "voglio"; +$a->strings["wants"] = "vuole"; +$a->strings["likes"] = "ama"; +$a->strings["dislikes"] = "non ama"; $a->strings["Not a valid email address"] = "Email non valida"; $a->strings["Your email domain is not among those allowed on this site"] = "Il dominio della tua email attualmente non è permesso su questo sito"; $a->strings["Your email address is already registered at this site."] = "La tua email è già registrata su questo sito."; @@ -494,24 +535,18 @@ $a->strings["Manage Webpages"] = "Gestisci le pagine web"; $a->strings["Logged out."] = "Uscita effettuata."; $a->strings["Failed authentication"] = "Autenticazione fallita"; $a->strings["Login failed."] = "Accesso fallito."; -$a->strings["You have %1$.0f of %2$.0f allowed connections."] = "Hai attivato %1$.0f delle %2$.0f connessioni permesse."; -$a->strings["Add New Connection"] = "Aggiungi un contatto"; -$a->strings["Enter the channel address"] = "Scrivi l'indirizzo del canale"; -$a->strings["Example: bob@example.com, http://example.com/barbara"] = "Per esempio: mario@pippo.it oppure http://pluto.com/barbara"; $a->strings["%d invitation available"] = array( 0 => "%d invito disponibile", 1 => "%d inviti disponibili", ); $a->strings["Find Channels"] = "Ricerca canali"; $a->strings["Enter name or interest"] = "Scrivi un nome o un interesse"; -$a->strings["Connect/Follow"] = "Entra in contatto/segui"; +$a->strings["Connect/Follow"] = "Entra in contatto"; $a->strings["Examples: Robert Morgenstein, Fishing"] = "Per esempio: Mario Rossi, Pesca"; $a->strings["Find"] = "Cerca"; $a->strings["Channel Suggestions"] = "Canali suggeriti"; $a->strings["Random Profile"] = "Profilo casuale"; $a->strings["Invite Friends"] = "Invita amici"; -$a->strings["Everything"] = "Tutto"; -$a->strings["Categories"] = "Categorie"; $a->strings["%d connection in common"] = array( 0 => "%d contatto in comune", 1 => "%d contatti in comune", @@ -529,7 +564,6 @@ $a->strings["%d Connection"] = array( 1 => "%d contatti", ); $a->strings["View Connections"] = "Elenco contatti"; -$a->strings["Save"] = "Salva"; $a->strings["poke"] = "poke"; $a->strings["ping"] = "ping"; $a->strings["pinged"] = "ha ricevuto un ping"; @@ -596,6 +630,9 @@ $a->strings["Blocks"] = "Riquadri"; $a->strings["Menus"] = "Menù"; $a->strings["Layouts"] = "Layout"; $a->strings["Pages"] = "Pagine"; +$a->strings["Click here to upgrade."] = "Clicca qui per aggiornare."; +$a->strings["This action exceeds the limits set by your subscription plan."] = "Questa operazione esce dai termini del tuo abbonamento."; +$a->strings["This action is not available under your subscription plan."] = "Questa operazione non è prevista dal tuo abbonamento."; $a->strings["Channel is blocked on this site."] = "Il canale è bloccato per questo sito."; $a->strings["Channel location missing."] = "Manca l'indirizzo del canale."; $a->strings["Channel discovery failed. Website may be down or misconfigured."] = "La ricerca del canale è fallita. Il sito potrebbe avere problemi o una configurazione sbagliata."; @@ -609,7 +646,7 @@ $a->strings["Can view my \"public\" photo albums"] = "Può vedere il mio album f $a->strings["Can view my \"public\" address book"] = "Può vedere il mio elenco contatti \"pubblico\""; $a->strings["Can view my \"public\" file storage"] = "Può vedere il mio archivio file \"pubblico\""; $a->strings["Can view my \"public\" pages"] = "Può vedere le mie pagine web \"pubbliche\""; -$a->strings["Can send me their channel stream and posts"] = "Può mostrarmi i contenuti del canale e gli articoli"; +$a->strings["Can send me their channel stream and posts"] = "Seguo i contenuti e gli articoli del suo canale"; $a->strings["Can post on my channel page (\"wall\")"] = "Può scrivere sulla bacheca del mio canale"; $a->strings["Can comment on my posts"] = "Può commentare i miei articoli"; $a->strings["Can send me private mail messages"] = "Può inviarmi messaggi privati"; @@ -624,17 +661,6 @@ $a->strings["Can source my \"public\" posts in derived channels"] = "Può aggiun $a->strings["Somewhat advanced - very useful in open communities"] = "Piuttosto avanzato - molto utile nelle comunità aperte"; $a->strings["Can administer my channel resources"] = "Può amministrare i contenuti del mio canale"; $a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = "Impostazione pericolosa - lasciare il valore predefinito se non si è assolutamente sicuri"; -$a->strings["Tags"] = "Tag"; -$a->strings["Keywords"] = "Parole chiave"; -$a->strings["have"] = "ho"; -$a->strings["has"] = "ha"; -$a->strings["want"] = "voglio"; -$a->strings["wants"] = "vuole"; -$a->strings["likes"] = "ama"; -$a->strings["dislikes"] = "non ama"; -$a->strings["Click here to upgrade."] = "Clicca qui per aggiornare."; -$a->strings["This action exceeds the limits set by your subscription plan."] = "Questa operazione esce dai termini del tuo abbonamento."; -$a->strings["This action is not available under your subscription plan."] = "Questa operazione non è prevista dal tuo abbonamento."; $a->strings["Default"] = "Predefinito"; $a->strings["Unable to obtain identity information from database"] = "Impossibile ottenere le informazioni di identificazione dal database"; $a->strings["Empty name"] = "Nome vuoto"; @@ -696,17 +722,11 @@ $a->strings["Welcome back "] = "Ciao, è bello rivederti"; $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."] = "L'identificativo di sicurezza del modulo che hai riempito non è corretto. Probabilmente è accaduto perché la pagina è stata tenuta aperta troppo a lungo (ore?) prima di inviare il contenuto."; $a->strings["Permission denied"] = "Permesso negato"; $a->strings["Item not found."] = "Elemento non trovato."; -$a->strings["Archives"] = "Archivi"; $a->strings["Collection not found."] = "Insieme non trovato."; -$a->strings["Group is empty"] = "L'insieme è vuoto"; +$a->strings["Collection is empty."] = "L'insieme di canali è vuoto."; +$a->strings["Collection: %s"] = "Insieme: %s"; +$a->strings["Connection: %s"] = "Contatto: %s"; $a->strings["Connection not found."] = "Contatto non trovato."; -$a->strings["Sort Options"] = "Opzioni di ordinamento"; -$a->strings["Alphabetic"] = "Alfabetico"; -$a->strings["Reverse Alphabetic"] = "Alfabetico inverso"; -$a->strings["Newest to Oldest"] = "Dal più nuovo al più vecchio"; -$a->strings["Enable Safe Search"] = "Abilita SafeSearch"; -$a->strings["Disable Safe Search"] = "Disabilita SafeSearch"; -$a->strings["Safe Mode"] = "Modalità SafeSearch"; $a->strings["No channel."] = "Nessun canale."; $a->strings["Common connections"] = "Contatti in comune"; $a->strings["No connections in common."] = "Nessun contatto in comune."; @@ -765,7 +785,6 @@ $a->strings["Please login to continue."] = "Accedi al sito per continuare."; $a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = "Vuoi autorizzare questa app ad accedere ai messaggi e ai contatti o creare nuovi messaggi per te?"; $a->strings["Yes"] = "Si"; $a->strings["No"] = "No"; -$a->strings["You must be logged in to see this page."] = "Devi aver effettuato l'accesso per vedere questa pagina."; $a->strings["No installed applications."] = "Nessuna app installata."; $a->strings["Applications"] = "Applicazioni"; $a->strings["Invalid item."] = "Elemento non valido."; @@ -1047,6 +1066,8 @@ $a->strings["Block public"] = "Blocca pagine pubbliche"; $a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = "Seleziona per impedire di vedere le pagine personali di questo sito a chi non ha effettuato l'accesso."; $a->strings["Force publish"] = "Forza la publicazione del profilo"; $a->strings["Check to force all profiles on this site to be listed in the site directory."] = "Seleziona per mostrare nell'elenco dei canali del sito tutti i profili registrati."; +$a->strings["No login on Homepage"] = "Non mostrare il login sulla 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)."] = "Per nascondere la possibilità di fare login ai visitatori (per esempio, quando il contenuto della homepage del sito è alimentato dal canale)."; $a->strings["Proxy user"] = "Utente proxy"; $a->strings["Proxy URL"] = "URL proxy"; $a->strings["Network timeout"] = "Timeout rete"; @@ -1130,6 +1151,7 @@ $a->strings["Add menu element"] = "Aggiungi un elemento al menù"; $a->strings["Delete this menu item"] = "Elimina questo elemento del menù"; $a->strings["Edit this menu item"] = "Modifica questo elemento del menù"; $a->strings["New Menu Element"] = "Nuovo elemento del menù"; +$a->strings["Menu Item Permissions"] = "Permessi del menu"; $a->strings["Link text"] = "Testo del link"; $a->strings["URL of link"] = "Indirizzo del link"; $a->strings["Use Red magic-auth if available"] = "Usa l'autenticazione magica di Red, se disponibile"; @@ -1154,7 +1176,6 @@ $a->strings["Collection Editor"] = "Modifica l'insieme"; $a->strings["Members"] = "Membri"; $a->strings["All Connected Channels"] = "Tutti i canali connessi"; $a->strings["Click on a channel to add or remove."] = "Clicca su un canale per aggiungerlo o rimuoverlo."; -$a->strings["Remove term"] = "Rimuovi termine"; $a->strings["Page owner information could not be retrieved."] = "Impossibile ottenere informazioni sul proprietario della pagina."; $a->strings["Album not found."] = "Album non trovato."; $a->strings["Delete Album"] = "Elimina album"; @@ -1234,7 +1255,6 @@ $a->strings["Private Conversation"] = "Conversazione privata"; $a->strings["Delete conversation"] = "Elimina la conversazione"; $a->strings["No secure communications available. You may be able to respond from the sender's profile page."] = "Non è disponibile alcun sistema per comunicare in modo sicuro. Puoi verificare se eventualmente è possibile rispondere dalla pagina del profilo del mittente."; $a->strings["Send Reply"] = "Invia la risposta"; -$a->strings["No profile"] = "Nessun profilo"; $a->strings["Layout Help"] = "Guida al layout"; $a->strings["Help with this feature"] = "La guida per questa funzionalità"; $a->strings["Layout Name"] = "Nome layout"; @@ -1244,27 +1264,11 @@ $a->strings["Remote Authentication"] = "Autenticazione a distanza"; $a->strings["Enter your channel address (e.g. channel@example.com)"] = "Inserisci l'indirizzo del tuo canale (ad esempio lucia@esempio.com)"; $a->strings["Authenticate"] = "Autenticazione"; $a->strings["No such group"] = "Impossibile trovare l'insieme"; -$a->strings["Refresh"] = "Aggiorna"; -$a->strings["Me"] = "Io"; -$a->strings["Best Friends"] = "Buoni amici"; -$a->strings["Co-workers"] = "Colleghi"; -$a->strings["Former Friends"] = "Ex amici"; -$a->strings["Acquaintances"] = "Conoscenti"; -$a->strings["Everybody"] = "Tutti"; $a->strings["Search Results For:"] = "Cerca risultati con:"; +$a->strings["Collection is empty"] = "L'insieme di canali è vuoto"; $a->strings["Collection: "] = "Insieme:"; $a->strings["Connection: "] = "Connessione:"; $a->strings["Invalid connection."] = "Connessione non valida."; -$a->strings["Ignore"] = "Ignora"; -$a->strings["Connection updated."] = "Contatto aggiornato."; -$a->strings["Connection update failed."] = "Impossibile aggiornare il contatto."; -$a->strings["Introductions and Connection Requests"] = "Richieste di entrare in contatto"; -$a->strings["No pending introductions."] = "Nessuna richiesta in attesa."; -$a->strings["System error. Please try again later."] = "Errore di sistema. Riprovare più tardi."; -$a->strings["Hide this contact from others"] = "Nascondi questo contatto agli altri"; -$a->strings["Post a new friend activity"] = "Pubblica sulla bacheca che hai un nuovo contatto"; -$a->strings["if applicable"] = "se possibile"; -$a->strings["Discard"] = "Rifiuta"; $a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = "L'autenticazione remota non è disponibile. Hai accesso solamente a questo sito. Puoi provare ad uscire per tentare di nuovo."; $a->strings["Welcome %s. Remote authentication successful."] = "Ciao %s. La tua autenticazione da remoto è avvenuta con successo."; $a->strings["This site is not a directory server"] = "Questo sito non fornisce l'elenco generale dei canali"; @@ -1339,6 +1343,7 @@ $a->strings["Your nickname will be used to create an easily remembered channel a $a->strings["Or import an existing channel from another location"] = "Oppure importa un tuo canale esistente da un altro server/hub"; $a->strings["Could not access contact record."] = "Non è possibile accedere alle informazioni sul contatto."; $a->strings["Could not locate selected profile."] = "Non riesco a trovare il profilo selezionato."; +$a->strings["Connection updated."] = "Contatto aggiornato."; $a->strings["Failed to update connection record."] = "Impossibile aggiornare le informazioni del contatto."; $a->strings["Could not access address book record."] = "Impossibile accedere alle informazioni della rubrica."; $a->strings["Refresh failed - channel is currently unavailable."] = "Il canale non è disponibile - impossibile aggiornare."; @@ -1361,6 +1366,7 @@ $a->strings["Recent Activity"] = "Attività recenti"; $a->strings["View recent posts and comments"] = "Leggi i post recenti e i commenti"; $a->strings["Block or Unblock this connection"] = "Per bloccare o meno questo contatto"; $a->strings["Unignore"] = "Non ignorare"; +$a->strings["Ignore"] = "Ignora"; $a->strings["Ignore or Unignore this connection"] = "Per ignorare o meno questo contatto"; $a->strings["Unarchive"] = "Non archiviare"; $a->strings["Archive"] = "Archivia"; @@ -1407,15 +1413,15 @@ $a->strings["Currently blocked"] = "Attualmente bloccato"; $a->strings["Currently ignored"] = "Attualmente ignorato"; $a->strings["Currently archived"] = "Attualmente archiviato"; $a->strings["Currently pending"] = "Attualmente da approvare"; +$a->strings["Hide this contact from others"] = "Nascondi questo contatto agli altri"; $a->strings["Replies/likes to your public posts may still be visible"] = "Le risposte ai tuoi articoli pubblici potrebbero restare comunque visibili"; $a->strings["Blocked"] = "Bloccati"; $a->strings["Ignored"] = "Ignorati"; $a->strings["Hidden"] = "Nascosti"; $a->strings["Archived"] = "Archiviati"; $a->strings["All"] = "Tutti"; -$a->strings["Suggestions"] = "Suggerimenti"; $a->strings["Suggest new connections"] = "Suggerisci nuovi contatti"; -$a->strings["Show pending (new) connections"] = "Richieste di entrare in contatto"; +$a->strings["Show pending (new) connections"] = "Richieste di contatto in attesa"; $a->strings["All Connections"] = "Tutti i contatti"; $a->strings["Show all connections"] = "Mostra tutti i contatti"; $a->strings["Unblocked"] = "Non bloccati"; @@ -1479,21 +1485,6 @@ $a->strings["Profile Match"] = "Profili corrispondenti"; $a->strings["No keywords to match. Please add keywords to your default profile."] = "Nessuna parola chiave per le ricerche. Aggiungi parole chiave al tuo profilo predefinito."; $a->strings["is interested in:"] = "interessi personali:"; $a->strings["No matches"] = "Nessun risultato"; -$a->strings["Contact settings applied."] = "Contatto modificato."; -$a->strings["Contact update failed."] = "Le modifiche al contatto non sono state salvate."; -$a->strings["Contact not found."] = "Contatto non trovato."; -$a->strings["Repair Contact Settings"] = "Ripara le impostazioni del contatto"; -$a->strings["WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working."] = "ATTENZIONE: Queste sono impostazioni avanzate e se inserisci informazioni errate le tue comunicazioni con questo contatto potrebbero non funzionare più"; -$a->strings["Please use your browser 'Back' button now if you are uncertain what to do on this page."] = "Clicca adesso il tasto 'Indietro' del browser se non hai la certezza assoluta di quel che stai facendo."; -$a->strings["Return to contact editor"] = "Ritorna alla modifica del contatto"; -$a->strings["Account Nickname"] = "Nome utente"; -$a->strings["@Tagname - overrides Name/Nickname"] = "@TagName - sostituirà il nome utente"; -$a->strings["Account URL"] = "URL dell'utente"; -$a->strings["Friend Request URL"] = "URL di richiesta amicizia"; -$a->strings["Friend Confirm URL"] = "URL di conferma amicizia"; -$a->strings["Notification Endpoint URL"] = "URL per le notifiche"; -$a->strings["Poll/Feed URL"] = "URL del feed"; -$a->strings["New photo from this URL"] = "Nuova foto da questo URL"; $a->strings["invalid target signature"] = "la firma riscontrata non è valida"; $a->strings["Channel added."] = "Canale aggiunto."; $a->strings["Item not found"] = "Elemento non trovato"; @@ -1523,36 +1514,9 @@ $a->strings["Image size reduction [%s] failed."] = "Il ridimensionamento del'imm $a->strings["Edit Webpage"] = "Modifica la pagina web"; $a->strings["Delete Webpage"] = "Elimina la pagina web"; $a->strings["Invalid request identifier."] = "L'identificativo della richiesta non è valido."; -$a->strings["System"] = "Sistema"; -$a->strings["Introductions"] = "Richieste di amicizia"; -$a->strings["Show Ignored Requests"] = "Mostra le richieste ignorate"; -$a->strings["Hide Ignored Requests"] = "Nascondi le richieste ignorate"; -$a->strings["Notification type: "] = "Tipo di notifica: "; -$a->strings["Friend Suggestion"] = "Suggerimento di amicizia"; -$a->strings["suggested by %s"] = "suggerito da %s"; -$a->strings["Claims to be known to you: "] = "Dice di conoscerti: "; -$a->strings["yes"] = "si"; -$a->strings["no"] = "no"; -$a->strings["Approve as: "] = "Approva come: "; -$a->strings["Friend"] = "Amico"; -$a->strings["Sharer"] = "Sharer"; -$a->strings["Fan/Admirer"] = "Fan/Ammiratore"; -$a->strings["Friend/Connect Request"] = "Richiesta di entrare in contatto"; -$a->strings["New Follower"] = "Nuovo follower"; -$a->strings["No introductions."] = "Nessuna richiesta di amicizia."; -$a->strings["%s liked %s's post"] = "A %s è piaciuto l'articolo di %s"; -$a->strings["%s disliked %s's post"] = "A %s non è piaciuto l'articolo di %s"; -$a->strings["%s is now friends with %s"] = "%s è ora amico di %s"; -$a->strings["%s created a new post"] = "%s ha creato un nuovo articolo"; -$a->strings["%s commented on %s's post"] = "%s ha commentato l'articolo di %s"; -$a->strings["No more network notifications."] = "Non ci sono nuove notifiche dalla rete."; -$a->strings["Network Notifications"] = "Notifiche dalla rete"; +$a->strings["Discard"] = "Rifiuta"; $a->strings["No more system notifications."] = "Non ci sono nuove notifiche di sistema."; $a->strings["System Notifications"] = "Notifiche di sistema"; -$a->strings["No more personal notifications."] = "Non ci sono nuove notifiche personali."; -$a->strings["Personal Notifications"] = "Notifiche personali"; -$a->strings["No more home notifications."] = "Non ci sono nuove notifiche dalla bacheca."; -$a->strings["Home Notifications"] = "Notifiche dalla bacheca"; $a->strings["Block Name"] = "Nome del riquadro"; $a->strings["Unable to find your hub."] = "Impossibile raggiungere il tuo hub."; $a->strings["Post successful."] = "Inviato!"; @@ -1564,11 +1528,13 @@ $a->strings["Recipient"] = "Destinatario"; $a->strings["Choose what you wish to do to recipient"] = "Scegli cosa vuoi inviare al destinatario"; $a->strings["Make this post private"] = "Rendi privato questo articolo"; $a->strings["Wall Photos"] = "Foto della bacheca"; +$a->strings["You must be logged in to see this page."] = "Devi aver effettuato l'accesso per vedere questa pagina."; $a->strings["Insufficient permissions. Request redirected to profile page."] = "Permessi insufficienti. Sarà visualizzata la pagina del profilo."; $a->strings["Not available."] = "Non disponibile."; $a->strings["Community"] = "Comunità"; $a->strings["No results."] = "Nessun risultato."; $a->strings["Files"] = "Elenco file"; +$a->strings["Contact not found."] = "Contatto non trovato."; $a->strings["Friend suggestion sent."] = "Suggerimento di amicizia inviato."; $a->strings["Suggest Friends"] = "Suggerisci amici"; $a->strings["Suggest a friend for %s"] = "Suggerisci un amico a %s"; @@ -1595,7 +1561,6 @@ $a->strings["Please visit GetZot.com to learn $a->strings["Bug reports and issues: please visit"] = "Per segnalare bug e problemi: visita"; $a->strings["Suggestions, praise, donations, etc. - please email \"redmatrix\" at librelist - dot com"] = "Per consigli, ringraziamenti, donazioni, ecc. - scrivi a \"redmatrix\" at librelist - dot com"; $a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Nessun suggerimento disponibile. Se questo è un sito nuovo, riprova tra 24 ore."; -$a->strings["Ignore/Hide"] = "Ignora/nascondi"; $a->strings["Public Sites"] = "Siti pubblici"; $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."] = "Gli indirizzi elencati permettono la registrazione su Red Matrix. Tutti i siti di questa rete sono interconnessi, quindi essere registrati su uno è come essere registrati ovunque. Alcuni potrebbero richiedere un'iscrizione a pagamento o prevedere tipi diversi di abbonamento. Potrai trovare maggiori informazioni al riguardo visitando ciascun sito."; $a->strings["Site URL"] = "URL del sito"; -- 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
     
    const XCHAN_FLAGS_SELFCENSORED 0x0008
     
    const XCHAN_FLAGS_SYSTEM 0x0010
     
    const XCHAN_FLAGS_DELETED 0x1000
     
    const HUBLOC_NOTUSED 0x0000
     
    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
    -

    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
    -

    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
    -

    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
    -

    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
    + + + +
    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
    +
    + + +
    +
    + + + + +
    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)
     

    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
     
    file  mod_import.php
     
    file  mod_new_channel.php
     
    file  mod_register.php
     
    file  none.php
     
    file  theme_init.php
     
    file  admin.php
     
    file  allfriends.php
     
    file  api.php
     
    file  apps.php
     
    file  connections.php
     
    file  connedit.php
     
    file  contactgroup.php
     
    file  delegate.php
     
    file  pubsites.php
     
    file  qsearch.php
     
    file  randprof.php
     
    file  redir.php
     
    file  register.php
     
    file  regmod.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_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+util
    - +

    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
    -

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

    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
    -

    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
    -

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

    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
    -

    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