From 148f4e8795391d80994fe8009f161b02f57a130f Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 1 Sep 2014 19:55:43 -0700 Subject: issue #578 - this won't fix old items but should work going forward. The extra time slop shouldn't be needed and will in fact result in possibly undesired redundancy. --- include/externals.php | 2 +- include/items.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/externals.php b/include/externals.php index 8944524b7..ad2c71ac9 100644 --- a/include/externals.php +++ b/include/externals.php @@ -61,7 +61,7 @@ function externals_run($argv, $argc){ if($url) { if($r[0]['site_pull'] !== '0000-00-00 00:00:00') - $mindate = urlencode($r[0]['site_pull']); + $mindate = urlencode(datetime_convert('','',$r[0]['site_pull'] . ' - 1 day')); else { $days = get_config('externals','since_days'); if($days === false) diff --git a/include/items.php b/include/items.php index 7764d2f62..ca6737f8f 100755 --- a/include/items.php +++ b/include/items.php @@ -4056,7 +4056,7 @@ function zot_feed($uid,$observer_xchan,$mindate) { } if($mindate != '0000-00-00 00:00:00') { - $sql_extra .= " and created > '$mindate' "; + $sql_extra .= " and ( created > '$mindate' or edited > '$mindate' ) "; $limit = ""; } else -- cgit v1.2.3 From f64abf3ad8b5c753a3e47669c69c4acda9696e5e Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 1 Sep 2014 20:41:05 -0700 Subject: logic inverted --- include/follow.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/follow.php b/include/follow.php index d1c6afbee..cf6bfde77 100644 --- a/include/follow.php +++ b/include/follow.php @@ -51,7 +51,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) if($arr['channel']['success']) $ret = $arr['channel']; - elseif($is_http) + elseif(! $is_http) $ret = zot_finger($url,$channel); if($ret && $ret['success']) { -- cgit v1.2.3 From 5aa18a11af4ec4d40834abdcc06c2914f9296eb5 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 1 Sep 2014 20:47:01 -0700 Subject: pull in some posts when first connecting to feeds --- mod/follow.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mod/follow.php b/mod/follow.php index 663fb7536..e480a0964 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -26,10 +26,9 @@ function follow_init(&$a) { // If we can view their stream, pull in some posts - if($result['abook']['abook_their_perms'] & PERMS_R_STREAM) + if(($result['abook']['abook_their_perms'] & PERMS_R_STREAM) || ($result['abook']['xchan_network'] === 'rss')) proc_run('php','include/onepoll.php',$result['abook']['abook_id']); - goaway(z_root() . '/connedit/' . $result['abook']['abook_id'] . '?f=&follow=1'); } -- cgit v1.2.3 From 688722de5bf928c53fa694e0469f81c4ac2b646d Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 1 Sep 2014 20:59:53 -0700 Subject: fix phantom attachments in feeds --- include/follow.php | 2 +- include/items.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/follow.php b/include/follow.php index cf6bfde77..e6c42aad1 100644 --- a/include/follow.php +++ b/include/follow.php @@ -181,7 +181,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) return $result; } - $r = q("select count(*) as total from abook where abook_account = %d and abook_network = 'rss'", + $r = q("select count(*) as total from abook where abook_account = %d and ( abook_flags & ABOOK_FLAG_FEED )", intval($aid) ); if($r) diff --git a/include/items.php b/include/items.php index ca6737f8f..370dd5c72 100755 --- a/include/items.php +++ b/include/items.php @@ -1592,8 +1592,8 @@ function get_atom_elements($feed,$item,&$author) { $title = ' '; if(! $type) $type = 'application/octet-stream'; + $res['attach'][] = array('href' => $link, 'length' => $len, 'type' => $type, 'title' => $title ); } - $res['attach'][] = array('href' => $link, 'length' => $len, 'type' => $type, 'title' => $title ); } $rawobj = $item->get_item_tags(NAMESPACE_ACTIVITY, 'object'); -- cgit v1.2.3 From 9dac46ca25b11f80dded42db31e7e062fc7b5142 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 1 Sep 2014 22:59:11 -0700 Subject: minor nits --- include/diaspora.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index b544dad53..2f32053f8 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -2584,18 +2584,22 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { * */ - $handle = diaspora_handle_from_contact($item['author_xchan']); + if($item['author_xchan'] === $owner['channel_hash']) + $handle = $owner['channel_address'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); + else + $handle = diaspora_handle_from_contact($item['author_xchan']); + if(! $handle) { logger('diaspora_send_relay: no handle'); return; } if($relay_retract) - $sender_signed_text = $item['guid'] . ';' . $target_type; + $sender_signed_text = $item['mid'] . ';' . $target_type; elseif($like) - $sender_signed_text = $item['guid'] . ';' . $target_type . ';' . $parent['guid'] . ';' . $positive . ';' . $handle; + $sender_signed_text = $item['mid'] . ';' . $target_type . ';' . $parent['mid'] . ';' . $positive . ';' . $handle; else - $sender_signed_text = $item['guid'] . ';' . $parent['guid'] . ';' . $text . ';' . $handle; + $sender_signed_text = $item['mid'] . ';' . $parent['mid'] . ';' . $text . ';' . $handle; // Sign the relayable with the top-level owner's signature // -- cgit v1.2.3 From 17c1ddb77e153b72fd70d3b58befb9e791ca04c7 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 2 Sep 2014 04:39:01 -0700 Subject: updated compatibility notes --- doc/diaspora_compat.md | 10 +++++++--- version.inc | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/diaspora_compat.md b/doc/diaspora_compat.md index 29ec0a78a..fd7c7f950 100644 --- a/doc/diaspora_compat.md +++ b/doc/diaspora_compat.md @@ -4,7 +4,9 @@ Diaspora protocol compatibility is presently considered an ***experimental*** fe Private mail is currently not working. Eventually this will be fixed. Posts and comments are partially working. -Private mail retraction will not be possible on Diaspora. +Private mail retraction (unsend) will not be possible on Diaspora. + +Private posts and their associated comments are sent in plaintext email notifications in Diaspora and Friendica. This is a major privacy issue and affects any private communications you have where *any* member of the conversation is on another network. Be aware of it. Access control only works on posts and comments. Diaspora members will get permission denied trying to access any other access controlled redmatrix objects such as files, photos, webpages, chatrooms, etc. In the case of private photos that are linked to posts, they will see a "prohibited sign" instead of the photo. Diaspora has no concept of private media. There is no workaround except to make your media resources public (to everybody on the internet). @@ -29,14 +31,16 @@ Community tags will not work. We will send a tagging activity as a comment. It w Forum tags (@forum+) and privacy tags (@!somebody) will not be available to Diaspora members. These tags may have to be stripped or obscured to prevent them from being hijacked - which could result in privacy issues. +It is possible for a Diaspora member to become a member of a forum, but they cannot initiate conversations. This requires the ability to plus-tag the channel or authenticate to post on the channel wall. Once a conversation is initiated, Diaspora members can comment and take part in the dicussion. + Premium channel redirects will not be sent. If you allow Diaspora connections, they will not see that you have a premium channel. You cannot use Diaspora channels as channel sources. -Dislikes of posts will be converted to comments and you will have the option to send these as comments or not send them to Diaspora (which does not provide dislike). +Dislikes of posts will be converted to comments and you will have the option to send these as comments or not send them to Diaspora (which does not provide dislike). Currently they are not sent. -We will do the same for both likes and dislikes of comments. They can either be sent as comments or you will have the ability to prevent them from being transmitted to Diaspora. +We will do the same for both likes and dislikes of comments. They can either be sent as comments or you will have the ability to prevent them from being transmitted to Diaspora. Currently they are not sent. "observer tags" will be converted to empty text. diff --git a/version.inc b/version.inc index d8c959b4b..fda7f617d 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-09-01.785 +2014-09-02.786 -- cgit v1.2.3 From 2c94d59cba0b3231b0dd822fc1b95bed5521c48d Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 2 Sep 2014 17:21:12 -0700 Subject: use feed title for channel name before checking author, make feed items shareable (they're private to the channel so they won't be shown in searches), try and handle Diaspora mentions a bit more elegantly. (Bug: we don't convert mentions to Diaspora's format on outbound at all!) --- include/ItemObject.php | 9 +++++++-- include/bb2diaspora.php | 24 +++++++++++++++++++++++- include/network.php | 12 +++++++----- mod/share.php | 6 ++++-- 4 files changed, 41 insertions(+), 10 deletions(-) diff --git a/include/ItemObject.php b/include/ItemObject.php index a5870ef91..b4a60762b 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -90,6 +90,10 @@ class Item extends BaseObject { : false); $shareable = ((($conv->get_profile_owner() == local_user()) && ($item['item_private'] != 1)) ? true : false); + // allow an exemption for sharing stuff from your private feeds + if($item['author']['xchan_network'] === 'rss') + $shareable = true; + $mode = $conv->get_mode(); if(local_user() && $observer['xchan_hash'] === $item['author_xchan']) @@ -207,10 +211,11 @@ class Item extends BaseObject { if($this->is_commentable()) { $like = array( t("I like this \x28toggle\x29"), t("like")); $dislike = array( t("I don't like this \x28toggle\x29"), t("dislike")); - if ($shareable) - $share = array( t('Share This'), t('share')); } + if ($shareable) + $share = array( t('Share This'), t('share')); + if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0) $indent .= ' shiny'; diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index f15a34e99..623b2d7b7 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -77,6 +77,25 @@ function share_unshield($m) { } +function diaspora_mention_callback($matches) { + + $webbie = $matches[2]; + $link = ''; + if($webbie) { + $r = q("select * from hubloc left join xchan on hubloc_hash = xchan_hash where hubloc_addr = '%s' limit 1", + dbesc($webbie) + ); + if($r) + $link = $r[0]['xchan_url']; + } + if(! $link) + $link = 'https://' . $matches[3] . '/u/' . $matches[2]; + + return '@[url=' . $link . ']' . trim($matches[1]) . '[/url]'; + +} + + // we don't want to support a bbcode specific markdown interpreter // and the markdown library we have is pretty good, but provides HTML output. @@ -97,7 +116,10 @@ function diaspora2bb($s,$use_zrl = false) { $s = str_replace("
","
",$s); $s = str_replace("\n","
",$s); - $s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s); + +// $s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s); + + $s = preg_replace_callback('/\@\{(.+?)\; (.+?)\@(.+?)\}/','diaspora_mention_callback',$s); // Escaping the hash tags - doesn't always seem to work // $s = preg_replace('/\#([^\s\#])/','\\#$1',$s); diff --git a/include/network.php b/include/network.php index c44ed77c4..77c1550ba 100644 --- a/include/network.php +++ b/include/network.php @@ -868,15 +868,18 @@ function discover_by_url($url,$arr = null) { if($feed->error()) logger('probe_url: scrape_feed: Error parsing XML: ' . $feed->error()); + $name = unxmlify(trim($feed->get_title())); $photo = $feed->get_image_url(); $author = $feed->get_author(); if($author) { - $name = unxmlify(trim($author->get_name())); if(! $name) + $name = unxmlify(trim($author->get_name())); + if(! $name) { $name = trim(unxmlify($author->get_email())); - if(strpos($name,'@') !== false) - $name = substr($name,0,strpos($name,'@')); + if(strpos($name,'@') !== false) + $name = substr($name,0,strpos($name,'@')); + } if(! $profile && $author->get_link()) $profile = trim(unxmlify($author->get_link())); if(! $photo) { @@ -924,8 +927,7 @@ function discover_by_url($url,$arr = null) { if(! $network) { $network = 'rss'; } - if(! $name) - $name = notags($feed->get_title()); + if(! $name) $name = notags($feed->get_description()); diff --git a/mod/share.php b/mod/share.php index 8b0403663..78a25ee10 100644 --- a/mod/share.php +++ b/mod/share.php @@ -14,10 +14,12 @@ function share_init(&$a) { killme(); - $r = q("SELECT * from item WHERE id = %d LIMIT 1", + $r = q("SELECT * from item left join xchan on author_xchan = xchan_hash WHERE id = %d LIMIT 1", intval($post_id) ); - if((! $r) || $r[0]['item_private']) + if(! $r) + killme(); + if(($r[0]['item_private']) && ($r[0]['xchan_network'] !== 'rss')) killme(); $sql_extra = item_permissions_sql($r[0]['uid']); -- cgit v1.2.3 From c7decf70a2d11dc2e208a508a0e7503139ab18c9 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 2 Sep 2014 17:43:42 -0700 Subject: feed removal issue --- include/Contact.php | 2 +- include/network.php | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/Contact.php b/include/Contact.php index a9e737bde..0590f9d1e 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -484,7 +484,7 @@ function contact_remove($channel_id, $abook_id) { ); if($r) { foreach($r as $rr) { - drop_item($rr,false); + drop_item($rr['id'],false); } } diff --git a/include/network.php b/include/network.php index 77c1550ba..5ca60b5fe 100644 --- a/include/network.php +++ b/include/network.php @@ -896,11 +896,13 @@ function discover_by_url($url,$arr = null) { if($item) { $author = $item->get_author(); if($author) { - $name = trim(unxmlify($author->get_name())); - if(! $name) - $name = trim(unxmlify($author->get_email())); - if(strpos($name,'@') !== false) - $name = substr($name,0,strpos($name,'@')); + if(! $name) { + $name = trim(unxmlify($author->get_name())); + if(! $name) + $name = trim(unxmlify($author->get_email())); + if(strpos($name,'@') !== false) + $name = substr($name,0,strpos($name,'@')); + } if(! $profile && $author->get_link()) $profile = trim(unxmlify($author->get_link())); } -- cgit v1.2.3 From 7001f41d3d021f1e7fb87cc3c628739bc5362d2a Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 2 Sep 2014 21:11:09 -0700 Subject: provide a config option to prevent wall uploads (photos and files) from being set to the same ACL as the containing post, and instead are uploaded with public visibility (no ACL). This is to prevent folks on other networks from seeing prohibited signs for things uploaded into a private conversation. It is primarily useful when posting to collections that have mixed folks from red and other networks and an otherwise public (typical) profile. Consequently, these uploads will match your chosen default visibility for photos and storage and not that of the containing conversation item (and is only useful if the default visibility is public). This choice must be explained adequately because it represents a complex series of tradeoffs and side effects. It will reduce complaints from other networks about blocked content, but essentially forces you to use another method (dav or the photos page) if you wish to upload protected files/media. --- include/apps.php | 30 ------------------------------ mod/item.php | 9 +++++++++ 2 files changed, 9 insertions(+), 30 deletions(-) diff --git a/include/apps.php b/include/apps.php index 7ac4c7e4b..91012b0ef 100644 --- a/include/apps.php +++ b/include/apps.php @@ -470,33 +470,3 @@ function papp_encode($papp) { } -/** - * install a shared design element (layout, webpage, block, menu, whatever) - * - */ - -function element_install($channel,$s) { - - $ret = array('success' => false); - - $s = str_replace(array('[element]','[/element]'),array('',''),$s); - $s = base64url_decode($s); - if(! $s) - return $ret; - $x = json_decode($s,true); - if(! $x) - return $ret; - - $d = array(); - - - - - - - - - $result = item_store($d); - -} - diff --git a/mod/item.php b/mod/item.php index c1dd15eb1..9338cf401 100644 --- a/mod/item.php +++ b/mod/item.php @@ -1190,6 +1190,10 @@ function handle_tag($a, &$body, &$access_tag, &$str_tags, $profile_uid, $tag) { function fix_attached_photo_permissions($uid,$xchan_hash,$body, $str_contact_allow,$str_group_allow,$str_contact_deny,$str_group_deny) { + if(get_pconfig($uid,'system','force_public_uploads')) { + $str_contact_allow = $str_group_allow = $str_contact_deny = $str_group_deny = ''; + } + $match = null; // match img and zmg image links if(preg_match_all("/\[[zi]mg(.*?)\](.*?)\[\/[zi]mg\]/",$body,$match)) { @@ -1259,6 +1263,10 @@ function fix_attached_photo_permissions($uid,$xchan_hash,$body, function fix_attached_file_permissions($channel,$observer_hash,$body, $str_contact_allow,$str_group_allow,$str_contact_deny,$str_group_deny) { + if(get_pconfig($channel['channel_id'],'system','force_public_uploads')) { + $str_contact_allow = $str_group_allow = $str_contact_deny = $str_group_deny = ''; + } + $match = false; if(preg_match_all("/\[attachment\](.*?)\[\/attachment\]/",$body,$match)) { @@ -1279,6 +1287,7 @@ function fix_attached_file_permissions($channel,$observer_hash,$body, } } } + function item_check_service_class($channel_id,$iswebpage) { $ret = array('success' => false, $message => ''); if ($iswebpage) { -- cgit v1.2.3 From 8337fd7bb417e73b4018bb11522e19b3b7fc705f Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 2 Sep 2014 21:43:46 -0700 Subject: try to proceed with a diaspora relayable even if we don't have the original author's signature. --- include/diaspora.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 2f32053f8..cd4f5591a 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -2558,7 +2558,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { $r = q("select * from sign where " . $sql_sign_id . " = %d limit 1", intval($item['id']) ); - if(count($r)) { + if($r) { $orig_sign = $r[0]; $signed_text = $orig_sign['signed_text']; $authorsig = $orig_sign['signature']; @@ -2569,7 +2569,8 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { // whether from Diaspora or Friendica) must be placed in the `sign` table before this // function is called logger('diaspora_send_relay: original author signature not found, cannot send relayable'); - return; +// ignore - see below +// return; } /* Since the author signature is only checked by the parent, not by the relay recipients, @@ -2584,11 +2585,12 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { * */ - if($item['author_xchan'] === $owner['channel_hash']) - $handle = $owner['channel_address'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); - else - $handle = diaspora_handle_from_contact($item['author_xchan']); - + if(! $handle) { + if($item['author_xchan'] === $owner['channel_hash']) + $handle = $owner['channel_address'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); + else + $handle = diaspora_handle_from_contact($item['author_xchan']); + } if(! $handle) { logger('diaspora_send_relay: no handle'); return; -- cgit v1.2.3 From f36b58eb45c2eb8a12c7869a8ec6991f245a4540 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 2 Sep 2014 21:55:40 -0700 Subject: if we don't have a stored diaspora author signature which has been passed the baton since the post's creation, fill in the field with their redmatrix signature. It's pointless, but there's so much pointless stuff in here that I doubt it matters. From what I can ascertain - nobody is going to look at it anyway. --- include/diaspora.php | 1 + 1 file changed, 1 insertion(+) diff --git a/include/diaspora.php b/include/diaspora.php index cd4f5591a..dbf906169 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -2568,6 +2568,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { // Author signature information (for likes, comments, and retractions of likes or comments, // whether from Diaspora or Friendica) must be placed in the `sign` table before this // function is called + $authorsig = $item['sig']; logger('diaspora_send_relay: original author signature not found, cannot send relayable'); // ignore - see below // return; -- cgit v1.2.3 From 5715d5f4c7a628c175fe9fea17210ca3151cd601 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 2 Sep 2014 22:50:32 -0700 Subject: fix diaspora_handle_from_contact() --- include/diaspora.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index dbf906169..477f82914 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -269,8 +269,8 @@ function diaspora_handle_from_contact($contact_hash) { logger("diaspora_handle_from_contact: contact id is " . $contact_hash, LOGGER_DEBUG); - $r = q("SELECT * from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' limit 1", - intval($contact_hash) + $r = q("SELECT xchan_addr from xchan where xchan_hash = '%s' limit 1", + dbesc($contact_hash) ); if($r) { return $r[0]['xchan_addr']; -- cgit v1.2.3 From 75d0f6329cc532c7f74927bdaa678d8d85f45a9e Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 3 Sep 2014 01:09:28 -0700 Subject: outbound feed issue --- include/diaspora.php | 4 ++-- include/items.php | 4 ++-- version.inc | 2 +- view/tpl/atom_feed.tpl | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 477f82914..c2f2b1ac9 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -2568,8 +2568,8 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { // Author signature information (for likes, comments, and retractions of likes or comments, // whether from Diaspora or Friendica) must be placed in the `sign` table before this // function is called - $authorsig = $item['sig']; - logger('diaspora_send_relay: original author signature not found, cannot send relayable'); +// $authorsig = $item['sig']; + logger('diaspora_send_relay: original author signature not found'); // ignore - see below // return; } diff --git a/include/items.php b/include/items.php index 370dd5c72..b3b9d28cd 100755 --- a/include/items.php +++ b/include/items.php @@ -518,13 +518,13 @@ function get_feed_for($channel, $observer_hash, $params) { $atom .= replace_macros($feed_template, array( '$version' => xmlify(RED_VERSION), '$red' => xmlify(RED_PLATFORM), - '$feed_id' => xmlify($channel['channel_url']), + '$feed_id' => xmlify($channel['xchan_url']), '$feed_title' => xmlify($channel['channel_name']), '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now' , ATOM_TIME)) , '$hub' => '', // feed_hublinks(), '$salmon' => '', // feed_salmonlinks($channel['channel_address']), '$name' => xmlify($channel['channel_name']), - '$profile_page' => xmlify($channel['channel_url']), + '$profile_page' => xmlify($channel['xchan_url']), '$mimephoto' => xmlify($channel['xchan_photo_mimetype']), '$photo' => xmlify($channel['xchan_photo_l']), '$thumb' => xmlify($channel['xchan_photo_m']), diff --git a/version.inc b/version.inc index fda7f617d..f8b14f55a 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-09-02.786 +2014-09-03.787 diff --git a/view/tpl/atom_feed.tpl b/view/tpl/atom_feed.tpl index 2c8024d47..9e5b5a5be 100755 --- a/view/tpl/atom_feed.tpl +++ b/view/tpl/atom_feed.tpl @@ -15,6 +15,7 @@ {{$feed_title}} {{$red}} + {{if $hub}} {{$hub}} {{/if}} -- cgit v1.2.3 From e8ef515b6136ee79ff17e1c143a15e29691d3d81 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 3 Sep 2014 05:09:43 -0700 Subject: store diaspora meta info in the item table. It has to go there or it will kill us with complex joins. We can phase out the sign table once this all checks out. --- boot.php | 2 +- include/diaspora.php | 54 ++++++++++++++++++++++++++-------------------------- include/identity.php | 27 +++++++++++--------------- include/items.php | 13 ++++++++++++- install/database.sql | 1 + install/update.php | 11 ++++++++++- mod/xrd.php | 17 +++++------------ 7 files changed, 67 insertions(+), 58 deletions(-) diff --git a/boot.php b/boot.php index 344a2a7ca..cb70b898b 100755 --- a/boot.php +++ b/boot.php @@ -47,7 +47,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1128 ); +define ( 'DB_UPDATE_VERSION', 1129 ); define ( 'EOL', '
' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/include/diaspora.php b/include/diaspora.php index c2f2b1ac9..fabcafa79 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -1343,6 +1343,11 @@ function diaspora_comment($importer,$xml,$msg) { $datarray['body'] = $body; $datarray['app'] = 'Diaspora'; + + if(! $parent_author_signature) { + $datarray['diaspora_meta'] = array('signer' => $diaspora_handle, 'body' => $text, + 'signed_text' => $signed_data, 'signature' => base64_encode($author_signature)); + } $result = item_store($datarray); @@ -1908,6 +1913,12 @@ EOT; $arr['unseen'] = 1; $arr['last-child'] = 0; + if(! $parent_author_signature) { + $datarray['diaspora_meta'] = array('signer' => $diaspora_handle, 'body' => $text, + 'signed_text' => $signed_data, 'signature' => base64_encode($author_signature)); + } + + $message_id = item_store($arr); @@ -2551,28 +2562,15 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { $tpl = get_markup_template('diaspora_comment_relay.tpl'); } - - // fetch the original signature if the relayable was created by a Diaspora, Friendica-over Diaspora, - // or zot user. Relayables for other networks are not supported. - - $r = q("select * from sign where " . $sql_sign_id . " = %d limit 1", - intval($item['id']) - ); - if($r) { - $orig_sign = $r[0]; - $signed_text = $orig_sign['signed_text']; - $authorsig = $orig_sign['signature']; - $handle = $orig_sign['signer']; + $diaspora_meta = (($item['diaspora_meta']) ? json_decode($item['diaspora_meta'],true) : ''); + if($diaspora_meta) { + $sender_signed_text = $diaspora_meta['signed_text']; + $authorsig = $diaspora_meta['signature']; + $handle = $diaspora_meta['signer']; + $text = $diaspora_meta['body']; } - else { - // Author signature information (for likes, comments, and retractions of likes or comments, - // whether from Diaspora or Friendica) must be placed in the `sign` table before this - // function is called -// $authorsig = $item['sig']; + else logger('diaspora_send_relay: original author signature not found'); -// ignore - see below -// return; - } /* Since the author signature is only checked by the parent, not by the relay recipients, * I think it may not be necessary for us to do so much work to preserve all the original @@ -2585,7 +2583,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { * * */ - +// bug - nomadic identity may/will affect diaspora_handle_from_contact if(! $handle) { if($item['author_xchan'] === $owner['channel_hash']) $handle = $owner['channel_address'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); @@ -2597,12 +2595,14 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { return; } - if($relay_retract) - $sender_signed_text = $item['mid'] . ';' . $target_type; - elseif($like) - $sender_signed_text = $item['mid'] . ';' . $target_type . ';' . $parent['mid'] . ';' . $positive . ';' . $handle; - else - $sender_signed_text = $item['mid'] . ';' . $parent['mid'] . ';' . $text . ';' . $handle; + if(! $sender_signed_text) { + if($relay_retract) + $sender_signed_text = $item['mid'] . ';' . $target_type; + elseif($like) + $sender_signed_text = $item['mid'] . ';' . $target_type . ';' . $parent['mid'] . ';' . $positive . ';' . $handle; + else + $sender_signed_text = $item['mid'] . ';' . $parent['mid'] . ';' . $text . ';' . $handle; + } // Sign the relayable with the top-level owner's signature // diff --git a/include/identity.php b/include/identity.php index 8b742f53e..282d323be 100644 --- a/include/identity.php +++ b/include/identity.php @@ -774,22 +774,17 @@ logger('online: ' . $profile['online']); ? trim(substr($profile['channel_name'],0,strpos($profile['channel_name'],' '))) : $profile['channel_name']); $lastname = (($firstname === $profile['channel_name']) ? '' : trim(substr($profile['channel_name'],strlen($firstname)))); - if(get_config('system','diaspora_enabled')) { - $diaspora = array( - 'podloc' => z_root(), - 'searchable' => (($block) ? 'false' : 'true'), - 'nickname' => $profile['channel_address'], - 'fullname' => $profile['channel_name'], - 'firstname' => $firstname, - 'lastname' => $lastname, - 'photo300' => z_root() . '/photo/profile/300/' . $profile['uid'] . '.jpg', - 'photo100' => z_root() . '/photo/profile/100/' . $profile['uid'] . '.jpg', - 'photo50' => z_root() . '/photo/profile/50/' . $profile['uid'] . '.jpg', - ); - } - else - $diaspora = null; - + $diaspora = array( + 'podloc' => z_root(), + 'searchable' => (($block) ? 'false' : 'true'), + 'nickname' => $profile['channel_address'], + 'fullname' => $profile['channel_name'], + 'firstname' => $firstname, + 'lastname' => $lastname, + 'photo300' => z_root() . '/photo/profile/300/' . $profile['uid'] . '.jpg', + 'photo100' => z_root() . '/photo/profile/100/' . $profile['uid'] . '.jpg', + 'photo50' => z_root() . '/photo/profile/50/' . $profile['uid'] . '.jpg', + ); $contact_block = contact_block(); diff --git a/include/items.php b/include/items.php index b3b9d28cd..9d80b3a81 100755 --- a/include/items.php +++ b/include/items.php @@ -795,7 +795,7 @@ function get_item_elements($x) { $arr['sig'] = (($x['signature']) ? htmlspecialchars($x['signature'], ENT_COMPAT,'UTF-8',false) : ''); - + $arr['diaspora_meta'] = (($x['diaspora_meta']) ? $x['diaspora_meta'] : ''); $arr['object'] = activity_sanitise($x['object']); $arr['target'] = activity_sanitise($x['target']); @@ -1194,6 +1194,7 @@ function encode_mail($item) { $x['message_parent'] = $item['parent_mid']; $x['created'] = $item['created']; $x['expires'] = $item['expires']; + $x['diaspora_meta'] = $item['diaspora_meta']; $x['title'] = $item['title']; $x['body'] = $item['body']; $x['from'] = encode_item_xchan($item['from']); @@ -1748,6 +1749,7 @@ function item_store($arr,$allow_exec = false) { $arr['title'] = ((array_key_exists('title',$arr) && strlen($arr['title'])) ? trim($arr['title']) : ''); $arr['body'] = ((array_key_exists('body',$arr) && strlen($arr['body'])) ? trim($arr['body']) : ''); + $arr['diaspora_meta'] = ((x($arr,'diaspora_meta')) ? $arr['diaspora_meta'] : ''); $arr['allow_cid'] = ((x($arr,'allow_cid')) ? trim($arr['allow_cid']) : ''); $arr['allow_gid'] = ((x($arr,'allow_gid')) ? trim($arr['allow_gid']) : ''); $arr['deny_cid'] = ((x($arr,'deny_cid')) ? trim($arr['deny_cid']) : ''); @@ -2236,6 +2238,8 @@ function item_store_update($arr,$allow_exec = false) { $arr['commented'] = $orig[0]['commented']; $arr['received'] = datetime_convert(); $arr['changed'] = datetime_convert(); + + $arr['diaspora_meta'] = ((x($arr,'diaspora_meta')) ? $arr['diaspora_meta'] : $orig[0]['diaspora_meta']); $arr['location'] = ((x($arr,'location')) ? notags(trim($arr['location'])) : $orig[0]['location']); $arr['coord'] = ((x($arr,'coord')) ? notags(trim($arr['coord'])) : $orig[0]['coord']); $arr['verb'] = ((x($arr,'verb')) ? notags(trim($arr['verb'])) : $orig[0]['verb']); @@ -2370,6 +2374,13 @@ function store_diaspora_comment_sig($datarray, $channel, $parent_item, $post_id) else $authorsig = ''; + $x = array('signer' => $diaspora_handle, 'body' => $signed_body, 'signed_text' => $signed_text, 'signature' => base64_encode($authorsig)); + + $r = q("update item set diaspora_meta = '%s' where id = %d limit 1", + dbesc(json_encode($x)), + intval($post_id) + ); + $r = q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ", intval($post_id), dbesc($signed_text), diff --git a/install/database.sql b/install/database.sql index c773fab10..a49bd377c 100644 --- a/install/database.sql +++ b/install/database.sql @@ -535,6 +535,7 @@ CREATE TABLE IF NOT EXISTS `item` ( `resource_type` char(16) NOT NULL DEFAULT '', `attach` mediumtext NOT NULL DEFAULT '', `sig` text NOT NULL DEFAULT '', + `diaspora_meta` mediumtext NOT NULL DEFAULT '', `location` char(255) NOT NULL DEFAULT '', `coord` char(255) NOT NULL DEFAULT '', `public_policy` char(255) NOT NULL DEFAULT '', diff --git a/install/update.php b/install/update.php index 92cb200a3..0b1fa5d2e 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ $a->get_baseurl(), - '$dspr_guid' => $r[0]['channel_guid'], - '$dspr_key' => base64_encode(pemtorsa($r[0]['channel_pubkey'])) - )); - } - else - $dspr = ''; - - + $dspr = replace_macros(get_markup_template('xrd_diaspora.tpl'),array( + '$baseurl' => $a->get_baseurl(), + '$dspr_guid' => $r[0]['channel_guid'], + '$dspr_key' => base64_encode(pemtorsa($r[0]['channel_pubkey'])) + )); $salmon_key = salmon_key($r[0]['channel_pubkey']); -- cgit v1.2.3 From d93f7d688ddf5a0f1295a93a4c84123e9e1b252f Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 3 Sep 2014 18:24:42 -0700 Subject: fix group membership management for non-red connections --- mod/group.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mod/group.php b/mod/group.php index 0f265f6fb..9b90b1a1a 100644 --- a/mod/group.php +++ b/mod/group.php @@ -118,14 +118,14 @@ function group_content(&$a) { check_form_security_token_ForbiddenOnErr('group_member_change', 't'); $r = q("SELECT abook_xchan from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and not (xchan_flags & %d) and not (abook_flags & %d) and not (abook_flags & %d) limit 1", - dbesc(argv(2)), + dbesc(base64url_decode(argv(2))), intval(local_user()), intval(XCHAN_FLAGS_DELETED), intval(ABOOK_FLAG_BLOCKED), intval(ABOOK_FLAG_PENDING) ); if(count($r)) - $change = argv(2); + $change = base64url_decode(argv(2)); } @@ -204,7 +204,7 @@ function group_content(&$a) { foreach($members as $member) { if($member['xchan_url']) { $member['archived'] = (($member['abook_flags'] & ABOOK_FLAG_ARCHIVED) ? true : false); - $member['click'] = 'groupChangeMember(' . $group['id'] . ',\'' . $member['xchan_hash'] . '\',\'' . $sec_token . '\'); return false;'; + $member['click'] = 'groupChangeMember(' . $group['id'] . ',\'' . base64url_encode($member['xchan_hash']) . '\',\'' . $sec_token . '\'); return false;'; $groupeditor['members'][] = micropro($member,true,'mpgroup', $textmode); } else @@ -223,7 +223,7 @@ function group_content(&$a) { foreach($r as $member) { if(! in_array($member['xchan_hash'],$preselected)) { $member['archived'] = (($member['abook_flags'] & ABOOK_FLAG_ARCHIVED) ? true : false); - $member['click'] = 'groupChangeMember(' . $group['id'] . ',\'' . $member['xchan_hash'] . '\',\'' . $sec_token . '\'); return false;'; + $member['click'] = 'groupChangeMember(' . $group['id'] . ',\'' . base64url_encode($member['xchan_hash']) . '\',\'' . $sec_token . '\'); return false;'; $groupeditor['contacts'][] = micropro($member,true,'mpall', $textmode); } } -- cgit v1.2.3 From 844087bc71f333719c1e08d807874f3ae3a7053e Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 3 Sep 2014 19:07:14 -0700 Subject: implement service class for feed polling frequenecy, fixed a service class bug, moved service class stuff from plugin to account.php where it belongs and load that by default instead of on demand --- boot.php | 1 + include/account.php | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++ include/plugin.php | 87 ---------------------------------------------------- include/poller.php | 5 +-- mod/admin.php | 2 -- mod/register.php | 1 - mod/regmod.php | 1 - mod/regver.php | 2 -- mod/zfinger.php | 1 - 9 files changed, 92 insertions(+), 96 deletions(-) diff --git a/boot.php b/boot.php index cb70b898b..0c2cfafbf 100755 --- a/boot.php +++ b/boot.php @@ -41,6 +41,7 @@ require_once('include/features.php'); require_once('include/taxonomy.php'); require_once('include/identity.php'); require_once('include/Contact.php'); +require_once('include/account.php'); define ( 'RED_PLATFORM', 'Red Matrix' ); diff --git a/include/account.php b/include/account.php index 4ded069d5..6cc203dc8 100644 --- a/include/account.php +++ b/include/account.php @@ -547,3 +547,91 @@ function downgrade_accounts() { } } + + +// check service_class restrictions. If there are no service_classes defined, everything is allowed. +// if $usage is supplied, we check against a maximum count and return true if the current usage is +// less than the subscriber plan allows. Otherwise we return boolean true or false if the property +// is allowed (or not) in this subscriber plan. An unset property for this service plan means +// the property is allowed, so it is only necessary to provide negative properties for each plan, +// or what the subscriber is not allowed to do. + + +function service_class_allows($uid,$property,$usage = false) { + $a = get_app(); + if($uid == local_user()) { + $service_class = $a->account['account_service_class']; + } + else { + $r = q("select account_service_class as service_class + from channel c, account a + where c.channel_account_id=a.account_id and c.channel_id= %d limit 1", + intval($uid) + ); + if($r !== false and count($r)) { + $service_class = $r[0]['service_class']; + } + } + if(! x($service_class)) + return true; // everything is allowed + + $arr = get_config('service_class',$service_class); + if(! is_array($arr) || (! count($arr))) + return true; + + if($usage === false) + return ((x($arr[$property])) ? (bool) $arr[$property] : true); + else { + if(! array_key_exists($property,$arr)) + return true; + return (((intval($usage)) < intval($arr[$property])) ? true : false); + } +} + + +function service_class_fetch($uid,$property) { + $a = get_app(); + if($uid == local_user()) { + $service_class = $a->account['account_service_class']; + } + else { + $r = q("select account_service_class as service_class + from channel c, account a + where c.channel_account_id=a.account_id and c.channel_id= %d limit 1", + intval($uid) + ); + if($r !== false and count($r)) { + $service_class = $r[0]['service_class']; + } + } + if(! x($service_class)) + return false; // everything is allowed + + $arr = get_config('service_class',$service_class); + + if(! is_array($arr) || (! count($arr))) + return false; + + return((array_key_exists($property,$arr)) ? $arr[$property] : false); +} + +function upgrade_link($bbcode = false) { + $l = get_config('service_class','upgrade_link'); + if(! $l) + return ''; + if($bbcode) + $t = sprintf('[zrl=%s]' . t('Click here to upgrade.') . '[/zrl]', $l); + else + $t = sprintf('' . t('Click here to upgrade.') . '', $l); + return $t; +} + +function upgrade_message($bbcode = false) { + $x = upgrade_link($bbcode); + return t('This action exceeds the limits set by your subscription plan.') . (($x) ? ' ' . $x : '') ; +} + +function upgrade_bool_message($bbcode = false) { + $x = upgrade_link($bbcode); + return t('This action is not available under your subscription plan.') . (($x) ? ' ' . $x : '') ; +} diff --git a/include/plugin.php b/include/plugin.php index c5f57829d..c2e08a989 100755 --- a/include/plugin.php +++ b/include/plugin.php @@ -430,93 +430,6 @@ function get_theme_screenshot($theme) { } -// check service_class restrictions. If there are no service_classes defined, everything is allowed. -// if $usage is supplied, we check against a maximum count and return true if the current usage is -// less than the subscriber plan allows. Otherwise we return boolean true or false if the property -// is allowed (or not) in this subscriber plan. An unset property for this service plan means -// the property is allowed, so it is only necessary to provide negative properties for each plan, -// or what the subscriber is not allowed to do. - - -function service_class_allows($uid,$property,$usage = false) { - $a = get_app(); - if($uid == local_user()) { - $service_class = $a->account['account_service_class']; - } - else { - $r = q("select account_service_class as service_class - from channel c, account a - where c.channel_account_id=a.account_id and c.channel_id= %d limit 1", - intval($uid) - ); - if($r !== false and count($r)) { - $service_class = $r[0]['service_class']; - } - } - if(! x($service_class)) - return true; // everything is allowed - - $arr = get_config('service_class',$service_class); - if(! is_array($arr) || (! count($arr))) - return true; - - if($usage === false) - return ((x($arr[$property])) ? (bool) $arr['property'] : true); - else { - if(! array_key_exists($property,$arr)) - return true; - return (((intval($usage)) < intval($arr[$property])) ? true : false); - } -} - - -function service_class_fetch($uid,$property) { - $a = get_app(); - if($uid == local_user()) { - $service_class = $a->account['account_service_class']; - } - else { - $r = q("select account_service_class as service_class - from channel c, account a - where c.channel_account_id=a.account_id and c.channel_id= %d limit 1", - intval($uid) - ); - if($r !== false and count($r)) { - $service_class = $r[0]['service_class']; - } - } - if(! x($service_class)) - return false; // everything is allowed - - $arr = get_config('service_class',$service_class); - - if(! is_array($arr) || (! count($arr))) - return false; - - return((array_key_exists($property,$arr)) ? $arr[$property] : false); -} - -function upgrade_link($bbcode = false) { - $l = get_config('service_class','upgrade_link'); - if(! $l) - return ''; - if($bbcode) - $t = sprintf('[zrl=%s]' . t('Click here to upgrade.') . '[/zrl]', $l); - else - $t = sprintf('' . t('Click here to upgrade.') . '', $l); - return $t; -} - -function upgrade_message($bbcode = false) { - $x = upgrade_link($bbcode); - return t('This action exceeds the limits set by your subscription plan.') . (($x) ? ' ' . $x : '') ; -} - -function upgrade_bool_message($bbcode = false) { - $x = upgrade_link($bbcode); - return t('This action is not available under your subscription plan.') . (($x) ? ' ' . $x : '') ; -} - /** * @brief add CSS to * diff --git a/include/poller.php b/include/poller.php index 2ba86dc0b..b26b9e696 100644 --- a/include/poller.php +++ b/include/poller.php @@ -151,7 +151,6 @@ function poller_run($argv, $argc){ q("delete from notify where seen = 1 and date < UTC_TIMESTAMP() - INTERVAL 30 DAY"); // expire any expired accounts - require_once('include/account.php'); downgrade_accounts(); // If this is a directory server, request a sync with an upstream @@ -264,7 +263,9 @@ function poller_run($argv, $argc){ $c = $contact['abook_connected']; if($contact['abook_flags'] & ABOOK_FLAG_FEED) { - $min = intval(get_config('system','minimum_feedcheck_minutes')); + $min = service_class_fetch($contact['abook_channel'],'minimum_feedcheck_minutes'); + if(! $min) + $min = intval(get_config('system','minimum_feedcheck_minutes')); if(! $min) $min = 60; $x = datetime_convert('UTC','UTC',"now - $min minutes"); diff --git a/mod/admin.php b/mod/admin.php index 31d3873ff..48b342d4e 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -608,13 +608,11 @@ function admin_page_users_post(&$a){ } if (x($_POST,'page_users_approve')){ - require_once('include/account.php'); foreach($pending as $hash){ user_allow($hash); } } if (x($_POST,'page_users_deny')){ - require_once('include/account.php'); foreach($pending as $hash){ user_deny($hash); } diff --git a/mod/register.php b/mod/register.php index 954a32fbf..0e33fa358 100644 --- a/mod/register.php +++ b/mod/register.php @@ -1,6 +1,5 @@ Date: Wed, 3 Sep 2014 21:14:24 -0700 Subject: this is turning into a wretched mess. It's going to get worse before it gets better, but I'm trying to do this incrementally so I don't break the whole shebang for a few days. It will get better once all the bbcode translation is done in a single place (cross fingers), and we can just sign the post once when we submit it and be done with it. If Diaspora ever implements editing of existing posts we'll have to go back and do the whole wretched mess over again. --- include/bb2diaspora.php | 268 ++++++++++++++---------------------------------- include/diaspora.php | 31 ++++-- 2 files changed, 99 insertions(+), 200 deletions(-) diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 623b2d7b7..622f239ad 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -233,6 +233,75 @@ function diaspora_ol($s) { return preg_replace("/\[\\\\\*\]( *)/", "1. ", $s[1]); } +function bb2dmention_callback($match) { + + $r = q("select xchan_addr from xchan where xchan_url = '%s'", + dbesc($match[2]) + ); + + if($r) + return '@{' . $match[3] . ' ; ' . $r[0]['xchan_addr'] . '}'; + return '@' . $match[3]; + +} + + + +function bb2diaspora_itembody($item) { + + if($item['diaspora_meta']) { + $j = json_decode($item['diaspora_meta'],true); + if($j && $j['body']) { + return $j['body']; + } + } + + if(array_key_exists('item_flags',$item) && ($item['item_flags'] & ITEM_OBSCURED)) { + $key = get_config('system','prvkey'); + $title = (($item['title']) ? crypto_unencapsulate(json_decode($item['title'],true),$key) : ''); + $body = (($item['body']) ? crypto_unencapsulate(json_decode($item['body'],true),$key) : ''); + } + + $body = preg_replace('/\#\^http/i', 'http', $body); + + // protect tags and mentions from hijacking + + if(intval(get_pconfig($item['uid'],'system','prevent_tag_hijacking'))) { + $new_tag = html_entity_decode('⋕',ENT_COMPAT,'UTF-8'); + $new_mention = html_entity_decode('＠',ENT_COMPAT,'UTF-8'); + + // #-tags + $body = preg_replace('/\#\[url/i', $new_tag . '[url', $body); + $body = preg_replace('/\#\[zrl/i', $new_tag . '[zrl', $body); + // @-mentions + $body = preg_replace('/\@\!?\[url/i', $new_mention . '[url', $body); + $body = preg_replace('/\@\!?\[zrl/i', $new_mention . '[zrl', $body); + } + + // remove multiple newlines + do { + $oldbody = $body; + $body = str_replace("\n\n\n", "\n\n", $body); + } while ($oldbody != $body); + + $body = bb2diaspora($body); + + if(strlen($title)) + $body = "## " . $title . "\n\n" . $body; + + if($item['attach']) { + $cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism',$item['attach'],$matches,PREG_SET_ORDER); + if(cnt) { + $body .= "\n" . t('Attachments:') . "\n"; + foreach($matches as $mtch) { + $body .= '[' . $mtch[3] . '](' . $mtch[1] . ')' . "\n"; + } + } + } + + return html_entity_decode($body); + +} function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) { @@ -243,10 +312,17 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) { /** * Transform #tags, strip off the [url] and replace spaces with underscore */ - $Text = preg_replace_callback('/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', create_function('$match', - 'return \'#\'. str_replace(\' \', \'_\', $match[2]);' + $Text = preg_replace_callback('/#\[([zu])rl\=(\w+.*?)\](\w+.*?)\[\/[(zu)]rl\]/i', create_function('$match', + 'return \'#\'. str_replace(\' \', \'_\', $match[3]);' ), $Text); + $Text = preg_replace_callback('/#\^\[([zu])rl\=(\w+.*?)\](\w+.*?)\[\/[(zu)]rl\]/i', create_function('$match', + 'return str_replace(\' \', \'_\', $match[3]);' + ), $Text); + + + $Text = preg_replace_callback('/\@\!?\[([zu])rl\=(\w+.*?)\](\w+.*?)\[\/([zu])rl\]/i', 'bb2dmention_callback', $Text); + // Converting images with size parameters to simple images. Markdown doesn't know it. $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $Text); @@ -274,195 +350,9 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) { // Remove all unconverted tags $Text = strip_tags($Text); - -/* Old routine - - $ev = bbtoevent($Text); - - // Replace any html brackets with HTML Entities to prevent executing HTML or script - // Don't use strip_tags here because it breaks [url] search by replacing & with amp - - $Text = str_replace("<", "<", $Text); - $Text = str_replace(">", ">", $Text); - - // If we find any event code, turn it into an event. - // After we're finished processing the bbcode we'll - // replace all of the event code with a reformatted version. - - if($preserve_nl) - $Text = str_replace(array("\n","\r"), array('',''),$Text); - else - // Remove the "return" character, as Diaspora uses only the "newline" - // character, so having the "return" character can cause signature - // failures - $Text = str_replace("\r", "", $Text); - - - // Set up the parameters for a URL search string - $URLSearchString = "^\[\]"; - // Set up the parameters for a MAIL search string - $MAILSearchString = $URLSearchString; - - // Perform URL Search - - // [img]pathtoimage[/img] - - // the following was added on 10-January-2012 due to an inability of Diaspora's - // new javascript markdown processor to handle links with images as the link "text" - // It is not optimal and may be removed if this ability is restored in the future - - $Text = preg_replace("/\[url\=([$URLSearchString]*)\]\[img\](.*?)\[\/img\]\[\/url\]/ism", - '![' . t('image/photo') . '](' . '$2' . ')' . "\n" . '[' . t('link') . '](' . '$1' . ')', $Text); - - $Text = preg_replace("/\[bookmark\]([$URLSearchString]*)\[\/bookmark\]/ism", '[$1]($1)', $Text); - $Text = preg_replace("/\[bookmark\=([$URLSearchString]*)\](.*?)\[\/bookmark\]/ism", '[$2]($1)', $Text); - - $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '[$1]($1)', $Text); - $Text = preg_replace("/\#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[#$2]($1)', $Text); - $Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '[$2]($1)', $Text); - - - $Text = preg_replace("/\[img\](.*?)\[\/img\]/", '![' . t('image/photo') . '](' . '$1' . ')', $Text); - $Text = preg_replace("/\[img\=(.*?)\](.*?)\[\/img\]/", '![' . t('image/photo') . '](' . '$2' . ')', $Text); - - $Text = preg_replace("/\[zrl\]([$URLSearchString]*)\[\/zrl\]/ism", '[$1]($1)', $Text); - $Text = preg_replace("/\#\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '[#$2]($1)', $Text); - $Text = preg_replace("/\[zrl\=([$URLSearchString]*)\](.*?)\[\/zrl\]/ism", '[$2]($1)', $Text); - - - $Text = preg_replace("/\[zmg\](.*?)\[\/zmg\]/", '![' . t('image/photo') . '](' . '$1' . ')', $Text); - $Text = preg_replace("/\[zmg\=(.*?)\](.*?)\[\/zmg\]/", '![' . t('image/photo') . '](' . '$2' . ')', $Text); - - // Perform MAIL Search - $Text = preg_replace("(\[mail\]([$MAILSearchString]*)\[/mail\])", '[$1](mailto:$1)', $Text); - $Text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.*?)\[\/mail\]/", '[$2](mailto:$1)', $Text); - - $Text = str_replace('*', '\\*', $Text); - $Text = str_replace('_', '\\_', $Text); - - $Text = str_replace('`','\\`', $Text); - - // Check for bold text - $Text = preg_replace("(\[b\](.*?)\[\/b\])is",'**$1**',$Text); - - // Check for italics text - $Text = preg_replace("(\[i\](.*?)\[\/i\])is",'_$1_',$Text); - - // Check for underline text - // Replace with italics since Diaspora doesn't have underline - $Text = preg_replace("(\[u\](.*?)\[\/u\])is",'_$1_',$Text); - - // Check for strike-through text - $Text = preg_replace("(\[s\](.*?)\[\/s\])is",'**[strike]**$1**[/strike]**',$Text); - - // Check for over-line text -// $Text = preg_replace("(\[o\](.*?)\[\/o\])is",'$1',$Text); - - // Check for colored text - // Remove color since Diaspora doesn't support it - $Text = preg_replace("(\[color=(.*?)\](.*?)\[\/color\])is","$2",$Text); - - // Check for sized text - // Remove it since Diaspora doesn't support sizes very well - $Text = preg_replace("(\[size=(.*?)\](.*?)\[\/size\])is","$2",$Text); - - // Check for list text - $endlessloop = 0; - while ((((strpos($Text, "[/list]") !== false) && (strpos($Text, "[list") !== false)) || - ((strpos($Text, "[/ol]") !== false) && (strpos($Text, "[ol]") !== false)) || - ((strpos($Text, "[/ul]") !== false) && (strpos($Text, "[ul]") !== false)) || - ((strpos($Text, "[/li]") !== false) && (strpos($Text, "[li]") !== false))) && (++$endlessloop < 20)) { - $Text = preg_replace_callback("/\[list\](.*?)\[\/list\]/is", 'diaspora_ul', $Text); - $Text = preg_replace_callback("/\[list=1\](.*?)\[\/list\]/is", 'diaspora_ol', $Text); - $Text = preg_replace_callback("/\[list=i\](.*?)\[\/list\]/s",'diaspora_ol', $Text); - $Text = preg_replace_callback("/\[list=I\](.*?)\[\/list\]/s", 'diaspora_ol', $Text); - $Text = preg_replace_callback("/\[list=a\](.*?)\[\/list\]/s", 'diaspora_ol', $Text); - $Text = preg_replace_callback("/\[list=A\](.*?)\[\/list\]/s", 'diaspora_ol', $Text); - $Text = preg_replace_callback("/\[ul\](.*?)\[\/ul\]/is", 'diaspora_ul', $Text); - $Text = preg_replace_callback("/\[ol\](.*?)\[\/ol\]/is", 'diaspora_ol', $Text); - $Text = preg_replace("/\[li\]( *)(.*?)\[\/li\]/s", '* $2' ,$Text); - } - - // Just get rid of table tags since Diaspora doesn't support tables - $Text = preg_replace("/\[th\](.*?)\[\/th\]/s", '$1' ,$Text); - $Text = preg_replace("/\[td\](.*?)\[\/td\]/s", '$1' ,$Text); - $Text = preg_replace("/\[tr\](.*?)\[\/tr\]/s", '$1' ,$Text); - $Text = preg_replace("/\[table\](.*?)\[\/table\]/s", '$1' ,$Text); - - $Text = preg_replace("/\[table border=(.*?)\](.*?)\[\/table\]/s", '$2' ,$Text); -// $Text = preg_replace("/\[table border=0\](.*?)\[\/table\]/s", '$1
' ,$Text); - - -// $Text = str_replace("[*]", "
  • ", $Text); - - // Check for font change text -// $Text = preg_replace("(\[font=(.*?)\](.*?)\[\/font\])","$2",$Text); - - - $Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/is",'stripdcode_br_cb',$Text); - - // Check for [code] text - $Text = preg_replace("/(\[code\])+(.*?)(\[\/code\])+/is","\t$2\n", $Text); - - - - - // Declare the format for [quote] layout - // $QuoteLayout = '
    $1
    '; - // Check for [quote] text - $Text = preg_replace("/\[quote\](.*?)\[\/quote\]/is",">$1\n\n", $Text); - $Text = preg_replace("/\[quote=(.*?)\](.*?)\[\/quote\]/is",">$2\n\n", $Text); - - // Images - - // html5 video and audio - - $Text = preg_replace("/\[video\](.*?)\[\/video\]/", '$1', $Text); - - $Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '$1', $Text); - -// $Text = preg_replace("/\[iframe\](.*?)\[\/iframe\]/", '', $Text); - - // [img=widthxheight]image source[/img] -// $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/", '', $Text); - - $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/ism",'http://www.youtube.com/watch?v=$1',$Text); - $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/embed\/(.*?)\[\/youtube\]/ism",'http://www.youtube.com/watch?v=$1',$Text); - $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/ism",'http://www.youtube.com/watch?v=$1',$Text); - $Text = preg_replace("/\[youtube\]([A-Za-z0-9\-_=]+)(.*?)\[\/youtube\]/ism", 'http://www.youtube.com/watch?v=$1', $Text); - - $Text = preg_replace("/\[vimeo\]https?:\/\/player.vimeo.com\/video\/([0-9]+)(.*?)\[\/vimeo\]/ism",'http://vimeo.com/$1',$Text); - $Text = preg_replace("/\[vimeo\]https?:\/\/vimeo.com\/([0-9]+)(.*?)\[\/vimeo\]/ism",'http://vimeo.com/$1',$Text); - $Text = preg_replace("/\[vimeo\]([0-9]+)(.*?)\[\/vimeo\]/ism", 'http://vimeo.com/$1',$Text); - - - $Text = str_replace('[nosmile]','',$Text); - - // oembed tag - // $Text = oembed_bbcode2html($Text); - - // If we found an event earlier, strip out all the event code and replace with a reformatted version. - - if(x($ev,'start')) { - - $sub = format_event_diaspora($ev); - - $Text = preg_replace("/\[event\-summary\](.*?)\[\/event\-summary\]/is",'',$Text); - $Text = preg_replace("/\[event\-description\](.*?)\[\/event\-description\]/is",'',$Text); - $Text = preg_replace("/\[event\-start\](.*?)\[\/event\-start\]/is",$sub,$Text); - $Text = preg_replace("/\[event\-finish\](.*?)\[\/event\-finish\]/is",'',$Text); - $Text = preg_replace("/\[event\-location\](.*?)\[\/event\-location\]/is",'',$Text); - $Text = preg_replace("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",'',$Text); - } - - $Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text); - - $Text = preg_replace_callback('/\[(.*?)\]\((.*?)\)/ism','unescape_underscores_in_links',$Text); - -*/ - // Remove any leading or trailing whitespace, as this will mess up // the Diaspora signature verification and cause the item to disappear + $Text = trim($Text); call_hooks('bb2diaspora',$Text); diff --git a/include/diaspora.php b/include/diaspora.php index fabcafa79..ae2c1184a 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -2278,20 +2278,29 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { $body = str_replace("\n\n\n", "\n\n", $body); } while ($oldbody != $body); + if($item['diaspora_meta']) { + $j = json_decode($item['diaspora_meta'],true); + if($j && $j['body']) { + $body = xmlify($j['body']); + } + } + else { + $body = xmlify(html_entity_decode(bb2diaspora($body))); - // convert to markdown - $body = xmlify(html_entity_decode(bb2diaspora($body))); - // Adding the title - if(strlen($title)) - $body = "## ".html_entity_decode($title)."\n\n".$body; + // convert to markdown - if($item['attach']) { - $cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism',$item['attach'],$matches,PREG_SET_ORDER); - if(cnt) { - $body .= "\n" . t('Attachments:') . "\n"; - foreach($matches as $mtch) { - $body .= '[' . $mtch[3] . '](' . $mtch[1] . ')' . "\n"; + // Adding the title + if(strlen($title)) + $body = "## ".html_entity_decode($title)."\n\n".$body; + + if($item['attach']) { + $cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism',$item['attach'],$matches,PREG_SET_ORDER); + if(cnt) { + $body .= "\n" . t('Attachments:') . "\n"; + foreach($matches as $mtch) { + $body .= '[' . $mtch[3] . '](' . $mtch[1] . ')' . "\n"; + } } } } -- cgit v1.2.3 From 6ad9d9f8454b1a44800a406d9eeaaa45ed10e8da Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 3 Sep 2014 22:00:18 -0700 Subject: sort out some of the bb2d madness --- include/bb2diaspora.php | 8 ++--- include/diaspora.php | 89 +++++++++++++------------------------------------ 2 files changed, 27 insertions(+), 70 deletions(-) diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 622f239ad..9c8c05aeb 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -252,6 +252,7 @@ function bb2diaspora_itembody($item) { if($item['diaspora_meta']) { $j = json_decode($item['diaspora_meta'],true); if($j && $j['body']) { + logger('bb2diaspora_itembody: cached '); return $j['body']; } } @@ -299,6 +300,8 @@ function bb2diaspora_itembody($item) { } } + logger('bb2diaspora_itembody : ' . $body); + return html_entity_decode($body); } @@ -316,10 +319,7 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) { 'return \'#\'. str_replace(\' \', \'_\', $match[3]);' ), $Text); - $Text = preg_replace_callback('/#\^\[([zu])rl\=(\w+.*?)\](\w+.*?)\[\/[(zu)]rl\]/i', create_function('$match', - 'return str_replace(\' \', \'_\', $match[3]);' - ), $Text); - + $Text = preg_replace('/#\^\[([zu])rl\=(\w+.*?)\](\w+.*?)\[\/([zu])rl\]/i', '[$1rl=$2]$3[/$4rl]', $Text); $Text = preg_replace_callback('/\@\!?\[([zu])rl\=(\w+.*?)\](\w+.*?)\[\/([zu])rl\]/i', 'bb2dmention_callback', $Text); diff --git a/include/diaspora.php b/include/diaspora.php index ae2c1184a..0b598ffb2 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -2224,7 +2224,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { $images = array(); $title = $item['title']; - $body = $item['body']; + $body = bb2diaspora_itembody($item); /* // We're trying to match Diaspora's split message/photo protocol but @@ -2250,61 +2250,6 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { */ - $body = str_ireplace("[quote", "\n\n[quote", $body); - $body = str_ireplace("[/quote]", "[/quote]\n\n", $body); - - // strip bookmark indicators - - $body = preg_replace('/\#\^\[([zu])rl/i', '[$1rl', $body); - $body = preg_replace('/\#\^http/i', 'http', $body); - - // protect tags and mentions from hijacking - - if(! intval(get_pconfig($owner['channel_id'],'system','allow_tag_hijacking'))) { - $new_tag = html_entity_decode('⋕',ENT_COMPAT,'UTF-8'); - $new_mention = html_entity_decode('＠',ENT_COMPAT,'UTF-8'); - - // #-tags - $body = preg_replace('/\#\[url/i', $new_tag . '[url', $body); - $body = preg_replace('/\#\[zrl/i', $new_tag . '[zrl', $body); - // @-mentions - $body = preg_replace('/\@\[url/i', $new_mention . '[url', $body); - $body = preg_replace('/\@\[zrl/i', $new_mention . '[zrl', $body); - } - - // remove multiple newlines - do { - $oldbody = $body; - $body = str_replace("\n\n\n", "\n\n", $body); - } while ($oldbody != $body); - - if($item['diaspora_meta']) { - $j = json_decode($item['diaspora_meta'],true); - if($j && $j['body']) { - $body = xmlify($j['body']); - } - } - else { - $body = xmlify(html_entity_decode(bb2diaspora($body))); - - - // convert to markdown - - // Adding the title - if(strlen($title)) - $body = "## ".html_entity_decode($title)."\n\n".$body; - - if($item['attach']) { - $cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism',$item['attach'],$matches,PREG_SET_ORDER); - if(cnt) { - $body .= "\n" . t('Attachments:') . "\n"; - foreach($matches as $mtch) { - $body .= '[' . $mtch[3] . '](' . $mtch[1] . ')' . "\n"; - } - } - } - } - $public = (($item['item_private']) ? 'false' : 'true'); require_once('include/datetime.php'); @@ -2326,7 +2271,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) { } else { $tpl = get_markup_template('diaspora_post.tpl'); $msg = replace_macros($tpl, array( - '$body' => $body, + '$body' => xmlify($body), '$guid' => $item['mid'], '$handle' => xmlify($myaddr), '$public' => $public, @@ -2480,16 +2425,28 @@ function diaspora_send_followup($item,$owner,$contact,$public_batch = false) { $like = false; } - $text = html_entity_decode(bb2diaspora($item['body'])); + if($item['diaspora_meta'] && ! $like) { + $j = json_decode($item['diaspora_meta'],true); + if($j) { + $signed_text = $j['signed_text']; + $text = $j['body']; + $signer = $j['signer']; + $authorsig = $j['signature']; + } + } + else { + $text = bb2diaspora_itembody($item); + + // sign it - // sign it + if($like) + $signed_text = $item['mid'] . ';' . $target_type . ';' . $parent['mid'] . ';' . $positive . ';' . $myaddr; + else + $signed_text = $item['mid'] . ';' . $parent['mid'] . ';' . $text . ';' . $myaddr; - if($like) - $signed_text = $item['mid'] . ';' . $target_type . ';' . $parent['mid'] . ';' . $positive . ';' . $myaddr; - else - $signed_text = $item['mid'] . ';' . $parent['mid'] . ';' . $text . ';' . $myaddr; + $authorsig = base64_encode(rsa_sign($signed_text,$owner['channel_prvkey'],'sha256')); - $authorsig = base64_encode(rsa_sign($signed_text,$owner['channel_prvkey'],'sha256')); + } $msg = replace_macros($tpl,array( '$guid' => xmlify($item['mid']), @@ -2516,9 +2473,9 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) { $a = get_app(); $myaddr = $owner['channel_address'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); + $text = bb2diaspora_itembody($item); - $body = $item['body']; - $text = html_entity_decode(bb2diaspora($body)); + $body = $text; // Diaspora doesn't support threaded comments, but some // versions of Diaspora (i.e. Diaspora-pistos) support -- cgit v1.2.3 From ed3310ada6cdc4b554ce1be4542ca25a3dd5bce0 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 3 Sep 2014 22:15:44 -0700 Subject: remove feed items from ACL selector - there's nothing we can do with them and if we were to try we'd have to binary pack all the hashes --- mod/acl.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mod/acl.php b/mod/acl.php index fa399a9b5..5658a05c5 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -225,6 +225,11 @@ function acl_init(&$a){ if(count($r)) { foreach($r as $g){ + + // remove RSS feeds from ACLs - they are inaccessible + if(strpos($g['hash'],'/')) + continue; + if(($g['abook_their_perms'] & PERMS_W_TAGWALL) && $type == 'c') { $contacts[] = array( "type" => "c", -- cgit v1.2.3 From 1659e0e7ad5511bb2f1d786b5dd5dd10000eabf7 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 3 Sep 2014 22:52:38 -0700 Subject: update docs as D* members should now be able to participate in redmatrix forums. They will need to plus-tag the forum. There may still be minor issues, but nothing fundamentally at odds with this working. --- doc/diaspora_compat.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/diaspora_compat.md b/doc/diaspora_compat.md index fd7c7f950..9b3e56383 100644 --- a/doc/diaspora_compat.md +++ b/doc/diaspora_compat.md @@ -29,9 +29,9 @@ Tags are converted into "un-hijackable" tags by default and will link back to yo Community tags will not work. We will send a tagging activity as a comment. It won't do anything. -Forum tags (@forum+) and privacy tags (@!somebody) will not be available to Diaspora members. These tags may have to be stripped or obscured to prevent them from being hijacked - which could result in privacy issues. +Privacy tags (@!somebody) will not be available to Diaspora members. These tags may have to be stripped or obscured to prevent them from being hijacked - which could result in privacy issues. -It is possible for a Diaspora member to become a member of a forum, but they cannot initiate conversations. This requires the ability to plus-tag the channel or authenticate to post on the channel wall. Once a conversation is initiated, Diaspora members can comment and take part in the dicussion. +Plus-tagged redmatrix forums should work from Diaspora. If not today, it's very close to working. Premium channel redirects will not be sent. If you allow Diaspora connections, they will not see that you have a premium channel. -- cgit v1.2.3 From ca2bf76b06360d6bd3dc386d53c6d7301cd518f3 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 4 Sep 2014 01:13:01 -0700 Subject: allow stuff with Diaspora authors to federate in zot conversations even if the local site has diaspora disabled. This way it won't look like folks are talking to themselves. --- include/follow.php | 6 ++++++ include/items.php | 17 +++++++++++++++++ include/network.php | 2 +- version.inc | 2 +- 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/include/follow.php b/include/follow.php index e6c42aad1..058f5d60b 100644 --- a/include/follow.php +++ b/include/follow.php @@ -118,6 +118,12 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) } } else { + if(! ($is_http)) { + if(! intval(get_config('system','diaspora_enabled'))) { + $result['message'] = t('Protocol disabled.'); + return $result; + } + } $my_perms = 0; $their_perms = 0; diff --git a/include/items.php b/include/items.php index 9d80b3a81..acdae90b2 100755 --- a/include/items.php +++ b/include/items.php @@ -871,6 +871,8 @@ function import_author_xchan($x) { if((! array_key_exists('network', $x)) || ($x['network'] === 'zot')) { $y = import_author_zot($x); } + if(! $y) + $y = import_author_diaspora($x); if($x['network'] === 'rss') { $y = import_author_rss($x); @@ -879,6 +881,21 @@ function import_author_xchan($x) { return(($y) ? $y : false); } + +function import_author_diaspora($x) { + if(! $x['address']) + return false; + if(discover_by_webbie($x['address'])) { + $r = q("select xchan_hash from xchan where xchan_addr = '%s' limit 1", + dbesc($x['address']) + ); + if($r) + return $r[0]['xchan_hash']; + } + return false; +} + + function import_author_rss($x) { if(! $x['url']) diff --git a/include/network.php b/include/network.php index 5ca60b5fe..5ad391491 100644 --- a/include/network.php +++ b/include/network.php @@ -1033,7 +1033,7 @@ function discover_by_webbie($webbie) { } } - if($diaspora && $diaspora_base && $diaspora_guid && intval(get_config('system','diaspora_enabled'))) { + if($diaspora && $diaspora_base && $diaspora_guid) { $guid = $diaspora_guid; $diaspora_base = trim($diaspora_base,'/'); diff --git a/version.inc b/version.inc index f8b14f55a..ae902fed0 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-09-03.787 +2014-09-04.788 -- cgit v1.2.3 From 1102499c71f42ca06e5ddfab304dec0d12e9d629 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 4 Sep 2014 16:09:52 -0700 Subject: realm detection logic reversed --- include/zot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/zot.php b/include/zot.php index 6ccee8c39..a53b39663 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1024,7 +1024,7 @@ function import_xchan($arr,$ud_flags = UPDATE_FLAGS_UPDATED, $ud_arr = null) { $realm = get_directory_realm(); if(array_key_exists('site',$arr) && array_key_exists('realm',$arr['site']) - && (strpos($arr['site']['realm'],$realm) !== false)) + && (strpos($arr['site']['realm'],$realm) === false)) $other_realm = true; if($dirmode != DIRECTORY_MODE_NORMAL) { -- cgit v1.2.3 From d1dfddbe80fb7d8415e50d387c4010b14869b7e6 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 4 Sep 2014 16:51:24 -0700 Subject: allow feeds to be sourced --- include/follow.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/follow.php b/include/follow.php index 058f5d60b..18a9e66ea 100644 --- a/include/follow.php +++ b/include/follow.php @@ -221,7 +221,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) intval($uid), dbesc($xchan_hash), intval(($is_http) ? ABOOK_FLAG_FEED : 0), - intval($their_perms), + intval(($is_http) ? $their_perms|PERMS_R_STREAM|PERMS_A_REPUBLISH : $their_perms), intval($my_perms), dbesc(datetime_convert()), dbesc(datetime_convert()) -- cgit v1.2.3 From 50c137d152f0e0df3a7912ba361c68dc5de13565 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 4 Sep 2014 17:51:24 -0700 Subject: constrain photos to a fixed block regardless of aspect ratio --- view/theme/redbasic/css/style.css | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 0f2949a49..5ff32ff58 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -660,11 +660,33 @@ aside li { } .photo-top-photo, .photo-album-photo { - padding: 10px; + /* padding: 10px; max-width: 300px; border: 1px solid #888888; +*/ + position: absolute; + display: block; + max-width: 100%; + max-height: 100%; + left: 0; + right: 0; + top: 0; + bottom: 0; + margin: auto; } +.photo-top-image-wrapper, .photo-album-image-wrapper { + width: 300px; +} + +.photo-top-photo-link, .photo-album-photo-link { + display: block; + width: 100%; + position: relative; + height: 0; + padding: 75% 0 0 0; + overflow: hidden; +} .photo-album-image-wrapper .caption { background-color: $acpopup_bgcolour; -- cgit v1.2.3 From e426f48a26542a169fc8e574491d5eaaa0258476 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 4 Sep 2014 18:06:59 -0700 Subject: oops forgot about the privacy exclusion --- include/items.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/include/items.php b/include/items.php index acdae90b2..297a62fb4 100755 --- a/include/items.php +++ b/include/items.php @@ -2938,9 +2938,6 @@ function start_delivery_chain($channel,$item,$item_id,$parent) { function check_item_source($uid,$item) { - if($item['item_private']) - return false; - $r = q("select * from source where src_channel_id = %d and ( src_xchan = '%s' || src_xchan = '*' ) limit 1", intval($uid), @@ -2950,7 +2947,7 @@ function check_item_source($uid,$item) { if(! $r) return false; - $x = q("select abook_their_perms from abook where abook_channel = %d and abook_xchan = '%s' limit 1", + $x = q("select abook_their_perms, abook_flags from abook where abook_channel = %d and abook_xchan = '%s' limit 1", intval($uid), dbesc($item['owner_xchan']) ); @@ -2961,6 +2958,10 @@ function check_item_source($uid,$item) { if(! ($x[0]['abook_their_perms'] & PERMS_A_REPUBLISH)) return false; + if($item['item_private'] && (! ($x[0]['abook_flags'] & ABOOK_FLAG_FEED))) + return false; + + if($r[0]['src_channel_xchan'] === $item['owner_xchan']) return false; -- cgit v1.2.3 From 955567fe5f517ec90623a4bf7f652fe2e02e1271 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 4 Sep 2014 18:52:37 -0700 Subject: unset item_nocomment when starting a new delivery chain --- include/items.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index 297a62fb4..c96a5e4ed 100755 --- a/include/items.php +++ b/include/items.php @@ -2844,7 +2844,6 @@ function tgroup_check($uid,$item) { function start_delivery_chain($channel,$item,$item_id,$parent) { - // Change this copy of the post to a forum head message and deliver to all the tgroup members // also reset all the privacy bits to the forum default permissions @@ -2858,6 +2857,11 @@ function start_delivery_chain($channel,$item,$item_id,$parent) { $flag_bits = $item['item_flags'] | ITEM_WALL|ITEM_ORIGIN; + // unset the nocomment bit if it's there. + + if($flag_bits & ITEM_NOCOMMENT) + $flag_bits = $flag_bits ^ ITEM_NOCOMMENT; + // maintain the original source, which will be the original item owner and was stored in source_xchan // when we created the delivery fork @@ -2944,6 +2948,7 @@ function check_item_source($uid,$item) { dbesc(($item['source_xchan']) ? $item['source_xchan'] : $item['owner_xchan']) ); + if(! $r) return false; @@ -2951,10 +2956,12 @@ function check_item_source($uid,$item) { intval($uid), dbesc($item['owner_xchan']) ); + if(! $x) return false; + if(! ($x[0]['abook_their_perms'] & PERMS_A_REPUBLISH)) return false; -- cgit v1.2.3 From 1e5e70fcf4a223601db8f8973626cce1efd6bc28 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 4 Sep 2014 19:15:01 -0700 Subject: import_author_rss not succeeding, missing url --- include/items.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/include/items.php b/include/items.php index c96a5e4ed..44d4abdf8 100755 --- a/include/items.php +++ b/include/items.php @@ -910,9 +910,10 @@ function import_author_rss($x) { } $name = trim($x['name']); - $r = q("insert into xchan ( xchan_hash, xchan_url, xchan_name, xchan_network ) - values ( '%s', '%s', '%s', '%s' )", - dbesc($x['url']), + $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_url, xchan_name, xchan_network ) + values ( '%s', '%s', '%s', '%s', '%s' )", + dbesc($x['guid']), + dbesc($x['guid']), dbesc($x['url']), dbesc(($name) ? $name : t('(Unknown)')), dbesc('rss') @@ -1068,7 +1069,7 @@ function encode_item_xchan($xchan) { $ret = array(); $ret['name'] = $xchan['xchan_name']; $ret['address'] = $xchan['xchan_addr']; - $ret['url'] = $xchan['hubloc_url']; + $ret['url'] = (($xchan['hubloc_url']) ? $xchan['hubloc_url'] : $xchan['xchan_url']); $ret['network'] = $xchan['xchan_network']; $ret['photo'] = array('mimetype' => $xchan['xchan_photo_mimetype'], 'src' => $xchan['xchan_photo_m']); $ret['guid'] = $xchan['xchan_guid']; -- cgit v1.2.3 From ad58fe893db1335ac6a4f6ef45e7e8e32595042e Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 4 Sep 2014 19:34:27 -0700 Subject: fix poco network --- mod/poco.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mod/poco.php b/mod/poco.php index 9295f13de..c1696e4cd 100644 --- a/mod/poco.php +++ b/mod/poco.php @@ -167,8 +167,11 @@ function poco_init(&$a) { $entry['displayName'] = $rr['xchan_name']; if($fields_ret['urls']) { $entry['urls'] = array(array('value' => $rr['xchan_url'], 'type' => 'profile')); + $network = $rr['xchan_network']; + if(strpos($network,'friendica') !== false) + $network = 'friendica'; if($rr['xchan_addr']) - $entry['urls'][] = array('value' => 'acct:' . $rr['xchan_addr'], 'type' => 'zot'); + $entry['urls'][] = array('value' => 'acct:' . $rr['xchan_addr'], 'type' => $network); } if($fields_ret['preferredUsername']) $entry['preferredUsername'] = substr($rr['xchan_addr'],0,strpos($rr['xchan_addr'],'@')); -- cgit v1.2.3 From 80f956a6223ad0a32c6b0e9b05a6075a71206aa5 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 4 Sep 2014 19:45:26 -0700 Subject: fix the client side of poco --- include/socgraph.php | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/include/socgraph.php b/include/socgraph.php index e12da5862..dc401ff34 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -123,7 +123,8 @@ function poco_load($xchan = '',$url = null) { $profile_url = $url['value']; continue; } - if($url['type'] == 'zot') { + if($url['type'] == 'zot' || $url['type'] == 'diaspora' || $url['type'] == 'friendica') { + $network = $url['type']; $address = str_replace('acct:' , '', $url['value']); continue; } @@ -151,17 +152,25 @@ function poco_load($xchan = '',$url = null) { if(($x !== false) && (! count($x))) { if($address) { - $z = zot_finger($address,null); - if($z['success']) { - $j = json_decode($z['body'],true); - if($j) - import_xchan($j); + if($network === 'zot') { + $z = zot_finger($address,null); + if($z['success']) { + $j = json_decode($z['body'],true); + if($j) + import_xchan($j); + } + $x = q("select xchan_hash from xchan where xchan_hash = '%s' limit 1", + dbesc($hash) + ); + if(! $x) { + continue; + } } - $x = q("select xchan_hash from xchan where xchan_hash = '%s' limit 1", - dbesc($hash) - ); - if(! $x) { - continue; + else { + $x = import_author_diaspora($address); + if(! $x) { + continue; + } } } else { -- cgit v1.2.3 From d71e304b150f500af60c215e9772f94b9a9f300b Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 4 Sep 2014 21:18:47 -0700 Subject: this improves the photos even more --- view/theme/redbasic/css/style.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5ff32ff58..bcbaec3d0 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -666,8 +666,8 @@ aside li { */ position: absolute; display: block; - max-width: 100%; - max-height: 100%; +/* max-width: 100%; + max-height: 100%; */ left: 0; right: 0; top: 0; @@ -676,7 +676,7 @@ aside li { } .photo-top-image-wrapper, .photo-album-image-wrapper { - width: 300px; + width: 240px; } .photo-top-photo-link, .photo-album-photo-link { -- cgit v1.2.3 From c7370df1cf1185084f2192453f680b557dfba9c7 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 4 Sep 2014 21:27:13 -0700 Subject: bb2diaspora_itembody - empty body, that explains a lot --- include/bb2diaspora.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 9c8c05aeb..5fb708706 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -257,6 +257,8 @@ function bb2diaspora_itembody($item) { } } + $body = $item['body']; + if(array_key_exists('item_flags',$item) && ($item['item_flags'] & ITEM_OBSCURED)) { $key = get_config('system','prvkey'); $title = (($item['title']) ? crypto_unencapsulate(json_decode($item['title'],true),$key) : ''); -- cgit v1.2.3 From 92e4448993ed22e155f2ada3658f1e2378e271cc Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 4 Sep 2014 22:30:12 -0700 Subject: put a date and time picker on events --- mod/events.php | 34 ++++++++++++++++--- view/tpl/event_form.tpl | 88 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 116 insertions(+), 6 deletions(-) diff --git a/mod/events.php b/mod/events.php index 02a9d1ed9..f3bf97141 100755 --- a/mod/events.php +++ b/mod/events.php @@ -14,6 +14,10 @@ function events_post(&$a) { $event_id = ((x($_POST,'event_id')) ? intval($_POST['event_id']) : 0); $xchan = ((x($_POST,'xchan')) ? dbesc($_POST['xchan']) : ''); $uid = local_user(); + + $start_text = escape_tags($_REQUEST['start_text']); + $finish_text = escape_tags($_REQUEST['finish_text']); + $startyear = intval($_POST['startyear']); $startmonth = intval($_POST['startmonth']); $startday = intval($_POST['startday']); @@ -37,12 +41,23 @@ function events_post(&$a) { // The default setting for the `private` field in event_store() is false, so mirror that $private_event = false; + if($start_text) { + $start = $start_text; + } + else { + $start = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute); + } - $start = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute); - if($nofinish) + if($nofinish) { $finish = '0000-00-00 00:00:00'; - else - $finish = sprintf('%d-%d-%d %d:%d:0',$finishyear,$finishmonth,$finishday,$finishhour,$finishminute); + } + + if($finish_text) { + $finish = $finish_text; + } + else { + $finish = sprintf('%d-%d-%d %d:%d:0',$finishyear,$finishmonth,$finishday,$finishhour,$finishminute); + } if($adjust) { $start = datetime_convert(date_default_timezone_get(),'UTC',$start); @@ -451,8 +466,10 @@ function events_content(&$a) { $smonth = datetime_convert('UTC', $tz, $sdt, 'm'); $sday = datetime_convert('UTC', $tz, $sdt, 'd'); + $shour = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'H') : 0); $sminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'i') : 0); + $stext = datetime_convert('UTC',$tz,$sdt); $fyear = datetime_convert('UTC', $tz, $fdt, 'Y'); $fmonth = datetime_convert('UTC', $tz, $fdt, 'm'); @@ -460,6 +477,7 @@ function events_content(&$a) { $fhour = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'H') : 0); $fminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'i') : 0); + $ftext = datetime_convert('UTC',$tz,$fdt); $f = get_config('system','event_input_format'); if(! $f) @@ -487,9 +505,15 @@ function events_content(&$a) { '$mid' => $mid, '$title' => t('Event details'), - '$desc' => sprintf( t('Format is %s %s. Starting date and Title are required.'),$dateformat,$timeformat), + '$format_desc' => sprintf( t('Format is %s %s.'),$dateformat,$timeformat), + '$desc' => t('Starting date and Title are required.'), '$s_text' => t('Event Starts:') . ' *', + '$bootstrap' => 1, + '$stext' => $stext, + '$ftext' => $ftext, + '$ModalCANCEL' => t('Cancel'), + '$ModalOK' => t('OK'), '$s_dsel' => datesel($f,'start',$syear+5,$syear,false,$syear,$smonth,$sday), '$s_tsel' => timesel('start',$shour,$sminute), '$n_text' => t('Finish date/time is not known or not relevant'), diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index bfdf4d0b6..611bf6006 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -1,7 +1,8 @@

    {{$title}}

    -{{$desc}} +{{if ! $bootstrap}} +{{$format_desc}} {{/if}}{{$desc}}

    @@ -11,7 +12,11 @@
    {{$s_text}}
    +{{if $bootstrap}} + +{{else}} {{$s_dsel}} {{$s_tsel}} +{{/if}}

    @@ -21,7 +26,11 @@
    {{$f_text}}
    +{{if $bootstrap}} + +{{else}} {{$f_dsel}} {{$f_tsel}} +{{/if}}
    @@ -51,4 +60,81 @@
    + + + + + + + -- cgit v1.2.3 From 4875473c1bf375cf280118b7e5b2eb80e55b8843 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 4 Sep 2014 22:41:02 -0700 Subject: issue #451 - clear gid and cid from network tab if discover is selected --- include/conversation.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index b14e609dd..c346a204c 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1417,7 +1417,7 @@ function network_tabs() { if(! get_config('system','disable_discover_tab')) { $tabs[] = array( 'label' => t('Discover'), - 'url'=>$a->get_baseurl(true) . '/' . $cmd . '?f=&fh=1' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''), + 'url'=>z_root() . '/' . $cmd . '?f=&fh=1' , 'sel'=> $public_active, 'title'=> t('Imported public streams'), ); @@ -1425,14 +1425,14 @@ function network_tabs() { $tabs[] = array( 'label' => t('Commented Order'), - 'url'=>$a->get_baseurl(true) . '/' . $cmd . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''), + 'url'=>z_root() . '/' . $cmd . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''), 'sel'=>$all_active, 'title'=> t('Sort by Comment Date'), ); $tabs[] = array( 'label' => t('Posted Order'), - 'url'=>$a->get_baseurl(true) . '/' . $cmd . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''), + 'url'=>z_root() . '/' . $cmd . '?f=&order=post' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''), 'sel'=>$postord_active, 'title' => t('Sort by Post Date'), ); @@ -1440,7 +1440,7 @@ function network_tabs() { if(feature_enabled(local_user(),'personal_tab')) { $tabs[] = array( 'label' => t('Personal'), - 'url' => $a->get_baseurl(true) . '/' . $cmd . '?f=' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . '&conv=1', + 'url' => z_root() . '/' . $cmd . '?f=' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . '&conv=1', 'sel' => $conv_active, 'title' => t('Posts that mention or involve you'), ); @@ -1449,7 +1449,7 @@ function network_tabs() { if(feature_enabled(local_user(),'new_tab')) { $tabs[] = array( 'label' => t('New'), - 'url' => $a->get_baseurl(true) . '/' . $cmd . '?f=' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . '&new=1' . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''), + 'url' => z_root() . '/' . $cmd . '?f=' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . '&new=1' . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''), 'sel' => $new_active, 'title' => t('Activity Stream - by date'), ); @@ -1458,7 +1458,7 @@ function network_tabs() { if(feature_enabled(local_user(),'star_posts')) { $tabs[] = array( 'label' => t('Starred'), - 'url'=>$a->get_baseurl(true) . '/' . $cmd . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&star=1', + 'url'=>z_root() . '/' . $cmd . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&star=1', 'sel'=>$starred_active, 'title' => t('Favourite Posts'), ); @@ -1468,7 +1468,7 @@ function network_tabs() { if(feature_enabled(local_user(),'spam_filter')) { $tabs[] = array( 'label' => t('Spam'), - 'url'=>$a->get_baseurl(true) . '/network?f=&spam=1', + 'url'=> z_root() . '/network?f=&spam=1', 'sel'=> $spam_active, 'title' => t('Posts flagged as SPAM'), ); -- cgit v1.2.3 From 01a5ac92a8363285f84689274ade0dbda30e5a41 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 4 Sep 2014 23:13:46 -0700 Subject: improved logging if you're using php54 or later --- include/text.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/include/text.php b/include/text.php index 7da6a8f2b..50c68b6b2 100644 --- a/include/text.php +++ b/include/text.php @@ -508,8 +508,14 @@ function logger($msg,$level = 0) { if((! $debugging) || (! $logfile) || ($level > $loglevel)) return; - - @file_put_contents($logfile, datetime_convert() . ':' . session_id() . ' ' . $msg . "\n", FILE_APPEND); + + $where = ''; + if(version_compare(PHP_VERSION,'5.4.0') >= 0) { + $stack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS,2); + $where = basename($stack[0]['file']) . ':' . $stack[0]['line'] . ':' . $stack[1]['function'] . ': '; + } + + @file_put_contents($logfile, datetime_convert() . ':' . session_id() . ' ' . $where . $msg . "\n", FILE_APPEND); return; } -- cgit v1.2.3 From a0b3ddca40e51fc996c983410b1323f227326f08 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 5 Sep 2014 01:58:12 -0700 Subject: doc updates --- doc/html/account_8php.html | 124 ++++++ doc/html/account_8php.js | 5 + doc/html/apw_2php_2style_8php.html | 4 +- doc/html/bb2diaspora_8php.html | 58 ++- doc/html/bb2diaspora_8php.js | 3 + doc/html/boot_8php.html | 56 ++- doc/html/boot_8php.js | 1 + doc/html/crypto_8php.html | 4 +- doc/html/datetime_8php.html | 2 +- doc/html/dba__driver_8php.html | 4 +- doc/html/dir__fns_8php.html | 20 + doc/html/dir__fns_8php.js | 1 + doc/html/extract_8php.html | 4 +- doc/html/globals_0x61.html | 3 + doc/html/globals_0x62.html | 6 + doc/html/globals_0x63.html | 3 + doc/html/globals_0x64.html | 6 + doc/html/globals_0x65.html | 7 +- doc/html/globals_0x66.html | 3 + doc/html/globals_0x69.html | 3 + doc/html/globals_0x73.html | 7 +- doc/html/globals_0x75.html | 6 +- doc/html/globals_func_0x62.html | 6 + doc/html/globals_func_0x63.html | 3 + doc/html/globals_func_0x64.html | 6 + doc/html/globals_func_0x65.html | 3 - doc/html/globals_func_0x66.html | 3 + doc/html/globals_func_0x69.html | 3 + doc/html/globals_func_0x73.html | 7 +- doc/html/globals_func_0x75.html | 6 +- doc/html/globals_vars_0x61.html | 3 + doc/html/include_2apps_8php.html | 29 -- doc/html/include_2apps_8php.js | 1 - doc/html/include_2config_8php.html | 6 +- doc/html/include_2network_8php.html | 36 +- doc/html/include_2network_8php.js | 1 + doc/html/items_8php.html | 98 ++++- doc/html/items_8php.js | 3 + doc/html/language_8php.html | 2 +- doc/html/navtree.js | 18 +- doc/html/navtreeindex0.js | 228 +++++------ doc/html/navtreeindex1.js | 326 ++++++++-------- doc/html/navtreeindex2.js | 20 +- doc/html/navtreeindex3.js | 26 +- doc/html/navtreeindex4.js | 24 +- doc/html/navtreeindex5.js | 72 ++-- doc/html/navtreeindex6.js | 116 +++--- doc/html/navtreeindex7.js | 36 +- doc/html/navtreeindex8.js | 18 +- doc/html/navtreeindex9.js | 8 + doc/html/photo__driver_8php.html | 2 +- doc/html/php_2theme__init_8php.html | 2 +- doc/html/plugin_8php.html | 126 +----- doc/html/plugin_8php.js | 7 +- doc/html/search/all_61.js | 1 + doc/html/search/all_62.js | 4 +- doc/html/search/all_63.js | 1 + doc/html/search/all_64.js | 2 + doc/html/search/all_65.js | 1 - doc/html/search/all_66.js | 3 +- doc/html/search/all_69.js | 1 + doc/html/search/all_73.js | 7 +- doc/html/search/all_75.js | 6 +- doc/html/search/functions_62.js | 2 + doc/html/search/functions_63.js | 1 + doc/html/search/functions_64.js | 2 + doc/html/search/functions_65.js | 1 - doc/html/search/functions_66.js | 1 + doc/html/search/functions_69.js | 1 + doc/html/search/functions_73.js | 5 +- doc/html/search/functions_75.js | 6 +- doc/html/search/variables_61.js | 1 + doc/html/text_8php.html | 12 +- doc/html/typo_8php.html | 2 +- doc/html/typohelper_8php.html | 2 +- util/messages.po | 737 ++++++++++++++++++------------------ version.inc | 2 +- 77 files changed, 1331 insertions(+), 1045 deletions(-) diff --git a/doc/html/account_8php.html b/doc/html/account_8php.html index eb7eb62ca..76f2d1b0a 100644 --- a/doc/html/account_8php.html +++ b/doc/html/account_8php.html @@ -138,6 +138,16 @@ Functions        downgrade_accounts ()   + service_class_allows ($uid, $property, $usage=false) +  + service_class_fetch ($uid, $property) +  + upgrade_link ($bbcode=false) +  + upgrade_message ($bbcode=false) +  + upgrade_bool_message ($bbcode=false) + 

    Function Documentation

    @@ -310,6 +320,120 @@ Functions

    Referenced by register_post().

    + + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    service_class_allows ( $uid,
     $property,
     $usage = false 
    )
    +
    + +

    Referenced by identity_check_service_class(), item_check_service_class(), and new_contact().

    + +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + +
    service_class_fetch ( $uid,
     $property 
    )
    +
    + +

    Referenced by attach_store(), chatroom_create(), chatroom_enter(), RedDirectory\createFile(), RedBrowser\generateDirectoryIndex(), RedDirectory\getQuotaInfo(), manage_content(), photo_upload(), photos_content(), poller_run(), RedFile\put(), and widget_follow().

    + +
    +
    + +
    +
    + + + + + + + + +
    upgrade_bool_message ( $bbcode = false)
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    upgrade_link ( $bbcode = false)
    +
    + +

    Referenced by upgrade_bool_message(), and upgrade_message().

    + +
    +
    + +
    +
    + + + + + + + + +
    upgrade_message ( $bbcode = false)
    +
    + +

    Referenced by attach_store(), chatroom_create(), identity_check_service_class(), item_check_service_class(), new_contact(), and photo_upload().

    +
    diff --git a/doc/html/account_8php.js b/doc/html/account_8php.js index 6e509ce60..fa7ce6657 100644 --- a/doc/html/account_8php.js +++ b/doc/html/account_8php.js @@ -9,6 +9,11 @@ var account_8php = [ "downgrade_accounts", "account_8php.html#a0d183a3cb4c67a0f5e906811df7a1fc9", null ], [ "send_reg_approval_email", "account_8php.html#a014de2d5d5c9785de5bf547a485822fa", null ], [ "send_verification_email", "account_8php.html#aa9c29c497c17d8f9344dce8631ad8761", null ], + [ "service_class_allows", "account_8php.html#a030cec6793b909c439c0336ba39b1571", null ], + [ "service_class_fetch", "account_8php.html#a905b54e10704b283ac64680a8abc0971", null ], + [ "upgrade_bool_message", "account_8php.html#a754d7f53b3abc557b753c057dc4e021d", null ], + [ "upgrade_link", "account_8php.html#a4fc13e528367f510fcb6d8bbfc559040", null ], + [ "upgrade_message", "account_8php.html#a901657dd078e070516cf97285e0bada7", null ], [ "user_allow", "account_8php.html#ac5c570a2d46446bad4dd2501e9c5a4b1", null ], [ "user_approve", "account_8php.html#ad07be417ac7eda939768804106ddea3d", null ], [ "user_deny", "account_8php.html#ac1653efba62493b9d87513e1b6c04c83", null ], diff --git a/doc/html/apw_2php_2style_8php.html b/doc/html/apw_2php_2style_8php.html index ce77cd3fb..43997f51e 100644 --- a/doc/html/apw_2php_2style_8php.html +++ b/doc/html/apw_2php_2style_8php.html @@ -246,7 +246,7 @@ Variables
    -

    Referenced by admin_page_channels(), admin_page_channels_post(), admin_page_users(), admin_page_users_post(), all_friends(), app_destroy(), app_install(), app_installed(), app_list(), build_sync_packet(), chat_message(), chatroom_list(), check_item_source(), check_list_permissions(), common_friends(), common_friends_zcid(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), del_pconfig(), delete_imported_item(), diaspora_get_contact_by_handle(), drop_items(), event_addtocal(), events_post(), feature_enabled(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), follow_init(), get_all_perms(), get_pconfig(), get_theme_uid(), get_things(), get_words(), group_add(), group_add_member(), group_byname(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), handle_feed(), import_channel_photo(), item_add_cid(), item_expire(), item_post(), item_remove_cid(), item_store_update(), items_fetch(), list_post_dates(), load_contact_links(), load_pconfig(), local_dir_update(), FKOAuth1\loginUser(), menu_add_item(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit_item(), menu_fetch(), mini_group_select(), mood_init(), new_contact(), notifier_run(), pdl_selector(), perm_is_allowed(), photo_init(), poke_init(), posted_dates(), private_messages_list(), remove_community_tag(), send_message(), service_class_allows(), service_class_fetch(), set_pconfig(), Conversation\set_profile_owner(), photo_driver\store(), store_item_tag(), suggestion_query(), tag_deliver(), tagadelic(), tagblock(), tgroup_check(), update_feed_item(), widget_archive(), widget_follow(), widget_item(), widget_tagcloud(), and zot_feed().

    +

    Referenced by admin_page_channels(), admin_page_channels_post(), admin_page_users(), admin_page_users_post(), all_friends(), app_destroy(), app_install(), app_installed(), app_list(), build_sync_packet(), chat_message(), chatroom_list(), check_item_source(), check_list_permissions(), common_friends(), common_friends_zcid(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), del_pconfig(), delete_imported_item(), diaspora_get_contact_by_handle(), drop_items(), event_addtocal(), events_post(), feature_enabled(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), follow_init(), get_all_perms(), get_pconfig(), get_theme_uid(), get_things(), get_words(), group_add(), group_add_member(), group_byname(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), handle_feed(), import_channel_photo(), item_add_cid(), item_expire(), item_post(), item_remove_cid(), item_store_update(), items_fetch(), list_post_dates(), load_contact_links(), load_pconfig(), local_dir_update(), FKOAuth1\loginUser(), menu_add_item(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit_item(), menu_fetch(), mini_group_select(), mood_init(), new_contact(), notifier_run(), pdl_selector(), perm_is_allowed(), photo_init(), poke_init(), posted_dates(), private_messages_list(), remove_community_tag(), send_message(), service_class_allows(), service_class_fetch(), set_pconfig(), Conversation\set_profile_owner(), photo_driver\store(), store_item_tag(), suggestion_query(), tag_deliver(), tagadelic(), tagblock(), tgroup_check(), update_feed_item(), widget_archive(), widget_follow(), widget_item(), widget_tagcloud(), and zot_feed().

    @@ -260,7 +260,7 @@ Variables
    -

    Referenced by Template\_replcb_for(), Template\_replcb_if(), account_remove(), acl_init(), activity_sanitise(), admin_page_channels(), admin_page_themes(), advanced_profile(), aes_encapsulate(), api_login(), app_decode(), app_install(), app_list(), app_render(), app_store(), app_update(), apps_content(), argv(), array_sanitise(), attach_change_permissions(), attach_delete(), attach_store(), autoname(), bb_parse_crypt(), bbcode(), block_content(), blocks_content(), bookmark_add(), bookmarks_content(), build_sync_packet(), change_channel(), channel_content(), chat_content(), chat_message(), chat_post(), chatroom_create(), chatroom_enter(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_config(), check_form_security_token(), check_item_source(), check_list_permissions(), check_webbie(), RedDirectory\childExists(), cloud_init(), common_init(), construct_page(), conversation(), RedDirectory\createFile(), photo_gd\cropImage(), photo_imagick\cropImage(), datesel(), datesel_format(), decode_tags(), deliver_run(), diaspora_reshare(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), discover_by_webbie(), display_content(), downgrade_accounts(), element_install(), email_header_encode(), encode_item(), encode_mail(), event_store_item(), events_post(), expand_groups(), expire_run(), externals_run(), feature_enabled(), fetch_post_tags(), fetch_xrd_links(), filer_content(), find_xchan_in_array(), findpeople_widget(), fix_private_photos(), fix_system_urls(), photo_gd\flip(), fsuggest_post(), get_all_perms(), get_directory_realm(), get_item_elements(), get_mail_elements(), get_mentions(), get_online_status(), get_profile_elements(), get_profile_fields_advanced(), get_profile_fields_basic(), get_system_apps(), get_terms_oftype(), get_theme_uid(), get_things(), RedDirectory\getChild(), RedDirectory\getDir(), RedDirectory\getQuotaInfo(), gprobe_run(), handle_feed(), hcard_init(), hostxrd_init(), ids_to_querystr(), import_author_rss(), import_author_xchan(), import_author_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_content(), invite_post(), item_post(), item_remove_cid(), items_fetch(), json_decode_plus(), json_return_and_die(), layouts_content(), legal_webbie(), FKOAuth1\loginUser(), magic_init(), mail_post(), manage_content(), mark_orphan_hubsxchans(), match_content(), menu_content(), menu_delete_id(), menu_fetch(), menu_render(), mimetype_select(), nav(), navbar_complete(), netgrowth_content(), network_content(), new_channel_init(), new_contact(), notification(), notifier_run(), oembed_fetch_url(), onedirsync_run(), onepoll_run(), openid_content(), page_content(), parse_app_description(), parse_xml_string(), pdledit_content(), pemtome(), perm_is_allowed(), photos_list_photos(), photos_post(), ping_init(), poco_load(), poller_run(), post_init(), post_post(), preg_heart(), print_template(), private_messages_list(), proc_run(), process_channel_sync_delivery(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), prune_hub_reinstalls(), public_recips(), pubrsatome(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), randprof_init(), red_item_new(), RedCollectionData(), RedFileData(), remote_online_status(), remove_community_tag(), rpost_content(), photo_driver\save(), scrape_feed(), scrape_vcard(), search_ac_init(), send_status_notifications(), share_init(), share_unshield(), site_default_perms(), smilies(), sources_content(), sslify_init(), photo_driver\store(), string_splitter(), stringify_array_elms(), sync_directories(), tag_deliver(), tagadelic(), tagrm_content(), tagrm_post(), theme_status(), thing_content(), timesel(), toggle_theme(), update_directory_entry(), update_imported_item(), upgrade_bool_message(), upgrade_message(), valid_email(), RedBasicAuth\validateUserPass(), webpages_content(), what_next(), widget_affinity(), widget_bookmarkedchats(), widget_suggestedchats(), widget_suggestions(), xchan_query(), xmlify(), zfinger_init(), zot_build_packet(), zot_process_response(), zot_refresh(), zot_register_hub(), and zotfeed_init().

    +

    Referenced by Template\_replcb_for(), Template\_replcb_if(), account_remove(), acl_init(), activity_sanitise(), admin_page_channels(), admin_page_themes(), advanced_profile(), aes_encapsulate(), api_login(), app_decode(), app_install(), app_list(), app_render(), app_store(), app_update(), apps_content(), argv(), array_sanitise(), attach_change_permissions(), attach_delete(), attach_store(), autoname(), bb_parse_crypt(), bbcode(), block_content(), blocks_content(), bookmark_add(), bookmarks_content(), build_sync_packet(), change_channel(), channel_content(), chat_content(), chat_message(), chat_post(), chatroom_create(), chatroom_enter(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_config(), check_form_security_token(), check_item_source(), check_list_permissions(), check_webbie(), RedDirectory\childExists(), cloud_init(), common_init(), construct_page(), conversation(), RedDirectory\createFile(), photo_gd\cropImage(), photo_imagick\cropImage(), datesel(), datesel_format(), decode_tags(), deliver_run(), diaspora_reshare(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), discover_by_url(), discover_by_webbie(), display_content(), downgrade_accounts(), email_header_encode(), encode_item(), encode_mail(), event_store_item(), events_post(), expand_groups(), expire_run(), externals_run(), feature_enabled(), fetch_post_tags(), fetch_xrd_links(), filer_content(), find_xchan_in_array(), findpeople_widget(), fix_private_photos(), fix_system_urls(), photo_gd\flip(), fsuggest_post(), get_all_perms(), get_directory_realm(), get_item_elements(), get_mail_elements(), get_mentions(), get_online_status(), get_profile_elements(), get_profile_fields_advanced(), get_profile_fields_basic(), get_system_apps(), get_terms_oftype(), get_theme_uid(), get_things(), RedDirectory\getChild(), RedDirectory\getDir(), RedDirectory\getQuotaInfo(), gprobe_run(), handle_feed(), hcard_init(), hostxrd_init(), ids_to_querystr(), import_author_diaspora(), import_author_rss(), import_author_xchan(), import_author_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_content(), invite_post(), item_post(), item_remove_cid(), items_fetch(), json_decode_plus(), json_return_and_die(), layouts_content(), legal_webbie(), FKOAuth1\loginUser(), magic_init(), mail_post(), manage_content(), mark_orphan_hubsxchans(), match_content(), menu_content(), menu_delete_id(), menu_fetch(), menu_render(), mimetype_select(), nav(), navbar_complete(), netgrowth_content(), network_content(), new_channel_init(), new_contact(), notification(), notifier_run(), oembed_fetch_url(), onedirsync_run(), onepoll_run(), openid_content(), page_content(), parse_app_description(), parse_xml_string(), pdledit_content(), pemtome(), perm_is_allowed(), photos_list_photos(), photos_post(), ping_init(), poco_load(), poller_run(), post_init(), post_post(), preg_heart(), print_template(), private_messages_list(), proc_run(), process_channel_sync_delivery(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), prune_hub_reinstalls(), public_recips(), pubrsatome(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), randprof_init(), red_item_new(), RedCollectionData(), RedFileData(), remote_online_status(), remove_community_tag(), rpost_content(), photo_driver\save(), scrape_feed(), scrape_vcard(), search_ac_init(), send_status_notifications(), share_init(), share_unshield(), site_default_perms(), smilies(), sources_content(), sslify_init(), photo_driver\store(), store_diaspora_comment_sig(), string_splitter(), stringify_array_elms(), sync_directories(), tag_deliver(), tagadelic(), tagrm_content(), tagrm_post(), theme_status(), thing_content(), timesel(), toggle_theme(), update_directory_entry(), update_imported_item(), upgrade_bool_message(), upgrade_message(), valid_email(), RedBasicAuth\validateUserPass(), webpages_content(), what_next(), widget_affinity(), widget_bookmarkedchats(), widget_suggestedchats(), widget_suggestions(), xchan_query(), xmlify(), zfinger_init(), zot_build_packet(), zot_process_response(), zot_refresh(), zot_register_hub(), and zotfeed_init().

    diff --git a/doc/html/bb2diaspora_8php.html b/doc/html/bb2diaspora_8php.html index 0eecc3512..df7ea4e63 100644 --- a/doc/html/bb2diaspora_8php.html +++ b/doc/html/bb2diaspora_8php.html @@ -120,6 +120,8 @@ Functions    share_unshield ($m)   + diaspora_mention_callback ($matches) +   diaspora2bb ($s, $use_zrl=false)    stripdcode_br_cb ($s) @@ -128,6 +130,10 @@ Functions    diaspora_ol ($s)   + bb2dmention_callback ($match) +  + bb2diaspora_itembody ($item) +   bb2diaspora ($Text, $preserve_nl=false, $fordiaspora=true)    unescape_underscores_in_links ($m) @@ -167,7 +173,41 @@ Functions

    Transform #tags, strip off the [url] and replace spaces with underscore

    -

    Referenced by diaspora_send_followup(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_status(), and format_event_diaspora().

    +

    Referenced by bb2diaspora_itembody(), diaspora_send_mail(), format_event_diaspora(), and store_diaspora_comment_sig().

    + +
    + + +
    +
    + + + + + + + + +
    bb2diaspora_itembody ( $item)
    +
    + +

    Referenced by diaspora_send_followup(), diaspora_send_relay(), and diaspora_send_status().

    + +
    +
    + +
    +
    + + + + + + + + +
    bb2dmention_callback ( $match)
    +
    @@ -237,6 +277,22 @@ Functions

    Referenced by diaspora_comment(), diaspora_conversation(), diaspora_message(), diaspora_post(), diaspora_reshare(), and item_post().

    + + + +
    +
    + + + + + + + + +
    diaspora_mention_callback ( $matches)
    +
    +
    diff --git a/doc/html/bb2diaspora_8php.js b/doc/html/bb2diaspora_8php.js index d35562c5c..60831be29 100644 --- a/doc/html/bb2diaspora_8php.js +++ b/doc/html/bb2diaspora_8php.js @@ -1,8 +1,11 @@ var bb2diaspora_8php = [ [ "bb2diaspora", "bb2diaspora_8php.html#a4f10e0876b27373c762bc1abbe745f5c", null ], + [ "bb2diaspora_itembody", "bb2diaspora_8php.html#a2052c66bc1006a42b4c230320c269e47", null ], + [ "bb2dmention_callback", "bb2diaspora_8php.html#a5258d2f1addeb0a2a6b54c4f9e7d0f34", null ], [ "bb_tag_preg_replace", "bb2diaspora_8php.html#ad0abe1a7ee50aa0736a233df0a422eba", null ], [ "diaspora2bb", "bb2diaspora_8php.html#ac9061ee10fcfcdac69566b649614e625", null ], + [ "diaspora_mention_callback", "bb2diaspora_8php.html#a4a27604f0745f1efda672966aaca9a3b", null ], [ "diaspora_ol", "bb2diaspora_8php.html#a8b96bd45884fa1c40b942939354197d4", null ], [ "diaspora_ul", "bb2diaspora_8php.html#adc92ccda5f85ed27e64fcc17712c89cc", null ], [ "format_event_diaspora", "bb2diaspora_8php.html#a29a2ad41f5826f3975fa9a49934ff863", null ], diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index 9168675a4..aeb375306 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -208,7 +208,7 @@ Variables   const ZOT_REVISION 1   -const DB_UPDATE_VERSION 1128 +const DB_UPDATE_VERSION 1129   const EOL '<br />' . "\r\n"   @@ -412,6 +412,8 @@ Variables   const ABOOK_FLAG_SELF 0x0080   +const ABOOK_FLAG_FEED 0x0100 +  const MAIL_DELETED 0x0001   const MAIL_REPLIED 0x0002 @@ -996,7 +998,7 @@ Variables
    -

    Referenced by FriendicaSmarty\__construct(), FriendicaSmartyEngine\__construct(), abook_toggle_flag(), account_remove(), allowed_public_recips(), api_apply_template(), api_format_items(), api_get_user(), api_statuses_home_timeline(), api_statuses_repeat(), api_statuses_user_timeline(), api_user(), app_render(), app_store(), 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_get_channel_id(), comanche_replace_region(), comanche_widget(), common_friends_visitor_widget(), connedit_content(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), design_tools(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_message(), diaspora_msg_build(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_pubmsg_build(), diaspora_request(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_transmit(), diaspora_unshare(), dir_tagblock(), dirsearch_content(), drop_item(), editpost_content(), event_store_item(), externals_run(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), format_event_diaspora(), RedBrowser\generateDirectoryIndex(), get_account_id(), get_best_language(), get_birthdays(), get_events(), get_feed_for(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_observer_hash(), get_plink(), get_theme_config_file(), get_theme_screenshot(), gprobe_run(), group_select(), guess_image_type(), handle_tag(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), head_remove_css(), head_remove_js(), identity_selector(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), info(), insert_hook(), is_developer(), is_public_profile(), is_site_admin(), item_message_id(), item_photo_menu(), item_redir_and_replace_images(), item_store(), item_store_update(), items_fetch(), load_contact_links(), load_hooks(), local_dir_update(), login(), FKOAuth1\loginUser(), manage_content(), map_scope(), menu_add_item(), menu_edit_item(), nav_set_selected(), new_contact(), notice(), notification(), notifier_run(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), onedirsync_run(), onepoll_run(), page_content(), parse_app_description(), photos_album_widget(), photos_content(), ping_init(), poco_load(), poller_run(), post_activity_item(), preg_heart(), prepare_body(), proc_run(), process_delivery(), profile_activity(), profile_sidebar(), public_permissions_sql(), register_page_template(), replace_macros(), rmagic_init(), rpost_callback(), scale_external_images(), scrape_feed(), scrape_vcard(), search(), searchbox(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), service_class_allows(), service_class_fetch(), smilies(), tag_deliver(), tgroup_check(), theme_include(), tryzrlvideo(), tt(), update_suggestions(), user_allow(), user_approve(), vcard_from_xchan(), verify_email_address(), wfinger_init(), what_next(), widget_archive(), widget_categories(), widget_chatroom_list(), widget_collections(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_mailmenu(), widget_menu_preview(), widget_photo_albums(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_tagcloud(), widget_tagcloud_wall(), widget_vcard(), z_fetch_url(), and zot_finger().

    +

    Referenced by FriendicaSmarty\__construct(), FriendicaSmartyEngine\__construct(), abook_toggle_flag(), account_remove(), allowed_public_recips(), api_apply_template(), api_format_items(), api_get_user(), api_statuses_home_timeline(), api_statuses_repeat(), api_statuses_user_timeline(), api_user(), app_render(), app_store(), 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_get_channel_id(), comanche_replace_region(), comanche_widget(), common_friends_visitor_widget(), connedit_content(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), design_tools(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_message(), diaspora_msg_build(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_pubmsg_build(), diaspora_request(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_transmit(), diaspora_unshare(), dir_tagblock(), dirsearch_content(), drop_item(), editpost_content(), event_store_item(), externals_run(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), format_event_diaspora(), RedBrowser\generateDirectoryIndex(), get_account_id(), get_best_language(), get_birthdays(), get_events(), get_feed_for(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_observer_hash(), get_plink(), get_theme_config_file(), get_theme_screenshot(), gprobe_run(), group_select(), guess_image_type(), handle_tag(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), head_remove_css(), head_remove_js(), identity_selector(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), info(), insert_hook(), is_developer(), is_public_profile(), is_site_admin(), item_message_id(), item_photo_menu(), item_redir_and_replace_images(), item_store(), item_store_update(), items_fetch(), load_contact_links(), load_hooks(), local_dir_update(), login(), FKOAuth1\loginUser(), manage_content(), map_scope(), menu_add_item(), menu_edit_item(), nav_set_selected(), new_contact(), notice(), notification(), notifier_run(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), onedirsync_run(), onepoll_run(), page_content(), parse_app_description(), photos_album_widget(), photos_content(), ping_init(), poco_load(), poller_run(), post_activity_item(), preg_heart(), prepare_body(), proc_run(), process_delivery(), profile_activity(), profile_sidebar(), public_permissions_sql(), register_page_template(), replace_macros(), rmagic_init(), rpost_callback(), scale_external_images(), scrape_feed(), scrape_vcard(), search(), searchbox(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), service_class_allows(), service_class_fetch(), smilies(), store_diaspora_comment_sig(), tag_deliver(), tgroup_check(), theme_include(), tryzrlvideo(), tt(), update_suggestions(), user_allow(), user_approve(), vcard_from_xchan(), verify_email_address(), wfinger_init(), what_next(), widget_archive(), widget_categories(), widget_chatroom_list(), widget_collections(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_mailmenu(), widget_menu_preview(), widget_photo_albums(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_tagcloud(), widget_tagcloud_wall(), widget_vcard(), z_fetch_url(), and zot_finger().

    @@ -1178,6 +1180,8 @@ Variables
    +

    Referenced by achievements_content().

    +
    @@ -1262,7 +1266,7 @@ Variables
    -

    Referenced by Conversation\__construct(), acl_init(), api_content(), api_get_user(), api_post(), api_user(), app_render(), appman_content(), appman_post(), apps_content(), apw_form(), best_link_url(), blocks_content(), bookmarks_content(), bookmarks_init(), App\build_pagehead(), build_sync_packet(), change_channel(), channel_content(), channel_init(), channel_remove(), chanview_content(), chat_content(), chat_init(), chat_post(), cloud_init(), comanche_get_channel_id(), common_friends_visitor_widget(), connect_content(), connect_post(), connections_content(), connections_init(), connections_post(), connedit_content(), connedit_init(), connedit_post(), contact_block(), contact_select(), contactgroup_content(), conversation(), current_theme(), delegate_content(), directory_content(), dirprofile_init(), display_content(), drop_item(), drop_items(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), filestorage_post(), findpeople_widget(), follow_content(), follow_init(), fsuggest_content(), fsuggest_post(), RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_online_status(), Item\get_template_data(), get_theme_uid(), group_content(), group_get_members(), group_post(), group_select(), group_side(), handle_tag(), hcard_init(), home_init(), identity_selector(), invite_content(), invite_post(), is_public_profile(), item_content(), item_permissions_sql(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), lockview_content(), login(), login_content(), magic_init(), mail_content(), mail_post(), manage_content(), match_content(), menu_add_item(), menu_content(), menu_edit_item(), menu_post(), message_content(), mimetype_select(), mitem_content(), mitem_init(), mitem_post(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), network_init(), new_contact(), notes_init(), notifications_content(), notifications_post(), notify_content(), notify_init(), oexchange_content(), parse_app_description(), pdledit_content(), pdledit_post(), 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_photo_set_profile_perms(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), profperm_init(), rbmark_content(), redbasic_form(), regmod_content(), removeaccount_content(), removeaccount_post(), removeme_content(), removeme_post(), rmagic_init(), rpost_content(), search(), search_ac_init(), search_content(), searchbox(), service_class_allows(), service_class_fetch(), Conversation\set_mode(), settings_init(), settings_post(), share_init(), smilies(), sources_content(), sources_post(), starred_init(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), suggest_content(), suggest_init(), tagger_content(), tagrm_content(), tagrm_post(), theme_content(), theme_post(), thing_content(), thing_init(), uexport_init(), vcard_from_xchan(), viewconnections_content(), viewconnections_init(), viewsrc_content(), webpages_content(), widget_affinity(), widget_appselect(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_mailmenu(), widget_notes(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_suggestions(), z_input_filter(), zid_init(), and zping_content().

    +

    Referenced by Conversation\__construct(), acl_init(), api_content(), api_get_user(), api_post(), api_user(), app_render(), appman_content(), appman_post(), apps_content(), apw_form(), best_link_url(), blocks_content(), bookmarks_content(), bookmarks_init(), App\build_pagehead(), build_sync_packet(), change_channel(), channel_content(), channel_init(), channel_remove(), chanview_content(), chat_content(), chat_init(), chat_post(), cloud_init(), comanche_get_channel_id(), common_friends_visitor_widget(), connect_content(), connect_post(), connections_content(), connections_init(), connections_post(), connedit_content(), connedit_init(), connedit_post(), contact_block(), contact_select(), contactgroup_content(), conversation(), current_theme(), delegate_content(), directory_content(), dirprofile_init(), display_content(), drop_item(), drop_items(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), filestorage_post(), findpeople_widget(), follow_content(), follow_init(), fsuggest_content(), fsuggest_post(), RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_online_status(), Item\get_template_data(), get_theme_uid(), group_content(), group_get_members(), group_post(), group_select(), group_side(), handle_tag(), hcard_init(), home_init(), identity_selector(), invite_content(), invite_post(), is_public_profile(), item_content(), item_permissions_sql(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), lockview_content(), login(), login_content(), magic_init(), mail_content(), mail_post(), manage_content(), match_content(), menu_add_item(), menu_content(), menu_edit_item(), menu_post(), message_content(), mimetype_select(), mitem_content(), mitem_init(), mitem_post(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), network_init(), new_contact(), notes_init(), notifications_content(), notifications_post(), notify_content(), notify_init(), oexchange_content(), parse_app_description(), pdledit_content(), pdledit_post(), 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_photo_set_profile_perms(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), profperm_init(), rbmark_content(), redbasic_form(), regmod_content(), removeaccount_content(), removeaccount_post(), removeme_content(), removeme_post(), rmagic_init(), rpost_content(), search(), search_ac_init(), search_content(), searchbox(), service_class_allows(), service_class_fetch(), Conversation\set_mode(), settings_init(), settings_post(), share_init(), smilies(), sources_content(), sources_post(), starred_init(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), suggest_content(), suggest_init(), tagger_content(), tagrm_content(), tagrm_post(), theme_content(), theme_post(), thing_content(), thing_init(), uexport_init(), vcard_from_xchan(), viewconnections_content(), viewconnections_init(), viewsrc_content(), webpages_content(), widget_affinity(), widget_appselect(), 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().

    @@ -1314,7 +1318,7 @@ Variables
    -

    Referenced by account_remove(), achievements_content(), admin_content(), admin_page_channels(), admin_page_channels_post(), admin_page_hubloc(), admin_page_plugins(), admin_page_profs(), admin_page_themes(), admin_page_users(), admin_page_users_post(), api_content(), api_post(), appman_content(), appman_post(), attach_init(), block_content(), blocks_content(), bookmarks_content(), channel_content(), channel_init(), chanview_content(), chat_content(), chat_init(), chatroom_enter(), check_form_security_token_redirectOnErr(), common_content(), common_init(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), dirprofile_init(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), filestorage_post(), follow_init(), fsuggest_content(), fsuggest_post(), group_add(), group_content(), group_post(), hcard_init(), home_content(), import_content(), import_post(), importelm_post(), invite_content(), invite_post(), item_content(), item_post(), layouts_content(), like_content(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), mood_content(), network_content(), network_init(), new_channel_content(), new_channel_post(), notifications_content(), notifications_post(), oexchange_content(), openid_content(), page_content(), pdledit_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(), removeaccount_post(), removeme_post(), rmagic_post(), search_content(), settings_post(), sources_content(), sources_post(), subthread_content(), suggest_content(), thing_content(), thing_init(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().

    +

    Referenced by account_remove(), achievements_content(), admin_content(), admin_page_channels(), admin_page_channels_post(), admin_page_hubloc(), admin_page_plugins(), admin_page_profs(), admin_page_themes(), admin_page_users(), admin_page_users_post(), api_content(), api_post(), appman_content(), appman_post(), attach_init(), block_content(), blocks_content(), bookmarks_content(), channel_content(), channel_init(), chat_content(), chat_init(), chatroom_enter(), check_form_security_token_redirectOnErr(), common_content(), common_init(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), dirprofile_init(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), filestorage_post(), follow_init(), fsuggest_content(), fsuggest_post(), group_add(), group_content(), group_post(), hcard_init(), home_content(), import_content(), import_post(), importelm_post(), invite_content(), invite_post(), item_content(), item_post(), layouts_content(), like_content(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), mood_content(), network_content(), network_init(), new_channel_content(), new_channel_post(), notifications_content(), notifications_post(), oexchange_content(), openid_content(), page_content(), pdledit_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(), removeaccount_post(), removeme_post(), rmagic_post(), search_content(), settings_post(), sources_content(), sources_post(), subthread_content(), suggest_content(), thing_content(), thing_init(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().

    @@ -1448,7 +1452,7 @@ Variables
    -

    Referenced by FriendicaSmarty\__construct(), App\__construct(), acl_init(), admin_page_channels_post(), 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(), app_store(), app_update(), attach_store(), authenticate_success(), bbcode(), bbtoevent(), best_link_url(), bookmark_add(), App\build_pagehead(), channel_content(), chatsvc_content(), check_form_security_token(), cloud_init(), connections_content(), connections_post(), connedit_content(), construct_page(), consume_feed(), conversation(), create_account(), create_identity(), current_theme(), current_theme_url(), del_pconfig(), del_xconfig(), delegate_content(), detect_language(), diaspora_asphoto(), diaspora_conversation(), diaspora_like(), diaspora_message(), directory_content(), dirprofile_init(), dirsearch_content(), display_content(), encode_rel_links(), event_addtocal(), events_content(), events_post(), feed_init(), filerm_content(), filestorage_post(), get_atom_elements(), get_browser_language(), get_item_elements(), get_my_address(), get_my_url(), get_plink(), get_public_feed(), Item\get_template_data(), group_add(), group_rmv(), group_side(), home_content(), import_post(), import_xchan(), info(), invite_post(), item_post(), item_store(), item_store_update(), lang_selector(), load_contact_links(), local_user(), lostpass_content(), magic_init(), mail_content(), mail_post(), mail_store(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), new_channel_content(), new_cookie(), notice(), oexchange_content(), openid_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(), profile_photo_post(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_post(), rbmark_content(), rbmark_post(), red_item_new(), ref_session_read(), register_content(), register_post(), App\register_template_engine(), regmod_content(), remote_user(), removeaccount_post(), removeme_post(), rpost_content(), scrape_feed(), script_path(), search_ac_init(), search_content(), search_init(), service_class_allows(), service_class_fetch(), App\set_baseurl(), settings_post(), setup_content(), setup_init(), siteinfo_init(), suggest_init(), t(), tagrm_post(), App\template_engine(), tt(), validate_channelname(), wall_upload_post(), webfinger_content(), wfinger_init(), widget_affinity(), widget_categories(), widget_filer(), widget_savedsearch(), widget_tagcloud(), xchan_content(), z_fetch_url(), z_post_url(), and zfinger_init().

    +

    Referenced by FriendicaSmarty\__construct(), App\__construct(), acl_init(), admin_page_channels_post(), 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(), app_store(), app_update(), attach_store(), authenticate_success(), bbcode(), bbtoevent(), best_link_url(), bookmark_add(), App\build_pagehead(), channel_content(), chatsvc_content(), check_form_security_token(), cloud_init(), connections_content(), connections_post(), connedit_content(), construct_page(), consume_feed(), conversation(), create_account(), create_identity(), current_theme(), current_theme_url(), del_pconfig(), del_xconfig(), delegate_content(), detect_language(), diaspora_asphoto(), diaspora_conversation(), diaspora_like(), diaspora_message(), directory_content(), dirprofile_init(), dirsearch_content(), discover_by_url(), display_content(), encode_rel_links(), event_addtocal(), events_content(), events_post(), feed_init(), filerm_content(), filestorage_post(), get_atom_elements(), get_browser_language(), get_item_elements(), get_my_address(), get_my_url(), get_plink(), get_public_feed(), Item\get_template_data(), group_add(), group_rmv(), group_side(), home_content(), import_post(), import_xchan(), info(), invite_post(), item_post(), item_store(), item_store_update(), lang_selector(), load_contact_links(), local_user(), lostpass_content(), magic_init(), mail_content(), mail_post(), mail_store(), mood_content(), mood_init(), nav(), navbar_complete(), network_content(), new_channel_content(), new_cookie(), notice(), oexchange_content(), openid_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(), profile_photo_post(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_post(), rbmark_content(), rbmark_post(), red_item_new(), ref_session_read(), register_content(), register_post(), App\register_template_engine(), regmod_content(), remote_user(), removeaccount_post(), removeme_post(), rpost_content(), scrape_feed(), script_path(), search_ac_init(), search_content(), search_init(), service_class_allows(), service_class_fetch(), App\set_baseurl(), settings_post(), setup_content(), setup_init(), siteinfo_init(), suggest_init(), t(), tagrm_post(), App\template_engine(), tt(), validate_channelname(), wall_upload_post(), webfinger_content(), wfinger_init(), widget_affinity(), widget_categories(), widget_filer(), widget_savedsearch(), widget_tagcloud(), xchan_content(), z_fetch_url(), z_post_url(), and zfinger_init().

    @@ -1482,7 +1486,7 @@ Variables
    -

    Referenced by admin_content(), admin_page_profs(), admin_page_profs_post(), allowed_public_recips(), app_render(), app_store(), app_update(), appman_post(), authenticate_success(), bb_parse_crypt(), bbcode(), blocks_content(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), channel_remove(), chat_content(), chat_post(), chatsvc_content(), check_config(), connect_post(), connections_content(), connections_post(), conversation(), create_identity(), deliver_run(), diaspora_comment(), diaspora_post(), diaspora_request(), diaspora_reshare(), directory_content(), dirprofile_init(), discover_by_webbie(), display_content(), event_store_item(), externals_run(), filestorage_content(), find_upstream_directory(), follow_init(), format_categories(), format_filer(), get_parent_cloudpath(), RedBrowser\getAssetUrl(), group_post(), handle_tag(), App\head_get_icon(), head_get_icon(), home_init(), hostxrd_init(), import_post(), import_xchan(), invite_content(), item_photo_menu(), item_post(), item_store(), layouts_content(), like_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), mail_post(), manage_content(), menu_content(), menu_post(), mitem_content(), mitem_post(), mood_init(), nav(), navbar_complete(), network_content(), new_channel_post(), notification(), notifications_post(), notifier_run(), openid_content(), pagelist_widget(), parse_app_description(), pdledit_post(), photo_upload(), photos_album_widget(), photos_albums_list(), photos_create_item(), photos_list_photos(), poll_content(), post_activity_item(), post_init(), post_post(), profile_activity(), profile_sidebar(), public_recips(), pubsites_content(), rbmark_content(), rbmark_post(), register_post(), removeaccount_content(), removeme_content(), rmagic_init(), rmagic_post(), rpost_content(), script_path(), search_content(), searchbox(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), sources_content(), sources_post(), sslify(), sync_directories(), tagger_content(), theme_attachments(), thing_init(), toggle_safesearch_init(), update_suggestions(), user_allow(), vcard_from_xchan(), verify_email_address(), webpages_content(), wfinger_init(), widget_archive(), widget_chatroom_list(), widget_dirtags(), widget_filer(), widget_savedsearch(), widget_suggestions(), xref_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), zot_new_uid(), and zot_refresh().

    +

    Referenced by admin_content(), admin_page_profs(), admin_page_profs_post(), allowed_public_recips(), app_render(), app_store(), app_update(), appman_post(), authenticate_success(), bb_parse_crypt(), bbcode(), blocks_content(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), channel_remove(), chat_content(), chat_post(), chatsvc_content(), check_config(), connect_post(), connections_content(), connections_post(), conversation(), create_identity(), deliver_run(), diaspora_comment(), diaspora_post(), diaspora_request(), diaspora_reshare(), directory_content(), dirprofile_init(), discover_by_url(), discover_by_webbie(), display_content(), event_store_item(), externals_run(), filestorage_content(), find_upstream_directory(), follow_init(), format_categories(), format_filer(), get_parent_cloudpath(), RedBrowser\getAssetUrl(), group_post(), handle_tag(), App\head_get_icon(), head_get_icon(), home_init(), hostxrd_init(), import_post(), import_xchan(), invite_content(), item_photo_menu(), item_post(), item_store(), layouts_content(), like_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), mail_post(), manage_content(), menu_content(), menu_post(), mitem_content(), mitem_post(), mood_init(), nav(), navbar_complete(), network_content(), new_channel_post(), notification(), notifications_post(), notifier_run(), openid_content(), pagelist_widget(), parse_app_description(), pdledit_post(), photo_upload(), photos_album_widget(), photos_albums_list(), photos_create_item(), photos_list_photos(), poll_content(), post_activity_item(), post_init(), post_post(), profile_activity(), profile_sidebar(), public_recips(), pubsites_content(), rbmark_content(), rbmark_post(), register_post(), removeaccount_content(), removeme_content(), rmagic_init(), rmagic_post(), rpost_content(), script_path(), search_content(), searchbox(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), sources_content(), sources_post(), sslify(), sync_directories(), tagger_content(), theme_attachments(), thing_init(), toggle_safesearch_init(), update_suggestions(), user_allow(), vcard_from_xchan(), verify_email_address(), webpages_content(), wfinger_init(), widget_archive(), widget_chatroom_list(), widget_dirtags(), widget_filer(), widget_savedsearch(), widget_suggestions(), xref_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), zot_new_uid(), and zot_refresh().

    @@ -1536,6 +1540,20 @@ Variables

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

    + + + +
    +
    + + + + +
    const ABOOK_FLAG_FEED 0x0100
    +
    + +

    Referenced by check_item_source(), new_contact(), onepoll_run(), and poller_run().

    +
    @@ -2278,7 +2296,7 @@ Variables
    - +
    const DB_UPDATE_VERSION 1128const DB_UPDATE_VERSION 1129
    @@ -2338,7 +2356,7 @@ Variables
    -

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

    +

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

    @@ -2352,7 +2370,7 @@ Variables
    -

    Referenced by import_site(), poller_run(), sync_directories(), and zfinger_init().

    +

    Referenced by check_upstream_directory(), import_site(), poller_run(), sync_directories(), and zfinger_init().

    @@ -2366,7 +2384,7 @@ Variables
    -

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

    +

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

    @@ -2436,7 +2454,7 @@ Variables
    -

    Referenced by account_remove(), achievements_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_profs(), admin_page_site_post(), admin_page_users(), api_content(), api_post(), appman_content(), appman_post(), attach_init(), block_content(), blocks_content(), bookmarks_content(), bookmarks_init(), channel_content(), channel_init(), chanview_content(), chat_content(), chat_init(), chatroom_enter(), check_account_email(), check_account_invite(), check_form_security_std_err_msg(), check_htaccess(), check_keys(), check_php(), check_smarty3(), check_store(), common_content(), common_init(), connect_init(), connections_content(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), dirprofile_init(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), filestorage_post(), follow_init(), format_like(), fsuggest_content(), fsuggest_post(), group_add(), group_content(), group_post(), hcard_init(), home_content(), import_post(), import_xchan(), importelm_post(), invite_content(), invite_post(), item_content(), item_post(), layouts_content(), like_content(), load_database(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), mood_content(), network_content(), network_init(), new_channel_content(), new_channel_post(), notifications_content(), notifications_post(), oexchange_content(), openid_content(), page_content(), pdledit_content(), pdledit_post(), 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(), removeaccount_post(), removeme_post(), rmagic_post(), search_content(), settings_post(), setup_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), tagrm_post(), thing_content(), thing_init(), user_allow(), user_approve(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().

    +

    Referenced by account_remove(), achievements_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_profs(), admin_page_site_post(), admin_page_users(), api_content(), api_post(), appman_content(), appman_post(), attach_init(), block_content(), blocks_content(), bookmarks_content(), bookmarks_init(), channel_content(), channel_init(), chat_content(), chat_init(), chatroom_enter(), check_account_email(), check_account_invite(), check_form_security_std_err_msg(), check_htaccess(), check_keys(), check_php(), check_smarty3(), check_store(), common_content(), common_init(), connect_init(), connections_content(), connections_post(), connedit_content(), connedit_post(), delegate_content(), directory_content(), dirprofile_init(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), events_post(), filestorage_content(), filestorage_post(), follow_init(), format_like(), fsuggest_content(), fsuggest_post(), group_add(), group_content(), group_post(), hcard_init(), home_content(), import_post(), import_xchan(), importelm_post(), invite_content(), invite_post(), item_content(), item_post(), layouts_content(), like_content(), load_database(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), match_content(), menu_content(), menu_post(), message_content(), mitem_content(), mitem_init(), mitem_post(), mood_content(), network_content(), network_init(), new_channel_content(), new_channel_post(), notifications_content(), notifications_post(), oexchange_content(), openid_content(), page_content(), pdledit_content(), pdledit_post(), 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(), removeaccount_post(), removeme_post(), rmagic_post(), search_content(), settings_post(), setup_content(), sources_content(), sources_post(), subthread_content(), suggest_content(), tagrm_post(), thing_content(), thing_init(), user_allow(), user_approve(), user_deny(), viewconnections_content(), viewsrc_content(), wall_attach_post(), wall_upload_post(), webpages_content(), and xchan_content().

    @@ -2719,7 +2737,7 @@ Variables
    -

    Referenced by Conversation\add_thread(), encode_item(), and item_store().

    +

    Referenced by Conversation\add_thread(), encode_item(), item_store(), and start_delivery_chain().

    @@ -2761,7 +2779,7 @@ Variables
    -

    Referenced by diaspora_process_outbound(), editpost_content(), editwebpage_content(), encode_item(), get_item_elements(), item_post(), item_store(), item_store_update(), localize_item(), notification(), post_activity_item(), start_delivery_chain(), tag_deliver(), unobscure(), and viewsrc_content().

    +

    Referenced by bb2diaspora_itembody(), diaspora_process_outbound(), editpost_content(), editwebpage_content(), encode_item(), get_item_elements(), item_post(), item_store(), item_store_update(), localize_item(), notification(), post_activity_item(), start_delivery_chain(), store_diaspora_comment_sig(), tag_deliver(), unobscure(), and viewsrc_content().

    @@ -3053,7 +3071,7 @@ Variables
    -

    Referenced by RedDirectory\__construct(), RedFile\__construct(), admin_page_logs(), build_sync_packet(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), RedDirectory\childExists(), consume_feed(), RedDirectory\createFile(), deliver_run(), detect_language(), diaspora_msg_build(), diaspora_pubmsg_build(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_status(), dir_parse_query(), directory_content(), dirprofile_init(), encode_item(), fetch_xrd_links(), find_diaspora_person_by_handle(), fix_private_photos(), get_atom_elements(), RedDirectory\getChild(), RedDirectory\getChildren(), RedDirectory\getDir(), RedDirectory\getName(), import_xchan(), item_post(), item_store(), item_store_update(), RedDirectory\log(), RedBasicAuth\log(), magic_init(), mail_post(), mail_store(), mini_group_select(), new_contact(), notifier_run(), old_webfinger(), onepoll_run(), openid_content(), parse_xml_string(), photos_post(), ping_init(), poco_load(), post_post(), public_recips(), receive_post(), RedChannelList(), RedCollectionData(), RedDirectory\setName(), sync_directories(), tag_deliver(), tgroup_check(), update_directory_entry(), update_feed_item(), 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 RedDirectory\__construct(), RedFile\__construct(), admin_page_logs(), build_sync_packet(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), RedDirectory\childExists(), consume_feed(), RedDirectory\createFile(), deliver_run(), detect_language(), diaspora_msg_build(), diaspora_pubmsg_build(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_status(), dir_parse_query(), directory_content(), dirprofile_init(), discover_by_url(), encode_item(), fetch_xrd_links(), find_diaspora_person_by_handle(), fix_private_photos(), get_atom_elements(), RedDirectory\getChild(), RedDirectory\getChildren(), RedDirectory\getDir(), RedDirectory\getName(), import_xchan(), item_post(), item_store(), item_store_update(), RedDirectory\log(), RedBasicAuth\log(), magic_init(), mail_post(), mail_store(), mini_group_select(), new_contact(), notifier_run(), old_webfinger(), onepoll_run(), openid_content(), parse_xml_string(), photos_post(), ping_init(), poco_load(), post_post(), public_recips(), receive_post(), RedChannelList(), RedCollectionData(), RedDirectory\setName(), sync_directories(), tag_deliver(), tgroup_check(), update_directory_entry(), update_feed_item(), xml2array(), z_fetch_url(), z_post_url(), zot_build_packet(), zot_fetch(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().

    @@ -3067,7 +3085,7 @@ Variables
    -

    Referenced by Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_page_logs(), admin_post(), api_login(), api_statuses_user_timeline(), avatar_img(), bookmark_add(), consume_feed(), conversation(), RedDirectory\createDirectory(), RedDirectory\createFile(), RedFile\delete(), delete_imported_item(), deliver_run(), diaspora_conversation(), diaspora_decode(), diaspora_dispatch(), diaspora_handle_from_contact(), diaspora_message(), diaspora_photo(), diaspora_reshare(), diaspora_transmit(), directory_content(), directory_run(), dirprofile_init(), discover_by_webbie(), expire_run(), externals_run(), fetch_lrdd_template(), fix_private_photos(), RedFile\get(), get_diaspora_key(), get_language_name(), Conversation\get_template_data(), RedDirectory\getDir(), RedFile\getName(), group_content(), guess_image_type(), import_author_rss(), 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(), load_plugin(), local_dir_update(), FKOAuth1\loginUser(), magic_init(), mail_store(), mood_init(), new_contact(), notes_init(), notification(), notifier_run(), parse_url_content(), photo_upload(), photos_post(), poco_init(), poco_load(), poke_init(), post_post(), process_delivery(), process_profile_delivery(), profile_load(), RedFile\put(), queue_run(), receive_post(), RedFileData(), Item\remove_child(), scale_external_images(), scrape_feed(), enotify\send(), Conversation\set_mode(), RedFile\setName(), stream_perms_api_uids(), stream_perms_xchans(), tag_deliver(), unload_plugin(), z_fetch_url(), z_post_url(), zot_feed(), zot_finger(), zot_gethub(), zot_register_hub(), and zotfeed_init().

    +

    Referenced by Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_page_logs(), admin_post(), api_login(), api_statuses_user_timeline(), avatar_img(), bookmark_add(), consume_feed(), conversation(), RedDirectory\createDirectory(), RedDirectory\createFile(), RedFile\delete(), delete_imported_item(), deliver_run(), diaspora_conversation(), diaspora_decode(), diaspora_dispatch(), diaspora_handle_from_contact(), diaspora_message(), diaspora_photo(), diaspora_reshare(), diaspora_transmit(), directory_content(), directory_run(), dirprofile_init(), discover_by_webbie(), expire_run(), externals_run(), fetch_lrdd_template(), fix_private_photos(), RedFile\get(), get_diaspora_key(), get_language_name(), Conversation\get_template_data(), RedDirectory\getDir(), RedFile\getName(), group_content(), guess_image_type(), import_author_rss(), 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(), load_plugin(), local_dir_update(), FKOAuth1\loginUser(), magic_init(), mail_store(), mood_init(), new_contact(), notes_init(), notification(), notifier_run(), onepoll_run(), parse_url_content(), photo_upload(), photos_post(), poco_init(), poco_load(), poke_init(), post_post(), process_delivery(), process_profile_delivery(), profile_load(), RedFile\put(), queue_run(), receive_post(), RedFileData(), Item\remove_child(), scale_external_images(), scrape_feed(), enotify\send(), Conversation\set_mode(), RedFile\setName(), store_diaspora_comment_sig(), stream_perms_api_uids(), stream_perms_xchans(), tag_deliver(), unload_plugin(), z_fetch_url(), z_post_url(), zot_feed(), zot_finger(), zot_gethub(), zot_register_hub(), and zotfeed_init().

    @@ -3976,7 +3994,7 @@ Variables
    -

    Referenced by check_item_source(), get_perms(), and get_role_perms().

    +

    Referenced by check_item_source(), get_perms(), get_role_perms(), and new_contact().

    @@ -4131,7 +4149,7 @@ Variables

    Permissions

    -

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

    +

    Referenced by diaspora_request(), follow_init(), get_perms(), get_role_perms(), new_contact(), onepoll_run(), and zot_refresh().

    @@ -4593,7 +4611,7 @@ Variables
    -

    Referenced by categories_widget(), channel_content(), decode_tags(), editpost_content(), encode_item_terms(), file_tag_file_query(), filerm_content(), format_categories(), item_post(), and widget_tagcloud().

    +

    Referenced by categories_widget(), channel_content(), decode_tags(), editpost_content(), encode_item_terms(), file_tag_file_query(), filerm_content(), format_categories(), get_atom_elements(), item_post(), and widget_tagcloud().

    @@ -4780,7 +4798,7 @@ Variables

    Tag/term types

    -

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

    +

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

    diff --git a/doc/html/boot_8php.js b/doc/html/boot_8php.js index 392763b1c..f5ae164f7 100644 --- a/doc/html/boot_8php.js +++ b/doc/html/boot_8php.js @@ -44,6 +44,7 @@ var boot_8php = [ "$DIRECTORY_FALLBACK_SERVERS", "boot_8php.html#a107d53f96acf5319905a34b1870db09a", null ], [ "ABOOK_FLAG_ARCHIVED", "boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5", null ], [ "ABOOK_FLAG_BLOCKED", "boot_8php.html#a52b599cd13e152ebc80d7e4413683195", null ], + [ "ABOOK_FLAG_FEED", "boot_8php.html#ae0d9527117cd87dcba11986047ae336e", null ], [ "ABOOK_FLAG_HIDDEN", "boot_8php.html#a34c756469ebed32e2fc987bcde62d382", null ], [ "ABOOK_FLAG_IGNORED", "boot_8php.html#aa3425e2de85b08f7041656d3a8502cb6", null ], [ "ABOOK_FLAG_PENDING", "boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155", null ], diff --git a/doc/html/crypto_8php.html b/doc/html/crypto_8php.html index 8110477ff..06fcf6200 100644 --- a/doc/html/crypto_8php.html +++ b/doc/html/crypto_8php.html @@ -344,7 +344,7 @@ Functions
    -

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

    +

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

    @@ -738,7 +738,7 @@ Functions
    -

    Referenced by create_identity(), diaspora_msg_build(), diaspora_pubmsg_build(), diaspora_send_followup(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), 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().

    +

    Referenced by create_identity(), diaspora_msg_build(), diaspora_pubmsg_build(), diaspora_send_followup(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), fix_system_urls(), import_post(), item_post(), item_store(), item_store_update(), magic_init(), post_activity_item(), post_post(), store_diaspora_comment_sig(), zfinger_init(), zot_build_packet(), and zot_fetch().

    diff --git a/doc/html/datetime_8php.html b/doc/html/datetime_8php.html index a4e987b31..01455ef29 100644 --- a/doc/html/datetime_8php.html +++ b/doc/html/datetime_8php.html @@ -336,7 +336,7 @@ Functions
    -

    Referenced by abook_toggle_flag(), account_verify_password(), advanced_profile(), age(), api_account_rate_limit_status(), api_date(), api_rss_extra(), atom_entry(), attach_delete(), attach_mkdir(), attach_store(), authenticate_success(), build_sync_packet(), cal(), channel_content(), channel_remove(), chat_message(), chatroom_create(), chatroom_enter(), chatsvc_content(), chatsvc_post(), Cache\clear(), comments_are_now_closed(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createFile(), cronhooks_run(), delete_item_lowlevel(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_message(), diaspora_post(), diaspora_profile(), diaspora_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_status(), diaspora_signed_retraction(), diaspora_transmit(), directory_run(), dirsearch_content(), discover_by_webbie(), dlogger(), dob(), editpost_content(), ev_compare(), event_store_event(), events_content(), events_post(), externals_run(), first_post_date(), fix_system_urls(), format_event_diaspora(), format_event_html(), fsuggest_post(), RedBrowser\generateDirectoryIndex(), get_atom_elements(), get_birthdays(), get_events(), get_feed_for(), get_first_dim(), get_item_elements(), get_mail_elements(), get_profile_elements(), get_public_feed(), Item\get_template_data(), RedDirectory\getLastModified(), RedFile\getLastModified(), import_author_rss(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), list_post_dates(), logger(), magic_init(), mail_content(), mail_post(), mail_store(), manage_content(), message_content(), network_content(), new_contact(), notification(), notifier_run(), onepoll_run(), openid_content(), pagelist_widget(), photo_upload(), photos_post(), ping_init(), poco_load(), poller_run(), post_post(), posted_dates(), profile_photo_post(), profiles_content(), profiles_post(), prune_hub_reinstalls(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), queue_run(), relative_date(), removeaccount_post(), removeme_post(), photo_driver\save(), send_message(), send_reg_approval_email(), Cache\set(), settings_post(), photo_driver\store(), sync_directories(), tag_deliver(), update_birthdays(), update_directory_entry(), update_modtime(), update_queue_time(), verify_email_address(), webpages_content(), z_birthday(), zot_feed(), zot_process_response(), zot_refresh(), and zotfeed_init().

    +

    Referenced by abook_toggle_flag(), account_verify_password(), advanced_profile(), age(), api_account_rate_limit_status(), api_date(), api_rss_extra(), atom_entry(), attach_delete(), attach_mkdir(), attach_store(), authenticate_success(), build_sync_packet(), cal(), channel_content(), channel_remove(), chat_message(), chatroom_create(), chatroom_enter(), chatsvc_content(), chatsvc_post(), Cache\clear(), comments_are_now_closed(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createFile(), cronhooks_run(), delete_item_lowlevel(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_message(), diaspora_post(), diaspora_profile(), diaspora_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_status(), diaspora_signed_retraction(), diaspora_transmit(), directory_run(), dirsearch_content(), discover_by_url(), discover_by_webbie(), dlogger(), dob(), editpost_content(), ev_compare(), event_store_event(), events_content(), events_post(), externals_run(), first_post_date(), fix_system_urls(), format_event_diaspora(), format_event_html(), fsuggest_post(), RedBrowser\generateDirectoryIndex(), get_atom_elements(), get_birthdays(), get_events(), get_feed_for(), get_first_dim(), get_item_elements(), get_mail_elements(), get_profile_elements(), get_public_feed(), Item\get_template_data(), RedDirectory\getLastModified(), RedFile\getLastModified(), import_author_rss(), import_directory_profile(), import_post(), import_site(), import_xchan(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), list_post_dates(), logger(), magic_init(), mail_content(), mail_post(), mail_store(), manage_content(), message_content(), network_content(), new_contact(), notification(), notifier_run(), onepoll_run(), openid_content(), pagelist_widget(), photo_upload(), photos_post(), ping_init(), poco_load(), poller_run(), post_post(), posted_dates(), profile_photo_post(), profiles_content(), profiles_post(), prune_hub_reinstalls(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), queue_run(), relative_date(), removeaccount_post(), removeme_post(), photo_driver\save(), send_message(), send_reg_approval_email(), Cache\set(), settings_post(), photo_driver\store(), sync_directories(), tag_deliver(), update_birthdays(), update_directory_entry(), update_modtime(), update_queue_time(), verify_email_address(), webpages_content(), 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 bec1003b1..95075c913 100644 --- a/doc/html/dba__driver_8php.html +++ b/doc/html/dba__driver_8php.html @@ -202,7 +202,7 @@ Functions
    -

    Referenced by abook_toggle_flag(), account_verify_password(), achievements_content(), acl_init(), add_source_route(), admin_page_profs_post(), admin_page_users(), advanced_profile(), allowed_public_recips(), api_direct_messages_new(), api_get_user(), api_login(), api_status_show(), api_statuses_destroy(), api_statuses_mentions(), api_user(), api_users_show(), app_destroy(), app_installed(), app_store(), app_update(), appman_content(), attach_by_hash(), attach_by_hash_nodata(), attach_change_permissions(), attach_count_files(), attach_delete(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), block_content(), blocks_content(), bookmark_add(), bookmarks_init(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), channel_content(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), chat_message(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatsvc_content(), chatsvc_post(), check_account_email(), check_account_invite(), check_item_source(), check_webbie(), Cache\clear(), comanche_block(), common_friends(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_post(), consume_feed(), contact_remove(), contactgroup_content(), count_common_friends(), create_account(), create_identity(), RedDirectory\createFile(), dbesc_array_cb(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_dispatch_public(), diaspora_get_contact_by_handle(), diaspora_like(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_process_outbound(), diaspora_profile(), diaspora_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_relay(), diaspora_share(), diaspora_signed_retraction(), diaspora_transmit(), dir_query_build(), directory_run(), dirsearch_content(), discover_by_webbie(), display_content(), downgrade_accounts(), editlayout_content(), editpost_content(), editwebpage_content(), event_addtocal(), event_store_event(), event_store_item(), events_content(), events_post(), externals_run(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), filerm_content(), filestorage_content(), find_diaspora_person_by_handle(), find_filename_by_hash(), find_folder_hash_by_attach_hash(), RedBrowser\findAttachHash(), RedBrowser\findAttachIdByHash(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_post(), Cache\get(), RedFile\get(), get_all_perms(), get_birthdays(), get_channel_by_nick(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), get_things(), RedDirectory\getDir(), RedDirectory\getLastModified(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), handle_feed(), handle_tag(), hcard_init(), home_content(), import_author_rss(), import_author_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), is_matrix_url(), item_add_cid(), item_message_id(), item_permissions_sql(), item_post(), item_remove_cid(), item_store(), item_store_update(), items_fetch(), layouts_content(), like_content(), list_public_sites(), load_config(), load_plugin(), load_xconfig(), local_dir_update(), lockview_content(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_store(), manage_content(), mark_orphan_hubsxchans(), match_openid(), member_of(), menu_add_item(), menu_create(), menu_delete(), menu_edit(), menu_edit_item(), menu_fetch(), menu_list(), msearch_post(), netgrowth_content(), 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(), openid_content(), page_content(), perm_is_allowed(), permissions_sql(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_content(), photos_list_photos(), photos_post(), ping_init(), plugin_is_installed(), poco_init(), poco_load(), poll_post(), 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(), profile_photo_set_profile_perms(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), prune_hub_reinstalls(), public_permissions_sql(), public_recips(), RedFile\put(), queue_run(), rconnect_url(), receive_post(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), register_post(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), rpost_content(), photo_driver\save(), search_ac_init(), search_content(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), RedDirectory\setName(), RedFile\setName(), settings_post(), siteinfo_init(), sitelist_init(), sources_content(), sources_post(), start_delivery_chain(), photo_driver\store(), store_item_tag(), stream_perms_xchans(), stringify_array_elms(), subthread_content(), suggest_init(), sync_directories(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), tgroup_check(), thing_content(), thing_init(), uninstall_plugin(), unregister_hook(), update_birthdays(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), user_allow(), user_approve(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), verify_email_address(), vote_post(), webpages_content(), wfinger_init(), widget_bookmarkedchats(), widget_item(), 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 abook_toggle_flag(), account_verify_password(), achievements_content(), acl_init(), add_source_route(), admin_page_profs_post(), admin_page_users(), advanced_profile(), allowed_public_recips(), api_direct_messages_new(), api_get_user(), api_login(), api_status_show(), api_statuses_destroy(), api_statuses_mentions(), api_user(), api_users_show(), app_destroy(), app_installed(), app_store(), app_update(), appman_content(), attach_by_hash(), attach_by_hash_nodata(), attach_change_permissions(), attach_count_files(), attach_delete(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), bb2dmention_callback(), block_content(), blocks_content(), bookmark_add(), bookmarks_init(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), channel_content(), channel_remove(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), chat_message(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatsvc_content(), chatsvc_post(), check_account_email(), check_account_invite(), check_item_source(), check_upstream_directory(), check_webbie(), Cache\clear(), comanche_block(), common_friends(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_post(), consume_feed(), contact_remove(), contactgroup_content(), count_common_friends(), create_account(), create_identity(), RedDirectory\createFile(), dbesc_array_cb(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_dispatch_public(), diaspora_get_contact_by_handle(), diaspora_handle_from_contact(), diaspora_like(), diaspora_mention_callback(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_process_outbound(), diaspora_profile(), diaspora_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_relay(), diaspora_share(), diaspora_signed_retraction(), diaspora_transmit(), dir_query_build(), directory_run(), dirsearch_content(), discover_by_url(), discover_by_webbie(), display_content(), downgrade_accounts(), editlayout_content(), editpost_content(), editwebpage_content(), event_addtocal(), event_store_event(), event_store_item(), events_content(), events_post(), externals_run(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), filerm_content(), filestorage_content(), filter_insecure(), find_diaspora_person_by_handle(), find_filename_by_hash(), find_folder_hash_by_attach_hash(), RedBrowser\findAttachHash(), RedBrowser\findAttachIdByHash(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_post(), Cache\get(), RedFile\get(), get_all_perms(), get_birthdays(), get_channel_by_nick(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), get_things(), RedDirectory\getDir(), RedDirectory\getLastModified(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), handle_feed(), handle_tag(), hcard_init(), home_content(), import_author_diaspora(), import_author_rss(), import_author_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), is_matrix_url(), item_add_cid(), item_message_id(), item_permissions_sql(), item_post(), item_remove_cid(), item_store(), item_store_update(), items_fetch(), layouts_content(), like_content(), list_public_sites(), load_config(), load_plugin(), load_xconfig(), local_dir_update(), lockview_content(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_store(), manage_content(), mark_orphan_hubsxchans(), match_openid(), member_of(), menu_add_item(), menu_create(), menu_delete(), menu_edit(), menu_edit_item(), menu_fetch(), menu_list(), msearch_post(), netgrowth_content(), 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(), openid_content(), page_content(), perm_is_allowed(), permissions_sql(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_content(), photos_list_photos(), photos_post(), ping_init(), plugin_is_installed(), poco_init(), poco_load(), poll_post(), 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(), profile_photo_set_profile_perms(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), prune_hub_reinstalls(), public_permissions_sql(), public_recips(), RedFile\put(), queue_run(), rconnect_url(), receive_post(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), register_post(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), rpost_content(), photo_driver\save(), search_ac_init(), search_content(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), RedDirectory\setName(), RedFile\setName(), settings_post(), siteinfo_init(), sitelist_init(), sources_content(), sources_post(), start_delivery_chain(), photo_driver\store(), store_diaspora_comment_sig(), store_item_tag(), stream_perms_xchans(), stringify_array_elms(), subthread_content(), suggest_init(), sync_directories(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), tgroup_check(), thing_content(), thing_init(), uninstall_plugin(), unregister_hook(), update_birthdays(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), user_allow(), user_approve(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), verify_email_address(), vote_post(), webpages_content(), wfinger_init(), widget_bookmarkedchats(), widget_item(), widget_savedsearch(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hublocs(), zot_gethub(), zot_process_response(), zot_refresh(), and zotfeed_init().

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

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

    -

    Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_remove(), account_total(), account_verify_password(), achievements_content(), acl_init(), add_source_route(), admin_content(), admin_page_channels(), admin_page_channels_post(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_profs(), admin_page_profs_post(), 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_login(), api_status_show(), api_statuses_destroy(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_user(), api_users_show(), app_destroy(), app_installed(), app_list(), app_store(), app_update(), appman_content(), attach_by_hash(), attach_by_hash_nodata(), attach_change_permissions(), attach_count_files(), attach_delete(), attach_init(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), block_content(), blocks_content(), bookmark_add(), bookmarks_init(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), chanman_remove_everything_from_network(), channel_content(), channel_remove(), channel_total(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), chat_content(), chat_message(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatroom_list(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_webbie(), Cache\clear(), collect_recipients(), comanche_block(), common_friends(), common_friends_zcid(), common_init(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_init(), connedit_post(), consume_feed(), contact_block(), contact_profile_assign(), contact_remove(), contact_select(), contactgroup_content(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), create_account(), create_identity(), RedDirectory\createDirectory(), RedDirectory\createFile(), current_theme(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_dispatch_public(), diaspora_get_contact_by_handle(), diaspora_handle_from_contact(), diaspora_like(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_process_outbound(), diaspora_profile(), diaspora_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_share(), diaspora_signed_retraction(), diaspora_transmit(), dir_parse_query(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), dirsearch_content(), discover_by_webbie(), display_content(), downgrade_accounts(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), encode_item(), event_addtocal(), event_store_event(), event_store_item(), events_content(), events_post(), expand_groups(), expire_run(), externals_run(), fbrowser_content(), feed_init(), fetch_post_tags(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), find_diaspora_person_by_handle(), find_filename_by_hash(), find_folder_hash_by_attach_hash(), RedBrowser\findAttachHash(), RedBrowser\findAttachIdByHash(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_content(), fsuggest_post(), RedBrowser\generateDirectoryIndex(), Cache\get(), RedFile\get(), get_all_perms(), get_birthdays(), get_channel_by_nick(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), get_sys_channel(), get_things(), get_words(), RedDirectory\getDir(), RedDirectory\getLastModified(), RedDirectory\getQuotaInfo(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_get_members(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), group_select(), group_side(), groups_containing(), handle_feed(), handle_tag(), hcard_init(), home_content(), identity_basic_export(), identity_check_service_class(), identity_selector(), import_author_rss(), import_author_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), is_matrix_url(), is_sys_channel(), item_add_cid(), item_check_service_class(), item_content(), item_expire(), item_message_id(), item_post(), item_remove_cid(), item_store(), item_store_update(), items_fetch(), layout_select(), layouts_content(), like_content(), list_public_sites(), load_config(), load_contact_links(), load_hooks(), load_pconfig(), load_plugin(), load_translation_table(), load_xconfig(), local_dir_update(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_store(), manage_content(), mark_orphan_hubsxchans(), match_content(), match_openid(), member_of(), menu_add_item(), menu_create(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit(), menu_edit_item(), menu_fetch(), menu_fetch_id(), menu_list(), mimetype_select(), mini_group_select(), mitem_content(), mood_init(), msearch_post(), nav(), netgrowth_content(), 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(), openid_content(), page_content(), pagelist_widget(), pdl_selector(), perm_is_allowed(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_albums_list(), photos_content(), photos_list_photos(), photos_post(), ping_init(), plugin_is_installed(), poco_init(), poco_load(), poke_content(), poke_init(), poll_content(), poll_post(), 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_photo_set_profile_perms(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), prune_hub_reinstalls(), public_recips(), RedFile\put(), queue_run(), random_profile(), rconnect_url(), receive_post(), RedChannelList(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_content(), register_hook(), register_post(), reload_plugins(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), retain_item(), rmagic_init(), rmagic_post(), rpost_content(), photo_driver\save(), search_ac_init(), search_content(), send_message(), send_reg_approval_email(), send_status_notifications(), service_class_allows(), service_class_fetch(), Cache\set(), set_config(), set_default_login_identity(), set_pconfig(), set_xconfig(), RedDirectory\setName(), RedFile\setName(), settings_post(), setup_content(), share_init(), siteinfo_content(), siteinfo_init(), sitelist_init(), sources_content(), sources_post(), starred_init(), start_delivery_chain(), photo_driver\store(), store_item_tag(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), suggest_init(), suggestion_query(), sync_directories(), tag_deliver(), tagadelic(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), thing_content(), thing_init(), uninstall_plugin(), unregister_hook(), update_birthdays(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), update_suggestions(), user_allow(), user_approve(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), verify_email_address(), viewconnections_content(), viewsrc_content(), vote_content(), vote_init(), vote_post(), webpages_content(), wfinger_init(), widget_bookmarkedchats(), widget_filer(), widget_follow(), widget_item(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_input_filter(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hublocs(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zotfeed_init().

    +

    Referenced by abook_connections(), abook_self(), abook_toggle_flag(), account_remove(), account_total(), account_verify_password(), achievements_content(), acl_init(), add_source_route(), admin_content(), admin_page_channels(), admin_page_channels_post(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_profs(), admin_page_profs_post(), 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_login(), api_status_show(), api_statuses_destroy(), api_statuses_f(), api_statuses_home_timeline(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_user(), api_users_show(), app_destroy(), app_installed(), app_list(), app_store(), app_update(), appman_content(), attach_by_hash(), attach_by_hash_nodata(), attach_change_permissions(), attach_count_files(), attach_delete(), attach_init(), attach_list_files(), attach_mkdir(), attach_store(), authenticate_success(), bb2dmention_callback(), block_content(), blocks_content(), bookmark_add(), bookmarks_init(), build_sync_packet(), call_hooks(), categories_widget(), change_channel(), chanman_remove_everything_from_network(), channel_content(), channel_remove(), channel_total(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), chat_content(), chat_message(), chat_post(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatroom_leave(), chatroom_list(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_account_email(), check_account_invite(), check_config(), check_item_source(), check_upstream_directory(), check_webbie(), Cache\clear(), collect_recipients(), comanche_block(), common_friends(), common_friends_zcid(), common_init(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_init(), connedit_post(), consume_feed(), contact_block(), contact_profile_assign(), contact_remove(), contact_select(), contactgroup_content(), count_all_friends(), count_common_friends(), count_common_friends_zcid(), create_account(), create_identity(), RedDirectory\createDirectory(), RedDirectory\createFile(), current_theme(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_dispatch_public(), diaspora_get_contact_by_handle(), diaspora_handle_from_contact(), diaspora_like(), diaspora_mention_callback(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_process_outbound(), diaspora_profile(), diaspora_request(), diaspora_reshare(), diaspora_retraction(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_share(), diaspora_signed_retraction(), diaspora_transmit(), dir_parse_query(), dir_tagadelic(), directory_content(), directory_run(), dirprofile_init(), dirsearch_content(), discover_by_url(), discover_by_webbie(), display_content(), downgrade_accounts(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), encode_item(), event_addtocal(), event_store_event(), event_store_item(), events_content(), events_post(), expand_groups(), expire_run(), externals_run(), fbrowser_content(), feed_init(), fetch_post_tags(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), filter_insecure(), find_diaspora_person_by_handle(), find_filename_by_hash(), find_folder_hash_by_attach_hash(), RedBrowser\findAttachHash(), RedBrowser\findAttachIdByHash(), first_post_date(), fix_attached_photo_permissions(), fix_private_photos(), fix_system_urls(), fsuggest_content(), fsuggest_post(), RedBrowser\generateDirectoryIndex(), Cache\get(), RedFile\get(), get_all_perms(), get_birthdays(), get_channel_by_nick(), get_cloudpath(), get_config_from_storage(), get_events(), get_item_elements(), get_online_status(), get_sys_channel(), get_things(), get_words(), RedDirectory\getDir(), RedDirectory\getLastModified(), RedDirectory\getQuotaInfo(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_get_members(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), group_select(), group_side(), groups_containing(), handle_feed(), handle_tag(), hcard_init(), home_content(), identity_basic_export(), identity_check_service_class(), identity_selector(), import_author_diaspora(), import_author_rss(), import_author_zot(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), is_matrix_url(), is_sys_channel(), item_add_cid(), item_check_service_class(), item_content(), item_expire(), item_message_id(), item_post(), item_remove_cid(), item_store(), item_store_update(), items_fetch(), layout_select(), layouts_content(), like_content(), list_public_sites(), load_config(), load_contact_links(), load_hooks(), load_pconfig(), load_plugin(), load_translation_table(), load_xconfig(), local_dir_update(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_store(), manage_content(), mark_orphan_hubsxchans(), match_content(), match_openid(), member_of(), menu_add_item(), menu_create(), menu_del_item(), menu_delete(), menu_delete_id(), menu_edit(), menu_edit_item(), menu_fetch(), menu_fetch_id(), menu_list(), mimetype_select(), mini_group_select(), mitem_content(), mood_init(), msearch_post(), nav(), netgrowth_content(), 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(), openid_content(), page_content(), pagelist_widget(), pdl_selector(), perm_is_allowed(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_albums_list(), photos_content(), photos_list_photos(), photos_post(), ping_init(), plugin_is_installed(), poco_init(), poco_load(), poke_content(), poke_init(), poll_content(), poll_post(), 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_photo_set_profile_perms(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), prune_hub_reinstalls(), public_recips(), RedFile\put(), queue_run(), random_profile(), rconnect_url(), receive_post(), RedChannelList(), RedCollectionData(), RedFileData(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_content(), register_hook(), register_post(), reload_plugins(), remote_online_status(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), retain_item(), rmagic_init(), rmagic_post(), rpost_content(), photo_driver\save(), search_ac_init(), search_content(), send_message(), send_reg_approval_email(), send_status_notifications(), service_class_allows(), service_class_fetch(), Cache\set(), set_config(), set_default_login_identity(), set_pconfig(), set_xconfig(), RedDirectory\setName(), RedFile\setName(), settings_post(), setup_content(), share_init(), siteinfo_content(), siteinfo_init(), sitelist_init(), sources_content(), sources_post(), starred_init(), start_delivery_chain(), photo_driver\store(), store_diaspora_comment_sig(), store_item_tag(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), suggest_init(), suggestion_query(), sync_directories(), tag_deliver(), tagadelic(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), thing_content(), thing_init(), uninstall_plugin(), unregister_hook(), update_birthdays(), update_directory_entry(), update_modtime(), update_queue_time(), update_remote_id(), update_suggestions(), user_allow(), user_approve(), user_deny(), RedBasicAuth\validateUserPass(), vcard_from_xchan(), verify_email_address(), viewconnections_content(), viewsrc_content(), vote_content(), vote_init(), vote_post(), webpages_content(), wfinger_init(), widget_bookmarkedchats(), widget_filer(), widget_follow(), widget_item(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_input_filter(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hublocs(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zotfeed_init().

    diff --git a/doc/html/dir__fns_8php.html b/doc/html/dir__fns_8php.html index 8ab7ddf42..b0da4b911 100644 --- a/doc/html/dir__fns_8php.html +++ b/doc/html/dir__fns_8php.html @@ -114,6 +114,8 @@ $(document).ready(function(){initNavTree('dir__fns_8php.html','');}); Functions  find_upstream_directory ($dirmode)   + check_upstream_directory () +   dir_sort_links ()    dir_safe_mode () @@ -126,6 +128,24 @@ Functions  

    Function Documentation

    + +
    +
    + + + + + + + +
    check_upstream_directory ()
    +
    +

    Directories may come and go over time. We will need to check that our directory server is still valid occasionally, and reset to something that is if our directory has gone offline for any reason

    + +

    Referenced by poller_run().

    + +
    +
    diff --git a/doc/html/dir__fns_8php.js b/doc/html/dir__fns_8php.js index 9c745ff6f..d0a717014 100644 --- a/doc/html/dir__fns_8php.js +++ b/doc/html/dir__fns_8php.js @@ -1,5 +1,6 @@ var dir__fns_8php = [ + [ "check_upstream_directory", "dir__fns_8php.html#a2f7d74bb2aea8bcd2537aee5c6708a16", null ], [ "dir_safe_mode", "dir__fns_8php.html#acf621621e929d49441da30aad76a58cf", null ], [ "dir_sort_links", "dir__fns_8php.html#ae56881d69bb6f8e828c9e35454386774", null ], [ "find_upstream_directory", "dir__fns_8php.html#a8c15aa69da12f2d3476b9e93b82b337d", null ], diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html index fdd9e1fa1..9790cd81d 100644 --- a/doc/html/extract_8php.html +++ b/doc/html/extract_8php.html @@ -132,7 +132,7 @@ Variables
    -

    Referenced by _well_known_init(), activity_sanitise(), api_rss_extra(), api_statuses_user_timeline(), app_store(), app_update(), appman_post(), array_sanitise(), attach_mkdir(), attach_store(), bookmark_add(), chat_message(), chat_post(), chatroom_create(), chatroom_destroy(), chatsvc_post(), 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(), diaspora_like(), diaspora_process_outbound(), directory_content(), discover_by_webbie(), drop_item(), event_store_event(), event_store_item(), externals_run(), feature_enabled(), fetch_xrd_links(), find_xchan_in_array(), format_like(), get_all_perms(), get_atom_elements(), get_cloudpath(), get_features(), get_item_elements(), get_mail_elements(), get_mood_verbs(), get_poke_verbs(), get_profile_elements(), Item\get_template_data(), get_terms_oftype(), App\get_widgets(), group_select(), hostxrd_init(), ids_to_querystr(), import_author_rss(), import_author_xchan(), import_directory_profile(), import_post(), import_site(), import_xchan(), item_getfeedattach(), item_store(), item_store_update(), items_fetch(), like_content(), like_puller(), load_database(), magic_init(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), mood_init(), network_content(), new_channel_post(), new_contact(), obj_verbs(), openid_content(), parse_url_content(), pdl_selector(), perm_is_allowed(), photo_upload(), photos_album_get_db_idstr(), photos_create_item(), ping_init(), po2php_run(), poke_init(), post_activity_item(), post_init(), post_post(), proc_run(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_activity(), profile_sidebar(), profiles_content(), redbasic_form(), register_page_template(), register_post(), remove_community_tag(), replace_macros(), rmagic_post(), photo_driver\save(), send_reg_approval_email(), service_class_allows(), service_class_fetch(), App\set_apps(), settings_post(), sort_by_date(), stringify_array_elms(), subthread_content(), suggest_content(), tag_deliver(), tagger_content(), tagrm_content(), tagrm_post(), theme_attachments(), theme_content(), thing_init(), translate_system_apps(), validate_channelname(), verify_email_address(), wfinger_init(), widget_affinity(), widget_archive(), widget_clock(), widget_item(), widget_photo(), 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 _well_known_init(), activity_sanitise(), api_rss_extra(), api_statuses_user_timeline(), app_store(), app_update(), appman_post(), array_sanitise(), attach_mkdir(), attach_store(), bookmark_add(), chat_message(), chat_post(), chatroom_create(), chatroom_destroy(), chatsvc_post(), 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(), diaspora_like(), diaspora_process_outbound(), directory_content(), discover_by_url(), discover_by_webbie(), drop_item(), event_store_event(), event_store_item(), externals_run(), feature_enabled(), fetch_xrd_links(), filter_insecure(), find_xchan_in_array(), format_like(), get_all_perms(), get_atom_elements(), get_cloudpath(), get_features(), get_item_elements(), get_mail_elements(), get_mood_verbs(), get_poke_verbs(), get_profile_elements(), Item\get_template_data(), get_terms_oftype(), App\get_widgets(), group_select(), hostxrd_init(), ids_to_querystr(), import_author_rss(), import_author_xchan(), import_directory_profile(), import_post(), import_site(), import_xchan(), item_getfeedattach(), item_store(), item_store_update(), items_fetch(), like_content(), like_puller(), load_database(), magic_init(), mail_store(), menu_add_item(), menu_create(), menu_edit(), menu_edit_item(), mood_init(), network_content(), new_channel_post(), new_contact(), obj_verbs(), openid_content(), parse_url_content(), pdl_selector(), perm_is_allowed(), photo_upload(), photos_album_get_db_idstr(), photos_create_item(), ping_init(), po2php_run(), poke_init(), post_activity_item(), post_init(), post_post(), proc_run(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_activity(), profile_sidebar(), profiles_content(), redbasic_form(), register_page_template(), register_post(), remove_community_tag(), replace_macros(), rmagic_post(), photo_driver\save(), send_reg_approval_email(), service_class_allows(), service_class_fetch(), App\set_apps(), settings_post(), sort_by_date(), stringify_array_elms(), subthread_content(), suggest_content(), tag_deliver(), tagger_content(), tagrm_content(), tagrm_post(), theme_attachments(), theme_content(), thing_init(), translate_system_apps(), validate_channelname(), verify_email_address(), wfinger_init(), widget_affinity(), widget_archive(), widget_clock(), widget_item(), widget_photo(), 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(), app_decode(), attribute_contains(), base64url_decode(), base64url_encode(), bb_tag_preg_replace(), bb_translate_video(), bbtoevent(), bbtovcal(), bookmarks_init(), chanlink_hash(), chanlink_url(), comanche_parser(), comanche_region(), comanche_webpage(), construct_page(), datetime_convert(), day_translate(), detect_language(), diaspora2bb(), diaspora_is_blacklisted(), diaspora_ol(), diaspora_ul(), dir_parse_query(), dir_query_build(), element_install(), expand_acl(), file_tag_decode(), file_tag_encode(), file_tag_file_query(), fix_mce_lf(), fix_private_photos(), format_categories(), format_filer(), format_hashtags(), format_mentions(), format_term_for_display(), get_bb_tag_pos(), get_intltext_template(), get_language_name(), get_markup_template(), get_tags(), html2bb_video(), info(), is_a_date_arg(), is_foreigner(), is_member(), json_decode_plus(), legal_webbie(), linkify(), magic_link(), mail_content(), network_to_name(), normalise_openid(), notice(), notifier_run(), oembed_iframe(), oembed_replacecb(), oexchange_content(), parse_xml_string(), photos_post(), poco_load(), prepare_body(), print_template(), printable(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), protect_sprintf(), purify_html(), qp(), random_string(), Template\replace(), replace_macros(), FriendicaSmartyEngine\replace_macros(), Template\replace_macros(), scale_external_images(), scrape_feed(), scrape_vcard(), search(), searchbox(), siteinfo_content(), smilies(), sslify(), string_splitter(), strip_zids(), stripdcode_br_cb(), t(), template_escape(), template_unescape(), term_query(), theme_attachments(), unamp(), undo_post_tagging(), unxmlify(), Template\var_replace(), webfinger_rfc7033(), 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(), app_decode(), attribute_contains(), base64url_decode(), base64url_encode(), bb_tag_preg_replace(), bb_translate_video(), bbtoevent(), bbtovcal(), bookmarks_init(), chanlink_hash(), chanlink_url(), comanche_parser(), comanche_region(), comanche_webpage(), construct_page(), datetime_convert(), day_translate(), detect_language(), diaspora2bb(), diaspora_is_blacklisted(), diaspora_ol(), diaspora_ul(), dir_parse_query(), dir_query_build(), expand_acl(), file_tag_decode(), file_tag_encode(), file_tag_file_query(), fix_mce_lf(), fix_private_photos(), format_categories(), format_filer(), format_hashtags(), format_mentions(), format_term_for_display(), get_bb_tag_pos(), get_intltext_template(), get_language_name(), get_markup_template(), get_tags(), html2bb_video(), info(), is_a_date_arg(), is_foreigner(), is_member(), json_decode_plus(), legal_webbie(), linkify(), magic_link(), mail_content(), network_to_name(), normalise_openid(), notice(), notifier_run(), oembed_iframe(), oembed_replacecb(), oexchange_content(), parse_xml_string(), photos_post(), poco_load(), prepare_body(), print_template(), printable(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), protect_sprintf(), purify_html(), qp(), random_string(), Template\replace(), replace_macros(), FriendicaSmartyEngine\replace_macros(), Template\replace_macros(), scale_external_images(), scrape_feed(), scrape_vcard(), search(), searchbox(), siteinfo_content(), smilies(), sslify(), string_splitter(), strip_zids(), stripdcode_br_cb(), t(), template_escape(), template_unescape(), term_query(), theme_attachments(), unamp(), undo_post_tagging(), unxmlify(), Template\var_replace(), webfinger_rfc7033(), x(), z_fetch_url(), z_input_filter(), z_post_url(), zfinger_init(), and zid().

    diff --git a/doc/html/globals_0x61.html b/doc/html/globals_0x61.html index 753529adc..c68a8a195 100644 --- a/doc/html/globals_0x61.html +++ b/doc/html/globals_0x61.html @@ -153,6 +153,9 @@ $(document).ready(function(){initNavTree('globals_0x61.html','');});
  • ABOOK_FLAG_BLOCKED : boot.php
    • +
  • ABOOK_FLAG_FEED +: boot.php +
  • ABOOK_FLAG_HIDDEN : boot.php
    • diff --git a/doc/html/globals_0x62.html b/doc/html/globals_0x62.html index 352eeed8e..940e54dee 100644 --- a/doc/html/globals_0x62.html +++ b/doc/html/globals_0x62.html @@ -153,6 +153,12 @@ $(document).ready(function(){initNavTree('globals_0x62.html','');});
  • bb2diaspora() : bb2diaspora.php
    • +
  • bb2diaspora_itembody() +: bb2diaspora.php +
    • +
  • bb2dmention_callback() +: bb2diaspora.php +
  • bb_location() : bbcode.php
    • diff --git a/doc/html/globals_0x63.html b/doc/html/globals_0x63.html index 3aa2e901b..81da4a01e 100644 --- a/doc/html/globals_0x63.html +++ b/doc/html/globals_0x63.html @@ -288,6 +288,9 @@ $(document).ready(function(){initNavTree('globals_0x63.html','');});
  • check_store() : setup.php
    • +
  • check_upstream_directory() +: dir_fns.php +
  • check_webbie() : text.php
    • diff --git a/doc/html/globals_0x64.html b/doc/html/globals_0x64.html index 679a4f838..c0dfc77fa 100644 --- a/doc/html/globals_0x64.html +++ b/doc/html/globals_0x64.html @@ -258,6 +258,9 @@ $(document).ready(function(){initNavTree('globals_0x64.html','');});
  • diaspora_like() : diaspora.php
    • +
  • diaspora_mention_callback() +: bb2diaspora.php +
  • diaspora_message() : diaspora.php
    • @@ -378,6 +381,9 @@ $(document).ready(function(){initNavTree('globals_0x64.html','');});
  • dirsearch_init() : dirsearch.php
    • +
  • discover_by_url() +: network.php +
  • discover_by_webbie() : network.php
    • diff --git a/doc/html/globals_0x65.html b/doc/html/globals_0x65.html index 3c07fee10..e79e01487 100644 --- a/doc/html/globals_0x65.html +++ b/doc/html/globals_0x65.html @@ -156,14 +156,11 @@ $(document).ready(function(){initNavTree('globals_0x65.html','');});
  • editwebpage_content() : editwebpage.php
    • -
  • element_install() -: apps.php -
  • else -: tpldebug.php -, style.php +: style.php , auth.php , fpostit.php +, tpldebug.php
  • email_header_encode() : network.php diff --git a/doc/html/globals_0x66.html b/doc/html/globals_0x66.html index 0c9ca3c1f..75b966ec1 100644 --- a/doc/html/globals_0x66.html +++ b/doc/html/globals_0x66.html @@ -195,6 +195,9 @@ $(document).ready(function(){initNavTree('globals_0x66.html','');});
  • filestorage_post() : filestorage.php
    • +
  • filter_insecure() +: items.php +
  • find_diaspora_person_by_handle() : diaspora.php
    • diff --git a/doc/html/globals_0x69.html b/doc/html/globals_0x69.html index e114f862a..41df68ff8 100644 --- a/doc/html/globals_0x69.html +++ b/doc/html/globals_0x69.html @@ -163,6 +163,9 @@ $(document).ready(function(){initNavTree('globals_0x69.html','');}); , default.php , full.php +
  • import_author_diaspora() +: items.php +
  • import_author_rss() : items.php
    • diff --git a/doc/html/globals_0x73.html b/doc/html/globals_0x73.html index 642fe2496..0fe98ada5 100644 --- a/doc/html/globals_0x73.html +++ b/doc/html/globals_0x73.html @@ -193,10 +193,10 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');}); : account.php
  • service_class_allows() -: plugin.php +: account.php
  • service_class_fetch() -: plugin.php +: account.php
  • set_config() : config.php @@ -321,6 +321,9 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
  • STORAGE_DEFAULT_PERMISSIONS : boot.php
    • +
  • store_diaspora_comment_sig() +: items.php +
  • store_item_tag() : taxonomy.php
    • diff --git a/doc/html/globals_0x75.html b/doc/html/globals_0x75.html index a12a6aad0..8afce83cb 100644 --- a/doc/html/globals_0x75.html +++ b/doc/html/globals_0x75.html @@ -223,13 +223,13 @@ $(document).ready(function(){initNavTree('globals_0x75.html','');}); : socgraph.php
  • upgrade_bool_message() -: plugin.php +: account.php
  • upgrade_link() -: plugin.php +: account.php
  • upgrade_message() -: plugin.php +: account.php
  • user_allow() : account.php diff --git a/doc/html/globals_func_0x62.html b/doc/html/globals_func_0x62.html index 0846a53df..7b6a33cf5 100644 --- a/doc/html/globals_func_0x62.html +++ b/doc/html/globals_func_0x62.html @@ -152,6 +152,12 @@ $(document).ready(function(){initNavTree('globals_func_0x62.html','');});
  • bb2diaspora() : bb2diaspora.php
    • +
  • bb2diaspora_itembody() +: bb2diaspora.php +
    • +
  • bb2dmention_callback() +: bb2diaspora.php +
  • bb_location() : bbcode.php
    • diff --git a/doc/html/globals_func_0x63.html b/doc/html/globals_func_0x63.html index 7a8b375dc..2b4614ceb 100644 --- a/doc/html/globals_func_0x63.html +++ b/doc/html/globals_func_0x63.html @@ -287,6 +287,9 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');});
  • check_store() : setup.php
    • +
  • check_upstream_directory() +: dir_fns.php +
  • check_webbie() : text.php
    • diff --git a/doc/html/globals_func_0x64.html b/doc/html/globals_func_0x64.html index e54fd48ad..5d360e46f 100644 --- a/doc/html/globals_func_0x64.html +++ b/doc/html/globals_func_0x64.html @@ -251,6 +251,9 @@ $(document).ready(function(){initNavTree('globals_func_0x64.html','');});
  • diaspora_like() : diaspora.php
    • +
  • diaspora_mention_callback() +: bb2diaspora.php +
  • diaspora_message() : diaspora.php
    • @@ -353,6 +356,9 @@ $(document).ready(function(){initNavTree('globals_func_0x64.html','');});
  • dirsearch_init() : dirsearch.php
    • +
  • discover_by_url() +: network.php +
  • discover_by_webbie() : network.php
    • diff --git a/doc/html/globals_func_0x65.html b/doc/html/globals_func_0x65.html index 375332588..9b7b41459 100644 --- a/doc/html/globals_func_0x65.html +++ b/doc/html/globals_func_0x65.html @@ -155,9 +155,6 @@ $(document).ready(function(){initNavTree('globals_func_0x65.html','');});
  • editwebpage_content() : editwebpage.php
    • -
  • element_install() -: apps.php -
  • email_header_encode() : network.php
    • diff --git a/doc/html/globals_func_0x66.html b/doc/html/globals_func_0x66.html index 3a67dc16b..8b86e9df8 100644 --- a/doc/html/globals_func_0x66.html +++ b/doc/html/globals_func_0x66.html @@ -194,6 +194,9 @@ $(document).ready(function(){initNavTree('globals_func_0x66.html','');});
  • filestorage_post() : filestorage.php
    • +
  • filter_insecure() +: items.php +
  • find_diaspora_person_by_handle() : diaspora.php
    • diff --git a/doc/html/globals_func_0x69.html b/doc/html/globals_func_0x69.html index 563c8b802..e99d28bbb 100644 --- a/doc/html/globals_func_0x69.html +++ b/doc/html/globals_func_0x69.html @@ -155,6 +155,9 @@ $(document).ready(function(){initNavTree('globals_func_0x69.html','');});
  • ids_to_querystr() : text.php
    • +
  • import_author_diaspora() +: items.php +
  • import_author_rss() : items.php
    • diff --git a/doc/html/globals_func_0x73.html b/doc/html/globals_func_0x73.html index e872bc1d2..84131a69b 100644 --- a/doc/html/globals_func_0x73.html +++ b/doc/html/globals_func_0x73.html @@ -192,10 +192,10 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');}); : account.php
  • service_class_allows() -: plugin.php +: account.php
  • service_class_fetch() -: plugin.php +: account.php
  • set_config() : config.php @@ -308,6 +308,9 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');});
  • status_editor() : conversation.php
    • +
  • store_diaspora_comment_sig() +: items.php +
  • store_item_tag() : taxonomy.php
    • diff --git a/doc/html/globals_func_0x75.html b/doc/html/globals_func_0x75.html index 5b05540e1..e6254f708 100644 --- a/doc/html/globals_func_0x75.html +++ b/doc/html/globals_func_0x75.html @@ -207,13 +207,13 @@ $(document).ready(function(){initNavTree('globals_func_0x75.html','');}); : socgraph.php
  • upgrade_bool_message() -: plugin.php +: account.php
  • upgrade_link() -: plugin.php +: account.php
  • upgrade_message() -: plugin.php +: account.php
  • user_allow() : account.php diff --git a/doc/html/globals_vars_0x61.html b/doc/html/globals_vars_0x61.html index 10412e050..bfb98856f 100644 --- a/doc/html/globals_vars_0x61.html +++ b/doc/html/globals_vars_0x61.html @@ -145,6 +145,9 @@ $(document).ready(function(){initNavTree('globals_vars_0x61.html','');});
  • ABOOK_FLAG_BLOCKED : boot.php
    • +
  • ABOOK_FLAG_FEED +: boot.php +
  • ABOOK_FLAG_HIDDEN : boot.php
    • diff --git a/doc/html/include_2apps_8php.html b/doc/html/include_2apps_8php.html index d8fe20714..9f8ab7072 100644 --- a/doc/html/include_2apps_8php.html +++ b/doc/html/include_2apps_8php.html @@ -140,8 +140,6 @@ Functions    papp_encode ($papp)   - element_install ($channel, $s) - 

    Function Documentation

    @@ -381,33 +379,6 @@ Functions

    Referenced by app_install().

    - - - -
    -
    - - - - - - - - - - - - - - - - - - -
    element_install ( $channel,
     $s 
    )
    -
    -

    install a shared design element (layout, webpage, block, menu, whatever)

    -
    diff --git a/doc/html/include_2apps_8php.js b/doc/html/include_2apps_8php.js index 4b28e1dc9..1be75a9e0 100644 --- a/doc/html/include_2apps_8php.js +++ b/doc/html/include_2apps_8php.js @@ -10,7 +10,6 @@ var include_2apps_8php = [ "app_render", "include_2apps_8php.html#a1b2e737f477a2e0d9d11ef14adc5aa66", null ], [ "app_store", "include_2apps_8php.html#a15626f24069c18816f7cdaf4735f58f9", null ], [ "app_update", "include_2apps_8php.html#aeab6a62d2f3dfaa86ed043a006305f46", null ], - [ "element_install", "include_2apps_8php.html#a7c8bf17bd61a310bacb21ba9ad7a061b", null ], [ "get_system_apps", "include_2apps_8php.html#ae64f72eb4f126e03b4eb65ed1702a3ca", null ], [ "papp_encode", "include_2apps_8php.html#ad6ba3f254003f69f8f3f94ca5bda0680", null ], [ "parse_app_description", "include_2apps_8php.html#a32fe4ed9666228fd4b67dc487cc57a83", null ], diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html index 39065742f..59239b48e 100644 --- a/doc/html/include_2config_8php.html +++ b/doc/html/include_2config_8php.html @@ -258,7 +258,7 @@ Functions
    -

    Referenced by account_verify_password(), acl_init(), admin_page_dbsync(), admin_page_logs(), admin_page_site(), admin_page_summary(), admin_page_themes(), allowed_email(), allowed_url(), api_statuses_mentions(), api_statusnet_config(), attach_store(), bbcode(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), create_account(), create_identity(), create_sys_channel(), RedDirectory\createFile(), detect_language(), diaspora_dispatch(), diaspora_dispatch_public(), diaspora_is_blacklisted(), diaspora_like(), diaspora_process_outbound(), diaspora_transmit(), directory_content(), directory_run(), dirprofile_init(), dirsearch_content(), display_content(), dlogger(), dob(), downgrade_accounts(), editblock_content(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), events_content(), expire_run(), externals_run(), feature_enabled(), feed_init(), find_upstream_directory(), findpeople_widget(), get_all_perms(), Item\get_comment_box(), get_default_profile_photo(), get_directory_realm(), get_item_elements(), get_mail_elements(), get_max_import_size(), get_online_status(), get_profile_fields_advanced(), get_profile_fields_basic(), RedDirectory\getChild(), RedDirectory\getChildren(), group_content(), home_content(), home_init(), photo_gd\imageString(), import_post(), import_xchan(), invite_content(), invite_post(), is_public_profile(), item_post(), item_store(), item_store_update(), photo_imagick\load(), localize_item(), logger(), login(), lostpass_content(), lostpass_post(), mark_orphan_hubsxchans(), nav(), navbar_complete(), network_content(), FKOAuthDataStore\new_access_token(), new_channel_post(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), openid_content(), parse_url_content(), perm_is_allowed(), photo_upload(), photos_content(), photos_init(), poco_init(), poller_run(), post_activity_item(), post_post(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), profile_content(), profile_create_sidebar(), profile_photo_post(), profile_sidebar(), profiles_content(), profperm_content(), pubsites_content(), RedFile\put(), receive_post(), 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(), start_delivery_chain(), tag_deliver(), theme_admin(), unobscure(), update_modtime(), update_suggestions(), upgrade_link(), user_allow(), valid_email(), validate_email(), verify_email_address(), viewconnections_content(), viewconnections_init(), viewsrc_content(), webpages_content(), widget_fullprofile(), widget_profile(), xrd_init(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_gethub(), zot_import(), and zotfeed_init().

    +

    Referenced by account_verify_password(), acl_init(), 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(), bb2diaspora_itembody(), bbcode(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), check_upstream_directory(), cli_startup(), create_account(), create_identity(), create_sys_channel(), RedDirectory\createFile(), detect_language(), diaspora_dispatch(), diaspora_dispatch_public(), diaspora_is_blacklisted(), diaspora_like(), diaspora_process_outbound(), diaspora_transmit(), directory_content(), directory_run(), dirprofile_init(), dirsearch_content(), display_content(), dlogger(), dob(), downgrade_accounts(), editblock_content(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), events_content(), expire_run(), externals_run(), feature_enabled(), feed_init(), filter_insecure(), find_upstream_directory(), findpeople_widget(), get_all_perms(), Item\get_comment_box(), get_default_profile_photo(), get_directory_realm(), get_item_elements(), get_mail_elements(), get_max_import_size(), get_online_status(), get_profile_fields_advanced(), get_profile_fields_basic(), RedDirectory\getChild(), RedDirectory\getChildren(), group_content(), home_content(), home_init(), photo_gd\imageString(), import_post(), import_xchan(), invite_content(), invite_post(), is_public_profile(), item_post(), item_store(), item_store_update(), photo_imagick\load(), localize_item(), logger(), login(), lostpass_content(), lostpass_post(), mark_orphan_hubsxchans(), nav(), navbar_complete(), network_content(), FKOAuthDataStore\new_access_token(), new_channel_post(), new_contact(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), openid_content(), parse_url_content(), perm_is_allowed(), photo_upload(), photos_content(), photos_init(), poco_init(), poller_run(), post_activity_item(), post_post(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), profile_content(), profile_create_sidebar(), profile_photo_post(), profiles_content(), profperm_content(), pubsites_content(), RedFile\put(), receive_post(), 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(), start_delivery_chain(), store_diaspora_comment_sig(), tag_deliver(), theme_admin(), unobscure(), update_modtime(), update_suggestions(), upgrade_link(), user_allow(), valid_email(), validate_email(), verify_email_address(), viewconnections_content(), viewconnections_init(), viewsrc_content(), webpages_content(), widget_fullprofile(), widget_profile(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_gethub(), zot_import(), and zotfeed_init().

    @@ -326,7 +326,7 @@ Functions
    -

    Referenced by Conversation\__construct(), acl_init(), App\build_pagehead(), change_channel(), channel_content(), connect_content(), connedit_post(), construct_page(), contact_block(), contact_remove(), conversation(), current_theme(), diaspora_send_status(), display_content(), editpost_content(), feature_enabled(), findpeople_widget(), Item\get_comment_box(), get_online_status(), get_theme_uid(), group_content(), home_init(), invite_content(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), FKOAuth1\loginUser(), mail_content(), message_content(), network_content(), notification(), pdledit_content(), post_post(), 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(), acl_init(), bb2diaspora_itembody(), App\build_pagehead(), change_channel(), channel_content(), connect_content(), connedit_post(), construct_page(), contact_block(), contact_remove(), conversation(), current_theme(), display_content(), editpost_content(), feature_enabled(), findpeople_widget(), fix_attached_file_permissions(), fix_attached_photo_permissions(), Item\get_comment_box(), get_online_status(), get_theme_uid(), group_content(), home_init(), invite_content(), invite_post(), item_post(), item_store(), item_store_update(), items_fetch(), FKOAuth1\loginUser(), mail_content(), message_content(), network_content(), notification(), pdledit_content(), post_post(), 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().

    @@ -470,7 +470,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(), create_sys_channel(), find_upstream_directory(), poller_run(), theme_admin_post(), and what_next().

    +

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

    diff --git a/doc/html/include_2network_8php.html b/doc/html/include_2network_8php.html index 5d8838356..66b95e7c0 100644 --- a/doc/html/include_2network_8php.html +++ b/doc/html/include_2network_8php.html @@ -146,6 +146,8 @@ Functions    email_send ($addr, $subject, $headers, $item)   + discover_by_url ($url, $arr=null) +   discover_by_webbie ($webbie)    webfinger_rfc7033 ($webbie) @@ -240,6 +242,34 @@ Functions

    Referenced by fetch_xrd_links().

    + + + +
    +
    + + + + + + + + + + + + + + + + + + +
    discover_by_url ( $url,
     $arr = null 
    )
    +
    + +

    Referenced by new_contact().

    +
    @@ -256,7 +286,7 @@ Functions
    -

    Referenced by find_diaspora_person_by_handle(), and new_contact().

    +

    Referenced by find_diaspora_person_by_handle(), import_author_diaspora(), and new_contact().

    @@ -529,6 +559,8 @@ Functions
    +

    Referenced by discover_by_url().

    +
    @@ -713,7 +745,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(), diaspora_reshare(), directory_content(), dirprofile_init(), discover_by_webbie(), externals_run(), fetch_xrd_links(), handle_feed(), import_post(), import_profile_photo(), import_site(), import_xchan(), navbar_complete(), oembed_fetch_url(), oexchange_content(), onepoll_run(), parseurl_getsiteinfo(), poco_load(), pubsites_content(), remote_online_status(), scale_external_images(), scrape_feed(), scrape_vcard(), setup_post(), sslify_init(), sync_directories(), update_suggestions(), webfinger_rfc7033(), z_post_url(), zot_finger(), and zot_register_hub().

    +

    Referenced by check_htaccess(), diaspora_reshare(), directory_content(), dirprofile_init(), discover_by_url(), discover_by_webbie(), externals_run(), fetch_xrd_links(), handle_feed(), import_post(), import_profile_photo(), import_site(), import_xchan(), navbar_complete(), oembed_fetch_url(), oexchange_content(), onepoll_run(), parseurl_getsiteinfo(), poco_load(), pubsites_content(), remote_online_status(), scale_external_images(), scrape_feed(), scrape_vcard(), setup_post(), sslify_init(), sync_directories(), update_suggestions(), webfinger_rfc7033(), 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 512573291..95d48dbd8 100644 --- a/doc/html/include_2network_8php.js +++ b/doc/html/include_2network_8php.js @@ -4,6 +4,7 @@ var include_2network_8php = [ "allowed_url", "include_2network_8php.html#aee35d9ad6b3f872bfb39ba3598936aa7", null ], [ "avatar_img", "include_2network_8php.html#ab07ce9d75eae559865ed90aad2154bd7", null ], [ "convert_xml_element_to_array", "include_2network_8php.html#ad4056d3ce69988f5c1a997a79f503246", null ], + [ "discover_by_url", "include_2network_8php.html#a5176176ddc1906d91f186df6fbd87b48", null ], [ "discover_by_webbie", "include_2network_8php.html#a63e62946e194928eb17c5a9f2bbef0fe", null ], [ "email_header_encode", "include_2network_8php.html#a469b9bd700269cd07d954f1a16c5899b", null ], [ "email_send", "include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0", null ], diff --git a/doc/html/items_8php.html b/doc/html/items_8php.html index 358d5a31c..fbdfe7082 100644 --- a/doc/html/items_8php.html +++ b/doc/html/items_8php.html @@ -114,6 +114,8 @@ $(document).ready(function(){initNavTree('items_8php.html','');}); Functions  collect_recipients ($item, &$private_envelope)   + filter_insecure ($channel_id, $arr) +   comments_are_now_closed ($item)    can_comment_on_post ($observer_xchan, $item) @@ -150,6 +152,8 @@ Functions    import_author_xchan ($x)   + import_author_diaspora ($x) +   import_author_rss ($x)    encode_item ($item) @@ -186,6 +190,8 @@ Functions    item_store_update ($arr, $allow_exec=false)   + store_diaspora_comment_sig ($datarray, $channel, $parent_item, $post_id) +   send_status_notifications ($post_id, $item)    get_item_contact ($item, $contacts) @@ -923,6 +929,36 @@ Functions

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

    + + + +
    +
    + + + + + + + + + + + + + + + + + + +
    filter_insecure ( $channel_id,
     $arr 
    )
    +
    +

    If channel is configured to filter insecure members of privacy groups (those whose networks leak privacy via email notifications or other criteria) remove them from any privacy groups (collections) that were included in a post. They can still be addressed individually. Networks may need to be added or removed from this list as circumstances change.

    +

    Update: this may need to be the default, which will force people to opt-in to sending stuff privately to insecure platforms.

    + +

    Referenced by collect_recipients().

    +
    @@ -1201,6 +1237,8 @@ Functions
    +

    Referenced by onepoll_run().

    +
    @@ -1219,6 +1257,24 @@ Functions

    Referenced by fix_private_photos().

    + + + +
    +
    + + + + + + + + +
    import_author_diaspora ( $x)
    +
    + +

    Referenced by import_author_xchan(), and poco_load().

    +
    @@ -1406,7 +1462,7 @@ Functions
    -

    Referenced by diaspora_asphoto(), diaspora_comment(), diaspora_like(), diaspora_post(), diaspora_reshare(), element_install(), event_store_item(), item_post(), like_content(), mood_init(), photo_upload(), photos_create_item(), post_activity_item(), process_delivery(), profile_activity(), and subthread_content().

    +

    Referenced by consume_feed(), diaspora_asphoto(), diaspora_comment(), diaspora_like(), diaspora_post(), diaspora_reshare(), event_store_item(), item_post(), like_content(), mood_init(), photo_upload(), photos_create_item(), post_activity_item(), process_delivery(), profile_activity(), and subthread_content().

    @@ -1796,6 +1852,46 @@ Functions

    Referenced by tag_deliver().

    + + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    store_diaspora_comment_sig ( $datarray,
     $channel,
     $parent_item,
     $post_id 
    )
    +
    + +

    Referenced by item_post().

    +
    diff --git a/doc/html/items_8php.js b/doc/html/items_8php.js index a666c156a..0354bfd6a 100644 --- a/doc/html/items_8php.js +++ b/doc/html/items_8php.js @@ -26,6 +26,7 @@ var items_8php = [ "encode_rel_links", "items_8php.html#aa723c0571e314a1853a24c5854b4f54f", null ], [ "enumerate_permissions", "items_8php.html#afbcf26dfcf8a83fff952aa858c1b7b67", null ], [ "fetch_post_tags", "items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9", null ], + [ "filter_insecure", "items_8php.html#a8cda98925a4c5c2f6dade70d9586d79a", null ], [ "first_post_date", "items_8php.html#a0cf98bb619f07dd18f602683a55a5f59", null ], [ "fix_private_photos", "items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87", null ], [ "get_atom_elements", "items_8php.html#a5e5be7bf1f8257dec0b2647e60a3f3f1", null ], @@ -37,6 +38,7 @@ var items_8php = [ "get_public_feed", "items_8php.html#a079e099e15d88d47aeb6ca6d60da7107", null ], [ "handle_feed", "items_8php.html#a52c24114b73c0bdb605a03cd29712223", null ], [ "has_permissions", "items_8php.html#a77051724d1784074ff187e73a4db93fe", null ], + [ "import_author_diaspora", "items_8php.html#a2c3f97b2109c05df86d97449b3c78ebc", null ], [ "import_author_rss", "items_8php.html#a6bee35961f2e32905f20367a9309d627", null ], [ "import_author_xchan", "items_8php.html#ae73794179b62d39bb597ff670ab1c1e5", null ], [ "item_add_cid", "items_8php.html#a02ca33c31ed535d24894f8a9a91ce9df", null ], @@ -61,6 +63,7 @@ var items_8php = [ "retain_item", "items_8php.html#af6237605c60d69abdd959ddbbee3420c", null ], [ "send_status_notifications", "items_8php.html#aab9e0c58247427126de0699c729c3b6c", null ], [ "start_delivery_chain", "items_8php.html#adf2b8137dc4ad9ec958de2842f16f3c2", null ], + [ "store_diaspora_comment_sig", "items_8php.html#af0a887050dc8d0f51c89890cdaf3145f", null ], [ "tag_deliver", "items_8php.html#ab1bce4261bcf75ad62753b498a144d17", null ], [ "termtype", "items_8php.html#ad34827ed330898456783fb14c7b46154", null ], [ "tgroup_check", "items_8php.html#a88c6cf7649ac836fbbed82a7a0315110", null ], diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html index 19a08acd2..98cc4693a 100644 --- a/doc/html/language_8php.html +++ b/doc/html/language_8php.html @@ -372,7 +372,7 @@ Functions
    Returns
    translated string if exsists, otherwise s
    -

    Referenced by account_remove(), achievements_content(), acl_init(), admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_logs(), admin_page_logs_post(), admin_page_plugins(), admin_page_profs(), 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(), app_render(), app_store(), app_update(), appman_content(), appman_post(), apps_content(), apw_form(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_init(), attach_list_files(), attach_mkdir(), attach_store(), bbcode(), block_content(), blocks_content(), blogtheme_form(), bookmark_add(), bookmarks_content(), bookmarks_init(), categories_widget(), channel_content(), channel_init(), chanview_content(), chat_content(), chat_init(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatsvc_content(), check_account_email(), check_account_invite(), check_config(), check_form_security_std_err_msg(), check_funcs(), check_htaccess(), check_htconfig(), check_keys(), check_php(), check_smarty3(), check_store(), cloud_init(), common_content(), common_friends_visitor_widget(), common_init(), connect_content(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_block(), contact_poll_interval(), conversation(), create_account(), create_identity(), datesel_format(), day_translate(), delegate_content(), design_tools(), diaspora_like(), diaspora_send_status(), dir_safe_mode(), dir_sort_links(), dir_tagblock(), directory_content(), dirprofile_init(), dirsearch_content(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_store_item(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filestorage_content(), filestorage_post(), findpeople_widget(), follow_init(), format_categories(), format_event_diaspora(), format_event_html(), format_filer(), format_like(), format_notification(), fsuggest_content(), fsuggest_post(), gender_selector(), gender_selector_min(), RedBrowser\generateDirectoryIndex(), 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(), home_content(), RedBrowser\htmlActionsPanel(), identity_check_service_class(), import_author_rss(), import_channel_photo(), import_content(), import_post(), import_xchan(), dba_driver\install(), invite_content(), invite_post(), item_check_service_class(), item_content(), item_photo_menu(), item_post(), item_post_type(), items_fetch(), lang_selector(), layout_select(), layouts_content(), like_content(), load_database(), localize_item(), lockview_content(), login(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), manual_config(), marital_selector(), marital_selector_min(), match_content(), menu_content(), menu_post(), menu_render(), message_content(), mimetype_select(), mini_group_select(), mitem_content(), mitem_init(), mitem_post(), mood_content(), mood_init(), nav(), network_content(), network_init(), network_to_name(), new_channel_content(), new_channel_post(), new_contact(), notice(), notification(), notifications_content(), notifications_post(), notify_content(), obj_verbs(), oembed_bbcode2html(), oembed_iframe(), oexchange_content(), openid_content(), page_content(), pagelist_widget(), paginate(), pdl_selector(), pdledit_content(), pdledit_post(), photo_upload(), photos_album_widget(), photos_content(), photos_init(), photos_post(), ping_init(), poke_content(), poke_init(), poll_content(), populate_acl(), post_activity_item(), post_init(), probe_content(), profile_activity(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), pubsites_content(), rbmark_content(), rbmark_post(), redbasic_form(), register_content(), register_post(), regmod_content(), relative_date(), removeaccount_content(), removeaccount_post(), removeme_content(), removeme_post(), rmagic_content(), rmagic_post(), rpost_content(), scale_external_images(), search(), search_content(), searchbox(), select_timezone(), send_message(), send_reg_approval_email(), send_verification_email(), settings_post(), setup_content(), sexpref_selector(), sexpref_selector_min(), 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(), translate_scope(), translate_system_apps(), update_birthdays(), update_channel_content(), update_display_content(), update_network_content(), update_search_content(), upgrade_bool_message(), upgrade_link(), upgrade_message(), user_allow(), user_approve(), user_deny(), validate_channelname(), vcard_from_xchan(), verify_email_address(), viewconnections_content(), viewsrc_content(), vote_content(), wall_upload_post(), webpages_content(), what_next(), widget_affinity(), widget_appselect(), widget_archive(), widget_bookmarkedchats(), widget_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), widget_suggestions(), widget_tagcloud(), writepages_widget(), xchan_content(), z_readdir(), and zfinger_init().

    +

    Referenced by account_remove(), achievements_content(), acl_init(), admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_logs(), admin_page_logs_post(), admin_page_plugins(), admin_page_profs(), 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(), app_render(), app_store(), app_update(), appman_content(), appman_post(), apps_content(), apw_form(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_init(), attach_list_files(), attach_mkdir(), attach_store(), bb2diaspora_itembody(), bbcode(), block_content(), blocks_content(), blogtheme_form(), bookmark_add(), bookmarks_content(), bookmarks_init(), categories_widget(), channel_content(), channel_init(), chat_content(), chat_init(), chatroom_create(), chatroom_destroy(), chatroom_enter(), chatsvc_content(), check_account_email(), check_account_invite(), check_config(), check_form_security_std_err_msg(), check_funcs(), check_htaccess(), check_htconfig(), check_keys(), check_php(), check_smarty3(), check_store(), cloud_init(), common_content(), common_friends_visitor_widget(), common_init(), connect_content(), connect_init(), connect_post(), connections_content(), connections_post(), connedit_content(), connedit_post(), construct_page(), contact_block(), contact_poll_interval(), conversation(), create_account(), create_identity(), datesel_format(), day_translate(), delegate_content(), design_tools(), diaspora_like(), dir_safe_mode(), dir_sort_links(), dir_tagblock(), directory_content(), dirprofile_init(), dirsearch_content(), display_content(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_store_item(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filestorage_content(), filestorage_post(), findpeople_widget(), follow_init(), format_categories(), format_event_diaspora(), format_event_html(), format_filer(), format_like(), format_notification(), fsuggest_content(), fsuggest_post(), gender_selector(), gender_selector_min(), RedBrowser\generateDirectoryIndex(), 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(), home_content(), RedBrowser\htmlActionsPanel(), identity_check_service_class(), import_author_rss(), import_channel_photo(), import_content(), import_post(), import_xchan(), dba_driver\install(), invite_content(), invite_post(), item_check_service_class(), item_content(), item_photo_menu(), item_post(), item_post_type(), items_fetch(), lang_selector(), layout_select(), layouts_content(), like_content(), load_database(), localize_item(), lockview_content(), login(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manage_content(), manual_config(), marital_selector(), marital_selector_min(), match_content(), menu_content(), menu_post(), menu_render(), message_content(), mimetype_select(), mini_group_select(), mitem_content(), mitem_init(), mitem_post(), mood_content(), mood_init(), nav(), network_content(), network_init(), network_to_name(), new_channel_content(), new_channel_post(), new_contact(), notice(), notification(), notifications_content(), notifications_post(), notify_content(), obj_verbs(), oembed_bbcode2html(), oembed_iframe(), oexchange_content(), openid_content(), page_content(), pagelist_widget(), paginate(), pdl_selector(), pdledit_content(), pdledit_post(), photo_upload(), photos_album_widget(), photos_content(), photos_init(), photos_post(), ping_init(), poke_content(), poke_init(), poll_content(), populate_acl(), post_activity_item(), post_init(), probe_content(), profile_activity(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), pubsites_content(), rbmark_content(), rbmark_post(), redbasic_form(), register_content(), register_post(), regmod_content(), relative_date(), removeaccount_content(), removeaccount_post(), removeme_content(), removeme_post(), rmagic_content(), rmagic_post(), rpost_content(), scale_external_images(), search(), search_content(), searchbox(), select_timezone(), send_message(), send_reg_approval_email(), send_verification_email(), settings_post(), setup_content(), sexpref_selector(), sexpref_selector_min(), 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(), translate_scope(), translate_system_apps(), update_birthdays(), update_channel_content(), update_display_content(), update_network_content(), update_search_content(), upgrade_bool_message(), upgrade_link(), upgrade_message(), user_allow(), user_approve(), user_deny(), validate_channelname(), vcard_from_xchan(), verify_email_address(), viewconnections_content(), viewsrc_content(), vote_content(), wall_upload_post(), webpages_content(), what_next(), widget_affinity(), widget_appselect(), widget_archive(), widget_bookmarkedchats(), widget_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), widget_suggestions(), widget_tagcloud(), writepages_widget(), xchan_content(), z_readdir(), and zfinger_init().

    diff --git a/doc/html/navtree.js b/doc/html/navtree.js index a469c162f..8f0be4bc1 100644 --- a/doc/html/navtree.js +++ b/doc/html/navtree.js @@ -37,15 +37,15 @@ var NAVTREE = var NAVTREEINDEX = [ "BS-Default_8php.html", -"boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16", -"classApp.html#a8863703a0305eaa45eb970dbd2046291", -"classphoto__driver.html#a00cb166c00b7502dbc456c94330e5b03", -"dir_d520c5cf583201d9437764f209363c22.html", -"identity_8php.html#a2ab5172eabd375869060c9ad68323f5c", -"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091", -"photo__driver_8php.html#a32e2817faa25d7f11f60a8abff565035", -"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91", -"xrd_8php.html" +"boot_8php.html#a5df5359090d1f8e898c36d7cf8878ad2", +"classApp.html#a6844aedad10e201b8c3d80cfc9e876d3", +"classdba__mysql.html#ac3fd60c278f400907322dac578754a99", +"dir__fns_8php.html#acd37b17dce3bdec6d5a6344a20598c1e", +"html2plain_8php.html#a3214912e3d00cf0a948072daccf16740", +"invite_8php.html#a244385b28cfd021d308715f01158bfd9", +"pdledit_8php.html#a81da3c955d0e3db55d148a31483104c7", +"spam_8php.html#ab8fd81a82c9622cbebb8ceab6b310ca6", +"widgets_8php.html#ad1bf7aa69e8d100d95faba17c7bc91cd" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js index c836f5135..0adf988bb 100644 --- a/doc/html/navtreeindex0.js +++ b/doc/html/navtreeindex0.js @@ -26,17 +26,22 @@ var NAVTREEINDEX0 = "__well__known_8php.html#a6ebfa937a2024f0b5dab53f0ac90fed0":[6,0,1,0,0], "account_8php.html":[6,0,0,2], "account_8php.html#a014de2d5d5c9785de5bf547a485822fa":[6,0,0,2,7], +"account_8php.html#a030cec6793b909c439c0336ba39b1571":[6,0,0,2,9], "account_8php.html#a0d183a3cb4c67a0f5e906811df7a1fc9":[6,0,0,2,6], "account_8php.html#a141fe579c351c78209d425473f978eb5":[6,0,0,2,5], "account_8php.html#a144b4891022567668375b58ea61cfff0":[6,0,0,2,4], "account_8php.html#a43e3042b2723d76915a030bac3c668b6":[6,0,0,2,0], +"account_8php.html#a4fc13e528367f510fcb6d8bbfc559040":[6,0,0,2,12], +"account_8php.html#a754d7f53b3abc557b753c057dc4e021d":[6,0,0,2,11], +"account_8php.html#a901657dd078e070516cf97285e0bada7":[6,0,0,2,13], +"account_8php.html#a905b54e10704b283ac64680a8abc0971":[6,0,0,2,10], "account_8php.html#a917d74aad0baf3e0c4b51cf1051e654f":[6,0,0,2,1], "account_8php.html#aa9c29c497c17d8f9344dce8631ad8761":[6,0,0,2,8], "account_8php.html#aaff7720423417a4333697894ffd9ddeb":[6,0,0,2,3], -"account_8php.html#ac1653efba62493b9d87513e1b6c04c83":[6,0,0,2,11], -"account_8php.html#ac5c570a2d46446bad4dd2501e9c5a4b1":[6,0,0,2,9], -"account_8php.html#acd6b8d2124ba5ea4f4794d2c58ae8bf5":[6,0,0,2,12], -"account_8php.html#ad07be417ac7eda939768804106ddea3d":[6,0,0,2,10], +"account_8php.html#ac1653efba62493b9d87513e1b6c04c83":[6,0,0,2,16], +"account_8php.html#ac5c570a2d46446bad4dd2501e9c5a4b1":[6,0,0,2,14], +"account_8php.html#acd6b8d2124ba5ea4f4794d2c58ae8bf5":[6,0,0,2,17], +"account_8php.html#ad07be417ac7eda939768804106ddea3d":[6,0,0,2,15], "account_8php.html#ae052bd5558847bd38e89c213561a9771":[6,0,0,2,2], "achievements_8php.html":[6,0,1,1], "achievements_8php.html#a35ae04ada0e227d19671f289a32fb30e":[6,0,1,1,0], @@ -96,17 +101,20 @@ var NAVTREEINDEX0 = "auth_8php.html#a2add3a1129ffa4d5515442a9d52a9b1a":[6,0,0,8,2], "auth_8php.html#ab7be44ee051c0aa29847807cf2c5dd38":[6,0,0,8,1], "bb2diaspora_8php.html":[6,0,0,10], -"bb2diaspora_8php.html#a180b0e3a7d702998be19e3c3b44b0e93":[6,0,0,10,9], -"bb2diaspora_8php.html#a29a2ad41f5826f3975fa9a49934ff863":[6,0,0,10,5], -"bb2diaspora_8php.html#a4c2f8f11b29a06809d9b07782215b1b2":[6,0,0,10,6], +"bb2diaspora_8php.html#a180b0e3a7d702998be19e3c3b44b0e93":[6,0,0,10,12], +"bb2diaspora_8php.html#a2052c66bc1006a42b4c230320c269e47":[6,0,0,10,1], +"bb2diaspora_8php.html#a29a2ad41f5826f3975fa9a49934ff863":[6,0,0,10,8], +"bb2diaspora_8php.html#a4a27604f0745f1efda672966aaca9a3b":[6,0,0,10,5], +"bb2diaspora_8php.html#a4c2f8f11b29a06809d9b07782215b1b2":[6,0,0,10,9], "bb2diaspora_8php.html#a4f10e0876b27373c762bc1abbe745f5c":[6,0,0,10,0], -"bb2diaspora_8php.html#a599428bceb6f6d82a6a78cb66811f747":[6,0,0,10,10], -"bb2diaspora_8php.html#a8b96bd45884fa1c40b942939354197d4":[6,0,0,10,3], -"bb2diaspora_8php.html#ab61b4f8c065e97b151411858bb2f209a":[6,0,0,10,8], -"bb2diaspora_8php.html#ac9061ee10fcfcdac69566b649614e625":[6,0,0,10,2], -"bb2diaspora_8php.html#ad033be99e87a2aaa05e569c68f30792d":[6,0,0,10,7], -"bb2diaspora_8php.html#ad0abe1a7ee50aa0736a233df0a422eba":[6,0,0,10,1], -"bb2diaspora_8php.html#adc92ccda5f85ed27e64fcc17712c89cc":[6,0,0,10,4], +"bb2diaspora_8php.html#a5258d2f1addeb0a2a6b54c4f9e7d0f34":[6,0,0,10,2], +"bb2diaspora_8php.html#a599428bceb6f6d82a6a78cb66811f747":[6,0,0,10,13], +"bb2diaspora_8php.html#a8b96bd45884fa1c40b942939354197d4":[6,0,0,10,6], +"bb2diaspora_8php.html#ab61b4f8c065e97b151411858bb2f209a":[6,0,0,10,11], +"bb2diaspora_8php.html#ac9061ee10fcfcdac69566b649614e625":[6,0,0,10,4], +"bb2diaspora_8php.html#ad033be99e87a2aaa05e569c68f30792d":[6,0,0,10,10], +"bb2diaspora_8php.html#ad0abe1a7ee50aa0736a233df0a422eba":[6,0,0,10,3], +"bb2diaspora_8php.html#adc92ccda5f85ed27e64fcc17712c89cc":[6,0,0,10,7], "bbcode_8php.html":[6,0,0,11], "bbcode_8php.html#a009f61aaf78771737ed0765c8463911b":[6,0,0,11,9], "bbcode_8php.html#a064dcfd9767df6f53be1a0e11ceeb15d":[6,0,0,11,8], @@ -137,117 +145,109 @@ var NAVTREEINDEX0 = "blogga_2view_2theme_2blog_2theme_8php.html#aae58cc837fe56473d9f3370abfe533ae":[6,0,3,1,1,1,0,0,2,1], "blogga_2view_2theme_2blog_2theme_8php.html#af634a3f721c5e238530d0636d33230ec":[6,0,3,1,1,1,0,0,2,4], "boot_8php.html":[6,0,4], -"boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[6,0,4,143], +"boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[6,0,4,144], "boot_8php.html#a01353c9abebc3544ea080ac161729632":[6,0,4,38], -"boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[6,0,4,157], -"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[6,0,4,259], -"boot_8php.html#a028380b2902a86ba32198f6d3b5d10bb":[6,0,4,136], -"boot_8php.html#a032bbd6d0321e99e9117332c9ed2b1b8":[6,0,4,56], -"boot_8php.html#a03d19251c245587de7ed959300b87bdf":[6,0,4,176], -"boot_8php.html#a0450389f24c632906fbc24347700a543":[6,0,4,47], -"boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b":[6,0,4,109], +"boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[6,0,4,158], +"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[6,0,4,260], +"boot_8php.html#a028380b2902a86ba32198f6d3b5d10bb":[6,0,4,137], +"boot_8php.html#a032bbd6d0321e99e9117332c9ed2b1b8":[6,0,4,57], +"boot_8php.html#a03d19251c245587de7ed959300b87bdf":[6,0,4,177], +"boot_8php.html#a0450389f24c632906fbc24347700a543":[6,0,4,48], +"boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b":[6,0,4,110], "boot_8php.html#a081307d681d7d04f17b9ced2076e7c85":[6,0,4,1], -"boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[6,0,4,216], -"boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[6,0,4,71], -"boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[6,0,4,180], -"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[6,0,4,279], -"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[6,0,4,275], -"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[6,0,4,278], +"boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[6,0,4,217], +"boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[6,0,4,72], +"boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[6,0,4,181], +"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[6,0,4,280], +"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[6,0,4,276], +"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[6,0,4,279], "boot_8php.html#a0e4701c9742c3ef88f02ac450a042a84":[6,0,4,22], -"boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[6,0,4,63], +"boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[6,0,4,64], "boot_8php.html#a0e6db7e365f2b041a828b93786f694bc":[6,0,4,15], -"boot_8php.html#a0fb63e51c2a9814941842ae8f2f4dff8":[6,0,4,81], +"boot_8php.html#a0fb63e51c2a9814941842ae8f2f4dff8":[6,0,4,82], "boot_8php.html#a107d53f96acf5319905a34b1870db09a":[6,0,4,41], -"boot_8php.html#a115faf8797718c3165498abbd6895843":[6,0,4,264], -"boot_8php.html#a11cfe7d99b4dac0454d0de8873989f81":[6,0,4,138], -"boot_8php.html#a1200c1f968ff3d52ef878de5fc5c30c1":[6,0,4,263], -"boot_8php.html#a12c781cefc20167231e2e3fd5866b1b5":[6,0,4,85], -"boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd":[6,0,4,82], -"boot_8php.html#a14d44d4a00223dc3db4ea962325db192":[6,0,4,206], -"boot_8php.html#a176664e78dcb9132e16be69418223eb2":[6,0,4,66], -"boot_8php.html#a17b4ea23d9ecf628d9c8f53b7abcb805":[6,0,4,156], -"boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[6,0,4,152], -"boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[6,0,4,179], -"boot_8php.html#a18a400fa45e5632811b33041d8c048bf":[6,0,4,146], -"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[6,0,4,287], -"boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc":[6,0,4,253], -"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[6,0,4,289], -"boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[6,0,4,183], -"boot_8php.html#a1da180f961f49a11573cac4ff6c62c05":[6,0,4,80], -"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[6,0,4,231], -"boot_8php.html#a1f5906598e90b5ea2b4245f682be4348":[6,0,4,111], -"boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[6,0,4,163], -"boot_8php.html#a205d013103997adfa72953d2f20c01e1":[6,0,4,225], -"boot_8php.html#a20f0eed431d25870b624b8937a07a59f":[6,0,4,199], -"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[6,0,4,255], +"boot_8php.html#a115faf8797718c3165498abbd6895843":[6,0,4,265], +"boot_8php.html#a11cfe7d99b4dac0454d0de8873989f81":[6,0,4,139], +"boot_8php.html#a1200c1f968ff3d52ef878de5fc5c30c1":[6,0,4,264], +"boot_8php.html#a12c781cefc20167231e2e3fd5866b1b5":[6,0,4,86], +"boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd":[6,0,4,83], +"boot_8php.html#a14d44d4a00223dc3db4ea962325db192":[6,0,4,207], +"boot_8php.html#a176664e78dcb9132e16be69418223eb2":[6,0,4,67], +"boot_8php.html#a17b4ea23d9ecf628d9c8f53b7abcb805":[6,0,4,157], +"boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[6,0,4,153], +"boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[6,0,4,180], +"boot_8php.html#a18a400fa45e5632811b33041d8c048bf":[6,0,4,147], +"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[6,0,4,288], +"boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc":[6,0,4,254], +"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[6,0,4,290], +"boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[6,0,4,184], +"boot_8php.html#a1da180f961f49a11573cac4ff6c62c05":[6,0,4,81], +"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[6,0,4,232], +"boot_8php.html#a1f5906598e90b5ea2b4245f682be4348":[6,0,4,112], +"boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[6,0,4,164], +"boot_8php.html#a205d013103997adfa72953d2f20c01e1":[6,0,4,226], +"boot_8php.html#a20f0eed431d25870b624b8937a07a59f":[6,0,4,200], +"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[6,0,4,256], "boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5":[6,0,4,42], "boot_8php.html#a24a7a70afedd5d85fe0eadc85afa9f77":[6,0,4,21], -"boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8":[6,0,4,104], -"boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f":[6,0,4,96], -"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[6,0,4,267], -"boot_8php.html#a285732e7889fa7f333cbe431111e1029":[6,0,4,202], -"boot_8php.html#a29528a2544373cc19a378f350040c6a1":[6,0,4,87], -"boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[6,0,4,137], -"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[6,0,4,229], -"boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3":[6,0,4,112], -"boot_8php.html#a2b525996e4426bdddbcec277778bde08":[6,0,4,251], -"boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[6,0,4,198], -"boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d":[6,0,4,133], -"boot_8php.html#a2e90096fede6acce16abf0da8cb2febe":[6,0,4,72], -"boot_8php.html#a2f8f25b13480c37a5f22511f53da8bab":[6,0,4,77], +"boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8":[6,0,4,105], +"boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f":[6,0,4,97], +"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[6,0,4,268], +"boot_8php.html#a285732e7889fa7f333cbe431111e1029":[6,0,4,203], +"boot_8php.html#a29528a2544373cc19a378f350040c6a1":[6,0,4,88], +"boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[6,0,4,138], +"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[6,0,4,230], +"boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3":[6,0,4,113], +"boot_8php.html#a2b525996e4426bdddbcec277778bde08":[6,0,4,252], +"boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[6,0,4,199], +"boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d":[6,0,4,134], +"boot_8php.html#a2e90096fede6acce16abf0da8cb2febe":[6,0,4,73], +"boot_8php.html#a2f8f25b13480c37a5f22511f53da8bab":[6,0,4,78], "boot_8php.html#a329400dcb29897cdaae3020109272285":[6,0,4,17], -"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[6,0,4,236], -"boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[6,0,4,150], -"boot_8php.html#a34c756469ebed32e2fc987bcde62d382":[6,0,4,44], -"boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[6,0,4,126], -"boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[6,0,4,165], -"boot_8php.html#a36003bebe4ce860c6652bcc3e09b2214":[6,0,4,213], -"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[6,0,4,293], -"boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[6,0,4,187], -"boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[6,0,4,115], -"boot_8php.html#a3b56bfc6a0dd159070e316ddac3b7456":[6,0,4,120], -"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[6,0,4,292], -"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[6,0,4,227], +"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[6,0,4,237], +"boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[6,0,4,151], +"boot_8php.html#a34c756469ebed32e2fc987bcde62d382":[6,0,4,45], +"boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[6,0,4,127], +"boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[6,0,4,166], +"boot_8php.html#a36003bebe4ce860c6652bcc3e09b2214":[6,0,4,214], +"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[6,0,4,294], +"boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[6,0,4,188], +"boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[6,0,4,116], +"boot_8php.html#a3b56bfc6a0dd159070e316ddac3b7456":[6,0,4,121], +"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[6,0,4,293], +"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[6,0,4,228], "boot_8php.html#a3e0930933fb2c0bf8211cc7ab4e1c3b4":[6,0,4,12], -"boot_8php.html#a3e2ea123d29a72012db1241f96280b0e":[6,0,4,64], -"boot_8php.html#a3f40aa5bafff8c4eebdc62e5121daf77":[6,0,4,94], -"boot_8php.html#a400519fa181591cd6fdbb8f25fbcba0a":[6,0,4,54], -"boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb":[6,0,4,139], -"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[6,0,4,220], -"boot_8php.html#a43296b1b4398aacbf92a4b2d56bab91e":[6,0,4,197], -"boot_8php.html#a43c6c7d84d880e9500bd4f8f8ecc5731":[6,0,4,93], -"boot_8php.html#a444ce608ce34efb82ee11852f36e825f":[6,0,4,173], -"boot_8php.html#a44ae1542a805ffd7f826fb511db07374":[6,0,4,160], -"boot_8php.html#a44d069c8a1cfcc6d2007c506a17ff28f":[6,0,4,75], -"boot_8php.html#a458e19af801bc4b0d1f1ce1a6d9e857e":[6,0,4,166], -"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[6,0,4,276], -"boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[6,0,4,185], -"boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[6,0,4,110], -"boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4":[6,0,4,245], -"boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[6,0,4,184], +"boot_8php.html#a3e2ea123d29a72012db1241f96280b0e":[6,0,4,65], +"boot_8php.html#a3f40aa5bafff8c4eebdc62e5121daf77":[6,0,4,95], +"boot_8php.html#a400519fa181591cd6fdbb8f25fbcba0a":[6,0,4,55], +"boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb":[6,0,4,140], +"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[6,0,4,221], +"boot_8php.html#a43296b1b4398aacbf92a4b2d56bab91e":[6,0,4,198], +"boot_8php.html#a43c6c7d84d880e9500bd4f8f8ecc5731":[6,0,4,94], +"boot_8php.html#a444ce608ce34efb82ee11852f36e825f":[6,0,4,174], +"boot_8php.html#a44ae1542a805ffd7f826fb511db07374":[6,0,4,161], +"boot_8php.html#a44d069c8a1cfcc6d2007c506a17ff28f":[6,0,4,76], +"boot_8php.html#a458e19af801bc4b0d1f1ce1a6d9e857e":[6,0,4,167], +"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[6,0,4,277], +"boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[6,0,4,186], +"boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[6,0,4,111], +"boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4":[6,0,4,246], +"boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[6,0,4,185], "boot_8php.html#a4c02d88e66852a01bd5a1feecb7c3ce3":[6,0,4,6], -"boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[6,0,4,218], -"boot_8php.html#a4f507a5996dbb3da148add0339a40d5a":[6,0,4,60], -"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[6,0,4,241], -"boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[6,0,4,209], -"boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[6,0,4,164], +"boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[6,0,4,219], +"boot_8php.html#a4f507a5996dbb3da148add0339a40d5a":[6,0,4,61], +"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[6,0,4,242], +"boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[6,0,4,210], +"boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[6,0,4,165], "boot_8php.html#a52b599cd13e152ebc80d7e4413683195":[6,0,4,43], -"boot_8php.html#a53e4bdb6f225da55115acb9277f75e53":[6,0,4,86], +"boot_8php.html#a53e4bdb6f225da55115acb9277f75e53":[6,0,4,87], "boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209":[6,0,4,35], -"boot_8php.html#a56fd673eaa7014150297ce1162502db5":[6,0,4,201], -"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[6,0,4,240], -"boot_8php.html#a5a681a672e007cdc22b43345d71f07c6":[6,0,4,290], +"boot_8php.html#a56fd673eaa7014150297ce1162502db5":[6,0,4,202], +"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[6,0,4,241], +"boot_8php.html#a5a681a672e007cdc22b43345d71f07c6":[6,0,4,291], "boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1":[6,0,4,20], -"boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[6,0,4,65], -"boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[6,0,4,191], -"boot_8php.html#a5b8484922918946d041e5e0515dbe718":[6,0,4,214], -"boot_8php.html#a5c3747e0f505f0d5271dc4c54e3feaf4":[6,0,4,83], -"boot_8php.html#a5df5359090d1f8e898c36d7cf8878ad2":[6,0,4,171], -"boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640":[6,0,4,215], -"boot_8php.html#a5fbebdf7a1c0ea8f904dbd9d78c2c06c":[6,0,4,33], -"boot_8php.html#a623e49c79943f3e7bdb770d021683cf7":[6,0,4,19], -"boot_8php.html#a6252d8eca67c689d9035ec6da544cf46":[6,0,4,25], -"boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5":[6,0,4,79], -"boot_8php.html#a639f079bf28f7bbb2769fee651d76dd8":[6,0,4,108], -"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[6,0,4,272] +"boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[6,0,4,66], +"boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[6,0,4,192], +"boot_8php.html#a5b8484922918946d041e5e0515dbe718":[6,0,4,215], +"boot_8php.html#a5c3747e0f505f0d5271dc4c54e3feaf4":[6,0,4,84] }; diff --git a/doc/html/navtreeindex1.js b/doc/html/navtreeindex1.js index b1e24009e..79f4e8017 100644 --- a/doc/html/navtreeindex1.js +++ b/doc/html/navtreeindex1.js @@ -1,185 +1,194 @@ var NAVTREEINDEX1 = { -"boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[6,0,4,177], -"boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[6,0,4,148], -"boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11":[6,0,4,151], -"boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155":[6,0,4,46], -"boot_8php.html#a6969947145a139ec374ce098224d8e81":[6,0,4,154], -"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[6,0,4,257], -"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[6,0,4,244], -"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[6,0,4,238], -"boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd":[6,0,4,105], -"boot_8php.html#a6c5e9e293c8242dcb9bc2c3ea2fee2c9":[6,0,4,97], -"boot_8php.html#a6df1102664f64b274810db85197c2755":[6,0,4,224], -"boot_8php.html#a6e57d913634d033b4d5ad72d99fd3e9d":[6,0,4,135], -"boot_8php.html#a6ee7a72d558d1851bbb9e3cdde377932":[6,0,4,219], -"boot_8php.html#a7037bcbca223395c06bc67f65024de7a":[6,0,4,106], -"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[6,0,4,256], -"boot_8php.html#a718a801b0be6cbaef5e519516da12721":[6,0,4,170], +"boot_8php.html#a5df5359090d1f8e898c36d7cf8878ad2":[6,0,4,172], +"boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640":[6,0,4,216], +"boot_8php.html#a5fbebdf7a1c0ea8f904dbd9d78c2c06c":[6,0,4,33], +"boot_8php.html#a623e49c79943f3e7bdb770d021683cf7":[6,0,4,19], +"boot_8php.html#a6252d8eca67c689d9035ec6da544cf46":[6,0,4,25], +"boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5":[6,0,4,80], +"boot_8php.html#a639f079bf28f7bbb2769fee651d76dd8":[6,0,4,109], +"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[6,0,4,273], +"boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[6,0,4,178], +"boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[6,0,4,149], +"boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11":[6,0,4,152], +"boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155":[6,0,4,47], +"boot_8php.html#a6969947145a139ec374ce098224d8e81":[6,0,4,155], +"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[6,0,4,258], +"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[6,0,4,245], +"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[6,0,4,239], +"boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd":[6,0,4,106], +"boot_8php.html#a6c5e9e293c8242dcb9bc2c3ea2fee2c9":[6,0,4,98], +"boot_8php.html#a6df1102664f64b274810db85197c2755":[6,0,4,225], +"boot_8php.html#a6e57d913634d033b4d5ad72d99fd3e9d":[6,0,4,136], +"boot_8php.html#a6ee7a72d558d1851bbb9e3cdde377932":[6,0,4,220], +"boot_8php.html#a7037bcbca223395c06bc67f65024de7a":[6,0,4,107], +"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[6,0,4,257], +"boot_8php.html#a718a801b0be6cbaef5e519516da12721":[6,0,4,171], "boot_8php.html#a719c7f3972d5f9268f37a41c76cd4ef6":[6,0,4,29], -"boot_8php.html#a7236b2cdcf59f02a42302e893a99013b":[6,0,4,192], -"boot_8php.html#a749144d8dd9c1366596a0213c277d050":[6,0,4,141], -"boot_8php.html#a74bf27f7564c9a37975e7b37d973dcab":[6,0,4,76], +"boot_8php.html#a7236b2cdcf59f02a42302e893a99013b":[6,0,4,193], +"boot_8php.html#a749144d8dd9c1366596a0213c277d050":[6,0,4,142], +"boot_8php.html#a74bf27f7564c9a37975e7b37d973dcab":[6,0,4,77], "boot_8php.html#a75a90b0eadd0df510f7e63210733634d":[6,0,4,2], -"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[6,0,4,280], +"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[6,0,4,281], "boot_8php.html#a768f00b7d66be0daf7ef4eea2e862006":[6,0,4,4], -"boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966":[6,0,4,78], -"boot_8php.html#a781916f83fcc8ff1035649afa45f0292":[6,0,4,91], -"boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383":[6,0,4,247], -"boot_8php.html#a7a8ba64d089cc0412c59a2eefc6d655c":[6,0,4,121], -"boot_8php.html#a7aa57438db03834aaa0b468bdce773a6":[6,0,4,69], -"boot_8php.html#a7af107fab8d62b9a73801713b774ed30":[6,0,4,140], -"boot_8php.html#a7b8f8ad9dbe82711257d23891ef6b133":[6,0,4,172], -"boot_8php.html#a7bff2278e68a71e524afd1c7c951e1e3":[6,0,4,73], -"boot_8php.html#a7c286add8961fd2d79216314cd4aadd8":[6,0,4,113], -"boot_8php.html#a7c2eb822d50e1554bf5c32861f36342b":[6,0,4,61], -"boot_8php.html#a7ed4581ab66ebcde97f6b3730856b028":[6,0,4,174], -"boot_8php.html#a7eeb83e15968f7a6cc5937d493815773":[6,0,4,48], -"boot_8php.html#a7f3474fec541e261fc8dff47313c4017":[6,0,4,51], -"boot_8php.html#a7f4264232dbb6c3b41f2617deecb1866":[6,0,4,88], -"boot_8php.html#a7fc4b291a7cdaa48b38e27344ea183cf":[6,0,4,124], -"boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed":[6,0,4,211], -"boot_8php.html#a84057c5bfa1bca5fba8497fe005ee4d8":[6,0,4,55], -"boot_8php.html#a845891f82bf6edd7fa2d578b66703112":[6,0,4,118], -"boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688":[6,0,4,59], -"boot_8php.html#a852d4036a3bed66af1534d014c4ecde2":[6,0,4,222], -"boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[6,0,4,131], -"boot_8php.html#a87b0f279f8413c7e4d805c5d85f20d34":[6,0,4,123], -"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[6,0,4,271], -"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[6,0,4,270], -"boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[6,0,4,190], +"boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966":[6,0,4,79], +"boot_8php.html#a781916f83fcc8ff1035649afa45f0292":[6,0,4,92], +"boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383":[6,0,4,248], +"boot_8php.html#a7a8ba64d089cc0412c59a2eefc6d655c":[6,0,4,122], +"boot_8php.html#a7aa57438db03834aaa0b468bdce773a6":[6,0,4,70], +"boot_8php.html#a7af107fab8d62b9a73801713b774ed30":[6,0,4,141], +"boot_8php.html#a7b8f8ad9dbe82711257d23891ef6b133":[6,0,4,173], +"boot_8php.html#a7bff2278e68a71e524afd1c7c951e1e3":[6,0,4,74], +"boot_8php.html#a7c286add8961fd2d79216314cd4aadd8":[6,0,4,114], +"boot_8php.html#a7c2eb822d50e1554bf5c32861f36342b":[6,0,4,62], +"boot_8php.html#a7ed4581ab66ebcde97f6b3730856b028":[6,0,4,175], +"boot_8php.html#a7eeb83e15968f7a6cc5937d493815773":[6,0,4,49], +"boot_8php.html#a7f3474fec541e261fc8dff47313c4017":[6,0,4,52], +"boot_8php.html#a7f4264232dbb6c3b41f2617deecb1866":[6,0,4,89], +"boot_8php.html#a7fc4b291a7cdaa48b38e27344ea183cf":[6,0,4,125], +"boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed":[6,0,4,212], +"boot_8php.html#a84057c5bfa1bca5fba8497fe005ee4d8":[6,0,4,56], +"boot_8php.html#a845891f82bf6edd7fa2d578b66703112":[6,0,4,119], +"boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688":[6,0,4,60], +"boot_8php.html#a852d4036a3bed66af1534d014c4ecde2":[6,0,4,223], +"boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[6,0,4,132], +"boot_8php.html#a87b0f279f8413c7e4d805c5d85f20d34":[6,0,4,124], +"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[6,0,4,272], +"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[6,0,4,271], +"boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[6,0,4,191], "boot_8php.html#a899d24fd074594ceebbf72e1feff335f":[6,0,4,16], -"boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[6,0,4,102], -"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[6,0,4,242], -"boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[6,0,4,134], -"boot_8php.html#a8da836617174eed9fc2ac8054125354b":[6,0,4,128], -"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[6,0,4,249], -"boot_8php.html#a8fdcc4ffb365a3267bd02ce8a8d466d6":[6,0,4,288], +"boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[6,0,4,103], +"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[6,0,4,243], +"boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[6,0,4,135], +"boot_8php.html#a8da836617174eed9fc2ac8054125354b":[6,0,4,129], +"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[6,0,4,250], +"boot_8php.html#a8fdcc4ffb365a3267bd02ce8a8d466d6":[6,0,4,289], "boot_8php.html#a9255af5ae9c887520091ea04763c1a88":[6,0,4,32], "boot_8php.html#a926cad0b3d8b9d9ee5da1898fc063ba3":[6,0,4,11], -"boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[6,0,4,155], -"boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[6,0,4,132], -"boot_8php.html#a949116d9a295b214293006c060ca4848":[6,0,4,130], -"boot_8php.html#a9690d73434125ce594a1f5e7c2a4f7c0":[6,0,4,283], -"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[6,0,4,254], +"boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[6,0,4,156], +"boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[6,0,4,133], +"boot_8php.html#a949116d9a295b214293006c060ca4848":[6,0,4,131], +"boot_8php.html#a9690d73434125ce594a1f5e7c2a4f7c0":[6,0,4,284], +"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[6,0,4,255], "boot_8php.html#a97769915c9f14adc4f8ab1ea2cecfd90":[6,0,4,18], -"boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[6,0,4,204], -"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[6,0,4,243], -"boot_8php.html#a9c80420e5a063a4a87ce4831f086134d":[6,0,4,50], +"boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[6,0,4,205], +"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[6,0,4,244], +"boot_8php.html#a9c80420e5a063a4a87ce4831f086134d":[6,0,4,51], "boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e":[6,0,4,5], -"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[6,0,4,234], -"boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[6,0,4,205], -"boot_8php.html#a9ea1290e00c6d40684892047f2c778a9":[6,0,4,286], -"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[6,0,4,273], -"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[6,0,4,233], -"boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[6,0,4,193], +"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[6,0,4,235], +"boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[6,0,4,206], +"boot_8php.html#a9ea1290e00c6d40684892047f2c778a9":[6,0,4,287], +"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[6,0,4,274], +"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[6,0,4,234], +"boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[6,0,4,194], "boot_8php.html#aa1e828bbbcba170265eb2668d8daf42e":[6,0,4,26], -"boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[6,0,4,212], -"boot_8php.html#aa3425e2de85b08f7041656d3a8502cb6":[6,0,4,45], -"boot_8php.html#aa3679df31c8dad1b71816b0322d5baff":[6,0,4,162], +"boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[6,0,4,213], +"boot_8php.html#aa3425e2de85b08f7041656d3a8502cb6":[6,0,4,46], +"boot_8php.html#aa3679df31c8dad1b71816b0322d5baff":[6,0,4,163], "boot_8php.html#aa4221641e5c21db69fa52c426b9017f5":[6,0,4,9], -"boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2":[6,0,4,159], -"boot_8php.html#aa589421267f0c2f0d643f727792cce35":[6,0,4,117], -"boot_8php.html#aa74438cf71e48e37bf7b440b94243985":[6,0,4,90], -"boot_8php.html#aa8a2b61e70900139d1ca28e46f1da49d":[6,0,4,99], -"boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[6,0,4,239], -"boot_8php.html#aad33b494084f729b6ee3b0bc457718a1":[6,0,4,145], -"boot_8php.html#aae6c941bde5fd6fce07e51dba7326ead":[6,0,4,221], -"boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14":[6,0,4,70], -"boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[6,0,4,196], -"boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[6,0,4,122], -"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[6,0,4,223], +"boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2":[6,0,4,160], +"boot_8php.html#aa589421267f0c2f0d643f727792cce35":[6,0,4,118], +"boot_8php.html#aa74438cf71e48e37bf7b440b94243985":[6,0,4,91], +"boot_8php.html#aa8a2b61e70900139d1ca28e46f1da49d":[6,0,4,100], +"boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[6,0,4,240], +"boot_8php.html#aad33b494084f729b6ee3b0bc457718a1":[6,0,4,146], +"boot_8php.html#aae6c941bde5fd6fce07e51dba7326ead":[6,0,4,222], +"boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14":[6,0,4,71], +"boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[6,0,4,197], +"boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[6,0,4,123], +"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[6,0,4,224], "boot_8php.html#ab346a2ece14993861f3e4206befa94f0":[6,0,4,34], -"boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8":[6,0,4,217], -"boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0":[6,0,4,246], -"boot_8php.html#ab4bddb41a0cf407178ec5278b950c393":[6,0,4,189], -"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[6,0,4,228], -"boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764":[6,0,4,116], -"boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[6,0,4,147], -"boot_8php.html#ab5ddbe69d3d03acd06e1fb281488cb78":[6,0,4,57], -"boot_8php.html#ab724491497ab2618b23a01d5da60aec0":[6,0,4,207], +"boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8":[6,0,4,218], +"boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0":[6,0,4,247], +"boot_8php.html#ab4bddb41a0cf407178ec5278b950c393":[6,0,4,190], +"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[6,0,4,229], +"boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764":[6,0,4,117], +"boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[6,0,4,148], +"boot_8php.html#ab5ddbe69d3d03acd06e1fb281488cb78":[6,0,4,58], +"boot_8php.html#ab724491497ab2618b23a01d5da60aec0":[6,0,4,208], "boot_8php.html#ab79b8b4555cae20d03f8200666d89d63":[6,0,4,7], -"boot_8php.html#ab7d65a7e7417825a4db62906bb600729":[6,0,4,101], -"boot_8php.html#ab9dca53455cd157d3c6ba2bdecdbd22d":[6,0,4,282], +"boot_8php.html#ab7d65a7e7417825a4db62906bb600729":[6,0,4,102], +"boot_8php.html#ab9dca53455cd157d3c6ba2bdecdbd22d":[6,0,4,283], "boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda":[6,0,4,39], -"boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86":[6,0,4,250], +"boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86":[6,0,4,251], "boot_8php.html#abc0a90a1a77f5b668aa7e4b57d1776a7":[6,0,4,3], -"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[6,0,4,277], -"boot_8php.html#abdcdfc873ace4e0902177bad934de0c0":[6,0,4,68], -"boot_8php.html#abeb4d86e17cefa8584f1244e2183b0e1":[6,0,4,119], -"boot_8php.html#abedd940e664017c61b48c6efa31d0cb8":[6,0,4,100], -"boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450":[6,0,4,129], +"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[6,0,4,278], +"boot_8php.html#abdcdfc873ace4e0902177bad934de0c0":[6,0,4,69], +"boot_8php.html#abeb4d86e17cefa8584f1244e2183b0e1":[6,0,4,120], +"boot_8php.html#abedd940e664017c61b48c6efa31d0cb8":[6,0,4,101], +"boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450":[6,0,4,130], "boot_8php.html#ac17fc8a416ea79e9d5cb4dc9a8ff8c5c":[6,0,4,24], -"boot_8php.html#ac195fc9003298923ea81f144388e24b1":[6,0,4,175], -"boot_8php.html#ac43182e0d8bae7576a30b603774974f8":[6,0,4,248], -"boot_8php.html#ac59a18a4838710d6c2de37aed6b21f03":[6,0,4,98], +"boot_8php.html#ac195fc9003298923ea81f144388e24b1":[6,0,4,176], +"boot_8php.html#ac43182e0d8bae7576a30b603774974f8":[6,0,4,249], +"boot_8php.html#ac59a18a4838710d6c2de37aed6b21f03":[6,0,4,99], "boot_8php.html#ac5e74f899f6e98d8e91b14ba1c08bc08":[6,0,4,27], "boot_8php.html#ac608a34f3bc180e7724192e0fd31f9b0":[6,0,4,37], -"boot_8php.html#ac8400313df2c831653f9036f71ebd86d":[6,0,4,58], -"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[6,0,4,284], -"boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20":[6,0,4,125], -"boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[6,0,4,127], -"boot_8php.html#aca08bc4f1554ba877500f6abcc99e1e8":[6,0,4,203], +"boot_8php.html#ac8400313df2c831653f9036f71ebd86d":[6,0,4,59], +"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[6,0,4,285], +"boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20":[6,0,4,126], +"boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[6,0,4,128], +"boot_8php.html#aca08bc4f1554ba877500f6abcc99e1e8":[6,0,4,204], "boot_8php.html#aca47505b8732177f52bb2d647eb2741c":[6,0,4,36], "boot_8php.html#aca5e42678e178c6b9034610d66666fd7":[6,0,4,13], "boot_8php.html#acc4e0c910af066148b810e5fde55fff1":[6,0,4,8], -"boot_8php.html#acca19aae62e1a6951a856b945de20d67":[6,0,4,178], -"boot_8php.html#accd6f36cc9f40225cbd720e4d12a7c6e":[6,0,4,285], -"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[6,0,4,235], -"boot_8php.html#ace6d70ac290397ddd40e561fd0831858":[6,0,4,269], -"boot_8php.html#ace83842dbeb84f7ed9ac59a9f57a7c32":[6,0,4,210], -"boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3":[6,0,4,67], -"boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8":[6,0,4,158], -"boot_8php.html#ad11f30a6590d3d77f0c5e1e3909af8f5":[6,0,4,168], +"boot_8php.html#acca19aae62e1a6951a856b945de20d67":[6,0,4,179], +"boot_8php.html#accd6f36cc9f40225cbd720e4d12a7c6e":[6,0,4,286], +"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[6,0,4,236], +"boot_8php.html#ace6d70ac290397ddd40e561fd0831858":[6,0,4,270], +"boot_8php.html#ace83842dbeb84f7ed9ac59a9f57a7c32":[6,0,4,211], +"boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3":[6,0,4,68], +"boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8":[6,0,4,159], +"boot_8php.html#ad11f30a6590d3d77f0c5e1e3909af8f5":[6,0,4,169], "boot_8php.html#ad206598b909e8eb67eb0e0bb5ef69c13":[6,0,4,10], -"boot_8php.html#ad302cb26b838898d475f57f61b0fcc9f":[6,0,4,74], -"boot_8php.html#ad34c1547020a305915bcc39707744690":[6,0,4,89], +"boot_8php.html#ad302cb26b838898d475f57f61b0fcc9f":[6,0,4,75], +"boot_8php.html#ad34c1547020a305915bcc39707744690":[6,0,4,90], "boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44":[6,0,4,30], -"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[6,0,4,230], -"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[6,0,4,258], -"boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5":[6,0,4,252], -"boot_8php.html#ada72d88ae39a7e3b45baea201cb49a29":[6,0,4,95], -"boot_8php.html#adaeb4f590c56326b2dca3b19f31b6272":[6,0,4,142], -"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[6,0,4,261], +"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[6,0,4,231], +"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[6,0,4,259], +"boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5":[6,0,4,253], +"boot_8php.html#ada72d88ae39a7e3b45baea201cb49a29":[6,0,4,96], +"boot_8php.html#adaeb4f590c56326b2dca3b19f31b6272":[6,0,4,143], +"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[6,0,4,262], "boot_8php.html#add517a0958ac684792c62142a3877f81":[6,0,4,40], "boot_8php.html#adfb2fc7be5a4226c0a8e24131da9d498":[6,0,4,23], -"boot_8php.html#ae0da3ca0f54d75d22c71e007331f8d06":[6,0,4,107], -"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[6,0,4,268], -"boot_8php.html#ae3cef7b63e25e7bafea3fcf6b99fad0e":[6,0,4,186], -"boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[6,0,4,161], -"boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[6,0,4,194], -"boot_8php.html#aea392cb26ed617f3a8cde648385b5df0":[6,0,4,281], +"boot_8php.html#ae0d9527117cd87dcba11986047ae336e":[6,0,4,44], +"boot_8php.html#ae0da3ca0f54d75d22c71e007331f8d06":[6,0,4,108], +"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[6,0,4,269], +"boot_8php.html#ae3cef7b63e25e7bafea3fcf6b99fad0e":[6,0,4,187], +"boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[6,0,4,162], +"boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[6,0,4,195], +"boot_8php.html#aea392cb26ed617f3a8cde648385b5df0":[6,0,4,282], "boot_8php.html#aea7fc57a4d8e9dcb42f2601b0b9b761c":[6,0,4,28], -"boot_8php.html#aead84fa27d7516b855220fe004964a45":[6,0,4,274], -"boot_8php.html#aeb1039302affcbe7e8872c01c08c88f8":[6,0,4,52], -"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[6,0,4,232], -"boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6":[6,0,4,262], -"boot_8php.html#aed0dfb35f7dd00dc9e4f868ea7f7ff53":[6,0,4,169], -"boot_8php.html#aedfb9501ed408278667995524e0d15cf":[6,0,4,103], -"boot_8php.html#aee324eca9de4e0fedf01ab5f92e27c67":[6,0,4,181], -"boot_8php.html#aef4b6c558c68c88c10f13c5a00c20e3d":[6,0,4,195], -"boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[6,0,4,144], -"boot_8php.html#aefe573c3c7b0d37fbff264bbae79d673":[6,0,4,114], +"boot_8php.html#aead84fa27d7516b855220fe004964a45":[6,0,4,275], +"boot_8php.html#aeb1039302affcbe7e8872c01c08c88f8":[6,0,4,53], +"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[6,0,4,233], +"boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6":[6,0,4,263], +"boot_8php.html#aed0dfb35f7dd00dc9e4f868ea7f7ff53":[6,0,4,170], +"boot_8php.html#aedfb9501ed408278667995524e0d15cf":[6,0,4,104], +"boot_8php.html#aee324eca9de4e0fedf01ab5f92e27c67":[6,0,4,182], +"boot_8php.html#aef4b6c558c68c88c10f13c5a00c20e3d":[6,0,4,196], +"boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[6,0,4,145], +"boot_8php.html#aefe573c3c7b0d37fbff264bbae79d673":[6,0,4,115], "boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4":[6,0,4,31], -"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[6,0,4,265], -"boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[6,0,4,188], -"boot_8php.html#af3a4271630aabd8be592213f925d6a36":[6,0,4,62], -"boot_8php.html#af3bdfc20979c16f15bb9c60446a480f9":[6,0,4,53], -"boot_8php.html#af3ff14985bffbd951a6ea356b7ec3007":[6,0,4,237], -"boot_8php.html#af489d0c3166551b93e63a79ff2c9be35":[6,0,4,149], -"boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461":[6,0,4,208], -"boot_8php.html#af6b3de425e5849c73370a484c44607a3":[6,0,4,167], -"boot_8php.html#af6f6f6f40139f12fc09ec47373b30919":[6,0,4,92], -"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[6,0,4,260], -"boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d":[6,0,4,200], -"boot_8php.html#afaf93b7026f784b113b4f8921745891e":[6,0,4,182], -"boot_8php.html#afb97615e985a013799839b68b99018d7":[6,0,4,266], -"boot_8php.html#afbb1fe1b2c8c730ec8e08da93b6512c4":[6,0,4,49], -"boot_8php.html#afe084c30a1810c10442edb4fbcbc0086":[6,0,4,84], -"boot_8php.html#afe63ae69ba55299f813766e54df06ede":[6,0,4,153], +"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[6,0,4,266], +"boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[6,0,4,189], +"boot_8php.html#af3a4271630aabd8be592213f925d6a36":[6,0,4,63], +"boot_8php.html#af3bdfc20979c16f15bb9c60446a480f9":[6,0,4,54], +"boot_8php.html#af3ff14985bffbd951a6ea356b7ec3007":[6,0,4,238], +"boot_8php.html#af489d0c3166551b93e63a79ff2c9be35":[6,0,4,150], +"boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461":[6,0,4,209], +"boot_8php.html#af6b3de425e5849c73370a484c44607a3":[6,0,4,168], +"boot_8php.html#af6f6f6f40139f12fc09ec47373b30919":[6,0,4,93], +"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[6,0,4,261], +"boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d":[6,0,4,201], +"boot_8php.html#afaf93b7026f784b113b4f8921745891e":[6,0,4,183], +"boot_8php.html#afb97615e985a013799839b68b99018d7":[6,0,4,267], +"boot_8php.html#afbb1fe1b2c8c730ec8e08da93b6512c4":[6,0,4,50], +"boot_8php.html#afe084c30a1810c10442edb4fbcbc0086":[6,0,4,85], +"boot_8php.html#afe63ae69ba55299f813766e54df06ede":[6,0,4,154], "boot_8php.html#afe88b920aa285982edb817a0dd44eb37":[6,0,4,14], -"boot_8php.html#afef254290febac854c85fc698d9483a6":[6,0,4,291], -"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[6,0,4,226], +"boot_8php.html#afef254290febac854c85fc698d9483a6":[6,0,4,292], +"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[6,0,4,227], "boxy_8php.html":[6,0,3,1,3,1,0], "cache_8php.html":[6,0,0,13], "channel_8php.html":[6,0,1,12], @@ -240,14 +249,5 @@ var NAVTREEINDEX1 = "classApp.html#a5f64620473a9727a48ebe9cf6f335a98":[5,0,5,80], "classApp.html#a604d659d6977a99de42a160343e5289a":[5,0,5,4], "classApp.html#a61ca6e3af82071ea25ff2fd5dbcddae2":[5,0,5,45], -"classApp.html#a622eace13f8fc9f4b5672a68e2bc4396":[5,0,5,7], -"classApp.html#a6844aedad10e201b8c3d80cfc9e876d3":[5,0,5,81], -"classApp.html#a6859a4848a5c0049b4134cc4b34228b6":[5,0,5,82], -"classApp.html#a6bcb19cdc4907077da72864686d5a780":[5,0,5,69], -"classApp.html#a6e4f0fbfa3cf6c11baebe22a03db6165":[5,0,5,65], -"classApp.html#a6f55d087e1ff4710132c1b0863faa2ee":[5,0,5,47], -"classApp.html#a764cc6cd7578132c21d2b4545de9301c":[5,0,5,83], -"classApp.html#a78788f6e9d8b713b138f81e457c5cd08":[5,0,5,20], -"classApp.html#a7954862f44f606b0ff83d4c74d15e792":[5,0,5,57], -"classApp.html#a871898becd0697d778f36d9336253ae8":[5,0,5,14] +"classApp.html#a622eace13f8fc9f4b5672a68e2bc4396":[5,0,5,7] }; diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js index a06ddef94..02c78068c 100644 --- a/doc/html/navtreeindex2.js +++ b/doc/html/navtreeindex2.js @@ -1,5 +1,14 @@ var NAVTREEINDEX2 = { +"classApp.html#a6844aedad10e201b8c3d80cfc9e876d3":[5,0,5,81], +"classApp.html#a6859a4848a5c0049b4134cc4b34228b6":[5,0,5,82], +"classApp.html#a6bcb19cdc4907077da72864686d5a780":[5,0,5,69], +"classApp.html#a6e4f0fbfa3cf6c11baebe22a03db6165":[5,0,5,65], +"classApp.html#a6f55d087e1ff4710132c1b0863faa2ee":[5,0,5,47], +"classApp.html#a764cc6cd7578132c21d2b4545de9301c":[5,0,5,83], +"classApp.html#a78788f6e9d8b713b138f81e457c5cd08":[5,0,5,20], +"classApp.html#a7954862f44f606b0ff83d4c74d15e792":[5,0,5,57], +"classApp.html#a871898becd0697d778f36d9336253ae8":[5,0,5,14], "classApp.html#a8863703a0305eaa45eb970dbd2046291":[5,0,5,16], "classApp.html#a89e9feb2bfb5253883a9720beaffe876":[5,0,5,21], "classApp.html#a91fd3c8b89016113b05f3be24805ccff":[5,0,5,87], @@ -240,14 +249,5 @@ var NAVTREEINDEX2 = "classdba__mysql.html":[5,0,10], "classdba__mysql.html#a1887338627ce0e28786839363014bd0b":[5,0,10,1], "classdba__mysql.html#a850586714ef897bd25f643c89b4ef76e":[5,0,10,0], -"classdba__mysql.html#a99a7691ea6cb1300031fb6549379066e":[5,0,10,2], -"classdba__mysql.html#ac3fd60c278f400907322dac578754a99":[5,0,10,3], -"classdba__mysqli.html":[5,0,11], -"classdba__mysqli.html#a27d6a748af7f80028801306e7ea33f64":[5,0,11,2], -"classdba__mysqli.html#a611c4de8d6d7512dffb83a38bb6701ec":[5,0,11,3], -"classdba__mysqli.html#acb38f2c851187ad632ecfab30fdfab55":[5,0,11,0], -"classdba__mysqli.html#add062bd93961e5f0194d94820e9a51b1":[5,0,11,1], -"classenotify.html":[5,0,12], -"classes.html":[5,1], -"classphoto__driver.html":[5,0,19] +"classdba__mysql.html#a99a7691ea6cb1300031fb6549379066e":[5,0,10,2] }; diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js index 28c4c8389..87872da25 100644 --- a/doc/html/navtreeindex3.js +++ b/doc/html/navtreeindex3.js @@ -1,5 +1,14 @@ var NAVTREEINDEX3 = { +"classdba__mysql.html#ac3fd60c278f400907322dac578754a99":[5,0,10,3], +"classdba__mysqli.html":[5,0,11], +"classdba__mysqli.html#a27d6a748af7f80028801306e7ea33f64":[5,0,11,2], +"classdba__mysqli.html#a611c4de8d6d7512dffb83a38bb6701ec":[5,0,11,3], +"classdba__mysqli.html#acb38f2c851187ad632ecfab30fdfab55":[5,0,11,0], +"classdba__mysqli.html#add062bd93961e5f0194d94820e9a51b1":[5,0,11,1], +"classenotify.html":[5,0,12], +"classes.html":[5,1], +"classphoto__driver.html":[5,0,19], "classphoto__driver.html#a00cb166c00b7502dbc456c94330e5b03":[5,0,19,27], "classphoto__driver.html#a01d28d43b404d6f6de219dc9c5069dc9":[5,0,19,28], "classphoto__driver.html#a19e1af2b6af4c63aa6230abe69f83712":[5,0,19,13], @@ -237,17 +246,8 @@ var NAVTREEINDEX3 = "dir_922c77e958c99a98db92d38a3a349bf2.html":[6,0,3,1,1], "dir_92d6b429199666aa3765c8a934db5e14.html":[6,0,3,1,1,1], "dir__fns_8php.html":[6,0,0,30], -"dir__fns_8php.html#a44062d4b471d1e83f92f6c184585aa13":[6,0,0,30,5], -"dir__fns_8php.html#a8c15aa69da12f2d3476b9e93b82b337d":[6,0,0,30,2], -"dir__fns_8php.html#aa666e7df6ca8c332f4081c9b66b4bdf6":[6,0,0,30,4], -"dir__fns_8php.html#acd37b17dce3bdec6d5a6344a20598c1e":[6,0,0,30,3], -"dir__fns_8php.html#acf621621e929d49441da30aad76a58cf":[6,0,0,30,0], -"dir__fns_8php.html#ae56881d69bb6f8e828c9e35454386774":[6,0,0,30,1], -"dir_a8a0005c2b8590c535262d232c22afab.html":[6,0,3,1,1,1,0,0], -"dir_aae29906d7bfc07d076125f669c8352e.html":[6,0,0,1], -"dir_b2f003339c516cc00c8cadcafbe82f13.html":[6,0,3], -"dir_c02447ad39a5307c81c64e880ec9e8d3.html":[6,0,3,1,1,0], -"dir_cb8a8f75dcdd0b3fbfcc82e9eda410c5.html":[6,0,3,1,0,1], -"dir_d41ce877eb409a4791b288730010abe2.html":[6,0,1], -"dir_d44c64559bbebec7f509842c48db8b23.html":[6,0,0] +"dir__fns_8php.html#a2f7d74bb2aea8bcd2537aee5c6708a16":[6,0,0,30,0], +"dir__fns_8php.html#a44062d4b471d1e83f92f6c184585aa13":[6,0,0,30,6], +"dir__fns_8php.html#a8c15aa69da12f2d3476b9e93b82b337d":[6,0,0,30,3], +"dir__fns_8php.html#aa666e7df6ca8c332f4081c9b66b4bdf6":[6,0,0,30,5] }; diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js index ce6278c8c..d1955779a 100644 --- a/doc/html/navtreeindex4.js +++ b/doc/html/navtreeindex4.js @@ -1,5 +1,15 @@ var NAVTREEINDEX4 = { +"dir__fns_8php.html#acd37b17dce3bdec6d5a6344a20598c1e":[6,0,0,30,4], +"dir__fns_8php.html#acf621621e929d49441da30aad76a58cf":[6,0,0,30,1], +"dir__fns_8php.html#ae56881d69bb6f8e828c9e35454386774":[6,0,0,30,2], +"dir_a8a0005c2b8590c535262d232c22afab.html":[6,0,3,1,1,1,0,0], +"dir_aae29906d7bfc07d076125f669c8352e.html":[6,0,0,1], +"dir_b2f003339c516cc00c8cadcafbe82f13.html":[6,0,3], +"dir_c02447ad39a5307c81c64e880ec9e8d3.html":[6,0,3,1,1,0], +"dir_cb8a8f75dcdd0b3fbfcc82e9eda410c5.html":[6,0,3,1,0,1], +"dir_d41ce877eb409a4791b288730010abe2.html":[6,0,1], +"dir_d44c64559bbebec7f509842c48db8b23.html":[6,0,0], "dir_d520c5cf583201d9437764f209363c22.html":[6,0,3,1,0], "dir_f19da925ee886ec38f19b0e8c19779bc.html":[6,0,3,1,0,0], "dirprofile_8php.html":[6,0,1,24], @@ -169,8 +179,8 @@ var NAVTREEINDEX4 = "globals_0x77.html":[6,1,0,24], "globals_0x78.html":[6,1,0,25], "globals_0x7a.html":[6,1,0,26], -"globals_func.html":[6,1,1,0], "globals_func.html":[6,1,1], +"globals_func.html":[6,1,1,0], "globals_func_0x61.html":[6,1,1,1], "globals_func_0x62.html":[6,1,1,2], "globals_func_0x63.html":[6,1,1,3], @@ -239,15 +249,5 @@ var NAVTREEINDEX4 = "html2bbcode_8php.html#a5ad726995ac4070213abdb3bd09f4837":[6,0,0,40,1], "html2bbcode_8php.html#a71a07f135d196ec5943b13f7b2e6a9b2":[6,0,0,40,0], "html2bbcode_8php.html#ad174afe0ccbd8c475e48f8a6ee2f27d8":[6,0,0,40,2], -"html2plain_8php.html":[6,0,0,41], -"html2plain_8php.html#a3214912e3d00cf0a948072daccf16740":[6,0,0,41,0], -"html2plain_8php.html#a56d29b254333d29abb9d96a9a903a4b0":[6,0,0,41,3], -"html2plain_8php.html#ab3e121fa9f3feb16f9f942e705bc6c04":[6,0,0,41,2], -"html2plain_8php.html#ae1c203d0f089d5678d73a6c64a395201":[6,0,0,41,1], -"hubloc_8php.html":[6,0,0,42], -"hubloc_8php.html#ad3d0dcfcfcb347744f7617fe6f5de002":[6,0,0,42,1], -"hubloc_8php.html#aebd244b4616ded022cbbee5e82926951":[6,0,0,42,0], -"identity_8php.html":[6,0,0,43], -"identity_8php.html#a1cf83ac2b645de12868edaa3a5718f05":[6,0,0,43,3], -"identity_8php.html#a224710dfb7465b706c91134247c20afa":[6,0,0,43,11] +"html2plain_8php.html":[6,0,0,41] }; diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js index daacc1a78..fce0cb86e 100644 --- a/doc/html/navtreeindex5.js +++ b/doc/html/navtreeindex5.js @@ -1,5 +1,15 @@ var NAVTREEINDEX5 = { +"html2plain_8php.html#a3214912e3d00cf0a948072daccf16740":[6,0,0,41,0], +"html2plain_8php.html#a56d29b254333d29abb9d96a9a903a4b0":[6,0,0,41,3], +"html2plain_8php.html#ab3e121fa9f3feb16f9f942e705bc6c04":[6,0,0,41,2], +"html2plain_8php.html#ae1c203d0f089d5678d73a6c64a395201":[6,0,0,41,1], +"hubloc_8php.html":[6,0,0,42], +"hubloc_8php.html#ad3d0dcfcfcb347744f7617fe6f5de002":[6,0,0,42,1], +"hubloc_8php.html#aebd244b4616ded022cbbee5e82926951":[6,0,0,42,0], +"identity_8php.html":[6,0,0,43], +"identity_8php.html#a1cf83ac2b645de12868edaa3a5718f05":[6,0,0,43,3], +"identity_8php.html#a224710dfb7465b706c91134247c20afa":[6,0,0,43,11], "identity_8php.html#a2ab5172eabd375869060c9ad68323f5c":[6,0,0,43,17], "identity_8php.html#a332df795f684788002f5a6424abacfd7":[6,0,0,43,10], "identity_8php.html#a345f4c943d84de502ec6e72d2c813945":[6,0,0,43,2], @@ -93,15 +103,14 @@ var NAVTREEINDEX5 = "include_2apps_8php.html#a1adcd1aff4d36ad0277daca9f3d2bbe2":[6,0,0,6,4], "include_2apps_8php.html#a1b2e737f477a2e0d9d11ef14adc5aa66":[6,0,0,6,7], "include_2apps_8php.html#a1cb5c016510e39bcdc1d1c096d51c5c7":[6,0,0,6,2], -"include_2apps_8php.html#a32fe4ed9666228fd4b67dc487cc57a83":[6,0,0,6,13], -"include_2apps_8php.html#a48289d5cc44b7638191738106ac5d030":[6,0,0,6,14], +"include_2apps_8php.html#a32fe4ed9666228fd4b67dc487cc57a83":[6,0,0,6,12], +"include_2apps_8php.html#a48289d5cc44b7638191738106ac5d030":[6,0,0,6,13], "include_2apps_8php.html#a6b472df85ed875e7ae75642cece5206f":[6,0,0,6,1], "include_2apps_8php.html#a72756e1601489eb77971eeda011446d0":[6,0,0,6,3], -"include_2apps_8php.html#a7c8bf17bd61a310bacb21ba9ad7a061b":[6,0,0,6,10], "include_2apps_8php.html#ab93a3310b7de99ee90f673518eccb658":[6,0,0,6,6], "include_2apps_8php.html#ad5f6f1443725386cc7af5ed34a5fe185":[6,0,0,6,0], -"include_2apps_8php.html#ad6ba3f254003f69f8f3f94ca5bda0680":[6,0,0,6,12], -"include_2apps_8php.html#ae64f72eb4f126e03b4eb65ed1702a3ca":[6,0,0,6,11], +"include_2apps_8php.html#ad6ba3f254003f69f8f3f94ca5bda0680":[6,0,0,6,11], +"include_2apps_8php.html#ae64f72eb4f126e03b4eb65ed1702a3ca":[6,0,0,6,10], "include_2apps_8php.html#aeab6a62d2f3dfaa86ed043a006305f46":[6,0,0,6,9], "include_2attach_8php.html":[6,0,0,7], "include_2attach_8php.html#a052f14487ff2ce72f62a09fac8d7e997":[6,0,0,7,9], @@ -181,29 +190,30 @@ var NAVTREEINDEX5 = "include_2message_8php.html#a751ffd6635022b2190f56154ee745752":[6,0,0,49,4], "include_2message_8php.html#aed272d77c06a309e2836ac79e75613f1":[6,0,0,49,0], "include_2network_8php.html":[6,0,0,51], -"include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0":[6,0,0,51,6], -"include_2network_8php.html#a27a951b59d8d622c0b3e7b0673ba74c6":[6,0,0,51,13], -"include_2network_8php.html#a316f318167a039c89719afbd129a8f3c":[6,0,0,51,15], -"include_2network_8php.html#a3e6c751a51de33ad3563f0938296e78a":[6,0,0,51,19], -"include_2network_8php.html#a469b9bd700269cd07d954f1a16c5899b":[6,0,0,51,5], -"include_2network_8php.html#a4c5d50079e089168d9248427018fffd4":[6,0,0,51,11], -"include_2network_8php.html#a4cfb2c05a1c295317283d762440ce0b2":[6,0,0,51,10], -"include_2network_8php.html#a5caa264fab6d2b2344e6bd5b298b08f2":[6,0,0,51,18], -"include_2network_8php.html#a63e62946e194928eb17c5a9f2bbef0fe":[6,0,0,51,4], -"include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7":[6,0,0,51,9], -"include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d":[6,0,0,51,8], -"include_2network_8php.html#a872bbe72d23826c64c9e0f822180a3ec":[6,0,0,51,12], -"include_2network_8php.html#a897e7112d86eb95526cbd0bff9375f02":[6,0,0,51,17], -"include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0":[6,0,0,51,7], -"include_2network_8php.html#a9129fd55e7fc175b4ea9a195cccc16bc":[6,0,0,51,23], -"include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff":[6,0,0,51,20], -"include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6":[6,0,0,51,21], -"include_2network_8php.html#aafd06c0a75402aefb06cfb9f9740fa37":[6,0,0,51,22], +"include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0":[6,0,0,51,7], +"include_2network_8php.html#a27a951b59d8d622c0b3e7b0673ba74c6":[6,0,0,51,14], +"include_2network_8php.html#a316f318167a039c89719afbd129a8f3c":[6,0,0,51,16], +"include_2network_8php.html#a3e6c751a51de33ad3563f0938296e78a":[6,0,0,51,20], +"include_2network_8php.html#a469b9bd700269cd07d954f1a16c5899b":[6,0,0,51,6], +"include_2network_8php.html#a4c5d50079e089168d9248427018fffd4":[6,0,0,51,12], +"include_2network_8php.html#a4cfb2c05a1c295317283d762440ce0b2":[6,0,0,51,11], +"include_2network_8php.html#a5176176ddc1906d91f186df6fbd87b48":[6,0,0,51,4], +"include_2network_8php.html#a5caa264fab6d2b2344e6bd5b298b08f2":[6,0,0,51,19], +"include_2network_8php.html#a63e62946e194928eb17c5a9f2bbef0fe":[6,0,0,51,5], +"include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7":[6,0,0,51,10], +"include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d":[6,0,0,51,9], +"include_2network_8php.html#a872bbe72d23826c64c9e0f822180a3ec":[6,0,0,51,13], +"include_2network_8php.html#a897e7112d86eb95526cbd0bff9375f02":[6,0,0,51,18], +"include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0":[6,0,0,51,8], +"include_2network_8php.html#a9129fd55e7fc175b4ea9a195cccc16bc":[6,0,0,51,24], +"include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff":[6,0,0,51,21], +"include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6":[6,0,0,51,22], +"include_2network_8php.html#aafd06c0a75402aefb06cfb9f9740fa37":[6,0,0,51,23], "include_2network_8php.html#ab07ce9d75eae559865ed90aad2154bd7":[6,0,0,51,2], "include_2network_8php.html#aba38458a2ff2d92d3536488dbb119694":[6,0,0,51,0], -"include_2network_8php.html#acb0bd7f5fe38ff1eaebeae3284525070":[6,0,0,51,16], +"include_2network_8php.html#acb0bd7f5fe38ff1eaebeae3284525070":[6,0,0,51,17], "include_2network_8php.html#ad4056d3ce69988f5c1a997a79f503246":[6,0,0,51,3], -"include_2network_8php.html#ae8d9c41a11000fb8667039fc71b4f73f":[6,0,0,51,14], +"include_2network_8php.html#ae8d9c41a11000fb8667039fc71b4f73f":[6,0,0,51,15], "include_2network_8php.html#aee35d9ad6b3f872bfb39ba3598936aa7":[6,0,0,51,1], "include_2notify_8php.html":[6,0,0,53], "include_2notify_8php.html#a0e61728e487df50c72e6434f911a57d3":[6,0,0,53,0], @@ -239,15 +249,5 @@ var NAVTREEINDEX5 = "interfaceITemplateEngine.html":[5,0,18], "interfaceITemplateEngine.html#aaa7381c8becc3d1c1790b53988a0f243":[5,0,18,1], "interfaceITemplateEngine.html#aaf2698adbf46c073c24b162fe1b1c442":[5,0,18,0], -"invite_8php.html":[6,0,1,46], -"invite_8php.html#a244385b28cfd021d308715f01158bfd9":[6,0,1,46,0], -"invite_8php.html#aeb0881c0f93c8e8552e5ed756ce6e5a5":[6,0,1,46,1], -"item_8php.html":[6,0,1,47], -"item_8php.html#a3daae7944f737bd30412a0d042207c0f":[6,0,1,47,0], -"item_8php.html#a5b1b36cb301a94b38150074f0d424e74":[6,0,1,47,3], -"item_8php.html#a693cd09805755ab85bbb5ecae69a48c3":[6,0,1,47,5], -"item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221":[6,0,1,47,4], -"item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[6,0,1,47,1], -"item_8php.html#aa22feef4de326e1d7078dedd892e615c":[6,0,1,47,2], -"items_8php.html":[6,0,0,46] +"invite_8php.html":[6,0,1,46] }; diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index fad41d01c..e3d8f5c10 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -1,73 +1,86 @@ var NAVTREEINDEX6 = { -"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[6,0,0,46,68], +"invite_8php.html#a244385b28cfd021d308715f01158bfd9":[6,0,1,46,0], +"invite_8php.html#aeb0881c0f93c8e8552e5ed756ce6e5a5":[6,0,1,46,1], +"item_8php.html":[6,0,1,47], +"item_8php.html#a3daae7944f737bd30412a0d042207c0f":[6,0,1,47,0], +"item_8php.html#a5b1b36cb301a94b38150074f0d424e74":[6,0,1,47,3], +"item_8php.html#a693cd09805755ab85bbb5ecae69a48c3":[6,0,1,47,5], +"item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221":[6,0,1,47,4], +"item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[6,0,1,47,1], +"item_8php.html#aa22feef4de326e1d7078dedd892e615c":[6,0,1,47,2], +"items_8php.html":[6,0,0,46], +"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[6,0,0,46,71], "items_8php.html#a016dd86c827d08db89061ea81d15c6cb":[6,0,0,46,3], -"items_8php.html#a02ca33c31ed535d24894f8a9a91ce9df":[6,0,0,46,39], -"items_8php.html#a04a35b610acfe54434df08adec39c0c7":[6,0,0,46,29], +"items_8php.html#a02ca33c31ed535d24894f8a9a91ce9df":[6,0,0,46,41], +"items_8php.html#a04a35b610acfe54434df08adec39c0c7":[6,0,0,46,30], "items_8php.html#a0790a4550b829e85504af548623002ca":[6,0,0,46,9], -"items_8php.html#a079e099e15d88d47aeb6ca6d60da7107":[6,0,0,46,34], -"items_8php.html#a09d425596b9f8663472cf7474ad36d96":[6,0,0,46,41], -"items_8php.html#a0cf98bb619f07dd18f602683a55a5f59":[6,0,0,46,26], +"items_8php.html#a079e099e15d88d47aeb6ca6d60da7107":[6,0,0,46,35], +"items_8php.html#a09d425596b9f8663472cf7474ad36d96":[6,0,0,46,43], +"items_8php.html#a0cf98bb619f07dd18f602683a55a5f59":[6,0,0,46,27], "items_8php.html#a1e75047cf175aaee8dd16aa761913ff9":[6,0,0,46,5], -"items_8php.html#a251343637ff40a50cca93452cd530c26":[6,0,0,46,33], -"items_8php.html#a2541e6861a56d145c9281877cc501615":[6,0,0,46,44], +"items_8php.html#a251343637ff40a50cca93452cd530c26":[6,0,0,46,34], +"items_8php.html#a2541e6861a56d145c9281877cc501615":[6,0,0,46,46], "items_8php.html#a275108c050f7eb18bcbb5018e6b81cf6":[6,0,0,46,4], -"items_8php.html#a2baa9e05f1e8aa3dd61c85803ae39bd6":[6,0,0,46,67], +"items_8php.html#a2baa9e05f1e8aa3dd61c85803ae39bd6":[6,0,0,46,70], +"items_8php.html#a2c3f97b2109c05df86d97449b3c78ebc":[6,0,0,46,38], "items_8php.html#a2d840c74ed23d1b6c7daee05cf89dda7":[6,0,0,46,22], "items_8php.html#a36e656667193c83aa2cc03a024fc131b":[6,0,0,46,0], -"items_8php.html#a410f9c743877c125ca06312373346903":[6,0,0,46,51], -"items_8php.html#a49905ea75adfe8a2d110be344d18d6a6":[6,0,0,46,53], -"items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b":[6,0,0,46,56], -"items_8php.html#a52c24114b73c0bdb605a03cd29712223":[6,0,0,46,35], -"items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361":[6,0,0,46,31], +"items_8php.html#a410f9c743877c125ca06312373346903":[6,0,0,46,53], +"items_8php.html#a49905ea75adfe8a2d110be344d18d6a6":[6,0,0,46,55], +"items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b":[6,0,0,46,58], +"items_8php.html#a52c24114b73c0bdb605a03cd29712223":[6,0,0,46,36], +"items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361":[6,0,0,46,32], "items_8php.html#a555762e1022a4b8e3c3abd32e7812408":[6,0,0,46,16], "items_8php.html#a566c601726697e044e75284af7fb6f17":[6,0,0,46,21], "items_8php.html#a56b2a4abcadfac71175cd50555528cc3":[6,0,0,46,14], -"items_8php.html#a5e5be7bf1f8257dec0b2647e60a3f3f1":[6,0,0,46,28], -"items_8php.html#a5ed782ff5b9cf050bec931e06de12c00":[6,0,0,46,43], +"items_8php.html#a5e5be7bf1f8257dec0b2647e60a3f3f1":[6,0,0,46,29], +"items_8php.html#a5ed782ff5b9cf050bec931e06de12c00":[6,0,0,46,45], "items_8php.html#a5f690fc2484abec07840b4f9dd525bd9":[6,0,0,46,19], -"items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7":[6,0,0,46,42], +"items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7":[6,0,0,46,44], "items_8php.html#a668ece2c37f05cc3abe538eb0dabfe55":[6,0,0,46,17], -"items_8php.html#a6bee35961f2e32905f20367a9309d627":[6,0,0,46,37], -"items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc":[6,0,0,46,40], -"items_8php.html#a756738301f2ed96be50232500677d58a":[6,0,0,46,46], -"items_8php.html#a77051724d1784074ff187e73a4db93fe":[6,0,0,46,36], +"items_8php.html#a6bee35961f2e32905f20367a9309d627":[6,0,0,46,39], +"items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc":[6,0,0,46,42], +"items_8php.html#a756738301f2ed96be50232500677d58a":[6,0,0,46,48], +"items_8php.html#a77051724d1784074ff187e73a4db93fe":[6,0,0,46,37], "items_8php.html#a772f0ae77ad77c8ab68ed918a3870946":[6,0,0,46,7], -"items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[6,0,0,46,49], -"items_8php.html#a78a60e39f6991bd3324a24dcbf9dac5a":[6,0,0,46,57], +"items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[6,0,0,46,51], +"items_8php.html#a78a60e39f6991bd3324a24dcbf9dac5a":[6,0,0,46,59], "items_8php.html#a81565acf729e629e588d823308448e3c":[6,0,0,46,1], "items_8php.html#a82955cc578f0fa600acec84475026194":[6,0,0,46,18], -"items_8php.html#a83a349062945d585edb4b3c5d763ab6e":[6,0,0,46,54], -"items_8php.html#a8675e62674de6fb7c42e4a408c7116cc":[6,0,0,46,50], +"items_8php.html#a83a349062945d585edb4b3c5d763ab6e":[6,0,0,46,56], +"items_8php.html#a8675e62674de6fb7c42e4a408c7116cc":[6,0,0,46,52], "items_8php.html#a87ac9e359591721a824ecd23bbb56296":[6,0,0,46,6], -"items_8php.html#a88c6cf7649ac836fbbed82a7a0315110":[6,0,0,46,63], +"items_8php.html#a88c6cf7649ac836fbbed82a7a0315110":[6,0,0,46,66], +"items_8php.html#a8cda98925a4c5c2f6dade70d9586d79a":[6,0,0,46,26], "items_8php.html#a8f3c85c584ccd2b98c3ca440e45b40f8":[6,0,0,46,12], -"items_8php.html#a94ddb1d6c8fa21dd7433677e85168037":[6,0,0,46,32], -"items_8php.html#a9b449eeae50003414b8b30ca927af434":[6,0,0,46,66], -"items_8php.html#aa2d3caa2f27720762b5c729e07df40fb":[6,0,0,46,48], -"items_8php.html#aa371905f0a211b307cb3f7188c6cba04":[6,0,0,46,64], +"items_8php.html#a94ddb1d6c8fa21dd7433677e85168037":[6,0,0,46,33], +"items_8php.html#a9b449eeae50003414b8b30ca927af434":[6,0,0,46,69], +"items_8php.html#aa2d3caa2f27720762b5c729e07df40fb":[6,0,0,46,50], +"items_8php.html#aa371905f0a211b307cb3f7188c6cba04":[6,0,0,46,67], "items_8php.html#aa579bc4445d60098b1410961ca8e96b7":[6,0,0,46,11], "items_8php.html#aa723c0571e314a1853a24c5854b4f54f":[6,0,0,46,23], "items_8php.html#aa9e99613d38a97b39c8cf5449699c2ee":[6,0,0,46,10], -"items_8php.html#aab9c6bae4c40799867596bdaae9829fd":[6,0,0,46,30], -"items_8php.html#aab9e0c58247427126de0699c729c3b6c":[6,0,0,46,59], -"items_8php.html#aabfaa193b83154c2a81e91284e5d5e59":[6,0,0,46,65], +"items_8php.html#aab9c6bae4c40799867596bdaae9829fd":[6,0,0,46,31], +"items_8php.html#aab9e0c58247427126de0699c729c3b6c":[6,0,0,46,61], +"items_8php.html#aabfaa193b83154c2a81e91284e5d5e59":[6,0,0,46,68], "items_8php.html#aac8c9eb4338e2a996c43914392c6cfdb":[6,0,0,46,15], -"items_8php.html#ab1bce4261bcf75ad62753b498a144d17":[6,0,0,46,61], -"items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87":[6,0,0,46,27], +"items_8php.html#ab1bce4261bcf75ad62753b498a144d17":[6,0,0,46,64], +"items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87":[6,0,0,46,28], "items_8php.html#abeb7886cde44d9a83dbaf2bc4ab18723":[6,0,0,46,8], "items_8php.html#abf7a1b73eb352d79acd36309b0dababd":[6,0,0,46,2], "items_8php.html#ac6673627d289ee4f547de0fe3b7acd0a":[6,0,0,46,20], -"items_8php.html#acf0bf7c9d21ac84f32effb754f7ad484":[6,0,0,46,45], -"items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0":[6,0,0,46,52], -"items_8php.html#ad34827ed330898456783fb14c7b46154":[6,0,0,46,62], -"items_8php.html#ad4ee16e3ff1eaf60428c61f82ba25e6a":[6,0,0,46,55], +"items_8php.html#acf0bf7c9d21ac84f32effb754f7ad484":[6,0,0,46,47], +"items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0":[6,0,0,46,54], +"items_8php.html#ad34827ed330898456783fb14c7b46154":[6,0,0,46,65], +"items_8php.html#ad4ee16e3ff1eaf60428c61f82ba25e6a":[6,0,0,46,57], "items_8php.html#adc26e08aa61f5666da04ab5d2a9d68a6":[6,0,0,46,13], -"items_8php.html#adf2b8137dc4ad9ec958de2842f16f3c2":[6,0,0,46,60], +"items_8php.html#adf2b8137dc4ad9ec958de2842f16f3c2":[6,0,0,46,62], "items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9":[6,0,0,46,25], -"items_8php.html#ae73794179b62d39bb597ff670ab1c1e5":[6,0,0,46,38], -"items_8php.html#af6237605c60d69abdd959ddbbee3420c":[6,0,0,46,58], -"items_8php.html#af94c281016c6c912d06e064113336c5c":[6,0,0,46,47], +"items_8php.html#ae73794179b62d39bb597ff670ab1c1e5":[6,0,0,46,40], +"items_8php.html#af0a887050dc8d0f51c89890cdaf3145f":[6,0,0,46,63], +"items_8php.html#af6237605c60d69abdd959ddbbee3420c":[6,0,0,46,60], +"items_8php.html#af94c281016c6c912d06e064113336c5c":[6,0,0,46,49], "items_8php.html#afbcf26dfcf8a83fff952aa858c1b7b67":[6,0,0,46,24], "lang_8php.html":[6,0,1,48], "lang_8php.html#a4c5c1140f51a638f224275cd618c2f37":[6,0,1,48,0], @@ -172,8 +185,8 @@ var NAVTREEINDEX6 = "mytheme_2php_2style_8php.html":[6,0,3,1,2,0,1], "mytheme_2php_2theme_8php.html":[6,0,3,1,2,0,2], "mytheme_2php_2theme_8php.html#a6ce5df8ece6acc09c1fddaccbeb244e8":[6,0,3,1,2,0,2,0], -"namespaceFriendica.html":[4,0,1], "namespaceFriendica.html":[5,0,1], +"namespaceFriendica.html":[4,0,1], "namespaceacl__selectors.html":[4,0,0], "namespaceacl__selectors.html":[5,0,0], "namespacefriendica-to-smarty-tpl.html":[5,0,2], @@ -236,18 +249,5 @@ var NAVTREEINDEX6 = "passion_8php.html":[6,0,3,1,0,2,6], "passionwide_8php.html":[6,0,3,1,0,2,7], "pdledit_8php.html":[6,0,1,76], -"pdledit_8php.html#a59cb550f6b7a4e7d8196fbc9de601619":[6,0,1,76,0], -"pdledit_8php.html#a81da3c955d0e3db55d148a31483104c7":[6,0,1,76,1], -"permissions_8php.html":[6,0,0,59], -"permissions_8php.html#a040fd3d3b8517658b1668ae0cd093972":[6,0,0,59,2], -"permissions_8php.html#a0f5bd9f7f4c8fb7ba4b2c1ed048b4dc7":[6,0,0,59,0], -"permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835":[6,0,0,59,4], -"permissions_8php.html#a9b5f5120566a3699a98efc5ccb0c59fe":[6,0,0,59,3], -"permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d":[6,0,0,59,5], -"permissions_8php.html#aeca9b280f3dc3358c89976d81d690008":[6,0,0,59,1], -"photo_8php.html":[6,0,1,77], -"photo_8php.html#a582779d24882b0d31ee909a91d70a448":[6,0,1,77,0], -"photo__driver_8php.html":[6,0,0,1,0], -"photo__driver_8php.html#a1d0bc7161dec0d177b7d3bbe4421af9a":[6,0,0,1,0,2], -"photo__driver_8php.html#a243cee492ce443afb6a7d77d54b6c4aa":[6,0,0,1,0,1] +"pdledit_8php.html#a59cb550f6b7a4e7d8196fbc9de601619":[6,0,1,76,0] }; diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js index 6e6983abb..b2d0617f6 100644 --- a/doc/html/navtreeindex7.js +++ b/doc/html/navtreeindex7.js @@ -1,5 +1,18 @@ var NAVTREEINDEX7 = { +"pdledit_8php.html#a81da3c955d0e3db55d148a31483104c7":[6,0,1,76,1], +"permissions_8php.html":[6,0,0,59], +"permissions_8php.html#a040fd3d3b8517658b1668ae0cd093972":[6,0,0,59,2], +"permissions_8php.html#a0f5bd9f7f4c8fb7ba4b2c1ed048b4dc7":[6,0,0,59,0], +"permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835":[6,0,0,59,4], +"permissions_8php.html#a9b5f5120566a3699a98efc5ccb0c59fe":[6,0,0,59,3], +"permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d":[6,0,0,59,5], +"permissions_8php.html#aeca9b280f3dc3358c89976d81d690008":[6,0,0,59,1], +"photo_8php.html":[6,0,1,77], +"photo_8php.html#a582779d24882b0d31ee909a91d70a448":[6,0,1,77,0], +"photo__driver_8php.html":[6,0,0,1,0], +"photo__driver_8php.html#a1d0bc7161dec0d177b7d3bbe4421af9a":[6,0,0,1,0,2], +"photo__driver_8php.html#a243cee492ce443afb6a7d77d54b6c4aa":[6,0,0,1,0,1], "photo__driver_8php.html#a32e2817faa25d7f11f60a8abff565035":[6,0,0,1,0,4], "photo__driver_8php.html#a78f5a10c568d2a9bbbb129dc96548887":[6,0,0,1,0,3], "photo__gd_8php.html":[6,0,0,1,1], @@ -23,8 +36,7 @@ var NAVTREEINDEX7 = "ping_8php.html":[6,0,1,80], "ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[6,0,1,80,0], "plugin_8php.html":[6,0,0,61], -"plugin_8php.html#a030cec6793b909c439c0336ba39b1571":[6,0,0,61,23], -"plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76":[6,0,0,61,26], +"plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76":[6,0,0,61,24], "plugin_8php.html#a0e8c2ea50bfdbc39e17ccccaea21ddc3":[6,0,0,61,22], "plugin_8php.html#a23c4fccf1eb5fcd63b24783ba1f05f7a":[6,0,0,61,8], "plugin_8php.html#a326365e48ef94f0b9a0a771b8d75e813":[6,0,0,61,17], @@ -32,20 +44,16 @@ var NAVTREEINDEX7 = "plugin_8php.html#a48047edfbef770125a5508dcc2f9282f":[6,0,0,61,7], "plugin_8php.html#a482131013272a1d5d5c1b1469c6c55d5":[6,0,0,61,16], "plugin_8php.html#a4a0ae7b881e7c8af99a69e3b03f898b4":[6,0,0,61,14], -"plugin_8php.html#a4fc13e528367f510fcb6d8bbfc559040":[6,0,0,61,30], "plugin_8php.html#a516591850f4fd49fd1425cfa54089db8":[6,0,0,61,9], -"plugin_8php.html#a56f71fe5adf9586ce950523d8180443e":[6,0,0,61,28], +"plugin_8php.html#a56f71fe5adf9586ce950523d8180443e":[6,0,0,61,26], "plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1":[6,0,0,61,11], -"plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2":[6,0,0,61,25], +"plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2":[6,0,0,61,23], "plugin_8php.html#a67ca417634de2d0beffffc54aeb951ff":[6,0,0,61,12], -"plugin_8php.html#a754d7f53b3abc557b753c057dc4e021d":[6,0,0,61,29], "plugin_8php.html#a75f7dfed291fd7add7fc85b5c022a1f4":[6,0,0,61,4], "plugin_8php.html#a7f05de16c0a32602853b09b99dd85e7c":[6,0,0,61,0], "plugin_8php.html#a855c4fdb38c0fc2714d537752a4347f9":[6,0,0,61,19], -"plugin_8php.html#a901657dd078e070516cf97285e0bada7":[6,0,0,61,31], "plugin_8php.html#a9039e15aae27676af7777dcbee5a11d6":[6,0,0,61,1], -"plugin_8php.html#a90538627db68605aeb6db17a8ead6523":[6,0,0,61,27], -"plugin_8php.html#a905b54e10704b283ac64680a8abc0971":[6,0,0,61,24], +"plugin_8php.html#a90538627db68605aeb6db17a8ead6523":[6,0,0,61,25], "plugin_8php.html#a9ab6caae31935f6cf781ce7872db7cdf":[6,0,0,61,13], "plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d":[6,0,0,61,18], "plugin_8php.html#acb63c27d07f6d7dffe95f98a6cef1295":[6,0,0,61,3], @@ -241,13 +249,5 @@ var NAVTREEINDEX7 = "sources_8php.html#ac442ccef080ab95772d8929fcafcb4b7":[6,0,1,111,0], "sources_8php.html#ac73298ff162ce7b2de8dcaf3d3305b1e":[6,0,1,111,1], "spam_8php.html":[6,0,0,73], -"spam_8php.html#a05861201147b9a538d006f0269255cf9":[6,0,0,73,1], -"spam_8php.html#ab8fd81a82c9622cbebb8ceab6b310ca6":[6,0,0,73,0], -"sslify_8php.html":[6,0,1,112], -"sslify_8php.html#a75b11e54a3d1fc83e7d4c0e8b4dab316":[6,0,1,112,0], -"starred_8php.html":[6,0,1,113], -"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[6,0,1,113,0], -"subthread_8php.html":[6,0,1,114], -"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[6,0,1,114,0], -"suggest_8php.html":[6,0,1,115] +"spam_8php.html#a05861201147b9a538d006f0269255cf9":[6,0,0,73,1] }; diff --git a/doc/html/navtreeindex8.js b/doc/html/navtreeindex8.js index a7746cd2e..53e731b10 100644 --- a/doc/html/navtreeindex8.js +++ b/doc/html/navtreeindex8.js @@ -1,5 +1,13 @@ var NAVTREEINDEX8 = { +"spam_8php.html#ab8fd81a82c9622cbebb8ceab6b310ca6":[6,0,0,73,0], +"sslify_8php.html":[6,0,1,112], +"sslify_8php.html#a75b11e54a3d1fc83e7d4c0e8b4dab316":[6,0,1,112,0], +"starred_8php.html":[6,0,1,113], +"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[6,0,1,113,0], +"subthread_8php.html":[6,0,1,114], +"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[6,0,1,114,0], +"suggest_8php.html":[6,0,1,115], "suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[6,0,1,115,0], "suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[6,0,1,115,1], "system__unavailable_8php.html":[6,0,0,74], @@ -241,13 +249,5 @@ var NAVTREEINDEX8 = "widgets_8php.html#aaa73bcf1702eaadd9dcd253502f55e01":[6,0,0,78,24], "widgets_8php.html#abd2e508a2a0b911c4a838e3cb7599923":[6,0,0,78,22], "widgets_8php.html#abe03366fd22fd27d683518fa0765da50":[6,0,0,78,29], -"widgets_8php.html#aced5cb177f630b30799c5eab873ee75c":[6,0,0,78,1], -"widgets_8php.html#ad1bf7aa69e8d100d95faba17c7bc91cd":[6,0,0,78,14], -"widgets_8php.html#add9b24d3304e529a7975e96122315554":[6,0,0,78,0], -"widgets_8php.html#ade630b19fb4c622b7b2f6f8ef89eefa2":[6,0,0,78,13], -"widgets_8php.html#ae4ced69d83dbdd9e6b51660d9eba8653":[6,0,0,78,28], -"widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b":[6,0,0,78,4], -"widgets_8php.html#afa2e55a78f95667a6da082efac7fec74":[6,0,0,78,17], -"xchan_8php.html":[6,0,1,135], -"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[6,0,1,135,0] +"widgets_8php.html#aced5cb177f630b30799c5eab873ee75c":[6,0,0,78,1] }; diff --git a/doc/html/navtreeindex9.js b/doc/html/navtreeindex9.js index f629f514c..f3f7f75e9 100644 --- a/doc/html/navtreeindex9.js +++ b/doc/html/navtreeindex9.js @@ -1,5 +1,13 @@ var NAVTREEINDEX9 = { +"widgets_8php.html#ad1bf7aa69e8d100d95faba17c7bc91cd":[6,0,0,78,14], +"widgets_8php.html#add9b24d3304e529a7975e96122315554":[6,0,0,78,0], +"widgets_8php.html#ade630b19fb4c622b7b2f6f8ef89eefa2":[6,0,0,78,13], +"widgets_8php.html#ae4ced69d83dbdd9e6b51660d9eba8653":[6,0,0,78,28], +"widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b":[6,0,0,78,4], +"widgets_8php.html#afa2e55a78f95667a6da082efac7fec74":[6,0,0,78,17], +"xchan_8php.html":[6,0,1,135], +"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[6,0,1,135,0], "xrd_8php.html":[6,0,1,136], "xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[6,0,1,136,0], "xref_8php.html":[6,0,1,137], diff --git a/doc/html/photo__driver_8php.html b/doc/html/photo__driver_8php.html index 272c6eb87..6c8bfe058 100644 --- a/doc/html/photo__driver_8php.html +++ b/doc/html/photo__driver_8php.html @@ -232,7 +232,7 @@ Functions
    -

    Referenced by app_store(), app_update(), diaspora_profile(), discover_by_webbie(), import_author_rss(), import_post(), import_xchan(), openid_content(), poller_run(), and thing_init().

    +

    Referenced by app_store(), app_update(), diaspora_profile(), discover_by_url(), discover_by_webbie(), import_author_rss(), import_post(), import_xchan(), openid_content(), poller_run(), and thing_init().

    diff --git a/doc/html/php_2theme__init_8php.html b/doc/html/php_2theme__init_8php.html index 5ff696a06..4e0755d37 100644 --- a/doc/html/php_2theme__init_8php.html +++ b/doc/html/php_2theme__init_8php.html @@ -127,7 +127,7 @@ Variables

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

    -

    Referenced by admin_page_channels(), api_call(), api_user(), appman_content(), attach_mkdir(), attach_store(), bbcode(), blocks_content(), bookmark_add(), bookmarks_content(), build_sync_packet(), channel_content(), channel_init(), channel_remove(), chat_content(), chat_init(), chat_post(), chatroom_create(), chatroom_destroy(), cloud_init(), connections_init(), connections_post(), connedit_content(), connedit_init(), connedit_post(), conversation(), design_tools(), diaspora_msg_build(), diaspora_pubmsg_build(), directory_run(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_addtocal(), events_content(), events_post(), feed_init(), filestorage_content(), filestorage_post(), fix_attached_file_permissions(), get_feed_for(), get_public_feed(), handle_feed(), handle_tag(), hcard_init(), home_init(), import_post(), importelm_post(), invite_content(), is_public_profile(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), magic_init(), mail_content(), mail_post(), menu_add_item(), menu_edit_item(), message_content(), mitem_content(), mitem_post(), mood_init(), nav(), network_content(), network_init(), new_contact(), notifier_run(), parse_app_description(), 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_content(), profiles_post(), profperm_init(), rbmark_content(), rbmark_post(), rpost_content(), send_message(), settings_post(), sources_post(), start_delivery_chain(), tagger_content(), thing_content(), thing_init(), uexport_init(), update_remote_id(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), widget_settings_menu(), zot_build_packet(), zot_finger(), and zot_refresh().

    +

    Referenced by admin_page_channels(), api_call(), api_user(), appman_content(), attach_mkdir(), attach_store(), bbcode(), blocks_content(), bookmark_add(), bookmarks_content(), build_sync_packet(), channel_content(), channel_init(), channel_remove(), chat_content(), chat_init(), chat_post(), chatroom_create(), chatroom_destroy(), cloud_init(), connections_init(), connections_post(), connedit_content(), connedit_init(), connedit_post(), conversation(), design_tools(), diaspora_msg_build(), diaspora_pubmsg_build(), directory_run(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), event_addtocal(), events_content(), events_post(), feed_init(), filestorage_content(), filestorage_post(), fix_attached_file_permissions(), get_feed_for(), get_public_feed(), handle_feed(), handle_tag(), hcard_init(), home_init(), import_post(), importelm_post(), invite_content(), is_public_profile(), item_photo_menu(), item_post(), item_store(), item_store_update(), items_fetch(), layouts_content(), magic_init(), mail_content(), mail_post(), menu_add_item(), menu_edit_item(), message_content(), mitem_content(), mitem_post(), mood_init(), nav(), network_content(), network_init(), new_contact(), notifier_run(), parse_app_description(), 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_content(), profiles_post(), profperm_init(), rbmark_content(), rbmark_post(), rpost_content(), send_message(), settings_post(), sources_post(), start_delivery_chain(), store_diaspora_comment_sig(), tagger_content(), thing_content(), thing_init(), uexport_init(), update_remote_id(), wall_attach_post(), wall_upload_post(), webpages_content(), wfinger_init(), widget_settings_menu(), zot_build_packet(), zot_finger(), and zot_refresh().

    diff --git a/doc/html/plugin_8php.html b/doc/html/plugin_8php.html index 140eff3e9..1e218d63e 100644 --- a/doc/html/plugin_8php.html +++ b/doc/html/plugin_8php.html @@ -151,16 +151,6 @@ Functions    get_theme_screenshot ($theme)   - service_class_allows ($uid, $property, $usage=false) -  - service_class_fetch ($uid, $property) -  - upgrade_link ($bbcode=false) -  - upgrade_message ($bbcode=false) -  - upgrade_bool_message ($bbcode=false) -   head_add_css ($src, $media= 'screen')  add CSS to <head> More...
      @@ -308,7 +298,7 @@ Functions
    -

    Referenced by admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_logs(), admin_page_plugins(), admin_page_profs(), admin_page_site(), admin_page_summary(), admin_page_themes(), admin_page_users(), advanced_profile(), alt_pager(), api_apply_template(), api_content(), app_render(), appman_content(), apps_content(), apw_form(), blocks_content(), blogtheme_form(), App\build_pagehead(), categories_widget(), channel_content(), chat_content(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), connedit_content(), construct_page(), contact_block(), conversation(), delegate_content(), design_tools(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_unshare(), dir_safe_mode(), dir_sort_links(), directory_content(), dirprofile_init(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), format_categories(), format_filer(), RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), RedBrowser\htmlActionsPanel(), identity_selector(), import_content(), invite_content(), lang_selector(), layouts_content(), login(), lostpass_content(), mail_content(), manage_content(), match_content(), menu_content(), menu_render(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), pdledit_content(), photos_album_widget(), photos_content(), poco_init(), poke_content(), poll_content(), populate_acl(), profile_sidebar(), profiles_content(), rbmark_content(), redbasic_form(), register_content(), removeaccount_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_appselect(), widget_archive(), widget_bookmarkedchats(), widget_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), widget_suggestions(), writepages_widget(), and xrd_init().

    +

    Referenced by achievements_content(), admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_logs(), admin_page_plugins(), admin_page_profs(), admin_page_site(), admin_page_summary(), admin_page_themes(), admin_page_users(), advanced_profile(), alt_pager(), api_apply_template(), api_content(), app_render(), appman_content(), apps_content(), apw_form(), blocks_content(), blogtheme_form(), App\build_pagehead(), categories_widget(), channel_content(), chat_content(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), connedit_content(), construct_page(), contact_block(), conversation(), delegate_content(), design_tools(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_unshare(), dir_safe_mode(), dir_sort_links(), directory_content(), dirprofile_init(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), format_categories(), format_filer(), RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), RedBrowser\htmlActionsPanel(), identity_selector(), import_content(), invite_content(), lang_selector(), layouts_content(), login(), lostpass_content(), mail_content(), manage_content(), match_content(), menu_content(), menu_render(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), pdledit_content(), photos_album_widget(), photos_content(), poco_init(), poke_content(), poll_content(), populate_acl(), profile_sidebar(), profiles_content(), rbmark_content(), redbasic_form(), register_content(), removeaccount_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_appselect(), widget_archive(), widget_bookmarkedchats(), widget_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), widget_suggestions(), writepages_widget(), and xrd_init().

    @@ -762,68 +752,6 @@ Functions

    Referenced by format_css_if_exists(), and format_js_if_exists().

    - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    service_class_allows ( $uid,
     $property,
     $usage = false 
    )
    -
    - -

    Referenced by identity_check_service_class(), item_check_service_class(), and new_contact().

    - -
    -
    - -
    -
    - - - - - - - - - - - - - - - - - - -
    service_class_fetch ( $uid,
     $property 
    )
    -
    - -

    Referenced by attach_store(), chatroom_create(), chatroom_enter(), RedDirectory\createFile(), RedBrowser\generateDirectoryIndex(), RedDirectory\getQuotaInfo(), manage_content(), photo_upload(), photos_content(), RedFile\put(), and widget_follow().

    -
    @@ -951,58 +879,6 @@ Functions

    Referenced by blog_uninstall().

    - - - -
    -
    - - - - - - - - -
    upgrade_bool_message ( $bbcode = false)
    -
    - -
    -
    - -
    -
    - - - - - - - - -
    upgrade_link ( $bbcode = false)
    -
    - -

    Referenced by upgrade_bool_message(), and upgrade_message().

    - -
    -
    - -
    -
    - - - - - - - - -
    upgrade_message ( $bbcode = false)
    -
    - -

    Referenced by attach_store(), chatroom_create(), identity_check_service_class(), item_check_service_class(), new_contact(), and photo_upload().

    -
    diff --git a/doc/html/plugin_8php.js b/doc/html/plugin_8php.js index 366378e08..383143f66 100644 --- a/doc/html/plugin_8php.js +++ b/doc/html/plugin_8php.js @@ -23,13 +23,8 @@ var plugin_8php = [ "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 ], [ "uninstall_plugin", "plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76", null ], [ "unload_plugin", "plugin_8php.html#a90538627db68605aeb6db17a8ead6523", null ], - [ "unregister_hook", "plugin_8php.html#a56f71fe5adf9586ce950523d8180443e", null ], - [ "upgrade_bool_message", "plugin_8php.html#a754d7f53b3abc557b753c057dc4e021d", null ], - [ "upgrade_link", "plugin_8php.html#a4fc13e528367f510fcb6d8bbfc559040", null ], - [ "upgrade_message", "plugin_8php.html#a901657dd078e070516cf97285e0bada7", null ] + [ "unregister_hook", "plugin_8php.html#a56f71fe5adf9586ce950523d8180443e", null ] ]; \ No newline at end of file diff --git a/doc/html/search/all_61.js b/doc/html/search/all_61.js index 9e544859d..380730a10 100644 --- a/doc/html/search/all_61.js +++ b/doc/html/search/all_61.js @@ -3,6 +3,7 @@ var searchData= ['abook_5fconnections',['abook_connections',['../Contact_8php.html#ae8803c330352cbf1e828eb7490edf47e',1,'Contact.php']]], ['abook_5fflag_5farchived',['ABOOK_FLAG_ARCHIVED',['../boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5',1,'boot.php']]], ['abook_5fflag_5fblocked',['ABOOK_FLAG_BLOCKED',['../boot_8php.html#a52b599cd13e152ebc80d7e4413683195',1,'boot.php']]], + ['abook_5fflag_5ffeed',['ABOOK_FLAG_FEED',['../boot_8php.html#ae0d9527117cd87dcba11986047ae336e',1,'boot.php']]], ['abook_5fflag_5fhidden',['ABOOK_FLAG_HIDDEN',['../boot_8php.html#a34c756469ebed32e2fc987bcde62d382',1,'boot.php']]], ['abook_5fflag_5fignored',['ABOOK_FLAG_IGNORED',['../boot_8php.html#aa3425e2de85b08f7041656d3a8502cb6',1,'boot.php']]], ['abook_5fflag_5fpending',['ABOOK_FLAG_PENDING',['../boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155',1,'boot.php']]], diff --git a/doc/html/search/all_62.js b/doc/html/search/all_62.js index c74251929..959791f4b 100644 --- a/doc/html/search/all_62.js +++ b/doc/html/search/all_62.js @@ -6,6 +6,8 @@ var searchData= ['baseobject_2ephp',['BaseObject.php',['../BaseObject_8php.html',1,'']]], ['bb2diaspora',['bb2diaspora',['../bb2diaspora_8php.html#a4f10e0876b27373c762bc1abbe745f5c',1,'bb2diaspora.php']]], ['bb2diaspora_2ephp',['bb2diaspora.php',['../bb2diaspora_8php.html',1,'']]], + ['bb2diaspora_5fitembody',['bb2diaspora_itembody',['../bb2diaspora_8php.html#a2052c66bc1006a42b4c230320c269e47',1,'bb2diaspora.php']]], + ['bb2dmention_5fcallback',['bb2dmention_callback',['../bb2diaspora_8php.html#a5258d2f1addeb0a2a6b54c4f9e7d0f34',1,'bb2diaspora.php']]], ['bb_5flocation',['bb_location',['../bbcode_8php.html#a3435c82a6c7693557800cdeb6848d0bd',1,'bbcode.php']]], ['bb_5fparse_5fapp',['bb_parse_app',['../bbcode_8php.html#abb02f1044ff1c635d12af690d0f2cfa2',1,'bbcode.php']]], ['bb_5fparse_5fcrypt',['bb_parse_crypt',['../bbcode_8php.html#a851f5aafefe52474201b83f9fd65931f',1,'bbcode.php']]], @@ -35,8 +37,8 @@ var searchData= ['blogtheme_5fform',['blogtheme_form',['../view_2theme_2blogga_2php_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27',1,'blogtheme_form(&$a, $headimg, $headimghome): config.php'],['../view_2theme_2blogga_2view_2theme_2blog_2config_8php.html#a8a311a402d3e746ce53fadc38e4b2d27',1,'blogtheme_form(&$a, $headimg, $headimghome): config.php']]], ['blogtheme_5fimgurl',['blogtheme_imgurl',['../blogga_2view_2theme_2blog_2theme_8php.html#af634a3f721c5e238530d0636d33230ec',1,'theme.php']]], ['bookmark_5fadd',['bookmark_add',['../include_2bookmarks_8php.html#aef1cb2968c41c759f2d106e1088ca323',1,'bookmarks.php']]], - ['bookmarks_2ephp',['bookmarks.php',['../mod_2bookmarks_8php.html',1,'']]], ['bookmarks_2ephp',['bookmarks.php',['../include_2bookmarks_8php.html',1,'']]], + ['bookmarks_2ephp',['bookmarks.php',['../mod_2bookmarks_8php.html',1,'']]], ['bookmarks_5fcontent',['bookmarks_content',['../mod_2bookmarks_8php.html#a774364b1c8404529581083631703527a',1,'bookmarks.php']]], ['bookmarks_5finit',['bookmarks_init',['../mod_2bookmarks_8php.html#a6b7942f3d27e40f0f47c88704127b9b3',1,'bookmarks.php']]], ['boot_2ephp',['boot.php',['../boot_8php.html',1,'']]], diff --git a/doc/html/search/all_63.js b/doc/html/search/all_63.js index 5d1a3a072..4b480a8d1 100644 --- a/doc/html/search/all_63.js +++ b/doc/html/search/all_63.js @@ -58,6 +58,7 @@ var searchData= ['check_5fphp',['check_php',['../setup_8php.html#a14d208682a88632290c895d20da6e7d6',1,'setup.php']]], ['check_5fsmarty3',['check_smarty3',['../setup_8php.html#afd8b0b3ade1507c45325caf377bf459d',1,'setup.php']]], ['check_5fstore',['check_store',['../setup_8php.html#ab4b71369a25021d59247c917e98d8246',1,'setup.php']]], + ['check_5fupstream_5fdirectory',['check_upstream_directory',['../dir__fns_8php.html#a2f7d74bb2aea8bcd2537aee5c6708a16',1,'dir_fns.php']]], ['check_5fwall_5fto_5fwall',['check_wall_to_wall',['../classItem.html#abcdb0ea9bcd1576bc99bba9b8f700bb8',1,'Item']]], ['check_5fwebbie',['check_webbie',['../text_8php.html#a0c65597bb4aed3a039eb795ff540e5e3',1,'text.php']]], ['childexists',['childExists',['../classRedDirectory.html#a5e3fc08b2bf9f61cea4d2ccae0495bec',1,'RedDirectory']]], diff --git a/doc/html/search/all_64.js b/doc/html/search/all_64.js index 512283299..1271af9ed 100644 --- a/doc/html/search/all_64.js +++ b/doc/html/search/all_64.js @@ -61,6 +61,7 @@ var searchData= ['diaspora_5fis_5fblacklisted',['diaspora_is_blacklisted',['../diaspora_8php.html#a858f70153c384f8778082cf7843a19da',1,'diaspora.php']]], ['diaspora_5fis_5freshare',['diaspora_is_reshare',['../diaspora_8php.html#ad9985cc4214bdfc14878785c838c8690',1,'diaspora.php']]], ['diaspora_5flike',['diaspora_like',['../diaspora_8php.html#a5d57518545baa31cf8a85a937a267681',1,'diaspora.php']]], + ['diaspora_5fmention_5fcallback',['diaspora_mention_callback',['../bb2diaspora_8php.html#a4a27604f0745f1efda672966aaca9a3b',1,'bb2diaspora.php']]], ['diaspora_5fmessage',['diaspora_message',['../diaspora_8php.html#a7cff2f8f11044c1b3a360f20e1bbee46',1,'diaspora.php']]], ['diaspora_5fmsg_5fbuild',['diaspora_msg_build',['../diaspora_8php.html#a4901762cba5cd8dcdc57bdf285eefb1b',1,'diaspora.php']]], ['diaspora_5fol',['diaspora_ol',['../bb2diaspora_8php.html#a8b96bd45884fa1c40b942939354197d4',1,'bb2diaspora.php']]], @@ -107,6 +108,7 @@ var searchData= ['dirsearch_5fcontent',['dirsearch_content',['../dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c',1,'dirsearch.php']]], ['dirsearch_5finit',['dirsearch_init',['../dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752',1,'dirsearch.php']]], ['discover',['discover',['../classProtoDriver.html#a64a3868cffe27d601d55f69a2ecc4337',1,'ProtoDriver\discover()'],['../classZotDriver.html#a40d328ff9f6b0a238afe286dddee1514',1,'ZotDriver\discover()']]], + ['discover_5fby_5furl',['discover_by_url',['../include_2network_8php.html#a5176176ddc1906d91f186df6fbd87b48',1,'network.php']]], ['discover_5fby_5fwebbie',['discover_by_webbie',['../include_2network_8php.html#a63e62946e194928eb17c5a9f2bbef0fe',1,'network.php']]], ['display_2ephp',['display.php',['../display_8php.html',1,'']]], ['display_5fcontent',['display_content',['../display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0',1,'display.php']]], diff --git a/doc/html/search/all_65.js b/doc/html/search/all_65.js index d8149217e..10bddfec9 100644 --- a/doc/html/search/all_65.js +++ b/doc/html/search/all_65.js @@ -8,7 +8,6 @@ var searchData= ['editpost_5fcontent',['editpost_content',['../editpost_8php.html#a34011690864d122680c802e9e748ccfb',1,'editpost.php']]], ['editwebpage_2ephp',['editwebpage.php',['../editwebpage_8php.html',1,'']]], ['editwebpage_5fcontent',['editwebpage_content',['../editwebpage_8php.html#a375e945255fad79a71036528f7480650',1,'editwebpage.php']]], - ['element_5finstall',['element_install',['../include_2apps_8php.html#a7c8bf17bd61a310bacb21ba9ad7a061b',1,'apps.php']]], ['else',['else',['../auth_8php.html#a0950af7c2888ca1d4743fe5d0bff9ae5',1,'else(): auth.php'],['../fpostit_8php.html#a501b5ca82f287509fc691c88524064c1',1,'else(): fpostit.php'],['../tpldebug_8php.html#afbc7aadb3f7ff1edf0aaaa326a42179c',1,'else(): tpldebug.php'],['../redbasic_2php_2style_8php.html#ab3afb90d611eca90819f597a2c0bb459',1,'else(): style.php']]], ['email_5fheader_5fencode',['email_header_encode',['../include_2network_8php.html#a469b9bd700269cd07d954f1a16c5899b',1,'network.php']]], ['email_5fsend',['email_send',['../include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0',1,'network.php']]], diff --git a/doc/html/search/all_66.js b/doc/html/search/all_66.js index f498619dc..3e2bbcd59 100644 --- a/doc/html/search/all_66.js +++ b/doc/html/search/all_66.js @@ -26,6 +26,7 @@ var searchData= ['filestorage_2ephp',['filestorage.php',['../filestorage_8php.html',1,'']]], ['filestorage_5fcontent',['filestorage_content',['../filestorage_8php.html#a61bb1be78472555df4ce619f51014040',1,'filestorage.php']]], ['filestorage_5fpost',['filestorage_post',['../filestorage_8php.html#ad3b64e3ece9831f9d3a9f00c0ae983cd',1,'filestorage.php']]], + ['filter_5finsecure',['filter_insecure',['../items_8php.html#a8cda98925a4c5c2f6dade70d9586d79a',1,'items.php']]], ['find_5fdiaspora_5fperson_5fby_5fhandle',['find_diaspora_person_by_handle',['../diaspora_8php.html#aade0c165fcdded71352c7a67bf6ce37b',1,'diaspora.php']]], ['find_5ffilename_5fby_5fhash',['find_filename_by_hash',['../include_2attach_8php.html#a4dbfd7e1cef52aa9ef52f4b88929fa86',1,'attach.php']]], ['find_5ffolder_5fhash_5fby_5fattach_5fhash',['find_folder_hash_by_attach_hash',['../include_2attach_8php.html#a052f14487ff2ce72f62a09fac8d7e997',1,'attach.php']]], @@ -47,8 +48,8 @@ var searchData= ['fkoauthdatastore',['FKOAuthDataStore',['../classFKOAuthDataStore.html',1,'']]], ['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()']]], ['fnull',['fnull',['../namespaceupdatetpl.html#a79c20eb62d568c999b56eb08530355d3',1,'updatetpl']]], - ['follow_2ephp',['follow.php',['../include_2follow_8php.html',1,'']]], ['follow_2ephp',['follow.php',['../mod_2follow_8php.html',1,'']]], + ['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']]], ['foreach',['foreach',['../typo_8php.html#a329c9c12217d2c8660c47bbc7c8df4c5',1,'typo.php']]], diff --git a/doc/html/search/all_69.js b/doc/html/search/all_69.js index 706be9447..e97771040 100644 --- a/doc/html/search/all_69.js +++ b/doc/html/search/all_69.js @@ -8,6 +8,7 @@ var searchData= ['if',['if',['../php2po_8php.html#a45b05625748f412ec97afcd61cf7980b',1,'if(): php2po.php'],['../php_2default_8php.html#a3987f5547ceb7e36a210a66a06241a5a',1,'if(): default.php'],['../full_8php.html#a3987f5547ceb7e36a210a66a06241a5a',1,'if(): full.php'],['../redable_8php.html#a3987f5547ceb7e36a210a66a06241a5a',1,'if(): redable.php'],['../apw_2php_2style_8php.html#a2f71e817b8fac88ce7f0ec5c0fb88b8d',1,'if(): style.php'],['../theme_2mytheme_2php_2default_8php.html#a3987f5547ceb7e36a210a66a06241a5a',1,'if(): default.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_5fdiaspora',['import_author_diaspora',['../items_8php.html#a2c3f97b2109c05df86d97449b3c78ebc',1,'items.php']]], ['import_5fauthor_5frss',['import_author_rss',['../items_8php.html#a6bee35961f2e32905f20367a9309d627',1,'items.php']]], ['import_5fauthor_5fxchan',['import_author_xchan',['../items_8php.html#ae73794179b62d39bb597ff670ab1c1e5',1,'items.php']]], ['import_5fauthor_5fzot',['import_author_zot',['../zot_8php.html#ad149f1e98c0c5b88ff9147e6ee3f330d',1,'zot.php']]], diff --git a/doc/html/search/all_73.js b/doc/html/search/all_73.js index 266b0bff9..806257116 100644 --- a/doc/html/search/all_73.js +++ b/doc/html/search/all_73.js @@ -25,8 +25,8 @@ var searchData= ['send_5freg_5fapproval_5femail',['send_reg_approval_email',['../account_8php.html#a014de2d5d5c9785de5bf547a485822fa',1,'account.php']]], ['send_5fstatus_5fnotifications',['send_status_notifications',['../items_8php.html#aab9e0c58247427126de0699c729c3b6c',1,'items.php']]], ['send_5fverification_5femail',['send_verification_email',['../account_8php.html#aa9c29c497c17d8f9344dce8631ad8761',1,'account.php']]], - ['service_5fclass_5fallows',['service_class_allows',['../plugin_8php.html#a030cec6793b909c439c0336ba39b1571',1,'plugin.php']]], - ['service_5fclass_5ffetch',['service_class_fetch',['../plugin_8php.html#a905b54e10704b283ac64680a8abc0971',1,'plugin.php']]], + ['service_5fclass_5fallows',['service_class_allows',['../account_8php.html#a030cec6793b909c439c0336ba39b1571',1,'account.php']]], + ['service_5fclass_5ffetch',['service_class_fetch',['../account_8php.html#a905b54e10704b283ac64680a8abc0971',1,'account.php']]], ['session_2ephp',['session.php',['../session_8php.html',1,'']]], ['set',['set',['../classCache.html#ae622b82adc1c2fb1f3e2cc4fd9688fce',1,'Cache']]], ['set_5faccount',['set_account',['../classApp.html#aeb1fe1c8ad9aa639909bd183ce578536',1,'App']]], @@ -108,6 +108,7 @@ var searchData= ['status_5feditor',['status_editor',['../conversation_8php.html#a2a7d541854bba755eb8ada59af7dcb1a',1,'conversation.php']]], ['storage_5fdefault_5fpermissions',['STORAGE_DEFAULT_PERMISSIONS',['../boot_8php.html#aecaa1b6945b317ba8f1daf4af2aed8e6',1,'boot.php']]], ['store',['store',['../classphoto__driver.html#a642a8d0c4ad5f887c99c6af77cee287b',1,'photo_driver']]], + ['store_5fdiaspora_5fcomment_5fsig',['store_diaspora_comment_sig',['../items_8php.html#af0a887050dc8d0f51c89890cdaf3145f',1,'items.php']]], ['store_5fitem_5ftag',['store_item_tag',['../taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd',1,'taxonomy.php']]], ['stream_5fperms_5fapi_5fuids',['stream_perms_api_uids',['../security_8php.html#a6126c77a1267e046ac59cf864613f011',1,'security.php']]], ['stream_5fperms_5fxchans',['stream_perms_xchans',['../security_8php.html#a3ef2be6a7e4928e39d50059d6feb457c',1,'security.php']]], @@ -116,9 +117,9 @@ var searchData= ['stringify_5farray_5felms',['stringify_array_elms',['../text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13',1,'text.php']]], ['strip_5fzids',['strip_zids',['../text_8php.html#a2f2585385530cb935a6325c809d84a4d',1,'text.php']]], ['stripdcode_5fbr_5fcb',['stripdcode_br_cb',['../bb2diaspora_8php.html#a180b0e3a7d702998be19e3c3b44b0e93',1,'bb2diaspora.php']]], - ['style_2ephp',['style.php',['../redbasic_2php_2style_8php.html',1,'']]], ['style_2ephp',['style.php',['../apw_2php_2style_8php.html',1,'']]], ['style_2ephp',['style.php',['../mytheme_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_75.js b/doc/html/search/all_75.js index 7d8bb61fd..a052a0a78 100644 --- a/doc/html/search/all_75.js +++ b/doc/html/search/all_75.js @@ -33,9 +33,9 @@ var searchData= ['update_5fsuggestions',['update_suggestions',['../socgraph_8php.html#a790690bb1a1d02483fe31632a160144d',1,'socgraph.php']]], ['updatetpl',['updatetpl',['../namespaceupdatetpl.html',1,'']]], ['updatetpl_2epy',['updatetpl.py',['../updatetpl_8py.html',1,'']]], - ['upgrade_5fbool_5fmessage',['upgrade_bool_message',['../plugin_8php.html#a754d7f53b3abc557b753c057dc4e021d',1,'plugin.php']]], - ['upgrade_5flink',['upgrade_link',['../plugin_8php.html#a4fc13e528367f510fcb6d8bbfc559040',1,'plugin.php']]], - ['upgrade_5fmessage',['upgrade_message',['../plugin_8php.html#a901657dd078e070516cf97285e0bada7',1,'plugin.php']]], + ['upgrade_5fbool_5fmessage',['upgrade_bool_message',['../account_8php.html#a754d7f53b3abc557b753c057dc4e021d',1,'account.php']]], + ['upgrade_5flink',['upgrade_link',['../account_8php.html#a4fc13e528367f510fcb6d8bbfc559040',1,'account.php']]], + ['upgrade_5fmessage',['upgrade_message',['../account_8php.html#a901657dd078e070516cf97285e0bada7',1,'account.php']]], ['user_5fallow',['user_allow',['../account_8php.html#ac5c570a2d46446bad4dd2501e9c5a4b1',1,'account.php']]], ['user_5fapprove',['user_approve',['../account_8php.html#ad07be417ac7eda939768804106ddea3d',1,'account.php']]], ['user_5fdeny',['user_deny',['../account_8php.html#ac1653efba62493b9d87513e1b6c04c83',1,'account.php']]], diff --git a/doc/html/search/functions_62.js b/doc/html/search/functions_62.js index 378c8486a..50e587929 100644 --- a/doc/html/search/functions_62.js +++ b/doc/html/search/functions_62.js @@ -3,6 +3,8 @@ var searchData= ['base64url_5fdecode',['base64url_decode',['../text_8php.html#a13286f8a95d2de6b102966ecc270c8d6',1,'text.php']]], ['base64url_5fencode',['base64url_encode',['../text_8php.html#a070384ec000fd65043fce11d5392d241',1,'text.php']]], ['bb2diaspora',['bb2diaspora',['../bb2diaspora_8php.html#a4f10e0876b27373c762bc1abbe745f5c',1,'bb2diaspora.php']]], + ['bb2diaspora_5fitembody',['bb2diaspora_itembody',['../bb2diaspora_8php.html#a2052c66bc1006a42b4c230320c269e47',1,'bb2diaspora.php']]], + ['bb2dmention_5fcallback',['bb2dmention_callback',['../bb2diaspora_8php.html#a5258d2f1addeb0a2a6b54c4f9e7d0f34',1,'bb2diaspora.php']]], ['bb_5flocation',['bb_location',['../bbcode_8php.html#a3435c82a6c7693557800cdeb6848d0bd',1,'bbcode.php']]], ['bb_5fparse_5fapp',['bb_parse_app',['../bbcode_8php.html#abb02f1044ff1c635d12af690d0f2cfa2',1,'bbcode.php']]], ['bb_5fparse_5fcrypt',['bb_parse_crypt',['../bbcode_8php.html#a851f5aafefe52474201b83f9fd65931f',1,'bbcode.php']]], diff --git a/doc/html/search/functions_63.js b/doc/html/search/functions_63.js index d11551d2d..ea32c91b1 100644 --- a/doc/html/search/functions_63.js +++ b/doc/html/search/functions_63.js @@ -49,6 +49,7 @@ var searchData= ['check_5fphp',['check_php',['../setup_8php.html#a14d208682a88632290c895d20da6e7d6',1,'setup.php']]], ['check_5fsmarty3',['check_smarty3',['../setup_8php.html#afd8b0b3ade1507c45325caf377bf459d',1,'setup.php']]], ['check_5fstore',['check_store',['../setup_8php.html#ab4b71369a25021d59247c917e98d8246',1,'setup.php']]], + ['check_5fupstream_5fdirectory',['check_upstream_directory',['../dir__fns_8php.html#a2f7d74bb2aea8bcd2537aee5c6708a16',1,'dir_fns.php']]], ['check_5fwall_5fto_5fwall',['check_wall_to_wall',['../classItem.html#abcdb0ea9bcd1576bc99bba9b8f700bb8',1,'Item']]], ['check_5fwebbie',['check_webbie',['../text_8php.html#a0c65597bb4aed3a039eb795ff540e5e3',1,'text.php']]], ['childexists',['childExists',['../classRedDirectory.html#a5e3fc08b2bf9f61cea4d2ccae0495bec',1,'RedDirectory']]], diff --git a/doc/html/search/functions_64.js b/doc/html/search/functions_64.js index 7c43a67b3..5f9bb71b5 100644 --- a/doc/html/search/functions_64.js +++ b/doc/html/search/functions_64.js @@ -40,6 +40,7 @@ var searchData= ['diaspora_5fis_5fblacklisted',['diaspora_is_blacklisted',['../diaspora_8php.html#a858f70153c384f8778082cf7843a19da',1,'diaspora.php']]], ['diaspora_5fis_5freshare',['diaspora_is_reshare',['../diaspora_8php.html#ad9985cc4214bdfc14878785c838c8690',1,'diaspora.php']]], ['diaspora_5flike',['diaspora_like',['../diaspora_8php.html#a5d57518545baa31cf8a85a937a267681',1,'diaspora.php']]], + ['diaspora_5fmention_5fcallback',['diaspora_mention_callback',['../bb2diaspora_8php.html#a4a27604f0745f1efda672966aaca9a3b',1,'bb2diaspora.php']]], ['diaspora_5fmessage',['diaspora_message',['../diaspora_8php.html#a7cff2f8f11044c1b3a360f20e1bbee46',1,'diaspora.php']]], ['diaspora_5fmsg_5fbuild',['diaspora_msg_build',['../diaspora_8php.html#a4901762cba5cd8dcdc57bdf285eefb1b',1,'diaspora.php']]], ['diaspora_5fol',['diaspora_ol',['../bb2diaspora_8php.html#a8b96bd45884fa1c40b942939354197d4',1,'bb2diaspora.php']]], @@ -75,6 +76,7 @@ var searchData= ['dirsearch_5fcontent',['dirsearch_content',['../dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c',1,'dirsearch.php']]], ['dirsearch_5finit',['dirsearch_init',['../dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752',1,'dirsearch.php']]], ['discover',['discover',['../classProtoDriver.html#a64a3868cffe27d601d55f69a2ecc4337',1,'ProtoDriver\discover()'],['../classZotDriver.html#a40d328ff9f6b0a238afe286dddee1514',1,'ZotDriver\discover()']]], + ['discover_5fby_5furl',['discover_by_url',['../include_2network_8php.html#a5176176ddc1906d91f186df6fbd87b48',1,'network.php']]], ['discover_5fby_5fwebbie',['discover_by_webbie',['../include_2network_8php.html#a63e62946e194928eb17c5a9f2bbef0fe',1,'network.php']]], ['display_5fcontent',['display_content',['../display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0',1,'display.php']]], ['dlogger',['dlogger',['../text_8php.html#a0a1f7c0e97f9ecbebf3e5834582b014c',1,'text.php']]], diff --git a/doc/html/search/functions_65.js b/doc/html/search/functions_65.js index 213d3e89b..8424dbba4 100644 --- a/doc/html/search/functions_65.js +++ b/doc/html/search/functions_65.js @@ -4,7 +4,6 @@ var searchData= ['editlayout_5fcontent',['editlayout_content',['../editlayout_8php.html#aa877e4157a26b099de904164181dd386',1,'editlayout.php']]], ['editpost_5fcontent',['editpost_content',['../editpost_8php.html#a34011690864d122680c802e9e748ccfb',1,'editpost.php']]], ['editwebpage_5fcontent',['editwebpage_content',['../editwebpage_8php.html#a375e945255fad79a71036528f7480650',1,'editwebpage.php']]], - ['element_5finstall',['element_install',['../include_2apps_8php.html#a7c8bf17bd61a310bacb21ba9ad7a061b',1,'apps.php']]], ['email_5fheader_5fencode',['email_header_encode',['../include_2network_8php.html#a469b9bd700269cd07d954f1a16c5899b',1,'network.php']]], ['email_5fsend',['email_send',['../include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0',1,'network.php']]], ['encode_5fitem',['encode_item',['../items_8php.html#a82955cc578f0fa600acec84475026194',1,'items.php']]], diff --git a/doc/html/search/functions_66.js b/doc/html/search/functions_66.js index d86e4c5d3..4e63189e8 100644 --- a/doc/html/search/functions_66.js +++ b/doc/html/search/functions_66.js @@ -17,6 +17,7 @@ var searchData= ['filerm_5fcontent',['filerm_content',['../filerm_8php.html#ae2eb28d2054fa2c37e38689882172208',1,'filerm.php']]], ['filestorage_5fcontent',['filestorage_content',['../filestorage_8php.html#a61bb1be78472555df4ce619f51014040',1,'filestorage.php']]], ['filestorage_5fpost',['filestorage_post',['../filestorage_8php.html#ad3b64e3ece9831f9d3a9f00c0ae983cd',1,'filestorage.php']]], + ['filter_5finsecure',['filter_insecure',['../items_8php.html#a8cda98925a4c5c2f6dade70d9586d79a',1,'items.php']]], ['find_5fdiaspora_5fperson_5fby_5fhandle',['find_diaspora_person_by_handle',['../diaspora_8php.html#aade0c165fcdded71352c7a67bf6ce37b',1,'diaspora.php']]], ['find_5ffilename_5fby_5fhash',['find_filename_by_hash',['../include_2attach_8php.html#a4dbfd7e1cef52aa9ef52f4b88929fa86',1,'attach.php']]], ['find_5ffolder_5fhash_5fby_5fattach_5fhash',['find_folder_hash_by_attach_hash',['../include_2attach_8php.html#a052f14487ff2ce72f62a09fac8d7e997',1,'attach.php']]], diff --git a/doc/html/search/functions_69.js b/doc/html/search/functions_69.js index 2b7e3939c..8a7f609a5 100644 --- a/doc/html/search/functions_69.js +++ b/doc/html/search/functions_69.js @@ -5,6 +5,7 @@ var searchData= ['identity_5fselector',['identity_selector',['../identity_8php.html#a2ab5172eabd375869060c9ad68323f5c',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_5fdiaspora',['import_author_diaspora',['../items_8php.html#a2c3f97b2109c05df86d97449b3c78ebc',1,'items.php']]], ['import_5fauthor_5frss',['import_author_rss',['../items_8php.html#a6bee35961f2e32905f20367a9309d627',1,'items.php']]], ['import_5fauthor_5fxchan',['import_author_xchan',['../items_8php.html#ae73794179b62d39bb597ff670ab1c1e5',1,'items.php']]], ['import_5fauthor_5fzot',['import_author_zot',['../zot_8php.html#ad149f1e98c0c5b88ff9147e6ee3f330d',1,'zot.php']]], diff --git a/doc/html/search/functions_73.js b/doc/html/search/functions_73.js index f771c9bdb..60abef114 100644 --- a/doc/html/search/functions_73.js +++ b/doc/html/search/functions_73.js @@ -22,8 +22,8 @@ var searchData= ['send_5freg_5fapproval_5femail',['send_reg_approval_email',['../account_8php.html#a014de2d5d5c9785de5bf547a485822fa',1,'account.php']]], ['send_5fstatus_5fnotifications',['send_status_notifications',['../items_8php.html#aab9e0c58247427126de0699c729c3b6c',1,'items.php']]], ['send_5fverification_5femail',['send_verification_email',['../account_8php.html#aa9c29c497c17d8f9344dce8631ad8761',1,'account.php']]], - ['service_5fclass_5fallows',['service_class_allows',['../plugin_8php.html#a030cec6793b909c439c0336ba39b1571',1,'plugin.php']]], - ['service_5fclass_5ffetch',['service_class_fetch',['../plugin_8php.html#a905b54e10704b283ac64680a8abc0971',1,'plugin.php']]], + ['service_5fclass_5fallows',['service_class_allows',['../account_8php.html#a030cec6793b909c439c0336ba39b1571',1,'account.php']]], + ['service_5fclass_5ffetch',['service_class_fetch',['../account_8php.html#a905b54e10704b283ac64680a8abc0971',1,'account.php']]], ['set',['set',['../classCache.html#ae622b82adc1c2fb1f3e2cc4fd9688fce',1,'Cache']]], ['set_5faccount',['set_account',['../classApp.html#aeb1fe1c8ad9aa639909bd183ce578536',1,'App']]], ['set_5fapp',['set_app',['../classBaseObject.html#a0a9acda12d751692834cf6999f889223',1,'BaseObject']]], @@ -88,6 +88,7 @@ var searchData= ['startup',['startup',['../boot_8php.html#aca47505b8732177f52bb2d647eb2741c',1,'boot.php']]], ['status_5feditor',['status_editor',['../conversation_8php.html#a2a7d541854bba755eb8ada59af7dcb1a',1,'conversation.php']]], ['store',['store',['../classphoto__driver.html#a642a8d0c4ad5f887c99c6af77cee287b',1,'photo_driver']]], + ['store_5fdiaspora_5fcomment_5fsig',['store_diaspora_comment_sig',['../items_8php.html#af0a887050dc8d0f51c89890cdaf3145f',1,'items.php']]], ['store_5fitem_5ftag',['store_item_tag',['../taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd',1,'taxonomy.php']]], ['stream_5fperms_5fapi_5fuids',['stream_perms_api_uids',['../security_8php.html#a6126c77a1267e046ac59cf864613f011',1,'security.php']]], ['stream_5fperms_5fxchans',['stream_perms_xchans',['../security_8php.html#a3ef2be6a7e4928e39d50059d6feb457c',1,'security.php']]], diff --git a/doc/html/search/functions_75.js b/doc/html/search/functions_75.js index 09258d0df..9c23d4d2e 100644 --- a/doc/html/search/functions_75.js +++ b/doc/html/search/functions_75.js @@ -21,9 +21,9 @@ var searchData= ['update_5fremote_5fid',['update_remote_id',['../items_8php.html#a2baa9e05f1e8aa3dd61c85803ae39bd6',1,'items.php']]], ['update_5fsearch_5fcontent',['update_search_content',['../update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52',1,'update_search.php']]], ['update_5fsuggestions',['update_suggestions',['../socgraph_8php.html#a790690bb1a1d02483fe31632a160144d',1,'socgraph.php']]], - ['upgrade_5fbool_5fmessage',['upgrade_bool_message',['../plugin_8php.html#a754d7f53b3abc557b753c057dc4e021d',1,'plugin.php']]], - ['upgrade_5flink',['upgrade_link',['../plugin_8php.html#a4fc13e528367f510fcb6d8bbfc559040',1,'plugin.php']]], - ['upgrade_5fmessage',['upgrade_message',['../plugin_8php.html#a901657dd078e070516cf97285e0bada7',1,'plugin.php']]], + ['upgrade_5fbool_5fmessage',['upgrade_bool_message',['../account_8php.html#a754d7f53b3abc557b753c057dc4e021d',1,'account.php']]], + ['upgrade_5flink',['upgrade_link',['../account_8php.html#a4fc13e528367f510fcb6d8bbfc559040',1,'account.php']]], + ['upgrade_5fmessage',['upgrade_message',['../account_8php.html#a901657dd078e070516cf97285e0bada7',1,'account.php']]], ['user_5fallow',['user_allow',['../account_8php.html#ac5c570a2d46446bad4dd2501e9c5a4b1',1,'account.php']]], ['user_5fapprove',['user_approve',['../account_8php.html#ad07be417ac7eda939768804106ddea3d',1,'account.php']]], ['user_5fdeny',['user_deny',['../account_8php.html#ac1653efba62493b9d87513e1b6c04c83',1,'account.php']]], diff --git a/doc/html/search/variables_61.js b/doc/html/search/variables_61.js index 7a5098d4c..5dd81d424 100644 --- a/doc/html/search/variables_61.js +++ b/doc/html/search/variables_61.js @@ -2,6 +2,7 @@ var searchData= [ ['abook_5fflag_5farchived',['ABOOK_FLAG_ARCHIVED',['../boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5',1,'boot.php']]], ['abook_5fflag_5fblocked',['ABOOK_FLAG_BLOCKED',['../boot_8php.html#a52b599cd13e152ebc80d7e4413683195',1,'boot.php']]], + ['abook_5fflag_5ffeed',['ABOOK_FLAG_FEED',['../boot_8php.html#ae0d9527117cd87dcba11986047ae336e',1,'boot.php']]], ['abook_5fflag_5fhidden',['ABOOK_FLAG_HIDDEN',['../boot_8php.html#a34c756469ebed32e2fc987bcde62d382',1,'boot.php']]], ['abook_5fflag_5fignored',['ABOOK_FLAG_IGNORED',['../boot_8php.html#aa3425e2de85b08f7041656d3a8502cb6',1,'boot.php']]], ['abook_5fflag_5fpending',['ABOOK_FLAG_PENDING',['../boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155',1,'boot.php']]], diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index 0af692d99..d2086b669 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -459,7 +459,7 @@ Variables
    -

    Referenced by aes_unencapsulate(), diaspora_decode(), element_install(), get_atom_elements(), get_item_elements(), import_post(), import_site(), import_xchan(), oembed_init(), pemtome(), post_init(), post_post(), pubrsatome(), share_unshield(), smile_unshield(), zfinger_init(), and zot_register_hub().

    +

    Referenced by aes_unencapsulate(), diaspora_decode(), get_atom_elements(), get_item_elements(), group_content(), import_post(), import_site(), import_xchan(), oembed_init(), pemtome(), post_init(), post_post(), pubrsatome(), share_unshield(), smile_unshield(), zfinger_init(), and zot_register_hub().

    @@ -487,7 +487,7 @@ Variables
    -

    Referenced by aes_encapsulate(), create_identity(), diaspora_decode(), diaspora_msg_build(), diaspora_pubmsg_build(), fix_system_urls(), identity_basic_export(), import_post(), item_post(), item_store(), item_store_update(), magic_init(), make_xchan_hash(), oembed_iframe(), post_activity_item(), post_post(), random_string(), salmon_key(), share_shield(), smile_shield(), zfinger_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().

    +

    Referenced by aes_encapsulate(), create_identity(), diaspora_decode(), diaspora_msg_build(), diaspora_pubmsg_build(), fix_system_urls(), group_content(), identity_basic_export(), import_post(), item_post(), item_store(), item_store_update(), magic_init(), make_xchan_hash(), oembed_iframe(), post_activity_item(), post_post(), random_string(), salmon_key(), share_shield(), smile_shield(), zfinger_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().

    @@ -1320,7 +1320,7 @@ Variables
    -

    Referenced by RedDirectory\__construct(), RedFile\__construct(), account_remove(), account_verify_password(), Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_post(), aes_encapsulate(), allowed_public_recips(), api_call(), api_channel_stream(), api_export_basic(), api_favorites(), api_get_user(), api_login(), api_oauth_request_token(), api_statuses_destroy(), api_statuses_mediap(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), attach_mkdir(), avatar_img(), base64url_decode(), blog_install(), blog_uninstall(), bookmark_add(), bookmarks_init(), build_sync_packet(), chanman_remove_everything_from_network(), channel_remove(), chanview_content(), chat_post(), check_config(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), RedDirectory\childExists(), cloud_init(), connedit_post(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createDirectory(), RedDirectory\createFile(), cronhooks_run(), datetime_convert(), RedFile\delete(), delete_imported_item(), deliver_run(), detect_language(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_decode(), diaspora_dispatch(), diaspora_dispatch_public(), diaspora_handle_from_contact(), diaspora_is_blacklisted(), diaspora_like(), diaspora_message(), diaspora_msg_build(), diaspora_photo(), diaspora_post(), diaspora_process_outbound(), diaspora_profile(), diaspora_pubmsg_build(), diaspora_request(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_status(), diaspora_share(), diaspora_signed_retraction(), diaspora_transmit(), dir_parse_query(), directory_content(), directory_run(), dirprofile_init(), discover_by_webbie(), downgrade_accounts(), email_send(), encode_item(), expire_run(), externals_run(), feed_init(), fetch_lrdd_template(), fetch_xrd_links(), filer_content(), filerm_content(), find_diaspora_person_by_handle(), fix_private_photos(), fix_system_urls(), RedFile\get(), get_atom_elements(), get_diaspora_key(), get_item_elements(), get_language_name(), Conversation\get_template_data(), RedDirectory\getChild(), RedDirectory\getChildren(), RedDirectory\getDir(), RedDirectory\getName(), RedFile\getName(), group_content(), guess_image_type(), handle_feed(), http_status_exit(), import_author_rss(), import_author_zot(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), load_plugin(), local_dir_update(), localize_item(), RedDirectory\log(), RedBasicAuth\log(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_token(), magic_init(), mail_post(), mail_store(), menu_edit(), mini_group_select(), mood_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_keypair(), FKOAuthDataStore\new_request_token(), notes_init(), notification(), notifier_run(), old_webfinger(), onedirsync_run(), onepoll_run(), openid_content(), parse_url_content(), parse_xml_string(), photo_init(), photo_upload(), photos_content(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), post_activity_item(), post_init(), post_post(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_load(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_content(), prune_hub_reinstalls(), public_recips(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), q(), queue_run(), rbmark_post(), receive_post(), red_item_new(), RedChannelList(), RedCollectionData(), RedFileData(), register_content(), reload_plugins(), Item\remove_child(), remove_community_tag(), remove_queue_item(), scale_external_images(), scrape_feed(), scrape_vcard(), search_ac_init(), enotify\send(), send_reg_approval_email(), Conversation\set_mode(), RedDirectory\setName(), RedFile\setName(), start_delivery_chain(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), sync_directories(), tag_deliver(), tagger_content(), tgroup_check(), uninstall_plugin(), unload_plugin(), update_directory_entry(), update_feed_item(), update_imported_item(), update_queue_time(), RedBasicAuth\validateUserPass(), verify_email_address(), xml2array(), xml_status(), z_fetch_url(), z_post_url(), zfinger_init(), zid_init(), zot_build_packet(), zot_feed(), zot_fetch(), zot_finger(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), zot_register_hub(), and zotfeed_init().

    +

    Referenced by RedDirectory\__construct(), RedFile\__construct(), account_remove(), account_verify_password(), Item\add_child(), Conversation\add_thread(), admin_content(), admin_page_hubloc_post(), admin_post(), aes_encapsulate(), allowed_public_recips(), api_call(), api_channel_stream(), api_export_basic(), api_favorites(), api_get_user(), api_login(), api_oauth_request_token(), api_statuses_destroy(), api_statuses_mediap(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), attach_mkdir(), avatar_img(), base64url_decode(), bb2diaspora_itembody(), blog_install(), blog_uninstall(), bookmark_add(), bookmarks_init(), build_sync_packet(), chanman_remove_everything_from_network(), channel_remove(), chanview_content(), chat_post(), check_config(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), RedDirectory\childExists(), cloud_init(), connedit_post(), consume_feed(), conversation(), create_account(), create_identity(), RedDirectory\createDirectory(), RedDirectory\createFile(), cronhooks_run(), datetime_convert(), RedFile\delete(), delete_imported_item(), deliver_run(), detect_language(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_decode(), diaspora_dispatch(), diaspora_dispatch_public(), diaspora_handle_from_contact(), diaspora_is_blacklisted(), diaspora_like(), diaspora_message(), diaspora_msg_build(), diaspora_photo(), diaspora_post(), diaspora_process_outbound(), diaspora_profile(), diaspora_pubmsg_build(), diaspora_request(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_status(), diaspora_share(), diaspora_signed_retraction(), diaspora_transmit(), dir_parse_query(), directory_content(), directory_run(), dirprofile_init(), discover_by_url(), discover_by_webbie(), downgrade_accounts(), email_send(), encode_item(), expire_run(), externals_run(), feed_init(), fetch_lrdd_template(), fetch_xrd_links(), filer_content(), filerm_content(), find_diaspora_person_by_handle(), fix_private_photos(), fix_system_urls(), RedFile\get(), get_atom_elements(), get_diaspora_key(), get_item_elements(), get_language_name(), Conversation\get_template_data(), RedDirectory\getChild(), RedDirectory\getChildren(), RedDirectory\getDir(), RedDirectory\getName(), RedFile\getName(), group_content(), guess_image_type(), http_status_exit(), import_author_rss(), import_author_zot(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), load_plugin(), local_dir_update(), localize_item(), RedDirectory\log(), RedBasicAuth\log(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_token(), magic_init(), mail_post(), mail_store(), menu_edit(), mini_group_select(), mood_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_keypair(), FKOAuthDataStore\new_request_token(), notes_init(), notification(), notifier_run(), old_webfinger(), onedirsync_run(), onepoll_run(), openid_content(), parse_url_content(), parse_xml_string(), photo_init(), photo_upload(), photos_content(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), post_activity_item(), post_init(), post_post(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_load(), profile_photo_set_profile_perms(), profile_sidebar(), profiles_content(), prune_hub_reinstalls(), public_recips(), RedFile\put(), dba_mysql\q(), dba_mysqli\q(), q(), queue_run(), rbmark_post(), receive_post(), red_item_new(), RedChannelList(), RedCollectionData(), RedFileData(), register_content(), reload_plugins(), Item\remove_child(), remove_community_tag(), remove_queue_item(), scale_external_images(), scrape_feed(), scrape_vcard(), search_ac_init(), enotify\send(), send_reg_approval_email(), Conversation\set_mode(), RedDirectory\setName(), RedFile\setName(), start_delivery_chain(), store_diaspora_comment_sig(), stream_perms_api_uids(), stream_perms_xchans(), subthread_content(), sync_directories(), tag_deliver(), tagger_content(), tgroup_check(), uninstall_plugin(), unload_plugin(), update_directory_entry(), update_feed_item(), update_imported_item(), update_queue_time(), RedBasicAuth\validateUserPass(), verify_email_address(), 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().

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

    Referenced by admin_page_logs_post(), admin_page_site_post(), channel_content(), connections_content(), conversation(), create_account(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_reshare(), diaspora_retraction(), diaspora_signed_retraction(), directory_content(), filestorage_post(), follow_init(), get_atom_elements(), group_post(), help_content(), invite_post(), item_post(), item_store(), item_store_update(), like_content(), lostpass_post(), mail_post(), mail_store(), mood_init(), network_content(), oexchange_content(), openid_content(), photos_post(), poco_init(), poke_init(), profiles_post(), register_post(), sanitise_acl(), settings_post(), setup_content(), setup_post(), subthread_content(), tagger_content(), and xrd_init().

    +

    Referenced by admin_page_logs_post(), admin_page_site_post(), channel_content(), connections_content(), conversation(), create_account(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_reshare(), diaspora_retraction(), diaspora_signed_retraction(), directory_content(), discover_by_url(), filestorage_post(), follow_init(), get_atom_elements(), group_post(), help_content(), invite_post(), item_post(), item_store(), item_store_update(), like_content(), lostpass_post(), mail_post(), mail_store(), mood_init(), network_content(), oexchange_content(), openid_content(), photos_post(), poco_init(), poke_init(), profiles_post(), register_post(), sanitise_acl(), settings_post(), setup_content(), setup_post(), subthread_content(), tagger_content(), and xrd_init().

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

    Referenced by admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_logs(), admin_page_plugins(), admin_page_profs(), admin_page_site(), admin_page_summary(), admin_page_themes(), admin_page_users(), advanced_profile(), alt_pager(), api_apply_template(), api_content(), app_render(), appman_content(), apps_content(), apw_form(), blocks_content(), blogtheme_form(), App\build_pagehead(), categories_widget(), channel_content(), chat_content(), check_config(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), connedit_content(), construct_page(), contact_block(), conversation(), delegate_content(), design_tools(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_unshare(), dir_safe_mode(), dir_sort_links(), directory_content(), dirprofile_init(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), format_categories(), format_filer(), RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), RedBrowser\htmlActionsPanel(), identity_selector(), import_content(), invite_content(), lang_selector(), layouts_content(), login(), lostpass_content(), lostpass_post(), mail_content(), manage_content(), match_content(), menu_content(), menu_render(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), pdledit_content(), photos_album_widget(), photos_content(), poco_init(), poke_content(), poll_content(), populate_acl(), profile_sidebar(), profiles_content(), rbmark_content(), redbasic_form(), register_content(), removeaccount_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(), verify_email_address(), viewconnections_content(), vote_content(), webpages_content(), widget_affinity(), widget_appselect(), widget_archive(), widget_bookmarkedchats(), widget_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), widget_suggestions(), writepages_widget(), and xrd_init().

    +

    Referenced by achievements_content(), admin_content(), admin_page_channels(), admin_page_dbsync(), admin_page_hubloc(), admin_page_logs(), admin_page_plugins(), admin_page_profs(), admin_page_site(), admin_page_summary(), admin_page_themes(), admin_page_users(), advanced_profile(), alt_pager(), api_apply_template(), api_content(), app_render(), appman_content(), apps_content(), apw_form(), blocks_content(), blogtheme_form(), App\build_pagehead(), categories_widget(), channel_content(), chat_content(), check_config(), check_php(), common_content(), common_friends_visitor_widget(), connect_content(), connections_content(), connedit_content(), construct_page(), contact_block(), conversation(), delegate_content(), design_tools(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_unshare(), dir_safe_mode(), dir_sort_links(), directory_content(), dirprofile_init(), display_content(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), events_content(), fbrowser_content(), field_timezone(), fileas_widget(), filer_content(), filestorage_content(), findpeople_widget(), format_categories(), format_filer(), RedBrowser\generateDirectoryIndex(), get_birthdays(), Item\get_comment_box(), get_events(), get_feed_for(), group_content(), group_side(), help_content(), hostxrd_init(), RedBrowser\htmlActionsPanel(), identity_selector(), import_content(), invite_content(), lang_selector(), layouts_content(), login(), lostpass_content(), lostpass_post(), mail_content(), manage_content(), match_content(), menu_content(), menu_render(), message_content(), micropro(), mini_group_select(), mitem_content(), mood_content(), nav(), network_content(), new_channel_content(), notification(), notifications_content(), notify_content(), oembed_format_object(), oexchange_init(), opensearch_init(), pagelist_widget(), pdledit_content(), photos_album_widget(), photos_content(), poco_init(), poke_content(), poll_content(), populate_acl(), profile_sidebar(), profiles_content(), rbmark_content(), redbasic_form(), register_content(), removeaccount_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(), verify_email_address(), viewconnections_content(), vote_content(), webpages_content(), widget_affinity(), widget_appselect(), widget_archive(), widget_bookmarkedchats(), widget_chatroom_list(), widget_filer(), widget_follow(), widget_mailmenu(), widget_notes(), widget_savedsearch(), widget_settings_menu(), widget_suggestedchats(), widget_suggestions(), writepages_widget(), and xrd_init().

    @@ -2173,7 +2173,7 @@ Variables
    -

    Referenced by diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_request(), diaspora_reshare(), diaspora_retraction(), diaspora_signed_retraction(), filer_content(), and get_atom_elements().

    +

    Referenced by diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_message(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_request(), diaspora_reshare(), diaspora_retraction(), diaspora_signed_retraction(), discover_by_url(), filer_content(), and get_atom_elements().

    diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html index b48ab1f3c..39533d0cf 100644 --- a/doc/html/typo_8php.html +++ b/doc/html/typo_8php.html @@ -134,7 +134,7 @@ Variables
    -

    Referenced by FriendicaSmarty\__construct(), Item\__construct(), FriendicaSmartyEngine\__construct(), Template\_replcb_if(), Template\_replcb_inc(), _well_known_init(), abook_toggle_flag(), achievements_content(), acl_init(), admin_content(), admin_page_channels(), admin_page_channels_post(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_logs(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_summary(), admin_page_themes(), admin_page_users(), admin_page_users_post(), admin_post(), advanced_profile(), allowed_email(), allowed_url(), alt_pager(), api_account_verify_credentials(), api_albums(), api_apply_template(), api_call(), api_content(), api_direct_messages_all(), api_direct_messages_box(), api_direct_messages_conversation(), api_direct_messages_inbox(), api_direct_messages_new(), api_direct_messages_sentbox(), api_favorites(), api_followers_ids(), api_format_as(), api_format_items(), api_friends_ids(), api_get_user(), api_item_get_user(), api_login(), api_photos(), api_post(), api_rss_extra(), api_status_show(), api_statuses_destroy(), api_statuses_f(), api_statuses_followers(), api_statuses_friends(), api_statuses_home_timeline(), api_statuses_mediap(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), api_statusnet_config(), api_users_show(), app_name_compare(), appman_content(), apw_form(), atom_entry(), attribute_contains(), authenticate_success(), avatar_img(), bb_sanitize_style(), bbcode(), best_link_url(), block_content(), block_init(), blocks_content(), blog_init(), blogtheme_display_item(), blogtheme_form(), blogtheme_imgurl(), bookmarks_content(), bookmarks_init(), build_sync_packet(), cal(), call_hooks(), categories_widget(), channel_content(), channel_init(), channel_remove(), chanview_content(), chat_content(), chat_init(), chat_post(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_config(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), clean_urls(), cli_startup(), cli_suggest_run(), cloud_init(), comanche_parser(), comanche_replace_region(), comanche_widget(), common_content(), common_friends_visitor_widget(), common_init(), 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(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_message(), diaspora_msg_build(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_pubmsg_build(), diaspora_request(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_transmit(), diaspora_unshare(), directory_content(), directory_init(), dirsearch_init(), display_content(), dlogger(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), ev_compare(), event_store_item(), events_content(), events_post(), expand_acl(), expand_groups(), externals_run(), fbrowser_content(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), filestorage_post(), 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(), hcard_init(), 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_developer(), is_site_admin(), item_photo_menu(), item_post(), items_fetch(), lang_selector(), layouts_content(), like_content(), link_compare(), load_config(), load_contact_links(), load_database(), load_hooks(), load_pconfig(), load_translation_table(), load_xconfig(), logger(), login(), login_content(), FKOAuth1\loginUser(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manual_config(), match_content(), message_content(), mitem_content(), mitem_init(), mitem_post(), mood_init(), msearch_post(), mytheme_init(), nav(), nav_set_selected(), network_content(), network_init(), new_contact(), notice(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), oexchange_content(), oexchange_init(), onedirsync_run(), onepoll_run(), openid_content(), opensearch_init(), page_content(), page_init(), paginate(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), pop_lang(), post_init(), preg_heart(), prepare_body(), probe_content(), proc_run(), profile_activity(), profile_content(), profile_create_sidebar(), profile_init(), profile_load(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_init(), push_lang(), queue_run(), randprof_init(), rbmark_content(), rbmark_post(), red_item_new(), redbasic_form(), register_content(), regmod_content(), regver_content(), relative_date(), removeaccount_content(), removeaccount_post(), removeme_content(), removeme_post(), replace_macros(), rmagic_post(), rpost_content(), scale_external_images(), scrape_feed(), scrape_vcard(), search(), search_ac_init(), search_content(), search_init(), searchbox(), send_message(), service_class_allows(), service_class_fetch(), set_config(), Conversation\set_mode(), set_pconfig(), set_xconfig(), settings_init(), settings_post(), setup_content(), setup_post(), share_init(), siteinfo_content(), siteinfo_init(), smilies(), sources_post(), subthread_content(), suggest_content(), t(), tag_deliver(), tag_sort_length(), tagger_content(), tagrm_content(), tagrm_post(), tags_sort(), tgroup_check(), theme_admin(), theme_content(), theme_include(), thing_content(), thing_init(), timezone_cmp(), toggle_mobile_init(), tt(), uexport_init(), update_channel_content(), update_display_content(), update_network_content(), update_search_content(), update_suggestions(), user_allow(), user_approve(), vcard_from_xchan(), viewconnections_content(), viewconnections_init(), viewsrc_content(), vote_content(), vote_init(), vote_post(), wall_upload_post(), webpages_content(), wfinger_init(), what_next(), widget_archive(), widget_categories(), widget_chatroom_list(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_item(), widget_mailmenu(), widget_photo_albums(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_tagcloud(), widget_tagcloud_wall(), xrd_init(), z_fetch_url(), z_path(), z_root(), zfinger_init(), zid_init(), zotfeed_init(), and zping_content().

    +

    Referenced by FriendicaSmarty\__construct(), Item\__construct(), FriendicaSmartyEngine\__construct(), Template\_replcb_if(), Template\_replcb_inc(), _well_known_init(), abook_toggle_flag(), achievements_content(), acl_init(), admin_content(), admin_page_channels(), admin_page_channels_post(), admin_page_dbsync(), admin_page_hubloc(), admin_page_hubloc_post(), admin_page_logs(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_summary(), admin_page_themes(), admin_page_users(), admin_page_users_post(), admin_post(), advanced_profile(), allowed_email(), allowed_url(), alt_pager(), api_account_verify_credentials(), api_albums(), api_apply_template(), api_call(), api_content(), api_direct_messages_all(), api_direct_messages_box(), api_direct_messages_conversation(), api_direct_messages_inbox(), api_direct_messages_new(), api_direct_messages_sentbox(), api_favorites(), api_followers_ids(), api_format_as(), api_format_items(), api_friends_ids(), api_get_user(), api_item_get_user(), api_login(), api_photos(), api_post(), api_rss_extra(), api_status_show(), api_statuses_destroy(), api_statuses_f(), api_statuses_followers(), api_statuses_friends(), api_statuses_home_timeline(), api_statuses_mediap(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), api_statusnet_config(), api_users_show(), app_name_compare(), appman_content(), apw_form(), atom_entry(), attribute_contains(), authenticate_success(), avatar_img(), bb_sanitize_style(), bbcode(), best_link_url(), block_content(), block_init(), blocks_content(), blog_init(), blogtheme_display_item(), blogtheme_form(), blogtheme_imgurl(), bookmarks_content(), bookmarks_init(), build_sync_packet(), cal(), call_hooks(), categories_widget(), channel_content(), channel_init(), channel_remove(), chanview_content(), chat_content(), chat_init(), chat_post(), chatsvc_content(), chatsvc_init(), chatsvc_post(), check_config(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), clean_urls(), cli_startup(), cli_suggest_run(), cloud_init(), comanche_parser(), comanche_replace_region(), comanche_widget(), common_content(), common_friends_visitor_widget(), common_init(), 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(), diaspora_asphoto(), diaspora_comment(), diaspora_conversation(), diaspora_like(), diaspora_message(), diaspora_msg_build(), diaspora_photo(), diaspora_post(), diaspora_profile(), diaspora_pubmsg_build(), diaspora_request(), diaspora_reshare(), diaspora_send_followup(), diaspora_send_images(), diaspora_send_mail(), diaspora_send_relay(), diaspora_send_retraction(), diaspora_send_status(), diaspora_share(), diaspora_transmit(), diaspora_unshare(), directory_content(), directory_init(), dirsearch_init(), display_content(), dlogger(), drop_item(), editblock_content(), editlayout_content(), editpost_content(), editwebpage_content(), ev_compare(), event_store_item(), events_content(), events_post(), expand_acl(), expand_groups(), externals_run(), fbrowser_content(), fileas_widget(), filer_content(), filerm_content(), filestorage_content(), filestorage_post(), 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(), hcard_init(), 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_developer(), is_site_admin(), item_photo_menu(), item_post(), items_fetch(), lang_selector(), layouts_content(), like_content(), link_compare(), load_config(), load_contact_links(), load_database(), load_hooks(), load_pconfig(), load_translation_table(), load_xconfig(), logger(), login(), login_content(), FKOAuth1\loginUser(), lostpass_content(), lostpass_post(), magic_init(), mail_content(), mail_post(), manual_config(), match_content(), message_content(), mitem_content(), mitem_init(), mitem_post(), mood_init(), msearch_post(), mytheme_init(), nav(), nav_set_selected(), network_content(), network_init(), new_contact(), notice(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), oexchange_content(), oexchange_init(), onedirsync_run(), onepoll_run(), openid_content(), opensearch_init(), page_content(), page_init(), paginate(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), pop_lang(), post_init(), preg_heart(), prepare_body(), probe_content(), proc_run(), profile_activity(), profile_content(), profile_create_sidebar(), profile_init(), profile_load(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profiles_content(), profiles_init(), profiles_post(), profperm_init(), push_lang(), queue_run(), randprof_init(), rbmark_content(), rbmark_post(), red_item_new(), redbasic_form(), register_content(), regmod_content(), regver_content(), relative_date(), removeaccount_content(), removeaccount_post(), removeme_content(), removeme_post(), replace_macros(), rmagic_post(), rpost_content(), scale_external_images(), scrape_feed(), scrape_vcard(), search(), search_ac_init(), search_content(), search_init(), searchbox(), send_message(), service_class_allows(), service_class_fetch(), set_config(), Conversation\set_mode(), set_pconfig(), set_xconfig(), settings_init(), settings_post(), setup_content(), setup_post(), share_init(), siteinfo_content(), siteinfo_init(), smilies(), sources_post(), subthread_content(), suggest_content(), t(), tag_deliver(), tag_sort_length(), tagger_content(), tagrm_content(), tagrm_post(), tags_sort(), tgroup_check(), theme_admin(), theme_content(), theme_include(), thing_content(), thing_init(), timezone_cmp(), toggle_mobile_init(), tt(), uexport_init(), update_channel_content(), update_display_content(), update_network_content(), update_search_content(), update_suggestions(), user_allow(), user_approve(), vcard_from_xchan(), viewconnections_content(), viewconnections_init(), viewsrc_content(), vote_content(), vote_init(), vote_post(), wall_upload_post(), webpages_content(), wfinger_init(), what_next(), widget_archive(), widget_categories(), widget_chatroom_list(), widget_design_tools(), widget_filer(), widget_follow(), widget_fullprofile(), widget_item(), widget_mailmenu(), widget_photo_albums(), widget_profile(), widget_savedsearch(), widget_settings_menu(), widget_tagcloud(), widget_tagcloud_wall(), xrd_init(), z_fetch_url(), z_path(), z_root(), zfinger_init(), zid_init(), zotfeed_init(), and zping_content().

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

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

    +

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

    diff --git a/util/messages.po b/util/messages.po index 489c14a26..a80e08f9b 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2014-08-29.782\n" +"Project-Id-Version: 2014-09-05.789\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-29 00:03-0700\n" +"POT-Creation-Date: 2014-09-05 00:03-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -63,7 +63,7 @@ msgstr "" msgid "Address Book" msgstr "" -#: ../../include/apps.php:126 ../../include/nav.php:119 ../../boot.php:1493 +#: ../../include/apps.php:126 ../../include/nav.php:119 ../../boot.php:1494 msgid "Login" msgstr "" @@ -77,8 +77,8 @@ msgid "Matrix" msgstr "" #: ../../include/apps.php:129 ../../include/nav.php:211 -#: ../../include/widgets.php:521 ../../mod/admin.php:950 -#: ../../mod/admin.php:1155 +#: ../../include/widgets.php:521 ../../mod/admin.php:948 +#: ../../mod/admin.php:1153 msgid "Settings" msgstr "" @@ -97,8 +97,8 @@ msgstr "" msgid "Channel Home" msgstr "" -#: ../../include/apps.php:133 ../../include/identity.php:991 -#: ../../include/identity.php:1109 ../../mod/profperm.php:112 +#: ../../include/apps.php:133 ../../include/identity.php:986 +#: ../../include/identity.php:1104 ../../mod/profperm.php:112 msgid "Profile" msgstr "" @@ -108,7 +108,7 @@ msgid "Photos" msgstr "" #: ../../include/apps.php:135 ../../include/nav.php:205 -#: ../../mod/events.php:396 +#: ../../mod/events.php:411 msgid "Events" msgstr "" @@ -139,7 +139,7 @@ msgid "Chat" msgstr "" #: ../../include/apps.php:142 ../../include/nav.php:169 -#: ../../include/text.php:815 ../../include/text.php:829 +#: ../../include/text.php:821 ../../include/text.php:835 #: ../../mod/search.php:30 msgid "Search" msgstr "" @@ -191,7 +191,7 @@ msgstr "" #: ../../include/apps.php:246 ../../include/page_widgets.php:8 #: ../../include/page_widgets.php:36 ../../include/reddav.php:1289 -#: ../../include/menu.php:42 ../../include/ItemObject.php:96 +#: ../../include/menu.php:42 ../../include/ItemObject.php:100 #: ../../mod/settings.php:579 ../../mod/blocks.php:99 #: ../../mod/connections.php:396 ../../mod/editblock.php:111 #: ../../mod/editlayout.php:106 ../../mod/editpost.php:112 @@ -201,10 +201,10 @@ msgid "Edit" msgstr "" #: ../../include/apps.php:247 ../../include/reddav.php:1290 -#: ../../include/conversation.php:648 ../../include/ItemObject.php:108 +#: ../../include/conversation.php:648 ../../include/ItemObject.php:112 #: ../../mod/settings.php:580 ../../mod/connedit.php:440 -#: ../../mod/photos.php:1052 ../../mod/group.php:176 ../../mod/admin.php:730 -#: ../../mod/admin.php:860 ../../mod/thing.php:236 +#: ../../mod/photos.php:1052 ../../mod/group.php:176 ../../mod/admin.php:728 +#: ../../mod/admin.php:858 ../../mod/thing.php:236 msgid "Delete" msgstr "" @@ -223,7 +223,7 @@ msgid "View" msgstr "" #: ../../include/page_widgets.php:40 ../../include/conversation.php:1109 -#: ../../include/ItemObject.php:592 ../../mod/editblock.php:141 +#: ../../include/ItemObject.php:597 ../../mod/editblock.php:141 #: ../../mod/editlayout.php:135 ../../mod/editpost.php:140 #: ../../mod/editwebpage.php:174 ../../mod/photos.php:1003 #: ../../mod/webpages.php:131 @@ -274,8 +274,8 @@ msgstr "" #: ../../include/attach.php:243 ../../include/attach.php:283 #: ../../include/attach.php:297 ../../include/attach.php:322 #: ../../include/attach.php:513 ../../include/attach.php:585 -#: ../../include/chat.php:116 ../../include/items.php:3692 -#: ../../mod/mood.php:112 ../../mod/mitem.php:73 ../../mod/achievements.php:27 +#: ../../include/chat.php:116 ../../include/items.php:3826 +#: ../../mod/mood.php:112 ../../mod/mitem.php:73 ../../mod/achievements.php:30 #: ../../mod/settings.php:494 ../../mod/poke.php:128 ../../mod/api.php:26 #: ../../mod/api.php:31 ../../mod/authtest.php:13 ../../mod/profile.php:64 #: ../../mod/profile.php:72 ../../mod/block.php:22 ../../mod/block.php:72 @@ -284,20 +284,20 @@ msgstr "" #: ../../mod/profiles.php:560 ../../mod/bookmarks.php:46 #: ../../mod/channel.php:89 ../../mod/channel.php:193 #: ../../mod/channel.php:236 ../../mod/chat.php:90 ../../mod/chat.php:95 -#: ../../mod/register.php:71 ../../mod/regmod.php:18 ../../mod/common.php:35 +#: ../../mod/register.php:70 ../../mod/regmod.php:17 ../../mod/common.php:35 #: ../../mod/network.php:12 ../../mod/connections.php:169 #: ../../mod/connedit.php:254 ../../mod/delegate.php:6 ../../mod/page.php:30 #: ../../mod/page.php:80 ../../mod/setup.php:203 ../../mod/editblock.php:34 #: ../../mod/pdledit.php:21 ../../mod/editlayout.php:48 #: ../../mod/editpost.php:13 ../../mod/editwebpage.php:44 #: ../../mod/editwebpage.php:83 ../../mod/photos.php:68 -#: ../../mod/photos.php:526 ../../mod/sources.php:66 ../../mod/events.php:160 +#: ../../mod/photos.php:526 ../../mod/sources.php:66 ../../mod/events.php:175 #: ../../mod/filestorage.php:10 ../../mod/filestorage.php:59 #: ../../mod/filestorage.php:75 ../../mod/filestorage.php:98 #: ../../mod/fsuggest.php:78 ../../mod/suggest.php:26 ../../mod/group.php:9 #: ../../mod/thing.php:249 ../../mod/thing.php:266 ../../mod/thing.php:301 #: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/item.php:178 -#: ../../mod/item.php:186 ../../mod/item.php:915 ../../mod/layouts.php:27 +#: ../../mod/item.php:186 ../../mod/item.php:920 ../../mod/layouts.php:27 #: ../../mod/layouts.php:39 ../../mod/like.php:154 #: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 #: ../../mod/viewsrc.php:12 ../../mod/mail.php:108 ../../mod/manage.php:6 @@ -352,7 +352,7 @@ msgstr "" msgid "Permissions" msgstr "" -#: ../../include/acl_selectors.php:249 ../../include/ItemObject.php:289 +#: ../../include/acl_selectors.php:249 ../../include/ItemObject.php:294 msgid "Close" msgstr "" @@ -441,37 +441,29 @@ msgstr "" msgid "database storage failed." msgstr "" -#: ../../include/plugin.php:504 ../../include/plugin.php:506 -msgid "Click here to upgrade." -msgstr "" - -#: ../../include/plugin.php:512 -msgid "This action exceeds the limits set by your subscription plan." -msgstr "" - -#: ../../include/plugin.php:517 -msgid "This action is not available under your subscription plan." +#: ../../include/bb2diaspora.php:298 +msgid "Attachments:" msgstr "" -#: ../../include/bb2diaspora.php:463 ../../include/event.php:11 +#: ../../include/bb2diaspora.php:377 ../../include/event.php:11 msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../include/bb2diaspora.php:469 ../../include/event.php:20 +#: ../../include/bb2diaspora.php:383 ../../include/event.php:20 msgid "Starts:" msgstr "" -#: ../../include/bb2diaspora.php:477 ../../include/event.php:30 +#: ../../include/bb2diaspora.php:391 ../../include/event.php:30 msgid "Finishes:" msgstr "" -#: ../../include/bb2diaspora.php:485 ../../include/event.php:40 +#: ../../include/bb2diaspora.php:399 ../../include/event.php:40 #: ../../include/identity.php:757 ../../mod/directory.php:156 -#: ../../mod/dirprofile.php:105 ../../mod/events.php:504 +#: ../../mod/dirprofile.php:105 ../../mod/events.php:528 msgid "Location:" msgstr "" -#: ../../include/nav.php:94 ../../include/nav.php:121 ../../boot.php:1492 +#: ../../include/nav.php:94 ../../include/nav.php:121 ../../boot.php:1493 msgid "Logout" msgstr "" @@ -549,7 +541,7 @@ msgstr "" msgid "Home Page" msgstr "" -#: ../../include/nav.php:159 ../../mod/register.php:221 ../../boot.php:1469 +#: ../../include/nav.php:159 ../../mod/register.php:220 ../../boot.php:1470 msgid "Register" msgstr "" @@ -703,319 +695,319 @@ msgstr "" msgid "newer" msgstr "" -#: ../../include/text.php:730 +#: ../../include/text.php:736 msgid "No connections" msgstr "" -#: ../../include/text.php:743 +#: ../../include/text.php:749 #, php-format msgid "%d Connection" msgid_plural "%d Connections" msgstr[0] "" msgstr[1] "" -#: ../../include/text.php:756 +#: ../../include/text.php:762 msgid "View Connections" msgstr "" -#: ../../include/text.php:817 ../../include/text.php:831 +#: ../../include/text.php:823 ../../include/text.php:837 #: ../../include/widgets.php:193 ../../mod/rbmark.php:28 -#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1338 -#: ../../mod/admin.php:1359 +#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1336 +#: ../../mod/admin.php:1357 msgid "Save" msgstr "" -#: ../../include/text.php:897 +#: ../../include/text.php:903 msgid "poke" msgstr "" -#: ../../include/text.php:897 ../../include/conversation.php:243 +#: ../../include/text.php:903 ../../include/conversation.php:243 msgid "poked" msgstr "" -#: ../../include/text.php:898 +#: ../../include/text.php:904 msgid "ping" msgstr "" -#: ../../include/text.php:898 +#: ../../include/text.php:904 msgid "pinged" msgstr "" -#: ../../include/text.php:899 +#: ../../include/text.php:905 msgid "prod" msgstr "" -#: ../../include/text.php:899 +#: ../../include/text.php:905 msgid "prodded" msgstr "" -#: ../../include/text.php:900 +#: ../../include/text.php:906 msgid "slap" msgstr "" -#: ../../include/text.php:900 +#: ../../include/text.php:906 msgid "slapped" msgstr "" -#: ../../include/text.php:901 +#: ../../include/text.php:907 msgid "finger" msgstr "" -#: ../../include/text.php:901 +#: ../../include/text.php:907 msgid "fingered" msgstr "" -#: ../../include/text.php:902 +#: ../../include/text.php:908 msgid "rebuff" msgstr "" -#: ../../include/text.php:902 +#: ../../include/text.php:908 msgid "rebuffed" msgstr "" -#: ../../include/text.php:911 +#: ../../include/text.php:917 msgid "happy" msgstr "" -#: ../../include/text.php:912 +#: ../../include/text.php:918 msgid "sad" msgstr "" -#: ../../include/text.php:913 +#: ../../include/text.php:919 msgid "mellow" msgstr "" -#: ../../include/text.php:914 +#: ../../include/text.php:920 msgid "tired" msgstr "" -#: ../../include/text.php:915 +#: ../../include/text.php:921 msgid "perky" msgstr "" -#: ../../include/text.php:916 +#: ../../include/text.php:922 msgid "angry" msgstr "" -#: ../../include/text.php:917 +#: ../../include/text.php:923 msgid "stupified" msgstr "" -#: ../../include/text.php:918 +#: ../../include/text.php:924 msgid "puzzled" msgstr "" -#: ../../include/text.php:919 +#: ../../include/text.php:925 msgid "interested" msgstr "" -#: ../../include/text.php:920 +#: ../../include/text.php:926 msgid "bitter" msgstr "" -#: ../../include/text.php:921 +#: ../../include/text.php:927 msgid "cheerful" msgstr "" -#: ../../include/text.php:922 +#: ../../include/text.php:928 msgid "alive" msgstr "" -#: ../../include/text.php:923 +#: ../../include/text.php:929 msgid "annoyed" msgstr "" -#: ../../include/text.php:924 +#: ../../include/text.php:930 msgid "anxious" msgstr "" -#: ../../include/text.php:925 +#: ../../include/text.php:931 msgid "cranky" msgstr "" -#: ../../include/text.php:926 +#: ../../include/text.php:932 msgid "disturbed" msgstr "" -#: ../../include/text.php:927 +#: ../../include/text.php:933 msgid "frustrated" msgstr "" -#: ../../include/text.php:928 +#: ../../include/text.php:934 msgid "depressed" msgstr "" -#: ../../include/text.php:929 +#: ../../include/text.php:935 msgid "motivated" msgstr "" -#: ../../include/text.php:930 +#: ../../include/text.php:936 msgid "relaxed" msgstr "" -#: ../../include/text.php:931 +#: ../../include/text.php:937 msgid "surprised" msgstr "" -#: ../../include/text.php:1094 +#: ../../include/text.php:1100 msgid "Monday" msgstr "" -#: ../../include/text.php:1094 +#: ../../include/text.php:1100 msgid "Tuesday" msgstr "" -#: ../../include/text.php:1094 +#: ../../include/text.php:1100 msgid "Wednesday" msgstr "" -#: ../../include/text.php:1094 +#: ../../include/text.php:1100 msgid "Thursday" msgstr "" -#: ../../include/text.php:1094 +#: ../../include/text.php:1100 msgid "Friday" msgstr "" -#: ../../include/text.php:1094 +#: ../../include/text.php:1100 msgid "Saturday" msgstr "" -#: ../../include/text.php:1094 +#: ../../include/text.php:1100 msgid "Sunday" msgstr "" -#: ../../include/text.php:1098 +#: ../../include/text.php:1104 msgid "January" msgstr "" -#: ../../include/text.php:1098 +#: ../../include/text.php:1104 msgid "February" msgstr "" -#: ../../include/text.php:1098 +#: ../../include/text.php:1104 msgid "March" msgstr "" -#: ../../include/text.php:1098 +#: ../../include/text.php:1104 msgid "April" msgstr "" -#: ../../include/text.php:1098 +#: ../../include/text.php:1104 msgid "May" msgstr "" -#: ../../include/text.php:1098 +#: ../../include/text.php:1104 msgid "June" msgstr "" -#: ../../include/text.php:1098 +#: ../../include/text.php:1104 msgid "July" msgstr "" -#: ../../include/text.php:1098 +#: ../../include/text.php:1104 msgid "August" msgstr "" -#: ../../include/text.php:1098 +#: ../../include/text.php:1104 msgid "September" msgstr "" -#: ../../include/text.php:1098 +#: ../../include/text.php:1104 msgid "October" msgstr "" -#: ../../include/text.php:1098 +#: ../../include/text.php:1104 msgid "November" msgstr "" -#: ../../include/text.php:1098 +#: ../../include/text.php:1104 msgid "December" msgstr "" -#: ../../include/text.php:1176 +#: ../../include/text.php:1182 msgid "unknown.???" msgstr "" -#: ../../include/text.php:1177 +#: ../../include/text.php:1183 msgid "bytes" msgstr "" -#: ../../include/text.php:1212 +#: ../../include/text.php:1218 msgid "remove category" msgstr "" -#: ../../include/text.php:1282 +#: ../../include/text.php:1288 msgid "remove from file" msgstr "" -#: ../../include/text.php:1347 ../../include/text.php:1359 +#: ../../include/text.php:1353 ../../include/text.php:1365 msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1514 ../../mod/events.php:374 +#: ../../include/text.php:1520 ../../mod/events.php:389 msgid "Link to Source" msgstr "" -#: ../../include/text.php:1533 +#: ../../include/text.php:1539 msgid "Select a page layout: " msgstr "" -#: ../../include/text.php:1536 ../../include/text.php:1601 +#: ../../include/text.php:1542 ../../include/text.php:1607 msgid "default" msgstr "" -#: ../../include/text.php:1572 +#: ../../include/text.php:1578 msgid "Page content type: " msgstr "" -#: ../../include/text.php:1613 +#: ../../include/text.php:1619 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1734 ../../include/diaspora.php:1852 +#: ../../include/text.php:1740 ../../include/diaspora.php:1860 #: ../../include/conversation.php:120 ../../mod/subthread.php:72 #: ../../mod/subthread.php:174 ../../mod/tagger.php:45 ../../mod/like.php:294 msgid "photo" msgstr "" -#: ../../include/text.php:1737 ../../include/conversation.php:123 +#: ../../include/text.php:1743 ../../include/conversation.php:123 #: ../../mod/tagger.php:49 msgid "event" msgstr "" -#: ../../include/text.php:1740 ../../include/diaspora.php:1852 +#: ../../include/text.php:1746 ../../include/diaspora.php:1860 #: ../../include/conversation.php:148 ../../mod/subthread.php:72 #: ../../mod/subthread.php:174 ../../mod/tagger.php:53 ../../mod/like.php:294 msgid "status" msgstr "" -#: ../../include/text.php:1742 ../../include/conversation.php:150 +#: ../../include/text.php:1748 ../../include/conversation.php:150 #: ../../mod/tagger.php:55 msgid "comment" msgstr "" -#: ../../include/text.php:1747 +#: ../../include/text.php:1753 msgid "activity" msgstr "" -#: ../../include/text.php:2006 +#: ../../include/text.php:2017 msgid "Design" msgstr "" -#: ../../include/text.php:2008 +#: ../../include/text.php:2019 msgid "Blocks" msgstr "" -#: ../../include/text.php:2009 +#: ../../include/text.php:2020 msgid "Menus" msgstr "" -#: ../../include/text.php:2010 +#: ../../include/text.php:2021 msgid "Layouts" msgstr "" -#: ../../include/text.php:2011 +#: ../../include/text.php:2022 msgid "Pages" msgstr "" @@ -1043,7 +1035,7 @@ msgstr "" msgid "wants" msgstr "" -#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:208 +#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:212 msgid "like" msgstr "" @@ -1051,7 +1043,7 @@ msgstr "" msgid "likes" msgstr "" -#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:209 +#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:213 msgid "dislike" msgstr "" @@ -1059,8 +1051,8 @@ msgstr "" msgid "dislikes" msgstr "" -#: ../../include/taxonomy.php:338 ../../include/identity.php:1017 -#: ../../include/ItemObject.php:134 +#: ../../include/taxonomy.php:338 ../../include/identity.php:1012 +#: ../../include/ItemObject.php:138 msgctxt "noun" msgid "Like" msgid_plural "Likes" @@ -1107,8 +1099,8 @@ msgstr "" msgid "RSS/Atom" msgstr "" -#: ../../include/contact_selectors.php:79 ../../mod/admin.php:726 -#: ../../mod/admin.php:735 ../../boot.php:1495 +#: ../../include/contact_selectors.php:79 ../../mod/admin.php:724 +#: ../../mod/admin.php:733 ../../boot.php:1496 msgid "Email" msgstr "" @@ -1282,16 +1274,24 @@ msgstr "" msgid "Account verified. Please login." msgstr "" -#: ../../include/diaspora.php:1868 ../../include/conversation.php:164 +#: ../../include/account.php:623 ../../include/account.php:625 +msgid "Click here to upgrade." +msgstr "" + +#: ../../include/account.php:631 +msgid "This action exceeds the limits set by your subscription plan." +msgstr "" + +#: ../../include/account.php:636 +msgid "This action is not available under your subscription plan." +msgstr "" + +#: ../../include/diaspora.php:1876 ../../include/conversation.php:164 #: ../../mod/like.php:331 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../include/diaspora.php:2278 -msgid "Attachments:" -msgstr "" - #: ../../include/datetime.php:43 ../../include/datetime.php:45 msgid "Miscellaneous" msgstr "" @@ -1375,31 +1375,31 @@ msgstr "" msgid "Happy Birthday %1$s" msgstr "" -#: ../../include/dir_fns.php:36 +#: ../../include/dir_fns.php:56 msgid "Sort Options" msgstr "" -#: ../../include/dir_fns.php:37 +#: ../../include/dir_fns.php:57 msgid "Alphabetic" msgstr "" -#: ../../include/dir_fns.php:38 +#: ../../include/dir_fns.php:58 msgid "Reverse Alphabetic" msgstr "" -#: ../../include/dir_fns.php:39 +#: ../../include/dir_fns.php:59 msgid "Newest to Oldest" msgstr "" -#: ../../include/dir_fns.php:51 +#: ../../include/dir_fns.php:71 msgid "Enable Safe Search" msgstr "" -#: ../../include/dir_fns.php:53 +#: ../../include/dir_fns.php:73 msgid "Disable Safe Search" msgstr "" -#: ../../include/dir_fns.php:55 +#: ../../include/dir_fns.php:75 msgid "Safe Mode" msgstr "" @@ -1637,7 +1637,7 @@ msgid "%1$s used of %2$s (%3$s%)" msgstr "" #: ../../include/reddav.php:1284 ../../mod/settings.php:519 -#: ../../mod/settings.php:545 ../../mod/admin.php:865 +#: ../../mod/settings.php:545 ../../mod/admin.php:863 msgid "Name" msgstr "" @@ -1699,7 +1699,7 @@ msgctxt "mood" msgid "%1$s is %2$s" msgstr "" -#: ../../include/conversation.php:647 ../../include/ItemObject.php:114 +#: ../../include/conversation.php:647 ../../include/ItemObject.php:118 msgid "Select" msgstr "" @@ -1708,7 +1708,7 @@ msgstr "" msgid "Private Message" msgstr "" -#: ../../include/conversation.php:662 ../../include/ItemObject.php:182 +#: ../../include/conversation.php:662 ../../include/ItemObject.php:186 msgid "Message is verified" msgstr "" @@ -1725,17 +1725,17 @@ msgstr "" msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:706 ../../include/ItemObject.php:250 +#: ../../include/conversation.php:706 ../../include/ItemObject.php:255 #, php-format msgid " from %s" msgstr "" -#: ../../include/conversation.php:709 ../../include/ItemObject.php:253 +#: ../../include/conversation.php:709 ../../include/ItemObject.php:258 #, php-format msgid "last edited: %s" msgstr "" -#: ../../include/conversation.php:710 ../../include/ItemObject.php:254 +#: ../../include/conversation.php:710 ../../include/ItemObject.php:259 #, php-format msgid "Expires: %s" msgstr "" @@ -1745,7 +1745,7 @@ msgid "View in context" msgstr "" #: ../../include/conversation.php:727 ../../include/conversation.php:1148 -#: ../../include/ItemObject.php:294 ../../mod/editblock.php:120 +#: ../../include/ItemObject.php:299 ../../mod/editblock.php:120 #: ../../mod/editlayout.php:115 ../../mod/editpost.php:121 #: ../../mod/editwebpage.php:152 ../../mod/photos.php:983 #: ../../mod/mail.php:231 ../../mod/mail.php:346 @@ -1998,19 +1998,20 @@ msgstr "" msgid "Set expiration date" msgstr "" -#: ../../include/conversation.php:1174 ../../include/ItemObject.php:595 +#: ../../include/conversation.php:1174 ../../include/ItemObject.php:600 #: ../../mod/editpost.php:148 ../../mod/mail.php:237 ../../mod/mail.php:351 msgid "Encrypt text" msgstr "" #: ../../include/conversation.php:1176 ../../mod/editpost.php:150 +#: ../../mod/events.php:516 msgid "OK" msgstr "" #: ../../include/conversation.php:1177 ../../mod/settings.php:518 #: ../../mod/settings.php:544 ../../mod/editpost.php:151 -#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 -#: ../../mod/tagrm.php:94 +#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117 +#: ../../mod/events.php:515 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 msgid "Cancel" msgstr "" @@ -2071,7 +2072,7 @@ msgstr "" msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/conversation.php:1509 ../../mod/admin.php:864 +#: ../../include/conversation.php:1509 ../../mod/admin.php:862 msgid "Channel" msgstr "" @@ -2353,23 +2354,27 @@ msgstr "" msgid "Channel location missing." msgstr "" -#: ../../include/follow.php:54 +#: ../../include/follow.php:70 msgid "Response from remote channel was incomplete." msgstr "" -#: ../../include/follow.php:85 +#: ../../include/follow.php:87 msgid "Channel was deleted and no longer exists." msgstr "" -#: ../../include/follow.php:143 -msgid "Channel discovery failed." +#: ../../include/follow.php:123 ../../include/follow.php:186 +msgid "Protocol disabled." msgstr "" #: ../../include/follow.php:160 +msgid "Channel discovery failed." +msgstr "" + +#: ../../include/follow.php:176 msgid "local account not found." msgstr "" -#: ../../include/follow.php:169 +#: ../../include/follow.php:203 msgid "Cannot connect to yourself." msgstr "" @@ -2393,75 +2398,75 @@ msgstr "" msgid "Room is full" msgstr "" -#: ../../include/items.php:315 ../../mod/profperm.php:23 +#: ../../include/items.php:357 ../../mod/profperm.php:23 #: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:242 #: ../../index.php:360 msgid "Permission denied" msgstr "" -#: ../../include/items.php:858 +#: ../../include/items.php:918 msgid "(Unknown)" msgstr "" -#: ../../include/items.php:990 +#: ../../include/items.php:1050 msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/items.php:992 +#: ../../include/items.php:1052 msgid "Visible to you only." msgstr "" -#: ../../include/items.php:994 +#: ../../include/items.php:1054 msgid "Visible to anybody in this network." msgstr "" -#: ../../include/items.php:996 +#: ../../include/items.php:1056 msgid "Visible to anybody authenticated." msgstr "" -#: ../../include/items.php:998 +#: ../../include/items.php:1058 #, php-format msgid "Visible to anybody on %s." msgstr "" -#: ../../include/items.php:1000 +#: ../../include/items.php:1060 msgid "Visible to all connections." msgstr "" -#: ../../include/items.php:1002 +#: ../../include/items.php:1062 msgid "Visible to approved connections." msgstr "" -#: ../../include/items.php:1004 +#: ../../include/items.php:1064 msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:3630 ../../mod/home.php:67 ../../mod/display.php:32 +#: ../../include/items.php:3764 ../../mod/home.php:67 ../../mod/display.php:32 #: ../../mod/filestorage.php:18 ../../mod/admin.php:168 -#: ../../mod/admin.php:895 ../../mod/admin.php:1098 ../../mod/thing.php:78 +#: ../../mod/admin.php:893 ../../mod/admin.php:1096 ../../mod/thing.php:78 #: ../../mod/viewsrc.php:18 msgid "Item not found." msgstr "" -#: ../../include/items.php:4063 ../../mod/group.php:38 ../../mod/group.php:140 +#: ../../include/items.php:4197 ../../mod/group.php:38 ../../mod/group.php:140 msgid "Collection not found." msgstr "" -#: ../../include/items.php:4078 +#: ../../include/items.php:4212 msgid "Collection is empty." msgstr "" -#: ../../include/items.php:4085 +#: ../../include/items.php:4219 #, php-format msgid "Collection: %s" msgstr "" -#: ../../include/items.php:4096 +#: ../../include/items.php:4230 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:4099 +#: ../../include/items.php:4233 msgid "Connection not found." msgstr "" @@ -2476,7 +2481,7 @@ msgstr "" msgid "Default privacy group for new contacts" msgstr "" -#: ../../include/group.php:253 ../../mod/admin.php:735 +#: ../../include/group.php:253 ../../mod/admin.php:733 msgid "All Channels" msgstr "" @@ -2504,7 +2509,7 @@ msgstr "" msgid "add" msgstr "" -#: ../../include/identity.php:30 ../../mod/item.php:1296 +#: ../../include/identity.php:30 ../../mod/item.php:1310 msgid "Unable to obtain identity information from database" msgstr "" @@ -2550,7 +2555,7 @@ msgstr "" msgid "Requested channel is not available." msgstr "" -#: ../../include/identity.php:557 ../../mod/achievements.php:8 +#: ../../include/identity.php:557 ../../mod/achievements.php:11 #: ../../mod/profile.php:16 ../../mod/blocks.php:10 ../../mod/connect.php:13 #: ../../mod/filestorage.php:40 ../../mod/layouts.php:8 #: ../../mod/webpages.php:8 ../../mod/hcard.php:8 @@ -2586,17 +2591,17 @@ msgstr "" msgid "Edit visibility" msgstr "" -#: ../../include/identity.php:759 ../../include/identity.php:1001 +#: ../../include/identity.php:759 ../../include/identity.php:996 #: ../../mod/directory.php:158 msgid "Gender:" msgstr "" -#: ../../include/identity.php:760 ../../include/identity.php:1045 +#: ../../include/identity.php:760 ../../include/identity.php:1040 #: ../../mod/directory.php:160 msgid "Status:" msgstr "" -#: ../../include/identity.php:761 ../../include/identity.php:1056 +#: ../../include/identity.php:761 ../../include/identity.php:1051 #: ../../mod/directory.php:162 msgid "Homepage:" msgstr "" @@ -2605,142 +2610,142 @@ msgstr "" msgid "Online Now" msgstr "" -#: ../../include/identity.php:845 ../../include/identity.php:925 +#: ../../include/identity.php:840 ../../include/identity.php:920 #: ../../mod/ping.php:298 msgid "g A l F d" msgstr "" -#: ../../include/identity.php:846 ../../include/identity.php:926 +#: ../../include/identity.php:841 ../../include/identity.php:921 msgid "F d" msgstr "" -#: ../../include/identity.php:891 ../../include/identity.php:966 +#: ../../include/identity.php:886 ../../include/identity.php:961 #: ../../mod/ping.php:320 msgid "[today]" msgstr "" -#: ../../include/identity.php:903 +#: ../../include/identity.php:898 msgid "Birthday Reminders" msgstr "" -#: ../../include/identity.php:904 +#: ../../include/identity.php:899 msgid "Birthdays this week:" msgstr "" -#: ../../include/identity.php:959 +#: ../../include/identity.php:954 msgid "[No description]" msgstr "" -#: ../../include/identity.php:977 +#: ../../include/identity.php:972 msgid "Event Reminders" msgstr "" -#: ../../include/identity.php:978 +#: ../../include/identity.php:973 msgid "Events this week:" msgstr "" -#: ../../include/identity.php:999 ../../mod/settings.php:943 +#: ../../include/identity.php:994 ../../mod/settings.php:943 msgid "Full Name:" msgstr "" -#: ../../include/identity.php:1006 +#: ../../include/identity.php:1001 msgid "Like this channel" msgstr "" -#: ../../include/identity.php:1030 +#: ../../include/identity.php:1025 msgid "j F, Y" msgstr "" -#: ../../include/identity.php:1031 +#: ../../include/identity.php:1026 msgid "j F" msgstr "" -#: ../../include/identity.php:1038 +#: ../../include/identity.php:1033 msgid "Birthday:" msgstr "" -#: ../../include/identity.php:1042 +#: ../../include/identity.php:1037 msgid "Age:" msgstr "" -#: ../../include/identity.php:1051 +#: ../../include/identity.php:1046 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/identity.php:1054 ../../mod/profiles.php:667 +#: ../../include/identity.php:1049 ../../mod/profiles.php:667 msgid "Sexual Preference:" msgstr "" -#: ../../include/identity.php:1058 ../../mod/profiles.php:669 +#: ../../include/identity.php:1053 ../../mod/profiles.php:669 msgid "Hometown:" msgstr "" -#: ../../include/identity.php:1060 +#: ../../include/identity.php:1055 msgid "Tags:" msgstr "" -#: ../../include/identity.php:1062 ../../mod/profiles.php:670 +#: ../../include/identity.php:1057 ../../mod/profiles.php:670 msgid "Political Views:" msgstr "" -#: ../../include/identity.php:1064 +#: ../../include/identity.php:1059 msgid "Religion:" msgstr "" -#: ../../include/identity.php:1066 ../../mod/directory.php:164 +#: ../../include/identity.php:1061 ../../mod/directory.php:164 msgid "About:" msgstr "" -#: ../../include/identity.php:1068 +#: ../../include/identity.php:1063 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/identity.php:1070 ../../mod/profiles.php:673 +#: ../../include/identity.php:1065 ../../mod/profiles.php:673 msgid "Likes:" msgstr "" -#: ../../include/identity.php:1072 ../../mod/profiles.php:674 +#: ../../include/identity.php:1067 ../../mod/profiles.php:674 msgid "Dislikes:" msgstr "" -#: ../../include/identity.php:1075 +#: ../../include/identity.php:1070 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/identity.php:1077 +#: ../../include/identity.php:1072 msgid "My other channels:" msgstr "" -#: ../../include/identity.php:1079 +#: ../../include/identity.php:1074 msgid "Musical interests:" msgstr "" -#: ../../include/identity.php:1081 +#: ../../include/identity.php:1076 msgid "Books, literature:" msgstr "" -#: ../../include/identity.php:1083 +#: ../../include/identity.php:1078 msgid "Television:" msgstr "" -#: ../../include/identity.php:1085 +#: ../../include/identity.php:1080 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/identity.php:1087 +#: ../../include/identity.php:1082 msgid "Love/Romance:" msgstr "" -#: ../../include/identity.php:1089 +#: ../../include/identity.php:1084 msgid "Work/employment:" msgstr "" -#: ../../include/identity.php:1091 +#: ../../include/identity.php:1086 msgid "School/education:" msgstr "" -#: ../../include/identity.php:1111 +#: ../../include/identity.php:1106 msgid "Like this thing" msgstr "" @@ -2924,118 +2929,118 @@ msgstr "" msgid "Suggested Chatrooms" msgstr "" -#: ../../include/ItemObject.php:118 +#: ../../include/ItemObject.php:122 msgid "Save to Folder" msgstr "" -#: ../../include/ItemObject.php:130 ../../include/ItemObject.php:142 +#: ../../include/ItemObject.php:134 ../../include/ItemObject.php:146 msgid "View all" msgstr "" -#: ../../include/ItemObject.php:139 +#: ../../include/ItemObject.php:143 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" msgstr[0] "" msgstr[1] "" -#: ../../include/ItemObject.php:167 +#: ../../include/ItemObject.php:171 msgid "Add Star" msgstr "" -#: ../../include/ItemObject.php:168 +#: ../../include/ItemObject.php:172 msgid "Remove Star" msgstr "" -#: ../../include/ItemObject.php:169 +#: ../../include/ItemObject.php:173 msgid "Toggle Star Status" msgstr "" -#: ../../include/ItemObject.php:173 +#: ../../include/ItemObject.php:177 msgid "starred" msgstr "" -#: ../../include/ItemObject.php:190 +#: ../../include/ItemObject.php:194 msgid "Add Tag" msgstr "" -#: ../../include/ItemObject.php:208 ../../mod/photos.php:980 +#: ../../include/ItemObject.php:212 ../../mod/photos.php:980 msgid "I like this (toggle)" msgstr "" -#: ../../include/ItemObject.php:209 ../../mod/photos.php:981 +#: ../../include/ItemObject.php:213 ../../mod/photos.php:981 msgid "I don't like this (toggle)" msgstr "" -#: ../../include/ItemObject.php:211 +#: ../../include/ItemObject.php:217 msgid "Share This" msgstr "" -#: ../../include/ItemObject.php:211 +#: ../../include/ItemObject.php:217 msgid "share" msgstr "" -#: ../../include/ItemObject.php:235 ../../include/ItemObject.php:236 +#: ../../include/ItemObject.php:240 ../../include/ItemObject.php:241 #, php-format msgid "View %s's profile - %s" msgstr "" -#: ../../include/ItemObject.php:237 +#: ../../include/ItemObject.php:242 msgid "to" msgstr "" -#: ../../include/ItemObject.php:238 +#: ../../include/ItemObject.php:243 msgid "via" msgstr "" -#: ../../include/ItemObject.php:239 +#: ../../include/ItemObject.php:244 msgid "Wall-to-Wall" msgstr "" -#: ../../include/ItemObject.php:240 +#: ../../include/ItemObject.php:245 msgid "via Wall-To-Wall:" msgstr "" -#: ../../include/ItemObject.php:274 +#: ../../include/ItemObject.php:279 msgid "Save Bookmarks" msgstr "" -#: ../../include/ItemObject.php:275 +#: ../../include/ItemObject.php:280 msgid "Add to Calendar" msgstr "" -#: ../../include/ItemObject.php:283 +#: ../../include/ItemObject.php:288 msgctxt "noun" msgid "Likes" msgstr "" -#: ../../include/ItemObject.php:284 +#: ../../include/ItemObject.php:289 msgctxt "noun" msgid "Dislikes" msgstr "" -#: ../../include/ItemObject.php:315 +#: ../../include/ItemObject.php:320 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../include/ItemObject.php:316 ../../include/js_strings.php:7 +#: ../../include/ItemObject.php:321 ../../include/js_strings.php:7 msgid "[+] show all" msgstr "" -#: ../../include/ItemObject.php:580 ../../mod/photos.php:999 +#: ../../include/ItemObject.php:585 ../../mod/photos.php:999 #: ../../mod/photos.php:1086 msgid "This is you" msgstr "" -#: ../../include/ItemObject.php:582 ../../include/js_strings.php:6 +#: ../../include/ItemObject.php:587 ../../include/js_strings.php:6 #: ../../mod/photos.php:1001 ../../mod/photos.php:1088 msgid "Comment" msgstr "" -#: ../../include/ItemObject.php:583 ../../mod/mood.php:135 +#: ../../include/ItemObject.php:588 ../../mod/mood.php:135 #: ../../mod/settings.php:517 ../../mod/settings.php:629 #: ../../mod/settings.php:658 ../../mod/settings.php:682 #: ../../mod/settings.php:755 ../../mod/settings.php:935 @@ -3045,10 +3050,10 @@ msgstr "" #: ../../mod/photos.php:563 ../../mod/photos.php:674 ../../mod/photos.php:962 #: ../../mod/photos.php:1002 ../../mod/photos.php:1089 #: ../../mod/sources.php:104 ../../mod/sources.php:138 -#: ../../mod/events.php:511 ../../mod/filestorage.php:137 +#: ../../mod/events.php:535 ../../mod/filestorage.php:137 #: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:413 -#: ../../mod/admin.php:723 ../../mod/admin.php:858 ../../mod/admin.php:991 -#: ../../mod/admin.php:1190 ../../mod/admin.php:1277 ../../mod/thing.php:286 +#: ../../mod/admin.php:721 ../../mod/admin.php:856 ../../mod/admin.php:989 +#: ../../mod/admin.php:1188 ../../mod/admin.php:1275 ../../mod/thing.php:286 #: ../../mod/thing.php:329 ../../mod/import.php:394 ../../mod/invite.php:142 #: ../../mod/mail.php:345 ../../mod/appman.php:99 ../../mod/poll.php:68 #: ../../view/theme/apw/php/config.php:256 @@ -3058,35 +3063,35 @@ msgstr "" msgid "Submit" msgstr "" -#: ../../include/ItemObject.php:584 +#: ../../include/ItemObject.php:589 msgid "Bold" msgstr "" -#: ../../include/ItemObject.php:585 +#: ../../include/ItemObject.php:590 msgid "Italic" msgstr "" -#: ../../include/ItemObject.php:586 +#: ../../include/ItemObject.php:591 msgid "Underline" msgstr "" -#: ../../include/ItemObject.php:587 +#: ../../include/ItemObject.php:592 msgid "Quote" msgstr "" -#: ../../include/ItemObject.php:588 +#: ../../include/ItemObject.php:593 msgid "Code" msgstr "" -#: ../../include/ItemObject.php:589 +#: ../../include/ItemObject.php:594 msgid "Image" msgstr "" -#: ../../include/ItemObject.php:590 +#: ../../include/ItemObject.php:595 msgid "Link" msgstr "" -#: ../../include/ItemObject.php:591 +#: ../../include/ItemObject.php:596 msgid "Video" msgstr "" @@ -3215,7 +3220,7 @@ msgstr "" msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/Contact.php:211 ../../mod/admin.php:649 +#: ../../include/Contact.php:211 ../../mod/admin.php:647 #, php-format msgid "User '%s' deleted" msgstr "" @@ -3684,6 +3689,10 @@ msgstr "" msgid "Modify" msgstr "" +#: ../../mod/achievements.php:34 +msgid "Some blurb about what to do when you're new here" +msgstr "" + #: ../../mod/ping.php:237 msgid "sent you a private message" msgstr "" @@ -3696,7 +3705,7 @@ msgstr "" msgid "posted an event" msgstr "" -#: ../../mod/acl.php:239 +#: ../../mod/acl.php:244 msgid "network" msgstr "" @@ -4221,8 +4230,8 @@ msgstr "" msgid "Invalid item." msgstr "" -#: ../../mod/block.php:39 ../../mod/chanview.php:77 ../../mod/page.php:47 -#: ../../mod/home.php:54 ../../mod/wall_upload.php:28 +#: ../../mod/block.php:39 ../../mod/page.php:47 ../../mod/home.php:54 +#: ../../mod/wall_upload.php:28 msgid "Channel not found." msgstr "" @@ -4380,7 +4389,7 @@ msgstr "" msgid "Interests" msgstr "" -#: ../../mod/profiles.php:433 ../../mod/admin.php:865 +#: ../../mod/profiles.php:433 ../../mod/admin.php:863 msgid "Address" msgstr "" @@ -4692,81 +4701,81 @@ msgstr "" msgid "%1$s's Chatrooms" msgstr "" -#: ../../mod/register.php:43 +#: ../../mod/register.php:42 msgid "Maximum daily site registrations exceeded. Please try again tomorrow." msgstr "" -#: ../../mod/register.php:49 +#: ../../mod/register.php:48 msgid "" "Please indicate acceptance of the Terms of Service. Registration failed." msgstr "" -#: ../../mod/register.php:83 +#: ../../mod/register.php:82 msgid "Passwords do not match." msgstr "" -#: ../../mod/register.php:116 +#: ../../mod/register.php:115 msgid "" "Registration successful. Please check your email for validation instructions." msgstr "" -#: ../../mod/register.php:122 +#: ../../mod/register.php:121 msgid "Your registration is pending approval by the site owner." msgstr "" -#: ../../mod/register.php:125 +#: ../../mod/register.php:124 msgid "Your registration can not be processed." msgstr "" -#: ../../mod/register.php:162 +#: ../../mod/register.php:161 msgid "Registration on this site/hub is by approval only." msgstr "" -#: ../../mod/register.php:163 +#: ../../mod/register.php:162 msgid "Register at another affiliated site/hub" msgstr "" -#: ../../mod/register.php:171 +#: ../../mod/register.php:170 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." msgstr "" -#: ../../mod/register.php:182 +#: ../../mod/register.php:181 msgid "Terms of Service" msgstr "" -#: ../../mod/register.php:188 +#: ../../mod/register.php:187 #, php-format msgid "I accept the %s for this website" msgstr "" -#: ../../mod/register.php:190 +#: ../../mod/register.php:189 #, php-format msgid "I am over 13 years of age and accept the %s for this website" msgstr "" -#: ../../mod/register.php:204 ../../mod/admin.php:414 +#: ../../mod/register.php:203 ../../mod/admin.php:414 msgid "Registration" msgstr "" -#: ../../mod/register.php:209 +#: ../../mod/register.php:208 msgid "Membership on this site is by invitation only." msgstr "" -#: ../../mod/register.php:210 +#: ../../mod/register.php:209 msgid "Please enter your invitation code" msgstr "" -#: ../../mod/register.php:213 +#: ../../mod/register.php:212 msgid "Your email address" msgstr "" -#: ../../mod/register.php:214 +#: ../../mod/register.php:213 msgid "Choose a password" msgstr "" -#: ../../mod/register.php:215 +#: ../../mod/register.php:214 msgid "Please re-enter your password" msgstr "" @@ -4778,7 +4787,7 @@ msgstr "" msgid "Online" msgstr "" -#: ../../mod/regmod.php:12 +#: ../../mod/regmod.php:11 msgid "Please login." msgstr "" @@ -5106,12 +5115,12 @@ msgid "View recent posts and comments" msgstr "" #: ../../mod/connedit.php:414 ../../mod/connedit.php:557 -#: ../../mod/admin.php:732 +#: ../../mod/admin.php:730 msgid "Unblock" msgstr "" #: ../../mod/connedit.php:414 ../../mod/connedit.php:557 -#: ../../mod/admin.php:731 +#: ../../mod/admin.php:729 msgid "Block" msgstr "" @@ -5464,7 +5473,7 @@ msgstr "" msgid "System check" msgstr "" -#: ../../mod/setup.php:261 ../../mod/events.php:399 +#: ../../mod/setup.php:261 ../../mod/events.php:414 msgid "Next" msgstr "" @@ -6138,73 +6147,77 @@ msgstr "" msgid "- select -" msgstr "" -#: ../../mod/events.php:72 +#: ../../mod/events.php:87 msgid "Event title and start time are required." msgstr "" -#: ../../mod/events.php:86 +#: ../../mod/events.php:101 msgid "Event not found." msgstr "" -#: ../../mod/events.php:329 +#: ../../mod/events.php:344 msgid "l, F j" msgstr "" -#: ../../mod/events.php:351 +#: ../../mod/events.php:366 msgid "Edit event" msgstr "" -#: ../../mod/events.php:397 +#: ../../mod/events.php:412 msgid "Create New Event" msgstr "" -#: ../../mod/events.php:398 +#: ../../mod/events.php:413 msgid "Previous" msgstr "" -#: ../../mod/events.php:469 +#: ../../mod/events.php:487 msgid "hour:minute" msgstr "" -#: ../../mod/events.php:489 +#: ../../mod/events.php:507 msgid "Event details" msgstr "" -#: ../../mod/events.php:490 +#: ../../mod/events.php:508 #, php-format -msgid "Format is %s %s. Starting date and Title are required." +msgid "Format is %s %s." msgstr "" -#: ../../mod/events.php:492 +#: ../../mod/events.php:509 +msgid "Starting date and Title are required." +msgstr "" + +#: ../../mod/events.php:511 msgid "Event Starts:" msgstr "" -#: ../../mod/events.php:492 ../../mod/events.php:506 ../../mod/appman.php:91 +#: ../../mod/events.php:511 ../../mod/events.php:530 ../../mod/appman.php:91 #: ../../mod/appman.php:92 msgid "Required" msgstr "" -#: ../../mod/events.php:495 +#: ../../mod/events.php:519 msgid "Finish date/time is not known or not relevant" msgstr "" -#: ../../mod/events.php:497 +#: ../../mod/events.php:521 msgid "Event Finishes:" msgstr "" -#: ../../mod/events.php:500 +#: ../../mod/events.php:524 msgid "Adjust for viewer timezone" msgstr "" -#: ../../mod/events.php:502 +#: ../../mod/events.php:526 msgid "Description:" msgstr "" -#: ../../mod/events.php:506 +#: ../../mod/events.php:530 msgid "Title:" msgstr "" -#: ../../mod/events.php:508 +#: ../../mod/events.php:532 msgid "Share this event" msgstr "" @@ -6357,15 +6370,15 @@ msgstr "" msgid "Accounts" msgstr "" -#: ../../mod/admin.php:99 ../../mod/admin.php:857 +#: ../../mod/admin.php:99 ../../mod/admin.php:855 msgid "Channels" msgstr "" -#: ../../mod/admin.php:100 ../../mod/admin.php:948 ../../mod/admin.php:990 +#: ../../mod/admin.php:100 ../../mod/admin.php:946 ../../mod/admin.php:988 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:101 ../../mod/admin.php:1153 ../../mod/admin.php:1189 +#: ../../mod/admin.php:101 ../../mod/admin.php:1151 ../../mod/admin.php:1187 msgid "Themes" msgstr "" @@ -6381,7 +6394,7 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../mod/admin.php:118 ../../mod/admin.php:125 ../../mod/admin.php:1276 +#: ../../mod/admin.php:118 ../../mod/admin.php:125 ../../mod/admin.php:1274 msgid "Logs" msgstr "" @@ -6398,9 +6411,9 @@ msgid "Message queues" msgstr "" #: ../../mod/admin.php:211 ../../mod/admin.php:411 ../../mod/admin.php:512 -#: ../../mod/admin.php:721 ../../mod/admin.php:856 ../../mod/admin.php:947 -#: ../../mod/admin.php:989 ../../mod/admin.php:1152 ../../mod/admin.php:1188 -#: ../../mod/admin.php:1275 +#: ../../mod/admin.php:719 ../../mod/admin.php:854 ../../mod/admin.php:945 +#: ../../mod/admin.php:987 ../../mod/admin.php:1150 ../../mod/admin.php:1186 +#: ../../mod/admin.php:1273 msgid "Administration" msgstr "" @@ -6680,7 +6693,7 @@ msgstr "" msgid "No server found" msgstr "" -#: ../../mod/admin.php:511 ../../mod/admin.php:735 +#: ../../mod/admin.php:511 ../../mod/admin.php:733 msgid "ID" msgstr "" @@ -6750,241 +6763,241 @@ msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:638 +#: ../../mod/admin.php:636 msgid "Account not found" msgstr "" -#: ../../mod/admin.php:658 +#: ../../mod/admin.php:656 #, php-format msgid "User '%s' unblocked" msgstr "" -#: ../../mod/admin.php:658 +#: ../../mod/admin.php:656 #, php-format msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:722 ../../mod/admin.php:734 +#: ../../mod/admin.php:720 ../../mod/admin.php:732 msgid "Users" msgstr "" -#: ../../mod/admin.php:724 ../../mod/admin.php:859 +#: ../../mod/admin.php:722 ../../mod/admin.php:857 msgid "select all" msgstr "" -#: ../../mod/admin.php:725 +#: ../../mod/admin.php:723 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:726 +#: ../../mod/admin.php:724 msgid "Request date" msgstr "" -#: ../../mod/admin.php:727 +#: ../../mod/admin.php:725 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:728 +#: ../../mod/admin.php:726 msgid "Approve" msgstr "" -#: ../../mod/admin.php:729 +#: ../../mod/admin.php:727 msgid "Deny" msgstr "" -#: ../../mod/admin.php:735 +#: ../../mod/admin.php:733 msgid "Register date" msgstr "" -#: ../../mod/admin.php:735 +#: ../../mod/admin.php:733 msgid "Last login" msgstr "" -#: ../../mod/admin.php:735 +#: ../../mod/admin.php:733 msgid "Expires" msgstr "" -#: ../../mod/admin.php:735 +#: ../../mod/admin.php:733 msgid "Service Class" msgstr "" -#: ../../mod/admin.php:737 +#: ../../mod/admin.php:735 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:738 +#: ../../mod/admin.php:736 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:771 +#: ../../mod/admin.php:769 #, php-format msgid "%s channel censored/uncensored" msgid_plural "%s channelss censored/uncensored" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:778 +#: ../../mod/admin.php:776 #, php-format msgid "%s channel deleted" msgid_plural "%s channels deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:797 +#: ../../mod/admin.php:795 msgid "Channel not found" msgstr "" -#: ../../mod/admin.php:808 +#: ../../mod/admin.php:806 #, php-format msgid "Channel '%s' deleted" msgstr "" -#: ../../mod/admin.php:818 +#: ../../mod/admin.php:816 #, php-format msgid "Channel '%s' uncensored" msgstr "" -#: ../../mod/admin.php:818 +#: ../../mod/admin.php:816 #, php-format msgid "Channel '%s' censored" msgstr "" -#: ../../mod/admin.php:861 +#: ../../mod/admin.php:859 msgid "Censor" msgstr "" -#: ../../mod/admin.php:862 +#: ../../mod/admin.php:860 msgid "Uncensor" msgstr "" -#: ../../mod/admin.php:865 +#: ../../mod/admin.php:863 msgid "UID" msgstr "" -#: ../../mod/admin.php:867 +#: ../../mod/admin.php:865 msgid "" "Selected channels will be deleted!\\n\\nEverything that was posted in these " "channels on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:868 +#: ../../mod/admin.php:866 msgid "" "The channel {0} will be deleted!\\n\\nEverything that was posted in this " "channel on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:907 +#: ../../mod/admin.php:905 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:911 +#: ../../mod/admin.php:909 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:921 ../../mod/admin.php:1123 +#: ../../mod/admin.php:919 ../../mod/admin.php:1121 msgid "Disable" msgstr "" -#: ../../mod/admin.php:923 ../../mod/admin.php:1125 +#: ../../mod/admin.php:921 ../../mod/admin.php:1123 msgid "Enable" msgstr "" -#: ../../mod/admin.php:949 ../../mod/admin.php:1154 +#: ../../mod/admin.php:947 ../../mod/admin.php:1152 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:957 ../../mod/admin.php:1164 +#: ../../mod/admin.php:955 ../../mod/admin.php:1162 msgid "Author: " msgstr "" -#: ../../mod/admin.php:958 ../../mod/admin.php:1165 +#: ../../mod/admin.php:956 ../../mod/admin.php:1163 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:1087 +#: ../../mod/admin.php:1085 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:1146 +#: ../../mod/admin.php:1144 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:1194 +#: ../../mod/admin.php:1192 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:1195 +#: ../../mod/admin.php:1193 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:1222 +#: ../../mod/admin.php:1220 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:1278 +#: ../../mod/admin.php:1276 msgid "Clear" msgstr "" -#: ../../mod/admin.php:1284 +#: ../../mod/admin.php:1282 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:1285 +#: ../../mod/admin.php:1283 msgid "Log file" msgstr "" -#: ../../mod/admin.php:1285 +#: ../../mod/admin.php:1283 msgid "" "Must be writable by web server. Relative to your Red top-level directory." msgstr "" -#: ../../mod/admin.php:1286 +#: ../../mod/admin.php:1284 msgid "Log level" msgstr "" -#: ../../mod/admin.php:1333 +#: ../../mod/admin.php:1331 msgid "New Profile Field" msgstr "" -#: ../../mod/admin.php:1334 ../../mod/admin.php:1355 +#: ../../mod/admin.php:1332 ../../mod/admin.php:1353 msgid "Field nickname" msgstr "" -#: ../../mod/admin.php:1334 ../../mod/admin.php:1355 +#: ../../mod/admin.php:1332 ../../mod/admin.php:1353 msgid "System name of field" msgstr "" -#: ../../mod/admin.php:1335 ../../mod/admin.php:1356 +#: ../../mod/admin.php:1333 ../../mod/admin.php:1354 msgid "Input type" msgstr "" -#: ../../mod/admin.php:1336 ../../mod/admin.php:1357 +#: ../../mod/admin.php:1334 ../../mod/admin.php:1355 msgid "Field Name" msgstr "" -#: ../../mod/admin.php:1336 ../../mod/admin.php:1357 +#: ../../mod/admin.php:1334 ../../mod/admin.php:1355 msgid "Label on profile pages" msgstr "" -#: ../../mod/admin.php:1337 ../../mod/admin.php:1358 +#: ../../mod/admin.php:1335 ../../mod/admin.php:1356 msgid "Help text" msgstr "" -#: ../../mod/admin.php:1337 ../../mod/admin.php:1358 +#: ../../mod/admin.php:1335 ../../mod/admin.php:1356 msgid "Additional info (optional)" msgstr "" -#: ../../mod/admin.php:1348 +#: ../../mod/admin.php:1346 msgid "Field definition not found" msgstr "" -#: ../../mod/admin.php:1354 +#: ../../mod/admin.php:1352 msgid "Edit Profile Field" msgstr "" @@ -7207,12 +7220,12 @@ msgstr "" msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:1301 +#: ../../mod/item.php:1315 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../mod/item.php:1307 +#: ../../mod/item.php:1321 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" @@ -7313,7 +7326,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1503 +#: ../../mod/lostpass.php:85 ../../boot.php:1504 msgid "Password Reset" msgstr "" @@ -8027,41 +8040,41 @@ msgstr "" msgid "Are you a clean desk or a messy desk person?" msgstr "" -#: ../../boot.php:1291 +#: ../../boot.php:1292 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1294 +#: ../../boot.php:1295 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1468 +#: ../../boot.php:1469 msgid "" "Create an account to access services and applications within the Red Matrix" msgstr "" -#: ../../boot.php:1496 +#: ../../boot.php:1497 msgid "Password" msgstr "" -#: ../../boot.php:1497 +#: ../../boot.php:1498 msgid "Remember me" msgstr "" -#: ../../boot.php:1502 +#: ../../boot.php:1503 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1567 +#: ../../boot.php:1568 msgid "permission denied" msgstr "" -#: ../../boot.php:1568 +#: ../../boot.php:1569 msgid "Got Zot?" msgstr "" -#: ../../boot.php:1998 +#: ../../boot.php:1999 msgid "toggle mobile" msgstr "" diff --git a/version.inc b/version.inc index ae902fed0..047aea03d 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-09-04.788 +2014-09-05.789 -- cgit v1.2.3 From dd7d0c4156a28cfc820700d3ba7b45bcbf58bf2e Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 5 Sep 2014 01:58:27 -0700 Subject: more work on the event edit form --- mod/events.php | 2 ++ view/tpl/event_form.tpl | 20 ++++++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/mod/events.php b/mod/events.php index f3bf97141..e5250e8f8 100755 --- a/mod/events.php +++ b/mod/events.php @@ -470,6 +470,7 @@ function events_content(&$a) { $shour = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'H') : 0); $sminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'i') : 0); $stext = datetime_convert('UTC',$tz,$sdt); + $stext = substr($stext,0,14) . "00:00"; $fyear = datetime_convert('UTC', $tz, $fdt, 'Y'); $fmonth = datetime_convert('UTC', $tz, $fdt, 'm'); @@ -478,6 +479,7 @@ function events_content(&$a) { $fhour = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'H') : 0); $fminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'i') : 0); $ftext = datetime_convert('UTC',$tz,$fdt); + $ftext = substr($ftext,0,14) . "00:00"; $f = get_config('system','event_input_format'); if(! $f) diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index 611bf6006..95ebe0351 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -11,6 +11,9 @@ +
    {{$t_text}}
    + +
    {{$s_text}}
    {{if $bootstrap}} @@ -20,17 +23,18 @@

    -
    {{$n_text}}
    +
    {{$n_text}}
    - +
    {{$f_text}}
    {{if $bootstrap}} {{else}} {{$f_dsel}} {{$f_tsel}} {{/if}} +
    @@ -39,8 +43,16 @@
    -
    {{$t_text}}
    - + + +{{if $catsenabled}} +
    + +
    +{{/if}} + + +
    {{$d_text}}
    -- cgit v1.2.3 From 7a9b1c4a77f279b04fa710df25aa289d7b2b47c1 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 5 Sep 2014 15:00:08 -0700 Subject: illegal string offset warnings --- include/socgraph.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/socgraph.php b/include/socgraph.php index dc401ff34..504a6b2c0 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -167,7 +167,7 @@ function poco_load($xchan = '',$url = null) { } } else { - $x = import_author_diaspora($address); + $x = import_author_diaspora(array('address' => $address)); if(! $x) { continue; } -- cgit v1.2.3 From 614452965eb62bc32f8394d6283f056710a06261 Mon Sep 17 00:00:00 2001 From: Charles Date: Fri, 5 Sep 2014 16:31:19 -0700 Subject: adding a bug report app --- app/bugreport.apd | 4 ++++ app/bugreport.png | Bin 0 -> 5394 bytes 2 files changed, 4 insertions(+) create mode 100644 app/bugreport.apd create mode 100644 app/bugreport.png diff --git a/app/bugreport.apd b/app/bugreport.apd new file mode 100644 index 000000000..412ef62b8 --- /dev/null +++ b/app/bugreport.apd @@ -0,0 +1,4 @@ +url: https://github.com/friendica/red/issues +requires: local_user +name: Bug Report +photo: $baseurl/app/bugreport.png diff --git a/app/bugreport.png b/app/bugreport.png new file mode 100644 index 000000000..64b6b7e9f Binary files /dev/null and b/app/bugreport.png differ -- cgit v1.2.3 From d439bf51378a7a44db629a4ac05f2fa771a3d335 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 6 Sep 2014 01:32:53 +0100 Subject: Fix directory for NOT endless scroll. Dunno what's wrong with endless scroll, sorry. --- mod/directory.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mod/directory.php b/mod/directory.php index 39eeb36ce..47bfdf380 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -224,10 +224,11 @@ function directory_content(&$a) { '$safetxt' => htmlspecialchars($search,ENT_QUOTES,'UTF-8'), '$entries' => $entries, '$dirlbl' => t('Directory'), - '$submit' => t('Find') + '$submit' => t('Find'), + '$next' => alt_pager($a,$j['records'], t('next page'), t('previous page')) + )); -// $o .= alt_pager($a,$j['records'], t('next page'), t('previous page')); } -- cgit v1.2.3 From 28b75b028dcb1633a9407a5a5c79e5d2423e18a5 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 6 Sep 2014 00:37:15 -0700 Subject: ajax work --- include/text.php | 14 ++++++++++ mod/directory.php | 2 +- mod/photos.php | 65 ++++++++++++++++++++++++++++++++++++---------- version.inc | 2 +- view/js/main.js | 2 +- view/js/mod_events.js | 37 ++++++++++++++++++++++++++ view/tpl/photos_recent.tpl | 3 +++ view/tpl/photosajax.tpl | 4 +++ 8 files changed, 113 insertions(+), 16 deletions(-) create mode 100644 view/js/mod_events.js create mode 100755 view/tpl/photosajax.tpl diff --git a/include/text.php b/include/text.php index 50c68b6b2..4fe9f9cde 100644 --- a/include/text.php +++ b/include/text.php @@ -2033,4 +2033,18 @@ function normalise_openid($s) { return trim(str_replace(array('http://','https://'),array('',''),$s),'/'); } +// used in ajax endless scroll request to find out all the args that the master page was viewing + +function extra_query_args() { + $s = ''; + if(count($_REQUEST)) { + foreach($_REQUEST as $k => $v) { + // these are request vars we don't want to duplicate + if(! in_array($k, array('q','f','zid','page','PHPSESSID'))) { + $s .= '&' . $k . '=' . $v; + } + } + } + return $s; +} \ No newline at end of file diff --git a/mod/directory.php b/mod/directory.php index 39eeb36ce..2c11e3247 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -216,7 +216,7 @@ function directory_content(&$a) { } else { - $o .= ""; + $o .= ""; $o .= replace_macros($tpl, array( '$search' => $search, '$desc' => t('Find'), diff --git a/mod/photos.php b/mod/photos.php index 428aff2a0..3bc105ba1 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -697,8 +697,10 @@ function photos_content(&$a) { $o .= '
    ' . t('Upload New Photos') . '
    '; } + $ajaxout = ''; + $tpl = get_markup_template('photo_album.tpl'); - if(count($r)) + if(count($r)) { $twist = 'rotright'; foreach($r as $rr) { @@ -728,7 +730,9 @@ function photos_content(&$a) { $rel=("photo"); // } - $o .= replace_macros($tpl,array( + $o .= ""; + + $tmp = replace_macros($tpl,array( '$id' => $rr['id'], '$twist' => ' ' . $twist . rand(2,4), '$photolink' => $imagelink, @@ -740,10 +744,24 @@ function photos_content(&$a) { '$ext' => $ext, '$hash'=> $rr['resource_id'], )); - + if($_REQUEST['aj']) + $ajaxout .= $tmp; + else + $o .= $tmp; + } + } + if($_REQUEST['aj']) { + if(! $r) + $ajaxout .= '
    '; + echo $ajaxout; + killme(); } + + $o .= '
    '; $o .= '
    '; - $o .= paginate($a); + $o .= ''; + $o .= '
    '; +// $o .= paginate($a); return $o; @@ -1192,16 +1210,37 @@ function photos_content(&$a) { } } - $tpl = get_markup_template('photos_recent.tpl'); - $o .= replace_macros($tpl, array( - '$title' => t('Recent Photos'), - '$can_post' => $can_post, - '$upload' => array(t('Upload New Photos'), $a->get_baseurl().'/photos/'.$a->data['channel']['channel_address'].'/upload'), - '$photos' => $photos, - )); + if($_REQUEST['aj']) { + if($photos) { + $o = replace_macros(get_markup_template('photosajax.tpl'),array( + '$photos' => $photos + )); + } + else { + $o = '
    '; + } + echo $o; + killme(); + } + else { + $o .= ""; + $tpl = get_markup_template('photos_recent.tpl'); + $o .= replace_macros($tpl, array( + '$title' => t('Recent Photos'), + '$can_post' => $can_post, + '$upload' => array(t('Upload New Photos'), $a->get_baseurl().'/photos/'.$a->data['channel']['channel_address'].'/upload'), + '$photos' => $photos, + )); - - $o .= paginate($a); + } + + if((! $photos) && ($_REQUEST['aj'])) { + $o .= '
    '; + echo $o; + killme(); + } + +// $o .= paginate($a); return $o; } diff --git a/version.inc b/version.inc index 047aea03d..edded63aa 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-09-05.789 +2014-09-06.790 diff --git a/view/js/main.js b/view/js/main.js index b5b77d473..c31e6231a 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -689,7 +689,7 @@ function updateConvItems(mode,data) { bParam_page = 1; } - update_url = baseurl + '/directory/?f=&aj=1&page=' + bParam_page; + update_url = baseurl + '/' + page_query + '/?f=&aj=1&page=' + bParam_page + extra_args ; $("#page-spinner").spin('small'); update_mode = 'append'; diff --git a/view/js/mod_events.js b/view/js/mod_events.js new file mode 100644 index 000000000..0ce128fcc --- /dev/null +++ b/view/js/mod_events.js @@ -0,0 +1,37 @@ + +$(document).ready( function() { showHideFinishDate(); }); + +function showHideFinishDate() { + if( $('#event-nofinish-checkbox').is(':checked')) + $('#event-finish-wrapper').hide(); + else + $('#event-finish-wrapper').show(); +} + + + + function eventGetStart() { + //reply = prompt("{{$expirewhen}}", $('#jot-expire').val()); + $('#startModal').modal(); + $('#start-modal-OKButton').on('click', function() { + reply=$('#start-date').val(); + if(reply && reply.length) { + $('#start-text').val(reply); + $('#startModal').modal('hide'); + } + }) + + + } + function eventGetFinish() { + //reply = prompt("{{$expirewhen}}", $('#jot-expire').val()); + $('#finishModal').modal(); + $('#finish-modal-OKButton').on('click', function() { + reply=$('#finish-date').val(); + if(reply && reply.length) { + $('#finish-text').val(reply); + $('#finishModal').modal('hide'); + } + }) + + } diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 43a22a017..9be1b12a7 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -7,5 +7,8 @@ {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} +
    + +
    diff --git a/view/tpl/photosajax.tpl b/view/tpl/photosajax.tpl new file mode 100755 index 000000000..a88682e8b --- /dev/null +++ b/view/tpl/photosajax.tpl @@ -0,0 +1,4 @@ + +{{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} +{{/foreach}} -- cgit v1.2.3 From b9f221637bc98cc64bcbc6becb4ffa4a2706cb87 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 6 Sep 2014 00:48:00 -0700 Subject: and more ajax work --- mod/directory.php | 2 +- mod/photos.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mod/directory.php b/mod/directory.php index c2a71b680..d6dc8627c 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -216,7 +216,7 @@ function directory_content(&$a) { } else { - $o .= ""; + $o .= ""; $o .= replace_macros($tpl, array( '$search' => $search, '$desc' => t('Find'), diff --git a/mod/photos.php b/mod/photos.php index 3bc105ba1..5618ae4e6 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -730,7 +730,7 @@ function photos_content(&$a) { $rel=("photo"); // } - $o .= ""; + $o .= ""; $tmp = replace_macros($tpl,array( '$id' => $rr['id'], @@ -1223,7 +1223,7 @@ function photos_content(&$a) { killme(); } else { - $o .= ""; + $o .= ""; $tpl = get_markup_template('photos_recent.tpl'); $o .= replace_macros($tpl, array( '$title' => t('Recent Photos'), -- cgit v1.2.3 From 8cbeeb09da93c3e6515f532c4e42ca558538ef5d Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 6 Sep 2014 03:11:07 -0700 Subject: extra_query_args() restricted to $_GET only. $_REQUEST was adding cookies and this is undesired and potentially a security issue. --- include/text.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/include/text.php b/include/text.php index 4fe9f9cde..097b02bbc 100644 --- a/include/text.php +++ b/include/text.php @@ -2033,13 +2033,14 @@ function normalise_openid($s) { return trim(str_replace(array('http://','https://'),array('',''),$s),'/'); } -// used in ajax endless scroll request to find out all the args that the master page was viewing - +// used in ajax endless scroll request to find out all the args that the master page was viewing. +// This was using $_REQUEST, but $_REQUEST also contains all your cookies. So we're restricting it +// to $_GET. If this is used in a post handler, that decision may need to be considered. function extra_query_args() { $s = ''; - if(count($_REQUEST)) { - foreach($_REQUEST as $k => $v) { + if(count($_GET)) { + foreach($_GET as $k => $v) { // these are request vars we don't want to duplicate if(! in_array($k, array('q','f','zid','page','PHPSESSID'))) { $s .= '&' . $k . '=' . $v; -- cgit v1.2.3 From b6d1ff3d8f20b146a86adbee5571ffbfa4ff610e Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 6 Sep 2014 05:22:30 -0700 Subject: hook photos scroll to page down --- view/js/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/js/main.js b/view/js/main.js index c31e6231a..8c4fcdc13 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -285,7 +285,7 @@ scroll_next = true; loadingPage = true; - if($('.directory-end').length == 0) + if(($('.directory-end').length == 0) && ($('.photos-end').length == 0)) liveUpdate(); else pageUpdate(); -- cgit v1.2.3 From 3cff9c55ba2afa374cc3cdeecfc3384b3001e527 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 6 Sep 2014 15:11:56 -0700 Subject: support the recent (2 years ago) changes to diaspora photo embeds --- include/diaspora.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/diaspora.php b/include/diaspora.php index 0b598ffb2..3053f7274 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -805,6 +805,12 @@ function diaspora_post($importer,$xml,$msg) { $body = diaspora2bb($xml->raw_message); + if($xml->photo) { + $body = '[img]' . $xml->photo->remote_photo_path . $xml->photo->remote_photo_name . '[/img]' . "\n\n" . $body; + $body = scale_external_images($body); + } + + //WTF? FIXME // Add OEmbed and other information to the body // $body = add_page_info_to_body($body, false, true); -- cgit v1.2.3 From 11b5ec7ec8bc6492f63ffe2be92ecb5e97fed800 Mon Sep 17 00:00:00 2001 From: Jeroen Date: Sun, 7 Sep 2014 21:46:20 +0000 Subject: Added abook-changed background colour to dark schema --- view/theme/redbasic/css/style.css | 4 ++++ view/theme/redbasic/php/style.php | 3 +++ view/theme/redbasic/schema/dark.php | 12 +++++++----- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index bcbaec3d0..4062c259c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2184,6 +2184,10 @@ img.mail-list-sender-photo { background-color: $abookself_bgcolour; } +.abook-pending-contact, .abook-permschange { + background: $abook_changebg; +} + .online-now { color: red; cursor: pointer; diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 4ffdcbef8..dbe7c306d 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -276,6 +276,8 @@ if(! $a->install) { $dirpopup_txtcol=""; if (!$dirpopup_linkcol) $dirpopup_linkcol=""; + if (!$abook_changebg) + $abook_changebg="orange"; if($nav_min_opacity === false || $nav_min_opacity === '') { $nav_float_min_opacity = 1.0; @@ -400,6 +402,7 @@ $options = array ( '$admintable_hoverbgcol' => $admintable_hoverbgcol, '$dirpopup_txtcol' => $dirpopup_txtcol, '$dirpopup_linkcol' => $dirpopup_linkcol, +'$abook_changebg' => $abook_changebg, ); echo str_replace(array_keys($options), array_values($options), $x); diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 69fcf403f..a4b43b31e 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -154,15 +154,15 @@ $abookself_bgcolour = "#251111"; if(! $infomess_bgcolour) $infomess_bgcolour = "#333"; - if(! $advperm_bgcolour) + if(! $advperm_bgcolour) $advperm_bgcolour = "#1E1E1E"; - if(! $advperm_bordercol) + if(! $advperm_bordercol) $advperm_bordercol = "#222"; - if(! $advperm_gradientcol) + if(! $advperm_gradientcol) $advperm_gradientcol = "#111"; - if(! $cal_bgcolour) + if(! $cal_bgcolour) $cal_bgcolour = "#333"; - if(! $fancybox_bgcolour) + if(! $fancybox_bgcolour) $fancybox_bgcolour = "#1E1E1E"; if (!$admintable_hoverbgcol) $admintable_hoverbgcol="#222"; @@ -170,3 +170,5 @@ $dirpopup_txtcol="#111"; if (!$dirpopup_linkcol) $dirpopup_linkcol="#000"; + if (!$abook_changebg) + $abook_changebg="#402900"; -- cgit v1.2.3 From 4faeebddb22095509149ecd37b548e8ac9151d59 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 7 Sep 2014 17:13:44 -0700 Subject: Diaspora actually puts the account full name into the "nickname" field of the vcard. They don't put the nickname into the vcard at all. One wonders why even have a nickname field since the fullname is already presented in the next line. This hasn't caused us a problem with Friendica because I'm guessing nobody actually uses this line, though the number of class tags on it makes it seem somewhat important. --- version.inc | 2 +- view/tpl/diaspora_vcard.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/version.inc b/version.inc index edded63aa..45852255c 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-09-06.790 +2014-09-07.791 diff --git a/view/tpl/diaspora_vcard.tpl b/view/tpl/diaspora_vcard.tpl index 9d234a398..f9dac9306 100644 --- a/view/tpl/diaspora_vcard.tpl +++ b/view/tpl/diaspora_vcard.tpl @@ -2,7 +2,7 @@
    Nickname
    - {{$diaspora.nickname}} + {{$diaspora.fullname}}
    -- cgit v1.2.3 From 75fc3a8cebbf727b708ae164e0f4208cb3072b95 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 7 Sep 2014 19:16:48 -0700 Subject: for webpages, hide the mimetype selector unless in advanced mode. For pages that endless scroll and show blocky-block things, set the default items-per-page to 60. Why? It fits column-widths of 2,3,4,5,6,10,12,15, and 20 without leaving remaindered items dangling at the end. No other setting less than 100 has this much versatility. --- mod/directory.php | 2 +- mod/dirsearch.php | 4 ++-- mod/photos.php | 4 ++-- mod/webpages.php | 13 +++++++++---- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/mod/directory.php b/mod/directory.php index d6dc8627c..3d7632ec0 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -5,7 +5,7 @@ require_once('include/widgets.php'); function directory_init(&$a) { - $a->set_pager_itemspage(80); + $a->set_pager_itemspage(60); } diff --git a/mod/dirsearch.php b/mod/dirsearch.php index e292553ad..d8f611e6a 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -4,7 +4,7 @@ require_once('include/dir_fns.php'); function dirsearch_init(&$a) { - $a->set_pager_itemspage(80); + $a->set_pager_itemspage(60); } @@ -122,7 +122,7 @@ function dirsearch_content(&$a) { } - $perpage = (($_REQUEST['n']) ? $_REQUEST['n'] : 80); + $perpage = (($_REQUEST['n']) ? $_REQUEST['n'] : 60); $page = (($_REQUEST['p']) ? intval($_REQUEST['p'] - 1) : 0); $startrec = (($page+1) * $perpage) - $perpage; $limit = (($_REQUEST['limit']) ? intval($_REQUEST['limit']) : 0); diff --git a/mod/photos.php b/mod/photos.php index 5618ae4e6..70870a33a 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -635,7 +635,7 @@ function photos_content(&$a) { ); if(count($r)) { $a->set_pager_total(count($r)); - $a->set_pager_itemspage(40); + $a->set_pager_itemspage(60); } if($_GET['order'] === 'posted') @@ -1156,7 +1156,7 @@ function photos_content(&$a) { ); if(count($r)) { $a->set_pager_total(count($r)); - $a->set_pager_itemspage(20); + $a->set_pager_itemspage(60); } $r = q("SELECT `resource_id`, `id`, `filename`, type, `album`, max(`scale`) AS `scale` FROM `photo` diff --git a/mod/webpages.php b/mod/webpages.php index bfa2ebd7d..1b906a97f 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -46,11 +46,16 @@ function webpages_content(&$a) { // } - $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_config('system','page_mimetype')); - if(! $mimetype) - $mimetype = 'choose'; + if(feature_enabled($owner,'expert_mode')) { + $mimetype = (($_REQUEST['mimetype']) ? $_REQUEST['mimetype'] : get_pconfig($owner,'system','page_mimetype')); + if(! $mimetype) + $mimetype = 'choose'; + } + else { + $mimetype = 'text/bbcode'; + } - $layout = (($_REQUEST['layout']) ? $_REQUEST['layout'] : get_config('system','page_layout')); + $layout = (($_REQUEST['layout']) ? $_REQUEST['layout'] : get_pconfig($owner,'system','page_layout')); if(! $layout) $layout = 'choose'; -- cgit v1.2.3 From 9d03f635119b69c9ed1865b77ae397488d1dd599 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 7 Sep 2014 20:05:38 -0700 Subject: set the default items-per-page for the entire app to 60 --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 0c2cfafbf..941d6f6f3 100755 --- a/boot.php +++ b/boot.php @@ -807,7 +807,7 @@ class App { */ $this->pager['page'] = ((x($_GET,'page') && intval($_GET['page']) > 0) ? intval($_GET['page']) : 1); - $this->pager['itemspage'] = 50; + $this->pager['itemspage'] = 60; $this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage']; if($this->pager['start'] < 0) $this->pager['start'] = 0; -- cgit v1.2.3 From ed847a91f6f8221bc13523574baf4ab7b3cf430a Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 7 Sep 2014 22:14:28 -0700 Subject: add categories to events --- include/event.php | 24 +++++++++++++++++++++++ mod/events.php | 51 ++++++++++++++++++++++++++++++++++++++++++++++++- view/css/mod_events.css | 14 ++++++++++++++ view/tpl/event_form.tpl | 4 +--- 4 files changed, 89 insertions(+), 4 deletions(-) diff --git a/include/event.php b/include/event.php index 0c29d26f6..1fe6e6f7f 100644 --- a/include/event.php +++ b/include/event.php @@ -374,6 +374,26 @@ function event_store_item($arr,$event) { intval($arr['uid']) ); + + $s = q("delete from term where oid = %d and otype = %d", + intval($r[0]['id']), + intval(TERM_OBJ_POST) + ); + + if(($arr['term']) && (is_array($arr['term']))) { + foreach($arr['term'] as $t) { + q("insert into term (uid,oid,otype,type,term,url) + values(%d,%d,%d,%d,'%s','%s') ", + intval($arr['uid']), + intval($r[0]['id']), + intval(TERM_OBJ_POST), + intval($t['type']), + dbesc($t['term']), + dbesc($t['url']) + ); + } + } + $item_id = $r[0]['id']; call_hooks('event_updated', $event['id']); return $item_id; @@ -424,6 +444,10 @@ function event_store_item($arr,$event) { $item_arr['item_private'] = $private; $item_arr['verb'] = ACTIVITY_POST; + + if(array_key_exists('term',$arr)) + $item_arr['term'] = $arr['term']; + $item_arr['resource_type'] = 'event'; $item_arr['resource_id'] = $event['event_hash']; diff --git a/mod/events.php b/mod/events.php index e5250e8f8..195dcb0ff 100755 --- a/mod/events.php +++ b/mod/events.php @@ -33,6 +33,10 @@ function events_post(&$a) { $adjust = intval($_POST['adjust']); $nofinish = intval($_POST['nofinish']); + $categories = escape_tags(trim($_POST['category'])); + + + // only allow editing your own events. if(($xchan) && ($xchan !== get_observer_hash())) @@ -138,6 +142,22 @@ function events_post(&$a) { } } + $post_tags = array(); + $channel = $a->get_channel(); + + if(strlen($categories)) { + $cats = explode(',',$categories); + foreach($cats as $cat) { + $post_tags[] = array( + 'uid' => $profile_uid, + 'type' => TERM_CATEGORY, + 'otype' => TERM_OBJ_POST, + 'term' => trim($cat), + 'url' => $channel['xchan_url'] . '?f=&cat=' . urlencode(trim($cat)) + ); + } + } + $datarray = array(); $datarray['start'] = $start; $datarray['finish'] = $finish; @@ -160,6 +180,11 @@ function events_post(&$a) { $datarray['edited'] = $edited; $event = event_store_event($datarray); + + + if($post_tags) + $datarray['term'] = $post_tags; + $item_id = event_store_item($datarray,$event); if($share) @@ -485,6 +510,28 @@ function events_content(&$a) { if(! $f) $f = 'ymd'; + $catsenabled = feature_enabled(local_user(),'categories'); + + $category = ''; + + if($catsenabled && x($orig_event)){ + $itm = q("select * from item where resource_type = 'event' and resource_id = '%s' and uid = %d limit 1", + dbesc($orig_event['event_hash']), + intval(local_user()) + ); + $itm = fetch_post_tags($itm); + if($itm) { + $cats = get_terms_oftype($itm[0]['term'], TERM_CATEGORY); + foreach ($cats as $cat) { + if(strlen($category)) + $category .= ', '; + $category .= $cat['term']; + } + } + } + + + $dateformat = datesel_format($f); $timeformat = t('hour:minute'); @@ -509,7 +556,9 @@ function events_content(&$a) { '$title' => t('Event details'), '$format_desc' => sprintf( t('Format is %s %s.'),$dateformat,$timeformat), '$desc' => t('Starting date and Title are required.'), - + '$catsenabled' => $catsenabled, + '$placeholdercategory' => t('Categories (comma-separated list)'), + '$category' => $category, '$s_text' => t('Event Starts:') . ' *', '$bootstrap' => 1, '$stext' => $stext, diff --git a/view/css/mod_events.css b/view/css/mod_events.css index 657eff082..0aef13aa6 100644 --- a/view/css/mod_events.css +++ b/view/css/mod_events.css @@ -1,3 +1,17 @@ #event-desc-textarea, #event-location-textarea { width: 400px; +} + +#event-summary { + width: 400px; +} + +.event-cats { + margin-top: 15px; + width: 400px; +} + +.required { + color: #ff0000; + font-size: 1.2rem; } \ No newline at end of file diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index 95ebe0351..af10e6c73 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -47,14 +47,12 @@ {{if $catsenabled}}
    - +
    {{/if}} - -
    {{$d_text}}
    -- cgit v1.2.3 From 715417c0e3ef51d0acf39a4a001656a07380eba4 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 8 Sep 2014 16:06:15 -0700 Subject: import_profile_photo array warnings --- include/items.php | 4 ++-- version.inc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/items.php b/include/items.php index 44d4abdf8..a0a19be1f 100755 --- a/include/items.php +++ b/include/items.php @@ -918,9 +918,9 @@ function import_author_rss($x) { dbesc(($name) ? $name : t('(Unknown)')), dbesc('rss') ); - if($r) { + if($r && $x['photo']) { - $photos = import_profile_photo($x['photo'],$x['url']); + $photos = import_profile_photo($x['photo']['src'],$x['url']); if($photos) { $r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_url = '%s' and xchan_network = 'rss' limit 1", diff --git a/version.inc b/version.inc index 45852255c..d04d03ce9 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-09-07.791 +2014-09-08.792 -- cgit v1.2.3 From b1254a71bc98cff230bbbba597da98cb96947cc6 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 8 Sep 2014 16:28:02 -0700 Subject: wrap photo albums (albums and top level) in a div id=photo-album-contents --- mod/photos.php | 5 ++++- view/tpl/photos_recent.tpl | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mod/photos.php b/mod/photos.php index 70870a33a..b1d105986 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -702,6 +702,9 @@ function photos_content(&$a) { $tpl = get_markup_template('photo_album.tpl'); if(count($r)) { $twist = 'rotright'; + $o .= ""; + $o .= '
    '; + foreach($r as $rr) { if($twist == 'rotright') @@ -730,7 +733,6 @@ function photos_content(&$a) { $rel=("photo"); // } - $o .= ""; $tmp = replace_macros($tpl,array( '$id' => $rr['id'], @@ -758,6 +760,7 @@ function photos_content(&$a) { } $o .= '
    '; + $o .= '
    '; // photo-album-contents $o .= '
    '; $o .= ''; $o .= '
    '; diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 9be1b12a7..386979de5 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -3,7 +3,7 @@ {{$upload.0}} {{/if}} -
    +
    {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} -- cgit v1.2.3 From 8fbeb370db7d1ec16a2f221fb7f022aebe7be109 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 8 Sep 2014 17:29:37 -0700 Subject: attempt to format diaspora reshares correctly. This might be an iterative process. --- include/diaspora.php | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 3053f7274..27843e4c7 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -939,23 +939,13 @@ function diaspora_reshare($importer,$xml,$msg) { } logger('diaspora_reshare: source: ' . $x['body']); - $x = str_replace(array('',''),array('',''),$x['body']); - $source_xml = parse_xml_string($x,false); - if(strlen($source_xml->post->asphoto->objectId) && ($source_xml->post->asphoto->objectId != 0) && ($source_xml->post->asphoto->image_url)) { - $body = '[url=' . notags(unxmlify($source_xml->post->asphoto->image_url)) . '][img]' . notags(unxmlify($source_xml->post->asphoto->objectId)) . '[/img][/url]' . "\n"; - $body = scale_external_images($body,false); - } - elseif($source_xml->post->asphoto->image_url) { - $body = '[img]' . notags(unxmlify($source_xml->post->asphoto->image_url)) . '[/img]' . "\n"; - $body = scale_external_images($body); - } - elseif($source_xml->post->status_message) { + if($source_xml->post->status_message) { $body = diaspora2bb($source_xml->post->status_message->raw_message); // Checking for embedded pictures - if($source_xml->post->status_message->photo->remote_photo_path AND + if($source_xml->post->status_message->photo->remote_photo_path && $source_xml->post->status_message->photo->remote_photo_name) { $remote_photo_path = notags(unxmlify($source_xml->post->status_message->photo->remote_photo_path)); @@ -985,12 +975,19 @@ function diaspora_reshare($importer,$xml,$msg) { $person = find_diaspora_person_by_handle($orig_author); - /*if(is_array($person) && x($person,'name') && x($person,'url')) - $details = '[url=' . $person['url'] . ']' . $person['name'] . '[/url]'; - else - $details = $orig_author; + if($person) { + $orig_author_name = $person['xchan_name']; + $orig_author_link = $person['xchan_url']; + $orig_author_photo = $person['xchan_photo_m']; + } - $prefix = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8') . $details . "\n";*/ + $newbody = "[share author='" . urlencode($orig_author_name) + . "' profile='" . $orig_author_link + . "' avatar='" . $orig_author_photo + . "' link='" . $orig_url + . "' posted='" . datetime_convert('UTC','UTC',unxmlify($sourcexml->post->status_message->created_at)) + . "' message_id='" . unxmlify($source_xml->post->status_message->guid) + . "]" . $body . "[/share]"; $created = unxmlify($xml->created_at); @@ -1000,7 +997,7 @@ function diaspora_reshare($importer,$xml,$msg) { $str_tags = ''; - $tags = get_tags($body); + $tags = get_tags($newbody); if(count($tags)) { @@ -1014,13 +1011,13 @@ function diaspora_reshare($importer,$xml,$msg) { // don't link tags that are already embedded in links - if(preg_match('/\[(.*?)' . preg_quote($tag,'/') . '(.*?)\]/',$body)) + if(preg_match('/\[(.*?)' . preg_quote($tag,'/') . '(.*?)\]/',$newbody)) continue; - if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag,'/') . '(.*?)\)/',$body)) + if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag,'/') . '(.*?)\)/',$newbody)) continue; $basetag = str_replace('_',' ',substr($tag,1)); - $body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body); + $newbody = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$newbody); $datarray['term'][] = array( 'uid' => $importer['channel_id'], @@ -1033,7 +1030,7 @@ function diaspora_reshare($importer,$xml,$msg) { } } - $cnt = preg_match_all('/@\[url=(.*?)\](.*?)\[\/url\]/ism',$body,$matches,PREG_SET_ORDER); + $cnt = preg_match_all('/@\[url=(.*?)\](.*?)\[\/url\]/ism',$newbody,$matches,PREG_SET_ORDER); if($cnt) { foreach($matches as $mtch) { $datarray['term'][] = array( @@ -1055,9 +1052,9 @@ function diaspora_reshare($importer,$xml,$msg) { $datarray['item_private'] = $private; $datarray['plink'] = $plink; $datarray['owner_xchan'] = $contact['xchan_hash']; - $datarray['author_xchan'] = $person['xchan_hash']; + $datarray['author_xchan'] = $contact['xchan_hash']; - $datarray['body'] = $body; + $datarray['body'] = $newbody; $datarray['app'] = 'Diaspora'; -- cgit v1.2.3 From c6d07feff575862b5db8d05e02be6375e51034c7 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 8 Sep 2014 20:35:15 -0700 Subject: This is long overdue - use a symblic constant NULL_DATE instead of the easily mis-typed sequence '0000-00-00 00:00:00' --- boot.php | 6 +++--- include/ItemObject.php | 2 +- include/account.php | 7 ++++--- include/conversation.php | 2 +- include/datetime.php | 2 +- include/diaspora.php | 2 +- include/dir_fns.php | 4 ++-- include/externals.php | 2 +- include/identity.php | 2 +- include/items.php | 28 ++++++++++++++-------------- include/message.php | 2 +- include/onepoll.php | 2 +- include/poller.php | 10 +++++----- include/zot.php | 2 +- mod/events.php | 2 +- mod/feed.php | 2 +- mod/import.php | 2 +- mod/item.php | 4 ++-- mod/mail.php | 2 +- mod/profiles.php | 4 ++-- mod/removeaccount.php | 2 +- mod/removeme.php | 2 +- 22 files changed, 47 insertions(+), 46 deletions(-) diff --git a/boot.php b/boot.php index 941d6f6f3..4223a57f3 100755 --- a/boot.php +++ b/boot.php @@ -50,9 +50,9 @@ define ( 'ZOT_REVISION', 1 ); define ( 'DB_UPDATE_VERSION', 1129 ); -define ( 'EOL', '
    ' . "\r\n" ); -define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); - +define ( 'EOL', '
    ' . "\r\n" ); +define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); +define ( 'NULL_DATE', '0000-00-00 00:00:00' ); define ( 'TEMPLATE_BUILD_PATH', 'store/[data]/smarty3' ); define ( 'DIRECTORY_MODE_NORMAL', 0x0000); // This is technically DIRECTORY_MODE_TERTIARY, but it's the default, hence 0x0000 diff --git a/include/ItemObject.php b/include/ItemObject.php index b4a60762b..451e369b0 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -256,7 +256,7 @@ class Item extends BaseObject { 'isotime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'c'), 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'), 'editedtime' => (($item['edited'] != $item['created']) ? sprintf( t('last edited: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r')) : ''), - 'expiretime' => (($item['expires'] !== '0000-00-00 00:00:00') ? sprintf( t('Expires: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['expires'], 'r')):''), + 'expiretime' => (($item['expires'] !== NULL_DATE) ? sprintf( t('Expires: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['expires'], 'r')):''), 'lock' => $lock, 'verified' => $verified, 'unverified' => $unverified, diff --git a/include/account.php b/include/account.php index 6cc203dc8..9b4dc409c 100644 --- a/include/account.php +++ b/include/account.php @@ -108,7 +108,7 @@ function create_account($arr) { $parent = ((x($arr,'parent')) ? intval($arr['parent']) : 0 ); $flags = ((x($arr,'account_flags')) ? intval($arr['account_flags']) : ACCOUNT_OK); $roles = ((x($arr,'account_roles')) ? intval($arr['account_roles']) : 0 ); - $expires = ((x($arr,'expires')) ? intval($arr['expires']) : '0000-00-00 00:00:00'); + $expires = ((x($arr,'expires')) ? intval($arr['expires']) : NULL_DATE); $default_service_class = get_config('system','default_service_class'); @@ -511,8 +511,9 @@ function user_approve($hash) { function downgrade_accounts() { $r = q("select * from account where not ( account_flags & %d ) - and account_expires != '0000-00-00 00:00:00' + and account_expires != '%s' and account_expires < UTC_TIMESTAMP() ", + dbesc(NULL_DATE), intval(ACCOUNT_EXPIRED) ); @@ -528,7 +529,7 @@ function downgrade_accounts() { $x = q("UPDATE account set account_service_class = '%s', account_expires = '%s' where account_id = %d limit 1", dbesc($basic), - dbesc('0000-00-00 00:00:00'), + dbesc(NULL_DATE), intval($rr['account_id']) ); $ret = array('account' => $rr); diff --git a/include/conversation.php b/include/conversation.php index c346a204c..05ae72d61 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -707,7 +707,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ 'isotime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'c'), 'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'), 'editedtime' => (($item['edited'] != $item['created']) ? sprintf( t('last edited: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['edited'], 'r')) : ''), - 'expiretime' => (($item['expires'] !== '0000-00-00 00:00:00') ? sprintf( t('Expires: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['expires'], 'r')):''), + 'expiretime' => (($item['expires'] !== NULL_DATE) ? sprintf( t('Expires: %s'), datetime_convert('UTC', date_default_timezone_get(), $item['expires'], 'r')):''), 'location' => $location, 'indent' => '', 'owner_name' => $owner_name, diff --git a/include/datetime.php b/include/datetime.php index 0214b9e4c..84ab1e2fa 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -271,7 +271,7 @@ function relative_date($posted_date,$format = null) { $abs = strtotime($localtime); - if (is_null($posted_date) || $posted_date === '0000-00-00 00:00:00' || $abs === False) { + if (is_null($posted_date) || $posted_date === NULL_DATE || $abs === False) { return t('never'); } diff --git a/include/diaspora.php b/include/diaspora.php index 27843e4c7..0d797d915 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -700,7 +700,7 @@ function diaspora_request($importer,$xml) { dbesc(datetime_convert()), dbesc(datetime_convert()), dbesc(datetime_convert()), - dbesc('0000-00-00 00:00:00'), + dbesc(NULL_DATE), intval(($default_perms) ? 0 : ABOOK_FLAG_PENDING) ); diff --git a/include/dir_fns.php b/include/dir_fns.php index 5fad6567e..f58e7c307 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -107,7 +107,7 @@ function sync_directories($dirmode) { $r = array( 'site_url' => DIRECTORY_FALLBACK_MASTER, 'site_flags' => DIRECTORY_MODE_PRIMARY, - 'site_update' => '0000-00-00 00:00:00', + 'site_update' => NULL_DATE, 'site_directory' => DIRECTORY_FALLBACK_MASTER . '/dirsearch', 'site_realm' => DIRECTORY_REALM ); @@ -137,7 +137,7 @@ function sync_directories($dirmode) { // for brand new directory servers, only load the last couple of days. Everything before that will be repeats. - $syncdate = (($rr['site_sync'] === '0000-00-00 00:00:00') ? datetime_convert('UTC','UTC','now - 2 days') : $rr['site_sync']); + $syncdate = (($rr['site_sync'] === NULL_DATE) ? datetime_convert('UTC','UTC','now - 2 days') : $rr['site_sync']); $x = z_fetch_url($rr['site_directory'] . '?f=&sync=' . urlencode($syncdate)); if(! $x['success']) diff --git a/include/externals.php b/include/externals.php index ad2c71ac9..acfaae3b6 100644 --- a/include/externals.php +++ b/include/externals.php @@ -60,7 +60,7 @@ function externals_run($argv, $argc){ } if($url) { - if($r[0]['site_pull'] !== '0000-00-00 00:00:00') + if($r[0]['site_pull'] !== NULL_DATE) $mindate = urlencode(datetime_convert('','',$r[0]['site_pull'] . ' - 1 day')); else { $days = get_config('externals','since_days'); diff --git a/include/identity.php b/include/identity.php index 282d323be..d8f59e56c 100644 --- a/include/identity.php +++ b/include/identity.php @@ -1042,7 +1042,7 @@ function advanced_profile(&$a) { if($a->profile['with']) $profile['marital']['with'] = bbcode($a->profile['with']); - if(strlen($a->profile['howlong']) && $a->profile['howlong'] !== '0000-00-00 00:00:00') { + if(strlen($a->profile['howlong']) && $a->profile['howlong'] !== NULL_DATE) { $profile['howlong'] = relative_date($a->profile['howlong'], t('for %1$d %2$s')); } diff --git a/include/items.php b/include/items.php index a0a19be1f..b93bf05ee 100755 --- a/include/items.php +++ b/include/items.php @@ -144,7 +144,7 @@ function filter_insecure($channel_id,$arr) { function comments_are_now_closed($item) { - if($item['comments_closed'] !== '0000-00-00 00:00:00') { + if($item['comments_closed'] !== NULL_DATE) { $d = datetime_convert(); if($d > $item['comments_closed']) return true; @@ -448,7 +448,7 @@ function post_activity_item($arr) { function get_public_feed($channel,$params) { $type = 'xml'; - $begin = '0000-00-00 00:00:00'; + $begin = NULL_DATE; $end = ''; $start = 0; $records = 40; @@ -459,7 +459,7 @@ function get_public_feed($channel,$params) { $params = array(); $params['type'] = ((x($params,'type')) ? $params['type'] : 'xml'); - $params['begin'] = ((x($params,'begin')) ? $params['begin'] : '0000-00-00 00:00:00'); + $params['begin'] = ((x($params,'begin')) ? $params['begin'] : NULL_DATE); $params['end'] = ((x($params,'end')) ? $params['end'] : datetime_convert('UTC','UTC','now')); $params['start'] = ((x($params,'start')) ? $params['start'] : 0); $params['records'] = ((x($params,'records')) ? $params['records'] : 40); @@ -758,14 +758,14 @@ function get_item_elements($x) { $arr['expires'] = ((x($x,'expires') && $x['expires']) ? datetime_convert('UTC','UTC',$x['expires']) - : '0000-00-00 00:00:00'); + : NULL_DATE); $arr['commented'] = ((x($x,'commented') && $x['commented']) ? datetime_convert('UTC','UTC',$x['commented']) : $arr['created']); $arr['comments_closed'] = ((x($x,'comments_closed') && $x['comments_closed']) ? datetime_convert('UTC','UTC',$x['comments_closed']) - : '0000-00-00 00:00:00'); + : NULL_DATE); $arr['title'] = (($x['title']) ? htmlspecialchars($x['title'], ENT_COMPAT,'UTF-8',false) : ''); @@ -1003,7 +1003,7 @@ function encode_item($item) { if($y = encode_item_flags($item)) $x['flags'] = $y; - if($item['comments_closed'] !== '0000-00-00 00:00:00') + if($item['comments_closed'] !== NULL_DATE) $x['comments_closed'] = $item['comments_closed']; $x['public_scope'] = $scope; @@ -1242,8 +1242,8 @@ function get_mail_elements($x) { $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')) - $arr['expires'] = '0000-00-00 00:00:00'; + if((! array_key_exists('expires',$x)) || ($x['expires'] === NULL_DATE)) + $arr['expires'] = NULL_DATE; else $arr['expires'] = datetime_convert('UTC','UTC',$x['expires']); @@ -1839,9 +1839,9 @@ 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['expires'] = ((x($arr,'expires') !== false) ? datetime_convert('UTC','UTC',$arr['expires']) : NULL_DATE); $arr['commented'] = ((x($arr,'commented') !== false) ? datetime_convert('UTC','UTC',$arr['commented']) : datetime_convert()); - $arr['comments_closed'] = ((x($arr,'comments_closed') !== false) ? datetime_convert('UTC','UTC',$arr['comments_closed']) : '0000-00-00 00:00:00'); + $arr['comments_closed'] = ((x($arr,'comments_closed') !== false) ? datetime_convert('UTC','UTC',$arr['comments_closed']) : NULL_DATE); $arr['received'] = datetime_convert(); $arr['changed'] = datetime_convert(); @@ -2248,7 +2248,7 @@ function item_store_update($arr,$allow_exec = false) { $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']) : $orig[0]['expires']); - if(array_key_exists('comments_closed',$arr) && $arr['comments_closed'] != '0000-00-00 00:00:00') + if(array_key_exists('comments_closed',$arr) && $arr['comments_closed'] != NULL_DATE) $arr['comments_closed'] = datetime_convert('UTC','UTC',$arr['comments_closed']); else $arr['comments_closed'] = $orig[0]['comments_closed']; @@ -3018,7 +3018,7 @@ function mail_store($arr) { $arr['from_xchan'] = ((x($arr,'from_xchan')) ? notags(trim($arr['from_xchan'])) : ''); $arr['to_xchan'] = ((x($arr,'to_xchan')) ? notags(trim($arr['to_xchan'])) : ''); $arr['created'] = ((x($arr,'created') !== false) ? datetime_convert('UTC','UTC',$arr['created']) : datetime_convert()); - $arr['expires'] = ((x($arr,'expires') !== false) ? datetime_convert('UTC','UTC',$arr['expires']) : '0000-00-00 00:00:00'); + $arr['expires'] = ((x($arr,'expires') !== false) ? datetime_convert('UTC','UTC',$arr['expires']) : NULL_DATE); $arr['title'] = ((x($arr,'title')) ? notags(trim($arr['title'])) : ''); $arr['parent_mid'] = ((x($arr,'parent_mid')) ? notags(trim($arr['parent_mid'])) : ''); $arr['body'] = ((x($arr,'body')) ? trim($arr['body']) : ''); @@ -4076,7 +4076,7 @@ function zot_feed($uid,$observer_xchan,$mindate) { $result = array(); $mindate = datetime_convert('UTC','UTC',$mindate); if(! $mindate) - $mindate = '0000-00-00 00:00:00'; + $mindate = NULL_DATE; $mindate = dbesc($mindate); @@ -4092,7 +4092,7 @@ function zot_feed($uid,$observer_xchan,$mindate) { $sql_extra = item_permissions_sql($uid); } - if($mindate != '0000-00-00 00:00:00') { + if($mindate != NULL_DATE) { $sql_extra .= " and ( created > '$mindate' or edited > '$mindate' ) "; $limit = ""; } diff --git a/include/message.php b/include/message.php index 607166ec9..96c3532c1 100644 --- a/include/message.php +++ b/include/message.php @@ -23,7 +23,7 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto=' $subject = t('[no subject]'); // if(! $expires) -// $expires = '0000-00-00 00:00:00'; +// $expires = NULL_DATE; // else // $expires = datetime_convert(date_default_timezone_get(),'UTC',$expires); diff --git a/include/onepoll.php b/include/onepoll.php index d64785f92..1f28852e9 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -67,7 +67,7 @@ function onepoll_run($argv, $argc){ logger("onepoll: poll: ({$contact['id']}) IMPORTER: {$importer['xchan_name']}, CONTACT: {$contact['xchan_name']}"); - $last_update = ((($contact['abook_updated'] === $contact['abook_created']) || ($contact['abook_updated'] === '0000-00-00 00:00:00')) + $last_update = ((($contact['abook_updated'] === $contact['abook_created']) || ($contact['abook_updated'] === NULL_DATE)) ? datetime_convert('UTC','UTC','now - 7 days') : datetime_convert('UTC','UTC',$contact['abook_updated'] . ' - 2 days') ); diff --git a/include/poller.php b/include/poller.php index b26b9e696..fe242d659 100644 --- a/include/poller.php +++ b/include/poller.php @@ -35,11 +35,11 @@ function poller_run($argv, $argc){ // expire any expired mail - q("delete from mail where expires != '0000-00-00 00:00:00' and expires < UTC_TIMESTAMP() "); + q("delete from mail where expires != NULL_DATE and expires < UTC_TIMESTAMP() "); // expire any expired items - $r = q("select id from item where expires != '0000-00-00 00:00:00' and expires < UTC_TIMESTAMP() + $r = q("select id from item where expires != NULL_DATE and expires < UTC_TIMESTAMP() and not ( item_restrict & %d ) ", intval(ITEM_DELETED) ); @@ -285,7 +285,7 @@ function poller_run($argv, $argc){ else { // if we've never connected with them, start the mark for death countdown from now - if($c == '0000-00-00 00:00:00') { + if($c == NULL_DATE) { $r = q("update abook set abook_connected = '%s' where abook_id = %d limit 1", dbesc(datetime_convert()), intval($contact['abook_id']) @@ -338,7 +338,7 @@ function poller_run($argv, $argc){ } if($dirmode == DIRECTORY_MODE_SECONDARY || $dirmode == DIRECTORY_MODE_PRIMARY) { - $r = q("select distinct ud_addr, updates.* from updates where not ( ud_flags & %d ) and ud_addr != '' and ( ud_last = '0000-00-00 00:00:00' OR ud_last > UTC_TIMESTAMP() - INTERVAL 7 DAY ) group by ud_addr ", + $r = q("select distinct ud_addr, updates.* from updates where not ( ud_flags & %d ) and ud_addr != '' and ( ud_last = NULL_DATE OR ud_last > UTC_TIMESTAMP() - INTERVAL 7 DAY ) group by ud_addr ", intval(UPDATE_FLAGS_UPDATED) ); if($r) { @@ -347,7 +347,7 @@ function poller_run($argv, $argc){ // If they didn't respond when we attempted before, back off to once a day // After 7 days we won't bother anymore - if($rr['ud_last'] != '0000-00-00 00:00:00') + if($rr['ud_last'] != NULL_DATE) if($rr['ud_last'] > datetime_convert('UTC','UTC', 'now - 1 day')) continue; proc_run('php','include/onedirsync.php',$rr['ud_id']); diff --git a/include/zot.php b/include/zot.php index a53b39663..f5099df8c 100644 --- a/include/zot.php +++ b/include/zot.php @@ -384,7 +384,7 @@ function zot_refresh($them,$channel = null, $force = false) { $next_birthday = datetime_convert('UTC','UTC',$j['profile']['next_birthday']); } else { - $next_birthday = '0000-00-00 00:00:00'; + $next_birthday = NULL_DATE; } if($r) { diff --git a/mod/events.php b/mod/events.php index 195dcb0ff..c80d1dd39 100755 --- a/mod/events.php +++ b/mod/events.php @@ -53,7 +53,7 @@ function events_post(&$a) { } if($nofinish) { - $finish = '0000-00-00 00:00:00'; + $finish = NULL_DATE; } if($finish_text) { diff --git a/mod/feed.php b/mod/feed.php index fdbe4db8c..776f9787f 100644 --- a/mod/feed.php +++ b/mod/feed.php @@ -7,7 +7,7 @@ function feed_init(&$a) { $params = array(); - $params['begin'] = ((x($_REQUEST,'date_begin')) ? $_REQUEST['date_begin'] : '0000-00-00 00:00:00'); + $params['begin'] = ((x($_REQUEST,'date_begin')) ? $_REQUEST['date_begin'] : NULL_DATE); $params['end'] = ((x($_REQUEST,'date_end')) ? $_REQUEST['date_end'] : ''); $params['type'] = ((stristr(argv(0),'json')) ? 'json' : 'xml'); $params['pages'] = ((x($_REQUEST,'pages')) ? intval($_REQUEST['pages']) : 0); diff --git a/mod/import.php b/mod/import.php index e732c3c06..7452bcdc9 100644 --- a/mod/import.php +++ b/mod/import.php @@ -256,7 +256,7 @@ function import_post(&$a) { require_once('include/photo/photo_driver.php'); $photos = import_profile_photo($xchan['xchan_photo_l'],$xchan['xchan_hash']); if($photos[4]) - $photodate = '0000-00-00 00:00:00'; + $photodate = NULL_DATE; else $photodate = $xchan['xchan_photo_date']; diff --git a/mod/item.php b/mod/item.php index 9338cf401..23d39a62c 100644 --- a/mod/item.php +++ b/mod/item.php @@ -384,13 +384,13 @@ function item_post(&$a) { } - $expires = '0000-00-00 00:00:00'; + $expires = NULL_DATE; if(feature_enabled($profile_uid,'content_expire')) { if(x($_REQUEST,'expire')) { $expires = datetime_convert(date_default_timezone_get(),'UTC', $_REQUEST['expire']); if($expires <= datetime_convert()) - $expires = '0000-00-00 00:00:00'; + $expires = NULL_DATE; } } diff --git a/mod/mail.php b/mod/mail.php index b7297443c..d6d802fe7 100644 --- a/mod/mail.php +++ b/mod/mail.php @@ -17,7 +17,7 @@ function mail_post(&$a) { $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'); + $expires = ((x($_REQUEST,'expires')) ? datetime_convert(date_default_timezone_get(),'UTC', $_REQUEST['expires']) : NULL_DATE); // 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 diff --git a/mod/profiles.php b/mod/profiles.php index 6361f56a3..063e714e7 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -304,7 +304,7 @@ function profiles_post(&$a) { $with = ((x($_POST,'with')) ? escape_tags(trim($_POST['with'])) : ''); if(! strlen($howlong)) - $howlong = '0000-00-00 00:00:00'; + $howlong = NULL_DATE; else $howlong = datetime_convert(date_default_timezone_get(),'UTC',$howlong); @@ -707,7 +707,7 @@ logger('extra_fields: ' . print_r($extra_fields,true)); '$marital' => marital_selector($r[0]['marital']), '$marital_min' => marital_selector_min($r[0]['marital']), '$with' => $r[0]['with'], - '$howlong' => ($r[0]['howlong'] === '0000-00-00 00:00:00' ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong'])), + '$howlong' => ($r[0]['howlong'] === NULL_DATE ? '' : datetime_convert('UTC',date_default_timezone_get(),$r[0]['howlong'])), '$sexual' => sexpref_selector($r[0]['sexual']), '$sexual_min' => sexpref_selector_min($r[0]['sexual']), '$about' => $r[0]['about'], diff --git a/mod/removeaccount.php b/mod/removeaccount.php index 1f9dbcafa..70979c07d 100644 --- a/mod/removeaccount.php +++ b/mod/removeaccount.php @@ -24,7 +24,7 @@ function removeaccount_post(&$a) { if(! account_verify_password($account['account_email'],$_POST['qxz_password'])) return; - if($account['account_password_changed'] != '0000-00-00 00:00:00') { + if($account['account_password_changed'] != NULL_DATE) { $d1 = datetime_convert('UTC','UTC','now - 48 hours'); if($account['account_password_changed'] > d1) { notice( t('Account removals are not allowed within 48 hours of changing the account password.') . EOL); diff --git a/mod/removeme.php b/mod/removeme.php index 13bf6cf63..d2ff013b8 100644 --- a/mod/removeme.php +++ b/mod/removeme.php @@ -23,7 +23,7 @@ function removeme_post(&$a) { if(! account_verify_password($account['account_email'],$_POST['qxz_password'])) return; - if($account['account_password_changed'] != '0000-00-00 00:00:00') { + if($account['account_password_changed'] != NULL_DATE) { $d1 = datetime_convert('UTC','UTC','now - 48 hours'); if($account['account_password_changed'] > d1) { notice( t('Channel removals are not allowed within 48 hours of changing the account password.') . EOL); -- cgit v1.2.3 From b56e49d196b439e94110b468f24c1d5fb1b5bb19 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 8 Sep 2014 20:45:17 -0700 Subject: missed one --- include/poller.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/poller.php b/include/poller.php index fe242d659..55794092e 100644 --- a/include/poller.php +++ b/include/poller.php @@ -35,12 +35,15 @@ function poller_run($argv, $argc){ // expire any expired mail - q("delete from mail where expires != NULL_DATE and expires < UTC_TIMESTAMP() "); + q("delete from mail where expires != '%s' and expires < UTC_TIMESTAMP() ", + dbesc(NULL_DATE) + ); // expire any expired items - $r = q("select id from item where expires != NULL_DATE and expires < UTC_TIMESTAMP() + $r = q("select id from item where expires != '%s' and expires < UTC_TIMESTAMP() and not ( item_restrict & %d ) ", + dbesc(NULL_DATE), intval(ITEM_DELETED) ); if($r) { -- cgit v1.2.3 From 21290bffce4420ab78167531bd9c4163ed61f740 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 8 Sep 2014 20:47:36 -0700 Subject: one more time --- include/poller.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/poller.php b/include/poller.php index 55794092e..c90e48d6b 100644 --- a/include/poller.php +++ b/include/poller.php @@ -341,8 +341,9 @@ function poller_run($argv, $argc){ } if($dirmode == DIRECTORY_MODE_SECONDARY || $dirmode == DIRECTORY_MODE_PRIMARY) { - $r = q("select distinct ud_addr, updates.* from updates where not ( ud_flags & %d ) and ud_addr != '' and ( ud_last = NULL_DATE OR ud_last > UTC_TIMESTAMP() - INTERVAL 7 DAY ) group by ud_addr ", - intval(UPDATE_FLAGS_UPDATED) + $r = q("select distinct ud_addr, updates.* from updates where not ( ud_flags & %d ) and ud_addr != '' and ( ud_last = '%s' OR ud_last > UTC_TIMESTAMP() - INTERVAL 7 DAY ) group by ud_addr ", + intval(UPDATE_FLAGS_UPDATED), + dbesc(NULL_DATE) ); if($r) { foreach($r as $rr) { -- cgit v1.2.3 From b7c1ad8cb2d50da98d38166500c83e17c611e163 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 8 Sep 2014 21:08:50 -0700 Subject: diaspora_like - sql error --- include/diaspora.php | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 0d797d915..9a85a0587 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -1684,36 +1684,29 @@ function diaspora_photo($importer,$xml,$msg,$attempt=1) { return 202; } - $r = q("SELECT * FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1", + $r = q("SELECT * FROM `item` WHERE `uid` = %d AND `mid` = '%s' LIMIT 1", intval($importer['channel_id']), dbesc($status_message_guid) ); - if(! count($r)) { - if($attempt <= 3) { - q("INSERT INTO dsprphotoq (uid, msg, attempt) VALUES (%d, '%s', %d)", - intval($importer['channel_id']), - dbesc(serialize($msg)), - intval($attempt + 1) - ); - } + if(! $r) { logger('diaspora_photo: attempt = ' . $attempt . '; status message not found: ' . $status_message_guid . ' for photo: ' . $guid); return; } - $parent_item = $r[0]; +// $parent_item = $r[0]; - $link_text = '[img]' . $remote_photo_path . $remote_photo_name . '[/img]' . "\n"; +// $link_text = '[img]' . $remote_photo_path . $remote_photo_name . '[/img]' . "\n"; - $link_text = scale_external_images($link_text, true, - array($remote_photo_name, 'scaled_full_' . $remote_photo_name)); +// $link_text = scale_external_images($link_text, true, +// array($remote_photo_name, 'scaled_full_' . $remote_photo_name)); - if(strpos($parent_item['body'],$link_text) === false) { - $r = q("update item set `body` = '%s', `visible` = 1 where `id` = %d and `uid` = %d", - dbesc($link_text . $parent_item['body']), - intval($parent_item['id']), - intval($parent_item['uid']) - ); - } +// if(strpos($parent_item['body'],$link_text) === false) { +// $r = q("update item set `body` = '%s', `visible` = 1 where `id` = %d and `uid` = %d", +// dbesc($link_text . $parent_item['body']), +// intval($parent_item['id']), +// intval($parent_item['uid']) +// ); +// } return; } @@ -1750,7 +1743,7 @@ function diaspora_like($importer,$xml,$msg) { return 202; } - $r = q("SELECT * FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1", + $r = q("SELECT * FROM `item` WHERE `uid` = %d AND `mid` = '%s' LIMIT 1", intval($importer['channel_id']), dbesc($parent_guid) ); @@ -1761,7 +1754,7 @@ function diaspora_like($importer,$xml,$msg) { $parent_item = $r[0]; - $r = q("SELECT * FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1", + $r = q("SELECT * FROM `item` WHERE `uid` = %d AND `mid` = '%s' LIMIT 1", intval($importer['channel_id']), dbesc($guid) ); -- cgit v1.2.3 From e4e9098f391e92fa95d0abeed6c90b651b579370 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 8 Sep 2014 21:36:33 -0700 Subject: prevent red#matrix smilie replacements from tripping over each other. --- include/text.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/text.php b/include/text.php index 097b02bbc..599c5d445 100644 --- a/include/text.php +++ b/include/text.php @@ -972,6 +972,7 @@ function smilies($s, $sample = false) { || (local_user() && intval(get_pconfig(local_user(),'system','no_smilies')))) return $s; + $s = preg_replace_callback('{<(pre|code)>.*?}ism','smile_shield',$s); $s = preg_replace_callback('/<[a-z]+ .*?>/ism','smile_shield',$s); @@ -1046,8 +1047,8 @@ function smilies($s, $sample = false) { ':facepalm', ':like', ':dislike', - 'redred#matrixmatrix', - 'redred#matrix', + 'red' . urlencode('red#matrix') . 'matrix', + 'red' . urlencode('red#') . 'matrix', 'redr#matrix' ); -- cgit v1.2.3 From 384eace32a0fb0f86880d66500419ebdb2498e31 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 8 Sep 2014 22:32:05 -0700 Subject: heavy lifting on diaspora likes. Still needs much more work - especially as we're ignoring signatures at this time --- include/diaspora.php | 123 +++++++++++++++++++++++---------------------------- 1 file changed, 56 insertions(+), 67 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 9a85a0587..c93ca089b 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -1776,6 +1776,13 @@ function diaspora_like($importer,$xml,$msg) { return; } } + + $i = q("select * from xchan where xchan_hash = '%s' limit 1", + dbesc($parent_item['author_xchan']) + ); + if($i) + $item_author = $i[0]; + // Note: I don't think "Like" objects with positive = "false" are ever actually used // It looks like "RelayableRetractions" are used for "unlike" instead if($positive === 'false') { @@ -1808,12 +1815,12 @@ function diaspora_like($importer,$xml,$msg) { $parent_author_signature = base64_decode($parent_author_signature); if(! rsa_verify($signed_data,$parent_author_signature,$key,'sha256')) { - if (intval(get_config('system','ignore_diaspora_like_signature'))) +// if (intval(get_config('system','ignore_diaspora_like_signature'))) logger('diaspora_like: top-level owner verification failed. Proceeding anyway.'); - else { - logger('diaspora_like: top-level owner verification failed.'); - return; - } +// else { +// logger('diaspora_like: top-level owner verification failed.'); +// return; +// } } } else { @@ -1825,12 +1832,12 @@ function diaspora_like($importer,$xml,$msg) { $author_signature = base64_decode($author_signature); if(! rsa_verify($signed_data,$author_signature,$key,'sha256')) { - if (intval(get_config('system','ignore_diaspora_like_signature'))) +// if (intval(get_config('system','ignore_diaspora_like_signature'))) logger('diaspora_like: like creator verification failed. Proceeding anyway'); - else { - logger('diaspora_like: like creator verification failed.'); - return; - } +// else { +// logger('diaspora_like: like creator verification failed.'); +// return; +// } } } @@ -1853,93 +1860,75 @@ function diaspora_like($importer,$xml,$msg) { $uri = $diaspora_handle . ':' . $guid; $activity = ACTIVITY_LIKE; - $post_type = (($parent_item['resource-id']) ? t('photo') : t('status')); - $objtype = (($parent_item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE ); - $link = xmlify('' . "\n") ; + + $post_type = (($parent_item['resource_type'] === 'photo') ? t('photo') : t('status')); + + $links = array(array('rel' => 'alternate','type' => 'text/html', 'href' => $parent_item['plink'])); + $objtype = (($parent_item['resource_type'] === 'photo') ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE ); + $body = $parent_item['body']; - $obj = <<< EOT - - $objtype - 1 - {$parent_item['uri']} - $link - - $body - -EOT; + $object = json_encode(array( + 'type' => $post_type, + 'id' => $parent_item['mid'], + 'parent' => (($parent_item['thr_parent']) ? $parent_item['thr_parent'] : $parent_item['parent_mid']), + 'link' => $links, + 'title' => $parent_item['title'], + 'content' => $parent_item['body'], + 'created' => $parent_item['created'], + 'edited' => $parent_item['edited'], + 'author' => array( + 'name' => $item_author['xchan_name'], + 'address' => $item_author['xchan_addr'], + 'guid' => $item_author['xchan_guid'], + 'guid_sig' => $item_author['xchan_guid_sig'], + 'link' => array( + array('rel' => 'alternate', 'type' => 'text/html', 'href' => $item_author['xchan_url']), + array('rel' => 'photo', 'type' => $item_author['xchan_photo_mimetype'], 'href' => $item_author['xchan_photo_m'])), + ), + )); + + $bodyverb = t('%1$s likes %2$s\'s %3$s'); $arr = array(); $arr['uri'] = $uri; $arr['uid'] = $importer['channel_id']; - $arr['guid'] = $guid; - $arr['network'] = NETWORK_DIASPORA; - $arr['contact-id'] = $contact['id']; - $arr['type'] = 'activity'; - $arr['wall'] = $parent_item['wall']; - $arr['gravity'] = GRAVITY_LIKE; - $arr['parent'] = $parent_item['id']; - $arr['parent-uri'] = $parent_item['uri']; - - $arr['owner-name'] = $parent_item['name']; - $arr['owner-link'] = $parent_item['url']; - //$arr['owner-avatar'] = $parent_item['thumb']; - $arr['owner-avatar'] = ((x($parent_item,'thumb')) ? $parent_item['thumb'] : $parent_item['photo']); - - $arr['author-name'] = $person['name']; - $arr['author-link'] = $person['url']; - $arr['author-avatar'] = ((x($person,'thumb')) ? $person['thumb'] : $person['photo']); + $arr['aid'] = $importer['channel_account_id']; + $arr['mid'] = $guid; + $arr['parent_mid'] = $parent_item['mid']; + $arr['owner_xchan'] = $parent_item['owner_xchan']; + $arr['author_xchan'] = $person['xchan_hash']; $ulink = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]'; $alink = '[url=' . $parent_item['author-link'] . ']' . $parent_item['author-name'] . '[/url]'; - //$plink = '[url=' . $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $parent_item['id'] . ']' . $post_type . '[/url]'; - $plink = '[url='.$a->get_baseurl().'/display/'.$guid.']'.$post_type.'[/url]'; + $plink = '[url='. z_root() .'/display/'.$guid.']'.$post_type.'[/url]'; $arr['body'] = sprintf( $bodyverb, $ulink, $alink, $plink ); $arr['app'] = 'Diaspora'; - $arr['private'] = $parent_item['private']; + $arr['item_private'] = $parent_item['item_private']; $arr['verb'] = $activity; $arr['object-type'] = $objtype; - $arr['object'] = $obj; - $arr['visible'] = 1; - $arr['unseen'] = 1; - $arr['last-child'] = 0; + $arr['object'] = $object; if(! $parent_author_signature) { $datarray['diaspora_meta'] = array('signer' => $diaspora_handle, 'body' => $text, 'signed_text' => $signed_data, 'signature' => base64_encode($author_signature)); } + $x = item_store($arr); - $message_id = item_store($arr); - - - //if($message_id) { - // q("update item set plink = '%s' where id = %d", - // //dbesc($a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $message_id), - // dbesc($a->get_baseurl().'/display/'.$guid), - // intval($message_id) - // ); - //} - - if(! $parent_author_signature) { - q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ", - intval($message_id), - dbesc($signed_data), - dbesc(base64_encode($author_signature)), - dbesc($diaspora_handle) - ); - } + if($x) + $message_id = $x['item_id']; // if the message isn't already being relayed, notify others // the existence of parent_author_signature means the parent_author or owner // is already relaying. The parent_item['origin'] indicates the message was created on our system - if(($parent_item['origin']) && (! $parent_author_signature)) + if(($parent_item['item_flags'] & ITEM_ORIGIN) && (! $parent_author_signature)) proc_run('php','include/notifier.php','comment-import',$message_id); return; -- cgit v1.2.3 From 4384fa8b12331b369b313efb938a23b8bde34e61 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 9 Sep 2014 01:14:15 -0700 Subject: d* friending vsprintf error --- include/bb2diaspora.php | 4 +++- include/diaspora.php | 2 +- version.inc | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 5fb708706..0f91c8bc8 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -91,7 +91,7 @@ function diaspora_mention_callback($matches) { if(! $link) $link = 'https://' . $matches[3] . '/u/' . $matches[2]; - return '@[url=' . $link . ']' . trim($matches[1]) . '[/url]'; + return '@[url=' . $link . ']' . trim($matches[1]) . ((substr($mentions[0],-1,1) === '+') ? '+' : '') . '[/url]' ; } @@ -119,6 +119,8 @@ function diaspora2bb($s,$use_zrl = false) { // $s = preg_replace('/\@\{(.+?)\; (.+?)\@(.+?)\}/','@[url=https://$3/u/$2]$1[/url]',$s); + // first try plustags + $s = preg_replace_callback('/\@\{(.+?)\; (.+?)\@(.+?)\}\+/','diaspora_mention_callback',$s); $s = preg_replace_callback('/\@\{(.+?)\; (.+?)\@(.+?)\}/','diaspora_mention_callback',$s); // Escaping the hash tags - doesn't always seem to work diff --git a/include/diaspora.php b/include/diaspora.php index c93ca089b..8da256bc5 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -689,7 +689,7 @@ function diaspora_request($importer,$xml) { $their_perms = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK|PERMS_W_STREAM|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT|PERMS_R_STORAGE|PERMS_R_PAGES; - $r = q("insert into abook ( abook_account, abook_channel, abook_xchan, abook_my_perms, abook_their_perms, abook_closeness, abook_rating, abook_created, abook_updated, abook_connected, abook_dob, abook_flags, abook_profile) values ( %d, %d, '%s' %d %d, %d, %d, '%s', '%s', '%s', '%s', %d, '%s')", + $r = q("insert into abook ( abook_account, abook_channel, abook_xchan, abook_my_perms, abook_their_perms, abook_closeness, abook_rating, abook_created, abook_updated, abook_connected, abook_dob, abook_flags) values ( %d, %d, '%s', %d, %d, %d, %d, '%s', '%s', '%s', '%s', %d )", intval($importer['channel_account_id']), intval($importer['channel_id']), dbesc($ret['xchan_hash']), diff --git a/version.inc b/version.inc index d04d03ce9..8bfa1e0be 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-09-08.792 +2014-09-09.793 -- cgit v1.2.3 From 9753453ec4ed56fe8d1d07910147929d2e1a05c2 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 9 Sep 2014 01:23:52 -0700 Subject: if we have php54 don't log the whole damn stack on a db error, just the current frame --- include/dba/dba_driver.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php index c829c3714..9e1804a7d 100755 --- a/include/dba/dba_driver.php +++ b/include/dba/dba_driver.php @@ -112,8 +112,11 @@ function q($sql) { if($db && $db->connected) { $stmt = vsprintf($sql,$args); - if($stmt === false) - logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true)); + if($stmt === false) { + if(version_compare(PHP_VERSION,'5.4.0') >= 0) + logger('dba: vsprintf error: ' . print_r(debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT,1),true)); + else + logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true)); return $db->q($stmt); } -- cgit v1.2.3 From 386156138f63fbabf9ac71a81a6bea99410c8100 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 9 Sep 2014 02:42:07 -0700 Subject: syntax error in dba driver, document z_post_url --- include/dba/dba_driver.php | 1 + include/network.php | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php index 9e1804a7d..3e19b7aa4 100755 --- a/include/dba/dba_driver.php +++ b/include/dba/dba_driver.php @@ -117,6 +117,7 @@ function q($sql) { logger('dba: vsprintf error: ' . print_r(debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT,1),true)); else logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true)); + } return $db->q($stmt); } diff --git a/include/network.php b/include/network.php index 5ad391491..543c6aa72 100644 --- a/include/network.php +++ b/include/network.php @@ -132,6 +132,35 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) { } +/** + * @function z_fetch_url + * @param string $url + * URL to fetch + * @param mixed $params + * The full data to post in a HTTP "POST" operation. To post a file, + * prepend a filename with @ and use the full path. The filetype can + * be explicitly specified by following the filename with the type in + * the format ';type=mimetype'. This parameter can either be passed + * as a urlencoded string like 'para1=val1¶2=val2&...' or as an + * array with the field name as key and field data as value. If value + * is an array, the Content-Type header will be set to multipart/form-data. + * As of PHP 5.2.0, value must be an array if files are passed to this + * option with the @ prefix. As of PHP 5.5.0, the @ prefix is deprecated + * and files can be sent using CURLFile. + * @param int $redirects = 0 + * internal use, recursion counter + * @param array $opts (optional parameters) + * 'accept_content' => supply Accept: header with 'accept_content' as the value + * 'timeout' => int seconds, default system config value or 60 seconds + * 'http_auth' => username:password + * 'novalidate' => do not validate SSL certs, default is to validate using our CA list + * + * @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 + */ function z_post_url($url,$params, $redirects = 0, $opts = array()) { -- cgit v1.2.3 From 409c89d629993b59eaafa8443ae9d0b5f0344c1f Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 9 Sep 2014 04:10:01 -0700 Subject: doco correction --- include/network.php | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/include/network.php b/include/network.php index 543c6aa72..0191f203d 100644 --- a/include/network.php +++ b/include/network.php @@ -133,20 +133,14 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) { /** - * @function z_fetch_url + * @function z_post_url * @param string $url - * URL to fetch + * URL to post * @param mixed $params - * The full data to post in a HTTP "POST" operation. To post a file, - * prepend a filename with @ and use the full path. The filetype can - * be explicitly specified by following the filename with the type in - * the format ';type=mimetype'. This parameter can either be passed - * as a urlencoded string like 'para1=val1¶2=val2&...' or as an - * array with the field name as key and field data as value. If value + * The full data to post in a HTTP "POST" operation. This parameter can + * either be passed as a urlencoded string like 'para1=val1¶2=val2&...' + * or as an array with the field name as key and field data as value. If value * is an array, the Content-Type header will be set to multipart/form-data. - * As of PHP 5.2.0, value must be an array if files are passed to this - * option with the @ prefix. As of PHP 5.5.0, the @ prefix is deprecated - * and files can be sent using CURLFile. * @param int $redirects = 0 * internal use, recursion counter * @param array $opts (optional parameters) -- cgit v1.2.3