From 02a36948685737afdbbb9a292a338b304bb5cc04 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 20 Aug 2013 19:51:58 -0700 Subject: [PATCH 001/330] fix superblock for comments --- include/ItemObject.php | 4 ++-- include/conversation.php | 14 ++++++++++++++ version.inc | 2 +- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/include/ItemObject.php b/include/ItemObject.php index 8c8c0ee2a..22b191e79 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -39,10 +39,10 @@ class Item extends BaseObject { foreach($data['children'] as $item) { /* - * Only add thos that will be displayed + * Only add those that will be displayed */ - if(! visible_activity($item)) { + if((! visible_activity($item)) || array_key_exists('author_blocked',$item)) { continue; } diff --git a/include/conversation.php b/include/conversation.php index aade06b8a..9dab5931b 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -712,6 +712,8 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { $threads = array(); foreach($items as $item) { + // Check for any blocked authors + if($arr_blocked) { $blocked = false; foreach($arr_blocked as $b) { @@ -724,6 +726,18 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { continue; } + // Check all the kids too + + if($arr_blocked && $item['children']) { + for($d = 0; $d < count($item['children']); $d ++) { + foreach($arr_blocked as $b) { + if(($b) && ($item['children'][$d]['author_xchan'] == $b)) + $item['children'][$d]['author_blocked'] = true; + } + } + } + + // Can we put this after the visibility check? like_puller($a,$item,$alike,'like'); diff --git a/version.inc b/version.inc index 717abe607..6ca230997 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-08-19.410 +2013-08-20.411 From 5d35d2110065dec9f984ad9028a5e8798f1faa37 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 20 Aug 2013 20:39:00 -0700 Subject: [PATCH 002/330] network-wide poll voting structure --- boot.php | 2 +- install/database.sql | 46 +++++++++++++++++++++++++++----------------- install/update.php | 19 +++++++++++++++++- 3 files changed, 47 insertions(+), 20 deletions(-) diff --git a/boot.php b/boot.php index 10f951b6a..cf3d17050 100755 --- a/boot.php +++ b/boot.php @@ -43,7 +43,7 @@ require_once('include/taxonomy.php'); define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1060 ); +define ( 'DB_UPDATE_VERSION', 1061 ); define ( 'EOL', '
' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/install/database.sql b/install/database.sql index 4a519adbb..de36bdad2 100644 --- a/install/database.sql +++ b/install/database.sql @@ -136,7 +136,7 @@ CREATE TABLE IF NOT EXISTS `challenge` ( `type` char(255) NOT NULL, `last_update` char(255) NOT NULL, PRIMARY KEY (`id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `channel` ( `channel_id` int(10) unsigned NOT NULL AUTO_INCREMENT, @@ -267,7 +267,7 @@ CREATE TABLE IF NOT EXISTS `event` ( KEY `aid` (`aid`), KEY `event_hash` (`event_hash`), KEY `event_xchan` (`event_xchan`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `fcontact` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, @@ -348,7 +348,7 @@ CREATE TABLE IF NOT EXISTS `group_member` ( KEY `uid` (`uid`), KEY `gid` (`gid`), KEY `xchan` (`xchan`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `hook` ( `id` int(11) NOT NULL AUTO_INCREMENT, @@ -421,7 +421,7 @@ CREATE TABLE IF NOT EXISTS `item` ( `owner_xchan` char(255) NOT NULL DEFAULT '', `author_xchan` char(255) NOT NULL DEFAULT '', `mimetype` char(255) NOT NULL DEFAULT '', - `title` text NOT NULL DEFAULT '', + `title` text NOT NULL, `body` mediumtext NOT NULL, `app` char(255) NOT NULL DEFAULT '', `lang` char(64) NOT NULL DEFAULT '', @@ -493,7 +493,7 @@ CREATE TABLE IF NOT EXISTS `item_id` ( KEY `sid` (`sid`), KEY `service` (`service`), KEY `iid` (`iid`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `mail` ( `id` int(10) unsigned NOT NULL AUTO_INCREMENT, @@ -504,7 +504,7 @@ CREATE TABLE IF NOT EXISTS `mail` ( `channel_id` int(10) unsigned NOT NULL, `title` text NOT NULL, `body` mediumtext NOT NULL, - `attach` mediumtext NOT NULL DEFAULT '', + `attach` mediumtext NOT NULL, `mid` char(255) NOT NULL, `parent_mid` char(255) NOT NULL, `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', @@ -536,7 +536,7 @@ CREATE TABLE IF NOT EXISTS `menu` ( PRIMARY KEY (`menu_id`), KEY `menu_channel_id` (`menu_channel_id`), KEY `menu_name` (`menu_name`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `menu_item` ( `mitem_id` int(10) unsigned NOT NULL AUTO_INCREMENT, @@ -551,10 +551,10 @@ CREATE TABLE IF NOT EXISTS `menu_item` ( `mitem_menu_id` int(10) unsigned NOT NULL DEFAULT '0', `mitem_order` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`mitem_id`), - KEY `mitem_flags` (`mitem_flags`), KEY `mitem_channel_id` (`mitem_channel_id`), - KEY `mitem_menu_id` (`mitem_menu_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; + KEY `mitem_menu_id` (`mitem_menu_id`), + KEY `mitem_flags` (`mitem_flags`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `notify` ( `id` int(11) NOT NULL AUTO_INCREMENT, @@ -595,7 +595,7 @@ CREATE TABLE IF NOT EXISTS `obj` ( KEY `obj_type` (`obj_type`), KEY `obj_channel` (`obj_channel`), KEY `obj_obj` (`obj_obj`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `outq` ( `outq_hash` char(255) NOT NULL, @@ -658,7 +658,7 @@ CREATE TABLE IF NOT EXISTS `photo` ( KEY `album` (`album`), KEY `scale` (`scale`), KEY `profile` (`profile`), - KEY `photo_flags` (`photo_flags`), + KEY `photo_flags` (`photo_flags`), KEY `type` (`type`), KEY `aid` (`aid`), KEY `xchan` (`xchan`), @@ -676,7 +676,7 @@ CREATE TABLE IF NOT EXISTS `profile` ( `hide_friends` tinyint(1) NOT NULL DEFAULT '0', `name` char(255) NOT NULL, `pdesc` char(255) NOT NULL, - `chandesc` text NOT NULL DEFAULT '', + `chandesc` text NOT NULL, `dob` char(32) NOT NULL DEFAULT '0000-00-00', `dob_tz` char(255) NOT NULL DEFAULT 'UTC', `address` char(255) NOT NULL, @@ -770,7 +770,7 @@ CREATE TABLE IF NOT EXISTS `register` ( KEY `hash` (`hash`), KEY `created` (`created`), KEY `uid` (`uid`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `session` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, @@ -842,7 +842,7 @@ CREATE TABLE IF NOT EXISTS `term` ( KEY `imgurl` (`imgurl`), KEY `term_hash` (`term_hash`), KEY `parent_hash` (`parent_hash`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `tokens` ( `id` varchar(40) NOT NULL, @@ -877,7 +877,17 @@ CREATE TABLE IF NOT EXISTS `verify` ( KEY `token` (`token`), KEY `meta` (`meta`), KEY `created` (`created`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +CREATE TABLE IF NOT EXISTS `vote` ( + `vote_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `vote_poll` int(11) NOT NULL DEFAULT '0', + `vote_element` int(11) NOT NULL DEFAULT '0', + `vote_result` text NOT NULL, + `vote_xchan` char(255) NOT NULL DEFAULT '', + PRIMARY KEY (`vote_id`), + UNIQUE KEY `vote_vote` (`vote_poll`,`vote_element`,`vote_xchan`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `xchan` ( `xchan_hash` char(255) NOT NULL, @@ -902,10 +912,10 @@ CREATE TABLE IF NOT EXISTS `xchan` ( KEY `xchan_addr` (`xchan_addr`), KEY `xchan_name` (`xchan_name`), KEY `xchan_network` (`xchan_network`), - KEY `xchan_instance_url` (`xchan_instance_url`), KEY `xchan_url` (`xchan_url`), KEY `xchan_flags` (`xchan_flags`), - KEY `xchan_connurl` (`xchan_connurl`) + KEY `xchan_connurl` (`xchan_connurl`), + KEY `xchan_instance_url` (`xchan_instance_url`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `xconfig` ( diff --git a/install/update.php b/install/update.php index 682ee2aea..fa5afe8de 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Wed, 21 Aug 2013 01:33:20 -0700 Subject: [PATCH 003/330] poll stuff --- boot.php | 2 +- install/database.sql | 27 ++++++++++++++++++++++++++- install/update.php | 38 +++++++++++++++++++++++++++++++++++++- version.inc | 2 +- 4 files changed, 65 insertions(+), 4 deletions(-) diff --git a/boot.php b/boot.php index cf3d17050..2323e302c 100755 --- a/boot.php +++ b/boot.php @@ -43,7 +43,7 @@ require_once('include/taxonomy.php'); define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1061 ); +define ( 'DB_UPDATE_VERSION', 1063 ); define ( 'EOL', '
' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/install/database.sql b/install/database.sql index de36bdad2..cefb081d1 100644 --- a/install/database.sql +++ b/install/database.sql @@ -666,6 +666,29 @@ CREATE TABLE IF NOT EXISTS `photo` ( KEY `resource_id` (`resource_id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE IF NOT EXISTS `poll` ( + `poll_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `poll_channel` int(10) unsigned NOT NULL DEFAULT '0', + `poll_desc` text NOT NULL, + `poll_flags` int(11) NOT NULL DEFAULT '0', + `poll_votes` int(11) NOT NULL DEFAULT '0', + PRIMARY KEY (`poll_id`), + KEY `poll_channel` (`poll_channel`), + KEY `poll_flags` (`poll_flags`), + KEY `poll_votes` (`poll_votes`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +CREATE TABLE IF NOT EXISTS `poll_elm` ( + `pelm_id` int(10) unsigned NOT NULL AUTO_INCREMENT, + `pelm_poll` int(10) unsigned NOT NULL DEFAULT '0', + `pelm_desc` text NOT NULL, + `pelm_flags` int(11) NOT NULL DEFAULT '0', + `pelm_result` float NOT NULL DEFAULT '0', + PRIMARY KEY (`pelm_id`), + KEY `pelm_poll` (`pelm_poll`), + KEY `pelm_result` (`pelm_result`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + CREATE TABLE IF NOT EXISTS `profile` ( `id` int(11) NOT NULL AUTO_INCREMENT, `profile_guid` char(64) NOT NULL DEFAULT '', @@ -886,7 +909,9 @@ CREATE TABLE IF NOT EXISTS `vote` ( `vote_result` text NOT NULL, `vote_xchan` char(255) NOT NULL DEFAULT '', PRIMARY KEY (`vote_id`), - UNIQUE KEY `vote_vote` (`vote_poll`,`vote_element`,`vote_xchan`) + UNIQUE KEY `vote_vote` (`vote_poll`,`vote_element`,`vote_xchan`), + KEY `vote_poll` (`vote_poll`), + KEY `vote_element` (`vote_element`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `xchan` ( diff --git a/install/update.php b/install/update.php index fa5afe8de..c5eaa4f19 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Wed, 21 Aug 2013 22:12:22 +0200 Subject: [PATCH 004/330] show chosen desktop theme when SESSION['show_mobile'] is false --- boot.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index 7b2d72f3c..dd008558d 100755 --- a/boot.php +++ b/boot.php @@ -1965,8 +1965,8 @@ function current_theme(){ if($is_mobile) { if(isset($_SESSION['show_mobile']) && !$_SESSION['show_mobile']) { - $system_theme = ''; - $theme_name = ''; + $system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : ''); + $theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme); } else { $system_theme = ((isset($a->config['system']['mobile_theme'])) ? $a->config['system']['mobile_theme'] : ''); From ab06b18f5b618bc2df80f309e6c9f1d10a6ba88f Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Wed, 21 Aug 2013 23:14:52 +0200 Subject: [PATCH 005/330] theme qualifier without dots --- mod/admin.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index df1a40019..7e8f7a301 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -365,11 +365,11 @@ function admin_page_site(&$a) { if($files) { foreach($files as $file) { $f = basename($file); - $theme_name = ((file_exists($file . '/.experimental')) ? sprintf("%s - Experimental", $f) : $f); - if (file_exists($file . '/.mobile')) { + $theme_name = ((file_exists($file . '/experimental')) ? sprintf("%s - Experimental", $f) : $f); + if (file_exists($file . '/mobile')) { $theme_choices_mobile[$f] = $theme_name; } - if (file_exists($file . '/.accessibility')) { + if (file_exists($file . '/accessibility')) { $theme_choices_accessibility[$f] = $theme_name; } $theme_choices[$f] = $theme_name; From 2d3a489f5171a8fe8b6b7aeb022c945a689d9f1a Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 21 Aug 2013 17:15:56 -0700 Subject: [PATCH 006/330] basic structure for premium channel implementation --- boot.php | 7 ++----- install/database.sql | 4 ++++ install/update.php | 10 +++++++++- mod/connect.php | 3 +++ mod/zfinger.php | 12 ++++++++++++ 5 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 mod/connect.php diff --git a/boot.php b/boot.php index 2323e302c..eeddf8162 100755 --- a/boot.php +++ b/boot.php @@ -43,7 +43,7 @@ require_once('include/taxonomy.php'); define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1063 ); +define ( 'DB_UPDATE_VERSION', 1064 ); define ( 'EOL', '
' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -190,13 +190,10 @@ define ( 'PAGE_HIDDEN', 0x0001 ); define ( 'PAGE_AUTOCONNECT', 0x0002 ); define ( 'PAGE_APPLICATION', 0x0004 ); define ( 'PAGE_DIRECTORY_CHANNEL', 0x0008 ); // system channel used for directory synchronisation +define ( 'PAGE_PREMIUM', 0x0010 ); define ( 'PAGE_REMOVED', 0x8000 ); -//define ( 'PAGE_FREELOVE', 3 ); -//define ( 'PAGE_BLOG', 4 ); -//define ( 'PAGE_PRVGROUP', 5 ); - /** * Photo types diff --git a/install/database.sql b/install/database.sql index cefb081d1..dbffbf59b 100644 --- a/install/database.sql +++ b/install/database.sql @@ -926,6 +926,8 @@ CREATE TABLE IF NOT EXISTS `xchan` ( `xchan_addr` char(255) NOT NULL DEFAULT '', `xchan_url` char(255) NOT NULL DEFAULT '', `xchan_connurl` char(255) NOT NULL DEFAULT '', + `xchan_follow` char(255) NOT NULL DEFAULT '', + `xchan_connpage` char(255) NOT NULL DEFAULT '', `xchan_name` char(255) NOT NULL DEFAULT '', `xchan_network` char(255) NOT NULL DEFAULT '', `xchan_instance_url` char(255) NOT NULL DEFAULT '', @@ -940,6 +942,8 @@ CREATE TABLE IF NOT EXISTS `xchan` ( KEY `xchan_url` (`xchan_url`), KEY `xchan_flags` (`xchan_flags`), KEY `xchan_connurl` (`xchan_connurl`), + KEY `xchan_follow` (`xchan_follow`), + KEY `xchan_connpage` (`xchan_connpage`), KEY `xchan_instance_url` (`xchan_instance_url`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/install/update.php b/install/update.php index c5eaa4f19..9beb25254 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Wed, 21 Aug 2013 17:34:04 -0700 Subject: [PATCH 007/330] implement premium channel discovery --- include/zot.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/include/zot.php b/include/zot.php index bddbc9bee..ff69a119e 100644 --- a/include/zot.php +++ b/include/zot.php @@ -441,6 +441,9 @@ function import_xchan($arr) { dbesc($xchan_hash) ); + if(! array_key_exists('connect_url', $arr)) + $arr['connect_url'] = ''; + if($r) { if($r[0]['xchan_photo_date'] != $arr['photo_updated']) @@ -462,18 +465,22 @@ function import_xchan($arr) { $new_flags = $r[0]['xchan_flags'] ^ XCHAN_FLAGS_HIDDEN; else $new_flags = $r[0]['xchan_flags']; - - + if(($r[0]['xchan_name_date'] != $arr['name_updated']) || ($r[0]['xchan_connurl'] != $arr['connections_url']) || ($r[0]['xchan_flags'] != $new_flags) || ($r[0]['xchan_addr'] != $arr['address']) + || ($r[0]['xchan_follow'] != $arr['follow_url']) + || ($r[0]['xchan_connpage'] != $arr['connect_url']) || ($r[0]['xchan_url'] != $arr['url'])) { - $r = q("update xchan set xchan_name = '%s', xchan_name_date = '%s', xchan_connurl = '%s', xchan_flags = %d, + $r = q("update xchan set xchan_name = '%s', xchan_name_date = '%s', xchan_connurl = '%s', xchan_follow = '%s', + xchan_connpage = '%s', xchan_flags = %d, xchan_addr = '%s', xchan_url = '%s' where xchan_hash = '%s' limit 1", dbesc($arr['name']), dbesc($arr['name_updated']), dbesc($arr['connections_url']), + dbesc($arr['follow_url']), + dbesc($arr['connect_url']), intval($new_flags), dbesc($arr['address']), dbesc($arr['url']), @@ -503,8 +510,8 @@ function import_xchan($arr) { $new_flags = 0; $x = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_photo_mimetype, - xchan_photo_l, xchan_addr, xchan_url, xchan_connurl, xchan_name, xchan_network, xchan_photo_date, xchan_name_date, xchan_flags) - values ( '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d) ", + xchan_photo_l, xchan_addr, xchan_url, xchan_connurl, xchan_follow, xchan_connpage, xchan_name, xchan_network, xchan_photo_date, xchan_name_date, xchan_flags) + values ( '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d) ", dbesc($xchan_hash), dbesc($arr['guid']), dbesc($arr['guid_sig']), @@ -514,6 +521,8 @@ function import_xchan($arr) { dbesc($arr['address']), dbesc($arr['url']), dbesc($arr['connections_url']), + dbesc($arr['follow_url']), + dbesc($arr['connect_url']), dbesc($arr['name']), dbesc('zot'), dbesc($arr['photo_updated']), From 6cea04eb440c2bb08bcb81ae13749c08d09b755c Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 21 Aug 2013 20:05:55 -0700 Subject: [PATCH 008/330] progress on generic sellpage - is not yet linked from existing connect buttons and editing has not been completed --- boot.php | 12 +++-- include/identity.php | 3 +- mod/connect.php | 98 +++++++++++++++++++++++++++++++++++- view/css/mod_connect.css | 3 ++ view/tpl/sellpage_submit.tpl | 3 ++ view/tpl/sellpage_view.tpl | 9 ++++ 6 files changed, 121 insertions(+), 7 deletions(-) create mode 100644 view/css/mod_connect.css create mode 100644 view/tpl/sellpage_submit.tpl create mode 100644 view/tpl/sellpage_view.tpl diff --git a/boot.php b/boot.php index 0afc976ae..3327fdbb2 100755 --- a/boot.php +++ b/boot.php @@ -1572,11 +1572,11 @@ function profile_load(&$a, $nickname, $profile = '') { return; } -function profile_create_sidebar(&$a) { +function profile_create_sidebar(&$a,$connect = true) { $block = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false); - $a->set_widget('profile',profile_sidebar($a->profile, $block)); + $a->set_widget('profile',profile_sidebar($a->profile, $block, $connect)); return; } @@ -1598,7 +1598,7 @@ function profile_create_sidebar(&$a) { -function profile_sidebar($profile, $block = 0) { +function profile_sidebar($profile, $block = 0, $show_connect = true) { $a = get_app(); @@ -1623,11 +1623,13 @@ function profile_sidebar($profile, $block = 0) { require_once('include/Contact.php'); - $connect_url = rconnect_url($profile['uid'],get_observer_hash()); + + $connect_url = (($show_connect) ? rconnect_url($profile['uid'],get_observer_hash()) : ''); + $connect = (($connect_url) ? t('Connect') : ''); if($connect_url) - $connect_url = $connect_url . '/follow?f=1&url=' . $profile['channel_address'] . '@' . $a->get_hostname(); + $connect_url = $connect_url . '/follow?f=1&url=' . urlencode($profile['channel_address'] . '@' . $a->get_hostname()); // show edit profile to yourself if($is_owner) { diff --git a/include/identity.php b/include/identity.php index 5f210c456..1658669d6 100644 --- a/include/identity.php +++ b/include/identity.php @@ -182,7 +182,7 @@ function create_identity($arr) { $newuid = $ret['channel']['channel_id']; - $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_photo_l, xchan_photo_m, xchan_photo_s, xchan_addr, xchan_url, xchan_name, xchan_network, xchan_photo_date, xchan_name_date ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')", + $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_guid_sig, xchan_pubkey, xchan_photo_l, xchan_photo_m, xchan_photo_s, xchan_addr, xchan_url, xchan_follow, xchan_name, xchan_network, xchan_photo_date, xchan_name_date ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s')", dbesc($hash), dbesc($guid), dbesc($sig), @@ -192,6 +192,7 @@ function create_identity($arr) { dbesc($a->get_baseurl() . "/photo/profile/s/{$newuid}"), dbesc($ret['channel']['channel_address'] . '@' . get_app()->get_hostname()), dbesc(z_root() . '/channel/' . $ret['channel']['channel_address']), + dbesc(z_root() . '/follow?f=&url=%s'), dbesc($ret['channel']['channel_name']), dbesc('zot'), dbesc(datetime_convert()), diff --git a/mod/connect.php b/mod/connect.php index 21d461c19..0ab994ddd 100644 --- a/mod/connect.php +++ b/mod/connect.php @@ -1,3 +1,99 @@ 1) + $which = argv(1); + else { + notice( t('Requested profile is not available.') . EOL ); + $a->error = 404; + return; + } + + profile_load($a,$which,''); + profile_create_sidebar($a,false); + + +} + +function connect_post(&$a) { + + $edit = ((local_user() && (local_user() == $a->profile['profile_uid'])) ? true : false); + + if($edit) { + $premium = (($_POST['premium']) ? intval($_POST['premium']) : 0); + $text = escape_tags($_POST['text']); + + $channel = $a->get_channel(); + if(($channel['channel_pageflags'] & PAGE_PREMIUM) != $premium) + $r = q("update channel set channel_flags = channel_flags ^ %d where channel_id = %d limit 1", + intval(PAGE_PREMIUM), + intval(local_user()) + ); + set_pconfig($a->profile['profile_uid'],'system','selltext',$text); + return; + } + + $url = ''; + $observer = $a->get_observer(); + if(($observer) && ($_POST['submit'] === t('Continue'))) { + if($observer['xchan_follow']) + $url = sprintf($observer['xchan_follow'],urlencode($a->profile['channel_address'] . '@' . $a->get_hostname())); + if(! $url) { + $r = q("select * from hubloc where hubloc_hash = '%s' order by hubloc_id desc limit 1", + dbesc($observer['xchan_hash']) + ); + if($r) + $url = $r[0]['hubloc_url'] . '/follow?f=&url=' . urlencode($a->profile['channel_address'] . '@' . $a->get_hostname()); + } + } + if($url) + goaway($url); + else + notice('Unable to connect to your home hub location.'); + +} + + + +function connect_content(&$a) { + + $edit = ((local_user() && (local_user() == $a->profile['profile_uid'])) ? true : false); + + $text = get_pconfig($a->profile['profile_uid'],'system','selltext'); + + if($edit) { + $o = replace_macros(get_markup_template('sellpage_edit.tpl'),array( + + + )); + return $o; + } + else { + $submit = replace_macros(get_markup_template('sellpage_submit.tpl'), array( + '$continue' => t('Continue'), + '$address' => $a->profile['channel_address'] + )); + + $o = replace_macros(get_markup_template('sellpage_view.tpl'),array( + '$header' => t('Restricted Channel'), + '$desc' => t('This channel may require additional steps or acknowledgement of the following conditions prior to connecting:'), + '$text' => prepare_text($text), + + '$desc2' => t('By continuing, I certify that I have complied with any instructions provided on this page.'), + '$submit' => $submit, + + )); + + + + + } + + return $o; +} \ No newline at end of file diff --git a/view/css/mod_connect.css b/view/css/mod_connect.css new file mode 100644 index 000000000..43de7d256 --- /dev/null +++ b/view/css/mod_connect.css @@ -0,0 +1,3 @@ +.sellpage-final { + margin-top: 25px; +} \ No newline at end of file diff --git a/view/tpl/sellpage_submit.tpl b/view/tpl/sellpage_submit.tpl new file mode 100644 index 000000000..2bd735ea4 --- /dev/null +++ b/view/tpl/sellpage_submit.tpl @@ -0,0 +1,3 @@ +
+ +
\ No newline at end of file diff --git a/view/tpl/sellpage_view.tpl b/view/tpl/sellpage_view.tpl new file mode 100644 index 000000000..414445039 --- /dev/null +++ b/view/tpl/sellpage_view.tpl @@ -0,0 +1,9 @@ +

{{$header}}

+ +
{{$desc}}
+ +
{{$text}}
+ +
{{$desc2}}
+ +{{$submit}} From 925b046794b77345c1321a3c74e4561d5c10ec95 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 21 Aug 2013 22:10:08 -0700 Subject: [PATCH 009/330] premium/restricted channel connections implemented, configure at yoursite/channel/nickname - this basically redirects "follow" requests to a premium channel's sell page if it has one configured. You can still click through and create a connection request (introduction), but this provides a means for the channel owner to state their terms. If you don't abide by the terms, you will likely be blocked or the channel deleted. This facility is extensible in a number of ways. --- boot.php | 17 ++++++++++++----- include/Contact.php | 9 ++++++++- include/follow.php | 7 ++++++- mod/connect.php | 28 ++++++++++++++++++++++------ mod/follow.php | 3 ++- mod/zfinger.php | 2 +- view/css/mod_connect.css | 8 ++++++++ view/tpl/sellpage_edit.tpl | 23 +++++++++++++++++++++++ 8 files changed, 82 insertions(+), 15 deletions(-) create mode 100644 view/tpl/sellpage_edit.tpl diff --git a/boot.php b/boot.php index 3327fdbb2..c8a8fbc7e 100755 --- a/boot.php +++ b/boot.php @@ -1623,13 +1623,20 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) { require_once('include/Contact.php'); + if($show_connect) { - $connect_url = (($show_connect) ? rconnect_url($profile['uid'],get_observer_hash()) : ''); - - $connect = (($connect_url) ? t('Connect') : ''); + // This will return an empty string if we're already connected. - if($connect_url) - $connect_url = $connect_url . '/follow?f=1&url=' . urlencode($profile['channel_address'] . '@' . $a->get_hostname()); + $connect_url = rconnect_url($profile['uid'],get_observer_hash()); + $connect = (($connect_url) ? t('Connect') : ''); + if($connect_url) + $connect_url = sprintf($connect_url,urlencode($profile['channel_address'] . '@' . $a->get_hostname())); + + // premium channel - over-ride + + if($profile['channel_pageflags'] & PAGE_PREMIUM) + $connect_url = z_root() . '/connect/' . $profile['channel_address']; + } // show edit profile to yourself if($is_owner) { diff --git a/include/Contact.php b/include/Contact.php index bf536ccd5..46d356f3f 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -15,13 +15,20 @@ function rconnect_url($channel_id,$xchan) { if($r) return ''; + $r = q("select * from xchan where xchan_hash = '%s' limit 1", + dbesc($xchan) + ); + + if(($r) && ($r[0]['xchan_follow'])) + return $r[0]['xchan_follow']; + $r = q("select hubloc_url from hubloc where hubloc_hash = '%s' and ( hubloc_flags & %d ) limit 1", dbesc($xchan), intval(HUBLOC_FLAGS_PRIMARY) ); if($r) - return $r[0]['hubloc_url']; + return $r[0]['hubloc_url'] . '/follow?f=&url=%s'; return ''; } diff --git a/include/follow.php b/include/follow.php index ce550b07f..510c6cd7e 100644 --- a/include/follow.php +++ b/include/follow.php @@ -11,7 +11,7 @@ require_once('include/zot.php'); -function new_contact($uid,$url,$channel,$interactive = false) { +function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) { $result = array('success' => false,'message' => ''); @@ -60,6 +60,11 @@ function new_contact($uid,$url,$channel,$interactive = false) { return $result; } + // Premium channel, set confirm before callback to avoid recursion + + if(array_key_exists('connect_url',$j) && (! $confirm)) + goaway($j['connect_url']); + // check service class limits diff --git a/mod/connect.php b/mod/connect.php index 0ab994ddd..c2b55d997 100644 --- a/mod/connect.php +++ b/mod/connect.php @@ -31,12 +31,13 @@ function connect_post(&$a) { $channel = $a->get_channel(); if(($channel['channel_pageflags'] & PAGE_PREMIUM) != $premium) - $r = q("update channel set channel_flags = channel_flags ^ %d where channel_id = %d limit 1", + $r = q("update channel set channel_pageflags = channel_pageflags ^ %d where channel_id = %d limit 1", intval(PAGE_PREMIUM), intval(local_user()) ); set_pconfig($a->profile['profile_uid'],'system','selltext',$text); - return; + goaway(z_root() . '/' . $a->query_string); + } $url = ''; @@ -53,7 +54,7 @@ function connect_post(&$a) { } } if($url) - goaway($url); + goaway($url . '&confirm=1'); else notice('Unable to connect to your home hub location.'); @@ -68,20 +69,34 @@ function connect_content(&$a) { $text = get_pconfig($a->profile['profile_uid'],'system','selltext'); if($edit) { + $channel = $a->get_channel(); + $o = replace_macros(get_markup_template('sellpage_edit.tpl'),array( + '$header' => t('Premium Channel Setup'), + '$address' => $a->profile['channel_address'], + '$premium' => array('premium', t('Enable premium channel connection restrictions'),(($channel['channel_pageflags'] & PAGE_PREMIUM) ? '1' : ''),''), + '$lbl_about' => t('Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc.'), + '$text' => $text, + '$desc' => t('This channel may require additional steps or acknowledgement of the following conditions prior to connecting:'), + '$lbl2' => t('Potential connections will then see the following text before proceeding:'), + '$desc2' => t('By continuing, I certify that I have complied with any instructions provided on this page.'), + '$submit' => t('Submit'), )); return $o; } else { + if(! $text) + $text = t('(No specific instructions have been provided by the channel owner.)'); + $submit = replace_macros(get_markup_template('sellpage_submit.tpl'), array( '$continue' => t('Continue'), '$address' => $a->profile['channel_address'] )); $o = replace_macros(get_markup_template('sellpage_view.tpl'),array( - '$header' => t('Restricted Channel'), + '$header' => t('Restricted or Premium Channel'), '$desc' => t('This channel may require additional steps or acknowledgement of the following conditions prior to connecting:'), '$text' => prepare_text($text), @@ -90,8 +105,9 @@ function connect_content(&$a) { )); - - + $arr = array('profile' => $a->profile,'observer' => $a->get_observer(), 'sellpage' => $o, 'submit' => $submit); + call_hooks('connect_premium', $arr); + $o = $arr['sellpage']; } diff --git a/mod/follow.php b/mod/follow.php index d21c50df6..9f5a8183b 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -12,8 +12,9 @@ function follow_init(&$a) { $uid = local_user(); $url = notags(trim($_REQUEST['url'])); $return_url = $_SESSION['return_url']; + $confirm = intval($_REQUEST['confirm']); - $result = new_contact($uid,$url,$a->get_channel(),true); + $result = new_contact($uid,$url,$a->get_channel(),true,$confirm); if($result['success'] == false) { if($result['message']) diff --git a/mod/zfinger.php b/mod/zfinger.php index d5b750537..320f0ca71 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -140,7 +140,7 @@ function zfinger_init(&$a) { // This is a template - %s will be replaced with the follow_url we discover for the return channel. if($special_channel) - $ret['connect_url'] = z_root() . '/connect/' . $e['channel_address'] . '?f=&follow=%s'; + $ret['connect_url'] = z_root() . '/connect/' . $e['channel_address']; // This is a template for our follow url, %s will be replaced with a webbie diff --git a/view/css/mod_connect.css b/view/css/mod_connect.css index 43de7d256..d1a46ec48 100644 --- a/view/css/mod_connect.css +++ b/view/css/mod_connect.css @@ -1,3 +1,11 @@ +.sellpage-body { + margin-top: 25px; +} + .sellpage-final { margin-top: 25px; +} + +#sellpage-edit label{ + width: 300px; } \ No newline at end of file diff --git a/view/tpl/sellpage_edit.tpl b/view/tpl/sellpage_edit.tpl new file mode 100644 index 000000000..0a4726fb2 --- /dev/null +++ b/view/tpl/sellpage_edit.tpl @@ -0,0 +1,23 @@ +

{{$header}}

+
+ +{{include file="field_checkbox.tpl" field=$premium}} + +
{{$desc}}
+ +
+

+{{$lbl_about}} +

+ + + +
+
+ + +
{{$lbl2}}
+
{{$desc2}}
+ + +
From 1101f4ab8879a189873804c8ee7b3cafec63c7da Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 21 Aug 2013 23:10:16 -0700 Subject: [PATCH 010/330] fixes for sellpage with blocked profiles --- mod/connect.php | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/mod/connect.php b/mod/connect.php index c2b55d997..6bf53eb2b 100644 --- a/mod/connect.php +++ b/mod/connect.php @@ -15,7 +15,15 @@ function connect_init(&$a) { return; } + $r = q("select * from channel where channel_address = '%s' limit 1", + dbesc($which) + ); + + if($r) + $a->data['channel'] = $r[0]; + profile_load($a,$which,''); + profile_create_sidebar($a,false); @@ -44,13 +52,13 @@ function connect_post(&$a) { $observer = $a->get_observer(); if(($observer) && ($_POST['submit'] === t('Continue'))) { if($observer['xchan_follow']) - $url = sprintf($observer['xchan_follow'],urlencode($a->profile['channel_address'] . '@' . $a->get_hostname())); + $url = sprintf($observer['xchan_follow'],urlencode($a->data['channel']['channel_address'] . '@' . $a->get_hostname())); if(! $url) { $r = q("select * from hubloc where hubloc_hash = '%s' order by hubloc_id desc limit 1", dbesc($observer['xchan_hash']) ); if($r) - $url = $r[0]['hubloc_url'] . '/follow?f=&url=' . urlencode($a->profile['channel_address'] . '@' . $a->get_hostname()); + $url = $r[0]['hubloc_url'] . '/follow?f=&url=' . urlencode($a->data['channel']['channel_address'] . '@' . $a->get_hostname()); } } if($url) @@ -64,17 +72,16 @@ function connect_post(&$a) { function connect_content(&$a) { - $edit = ((local_user() && (local_user() == $a->profile['profile_uid'])) ? true : false); + $edit = ((local_user() && (local_user() == $a->data['channel']['channel_id'])) ? true : false); - $text = get_pconfig($a->profile['profile_uid'],'system','selltext'); + $text = get_pconfig($a->data['channel']['channel_id'],'system','selltext'); if($edit) { - $channel = $a->get_channel(); $o = replace_macros(get_markup_template('sellpage_edit.tpl'),array( '$header' => t('Premium Channel Setup'), - '$address' => $a->profile['channel_address'], - '$premium' => array('premium', t('Enable premium channel connection restrictions'),(($channel['channel_pageflags'] & PAGE_PREMIUM) ? '1' : ''),''), + '$address' => $a->data['channel']['channel_address'], + '$premium' => array('premium', t('Enable premium channel connection restrictions'),(($a->data['channel']['channel_pageflags'] & PAGE_PREMIUM) ? '1' : ''),''), '$lbl_about' => t('Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc.'), '$text' => $text, '$desc' => t('This channel may require additional steps or acknowledgement of the following conditions prior to connecting:'), @@ -92,7 +99,7 @@ function connect_content(&$a) { $submit = replace_macros(get_markup_template('sellpage_submit.tpl'), array( '$continue' => t('Continue'), - '$address' => $a->profile['channel_address'] + '$address' => $a->data['channel']['channel_address'] )); $o = replace_macros(get_markup_template('sellpage_view.tpl'),array( @@ -105,7 +112,7 @@ function connect_content(&$a) { )); - $arr = array('profile' => $a->profile,'observer' => $a->get_observer(), 'sellpage' => $o, 'submit' => $submit); + $arr = array('channel' => $a->data['channel'],'observer' => $a->get_observer(), 'sellpage' => $o, 'submit' => $submit); call_hooks('connect_premium', $arr); $o = $arr['sellpage']; From 22b6ddef9457e5ed3d38cf03be4b4451ec9d150c Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 22 Aug 2013 00:44:24 -0700 Subject: [PATCH 011/330] add zid to connect_url --- include/follow.php | 2 +- version.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/follow.php b/include/follow.php index 510c6cd7e..10bcddf2b 100644 --- a/include/follow.php +++ b/include/follow.php @@ -63,7 +63,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) // Premium channel, set confirm before callback to avoid recursion if(array_key_exists('connect_url',$j) && (! $confirm)) - goaway($j['connect_url']); + goaway(zid($j['connect_url'])); // check service class limits diff --git a/version.inc b/version.inc index 9990b329d..eef8ef12b 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-08-21.412 +2013-08-22.413 From af72f40759418275abae575176f43d27388bfcd6 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 22 Aug 2013 01:00:54 -0700 Subject: [PATCH 012/330] make premium channels a feature --- include/features.php | 3 +-- mod/settings.php | 13 +++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/include/features.php b/include/features.php index 757f719df..6272b33ea 100644 --- a/include/features.php +++ b/include/features.php @@ -27,8 +27,7 @@ function get_features() { //FIXME - needs a description, but how the hell do we explain this to normals? array('sendzid', t('Extended Identity Sharing'), t(' ')), array('expert', t('Expert Mode'), t('Enable Expert Mode to provide advanced configuration options')), - - + array('premium_channel', t('Premium Channel'), t('Allows you to set restrictions and terms on those that connect with your channel')), ), // Post composition diff --git a/mod/settings.php b/mod/settings.php index 36befead1..2a3a64581 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -31,6 +31,8 @@ function settings_aside(&$a) { $a->argv[] = 'channel'; } + $channel = $a->get_channel(); + $abook_self_id = 0; // Retrieve the 'self' address book entry for use in the auto-permissions link @@ -101,6 +103,17 @@ function settings_aside(&$a) { ); + + if(feature_enabled(local_user(),'premium_channel')) { + $tabs[] = array( + 'label' => t('Premium Channel Settings'), + 'url' => $a->get_baseurl(true) . '/connect/' . $channel['channel_address'], + 'selected' => '' + ); + + } + + $tabtpl = get_markup_template("generic_links_widget.tpl"); $a->page['aside'] = replace_macros($tabtpl, array( From 32ff0932bf3b596e68ae7f4100bebbccdc1eae00 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 22 Aug 2013 03:24:50 -0700 Subject: [PATCH 013/330] add detailed logging to public recips - find out why some public recipients are getting bypassed (David Benfells' problem with tagging groups, etc.) --- include/zot.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/zot.php b/include/zot.php index ff69a119e..37d2a03bd 100644 --- a/include/zot.php +++ b/include/zot.php @@ -928,6 +928,8 @@ function public_recips($msg) { if(! $col) return NULL; + logger('__public_recips'); +dbg(1); if($msg['notify']['sender']['url'] === z_root()) $sql = " where (( " . $col . " & " . PERMS_NETWORK . " ) or ( " . $col . " & " . PERMS_SITE . " )) "; else @@ -945,6 +947,7 @@ function public_recips($msg) { if(! $x) $x = array(); +dbg(0); $r = array_merge($r,$x); logger('public_recips: ' . print_r($r,true), LOGGER_DATA); From 141c8ccb1f94b9ce80466aa6be178d97e3f290bf Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 22 Aug 2013 05:50:15 -0700 Subject: [PATCH 014/330] possible fix for mention tags not posting to mentioned forum (when send stream permission is blocked) --- include/zot.php | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/include/zot.php b/include/zot.php index 37d2a03bd..c7049dee6 100644 --- a/include/zot.php +++ b/include/zot.php @@ -838,6 +838,7 @@ function zot_import($arr) { // and who are allowed to see them based on the sender's permissions $deliveries = allowed_public_recips($i); + } if(! $deliveries) { logger('zot_import: no deliveries on this site'); @@ -910,10 +911,12 @@ function zot_import($arr) { function public_recips($msg) { + $check_mentions = false; if($msg['message']['type'] === 'activity') { if(array_key_exists('flags',$msg['message']) && in_array('thread_parent', $msg['message']['flags'])) { $col = 'channel_w_stream'; $field = PERMS_W_STREAM; + $check_mentions = true; } else { $col = 'channel_w_comment'; @@ -928,8 +931,7 @@ function public_recips($msg) { if(! $col) return NULL; - logger('__public_recips'); -dbg(1); + if($msg['notify']['sender']['url'] === z_root()) $sql = " where (( " . $col . " & " . PERMS_NETWORK . " ) or ( " . $col . " & " . PERMS_SITE . " )) "; else @@ -947,9 +949,29 @@ dbg(1); if(! $x) $x = array(); -dbg(0); $r = array_merge($r,$x); + + // look for any public mentions on this site + // They will get filtered by tgroup_check() so we don't need to check permissions now + + if($check_mentions && $msg['message']['tags']) { + if(is_array($msg['message']['tags']) && $msg['message']['tags']) { + foreach($msg['message']['tags'] as $tag) { + if(($tag['type'] === 'mention') && (strpos($tag['url'],z_root()) !== false)) { + $address = basename($tag['url']); + if($address) { + $z = q("select channel_hash as hash from channel where channel_address = '%s' limit 1", + dbesc($address) + ); + if($z) + $r = array_merge($r,$z); + } + } + } + } + } + logger('public_recips: ' . print_r($r,true), LOGGER_DATA); return $r; } From 99a9aee03e55af84f6963bbdbe3e365a7721e93d Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 22 Aug 2013 06:15:00 -0700 Subject: [PATCH 015/330] extra logging for translating likes in notification emails - which is still failing on occasion. --- include/conversation.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/conversation.php b/include/conversation.php index 9dab5931b..6e6ffef94 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -162,6 +162,9 @@ function localize_item(&$item){ $item['body'] .= "\n\n\n" . '[zrl=' . chanlink_url($author_link) . '][zmg=80x80]' . $Bphoto . '[/zmg][/zrl]'; } + else { + logger('localize_item like failed: link ' . $author_link . ' name ' . $author_name . ' url ' . $item_url); + } } From c102a4e428dd827667a3d8194523e94358cde5a5 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 22 Aug 2013 14:37:08 -0700 Subject: [PATCH 016/330] perform a refresh_all operation after changing premium status so that everybody will catch it quickly and not in a day or two. --- mod/connect.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mod/connect.php b/mod/connect.php index 6bf53eb2b..5731d050d 100644 --- a/mod/connect.php +++ b/mod/connect.php @@ -38,12 +38,14 @@ function connect_post(&$a) { $text = escape_tags($_POST['text']); $channel = $a->get_channel(); - if(($channel['channel_pageflags'] & PAGE_PREMIUM) != $premium) + if(($channel['channel_pageflags'] & PAGE_PREMIUM) != $premium) { $r = q("update channel set channel_pageflags = channel_pageflags ^ %d where channel_id = %d limit 1", intval(PAGE_PREMIUM), intval(local_user()) ); - set_pconfig($a->profile['profile_uid'],'system','selltext',$text); + proc_exec('php','include/notifier.php','refresh_all',$channel['channel_id']); + } + set_pconfig($channel['channel_id'],'system','selltext',$text); goaway(z_root() . '/' . $a->query_string); } From 347faa59b6f112ae76122e55f57ee73968479d7a Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 22 Aug 2013 14:59:17 -0700 Subject: [PATCH 017/330] proc_run, not proc_exec --- mod/connect.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/connect.php b/mod/connect.php index 5731d050d..1d0a21496 100644 --- a/mod/connect.php +++ b/mod/connect.php @@ -43,7 +43,7 @@ function connect_post(&$a) { intval(PAGE_PREMIUM), intval(local_user()) ); - proc_exec('php','include/notifier.php','refresh_all',$channel['channel_id']); + proc_run('php','include/notifier.php','refresh_all',$channel['channel_id']); } set_pconfig($channel['channel_id'],'system','selltext',$text); goaway(z_root() . '/' . $a->query_string); From 83e3e4e45a1906590a2a629f197800c928ebe169 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 22 Aug 2013 15:35:10 -0700 Subject: [PATCH 018/330] this should fix the premium checkbox stickiness issue --- mod/connect.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/mod/connect.php b/mod/connect.php index 1d0a21496..93f994af5 100644 --- a/mod/connect.php +++ b/mod/connect.php @@ -31,21 +31,25 @@ function connect_init(&$a) { function connect_post(&$a) { - $edit = ((local_user() && (local_user() == $a->profile['profile_uid'])) ? true : false); + if(! array_key_exists('channel', $a->data)) + return; + + $edit = ((local_user() && (local_user() == $a->data['channel']['channel_id'])) ? true : false); if($edit) { + $has_premium = (($a->data['channel']['channel_pageflags'] & PAGE_PREMIUM) ? 1 : 0); $premium = (($_POST['premium']) ? intval($_POST['premium']) : 0); $text = escape_tags($_POST['text']); - $channel = $a->get_channel(); - if(($channel['channel_pageflags'] & PAGE_PREMIUM) != $premium) { - $r = q("update channel set channel_pageflags = channel_pageflags ^ %d where channel_id = %d limit 1", + if($has_premium != $premium) { + $r = q("update channel set channel_pageflags = ( channel_pageflags ^ %d ) where channel_id = %d limit 1", intval(PAGE_PREMIUM), intval(local_user()) ); - proc_run('php','include/notifier.php','refresh_all',$channel['channel_id']); + proc_run('php','include/notifier.php','refresh_all',$a->data['channel']['channel_id']); } - set_pconfig($channel['channel_id'],'system','selltext',$text); + set_pconfig($a->data['channel']['channel_id'],'system','selltext',$text); + // reload the page completely to get fresh data goaway(z_root() . '/' . $a->query_string); } From c9fc8efd2295338febbbcba6dc3cc377e752d3d4 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sat, 24 Aug 2013 14:11:46 +0200 Subject: [PATCH 019/330] Make footers position fixed, so that its content appears --- view/theme/redbasic/css/style.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index f4c399735..1105bb4bb 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -331,6 +331,8 @@ ul.tabs { /* footer */ footer { + position:fixed; + bottom:1px; text-align: right; padding-bottom: 1em; padding-right: 3em; From 6999fb586ba90e9f1c79e9f09f4035f63fb925fd Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 24 Aug 2013 17:01:39 +0100 Subject: [PATCH 020/330] Generic wrapper classes makes themeing loads easier --- view/tpl/direntry.tpl | 23 +++++++++++++---------- view/tpl/mail_display.tpl | 2 ++ view/tpl/mail_list.tpl | 2 +- view/tpl/page_display.tpl | 2 +- view/tpl/profile_advanced.tpl | 3 ++- view/tpl/webpagelist.tpl | 2 +- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl index c6c0ab028..35bbbe0fd 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -1,13 +1,16 @@
-
-
- {{$entry.alttext}} -
-
+
-
{{$entry.name}}
- {{if $entry.connect}} - - {{/if}} -
{{$entry.details}}
+
+
+{{$entry.alttext}} +
+
+ +
{{$entry.name}}
+{{if $entry.connect}} + +{{/if}} +
{{$entry.details}}
+
diff --git a/view/tpl/mail_display.tpl b/view/tpl/mail_display.tpl index 26e02529a..7280f1e84 100755 --- a/view/tpl/mail_display.tpl +++ b/view/tpl/mail_display.tpl @@ -1,3 +1,4 @@ +
{{foreach $mails as $mail}} {{include file="mail_conv.tpl"}} {{/foreach}} @@ -7,3 +8,4 @@ {{else}} {{$unknown_text}} {{/if}} +
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index fc4af8ddd..8a6eeed56 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -1,4 +1,4 @@ -
+
{{$from_name}} {{$from_name}} diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl index 7b4fdb96e..d8175bdd2 100755 --- a/view/tpl/page_display.tpl +++ b/view/tpl/page_display.tpl @@ -1,6 +1,6 @@
-
+

{{$title}}

{{$date}}
diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index db48a8509..9f17a0ffa 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -1,3 +1,4 @@ +

{{$title}}

@@ -179,4 +180,4 @@ {{/foreach}} {{/if}} - +
diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl index b09dc9f38..9a189230b 100644 --- a/view/tpl/webpagelist.tpl +++ b/view/tpl/webpagelist.tpl @@ -2,7 +2,7 @@ {{if $pages}} -
+
{{foreach $pages as $key => $items}} {{foreach $items as $item}}
From cd21468fbfd4a63b90b76d6dca8935c6b96aebaa Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 24 Aug 2013 17:06:05 +0100 Subject: [PATCH 021/330] Another one. --- view/tpl/sellpage_view.tpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/view/tpl/sellpage_view.tpl b/view/tpl/sellpage_view.tpl index 414445039..20a65ffbe 100644 --- a/view/tpl/sellpage_view.tpl +++ b/view/tpl/sellpage_view.tpl @@ -1,3 +1,4 @@ +

{{$header}}

{{$desc}}
@@ -7,3 +8,4 @@
{{$desc2}}
{{$submit}} +
From d88e72771940002fc4d18a57a020b957867e67ab Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 24 Aug 2013 17:08:04 +0100 Subject: [PATCH 022/330] Typo --- view/tpl/mail_list.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index 8a6eeed56..a01396ae5 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -1,4 +1,4 @@ -
+
{{$from_name}} {{$from_name}} From 381f457c3fae5dea1c76883837f18a70a55e6bb8 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 24 Aug 2013 16:52:38 -0700 Subject: [PATCH 023/330] fix xchans more completely after a URL change --- boot.php | 17 +- doc/html/Contact_8php.html | 2 +- doc/html/boot_8php.html | 100 +- doc/html/boot_8php.js | 5 +- doc/html/crypto_8php.html | 2 +- doc/html/datetime_8php.html | 2 +- doc/html/dba__driver_8php.html | 4 +- .../dir_d41ce877eb409a4791b288730010abe2.html | 2 + .../dir_d41ce877eb409a4791b288730010abe2.js | 1 + doc/html/extract_8php.html | 4 +- doc/html/features_8php.html | 2 +- doc/html/files.html | 207 +- doc/html/globals_0x63.html | 9 + doc/html/globals_0x6e.html | 2 +- doc/html/globals_0x70.html | 7 +- doc/html/globals_0x73.html | 3 + doc/html/globals_func_0x63.html | 9 + doc/html/globals_func_0x6e.html | 2 +- doc/html/globals_func_0x70.html | 4 +- doc/html/globals_func_0x73.html | 3 + doc/html/globals_vars_0x70.html | 3 + doc/html/include_2attach_8php.html | 4 +- doc/html/include_2config_8php.html | 6 +- doc/html/include_2follow_8php.html | 14 +- doc/html/include_2follow_8php.js | 2 +- doc/html/include_2group_8php.html | 4 +- doc/html/include_2menu_8php.html | 4 +- doc/html/include_2network_8php.html | 2 +- doc/html/items_8php.html | 2 +- doc/html/language_8php.html | 2 +- doc/html/navtree.js | 14 +- doc/html/navtreeindex0.js | 80 +- doc/html/navtreeindex1.js | 42 +- doc/html/navtreeindex2.js | 40 +- doc/html/navtreeindex3.js | 88 +- doc/html/navtreeindex4.js | 86 +- doc/html/navtreeindex5.js | 218 +-- doc/html/navtreeindex6.js | 174 +- doc/html/navtreeindex7.js | 38 +- doc/html/permissions_8php.html | 23 +- doc/html/permissions_8php.js | 3 +- doc/html/php2po_8php.html | 2 +- doc/html/plugin_8php.html | 8 +- doc/html/redbasic_2php_2style_8php.html | 4 +- doc/html/search/all_63.js | 4 + doc/html/search/all_6e.js | 2 +- doc/html/search/all_70.js | 5 +- doc/html/search/all_73.js | 1 + doc/html/search/files_63.js | 1 + doc/html/search/functions_63.js | 3 + doc/html/search/functions_6e.js | 2 +- doc/html/search/functions_70.js | 4 +- doc/html/search/functions_73.js | 1 + doc/html/search/variables_70.js | 1 + doc/html/text_8php.html | 12 +- doc/html/typo_8php.html | 2 +- doc/html/zot_8php.html | 4 +- util/messages.po | 1727 +++++++++-------- version.inc | 2 +- 59 files changed, 1600 insertions(+), 1421 deletions(-) diff --git a/boot.php b/boot.php index c8a8fbc7e..11e805e8b 100755 --- a/boot.php +++ b/boot.php @@ -1284,7 +1284,7 @@ function fix_system_urls($oldurl,$newurl) { // that they can clean up their hubloc tables (this includes directories). // It's a very expensive operation so you don't want to have to do it often or after your site gets to be large. - $r = q("select xchan_hash, channel_prvkey from xchan left join channel on channel_hash = xchan_hash where xchan_url = '%s'", + $r = q("select * from xchan left join channel on channel_hash = xchan_hash where xchan_url = '%s'", dbesc($oldurl) ); if($r) { @@ -1296,10 +1296,15 @@ function fix_system_urls($oldurl,$newurl) { $newhost = $parsed['host']; $rhs = $newhost . (($parsed['port']) ? ':' . $parsed['port'] : '') . (($parsed['path']) ? $parsed['path'] : ''); - $x = q("update xchan set xchan_addr = '%s', xchan_url = '%s', xchan_connurl = '%s' where xchan_hash = '%s' limit 1", + $x = q("update xchan set xchan_addr = '%s', xchan_url = '%s', xchan_connurl = '%s', xchan_follow = '%s', xchan_connpage = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s' where xchan_hash = '%s' limit 1", dbesc($channel . '@' . $rhs), - dbesc($newurl), - dbesc($newurl . '/poco/' . $channel), + dbesc(str_replace($oldurl,$newurl,$rr['xchan_url'])), + dbesc(str_replace($oldurl,$newurl,$rr['xchan_connurl'])), + dbesc(str_replace($oldurl,$newurl,$rr['xchan_follow'])), + dbesc(str_replace($oldurl,$newurl,$rr['xchan_connpage'])), + dbesc(str_replace($oldurl,$newurl,$rr['xchan_photo_l'])), + dbesc(str_replace($oldurl,$newurl,$rr['xchan_photo_m'])), + dbesc(str_replace($oldurl,$newurl,$rr['xchan_photo_s'])), dbesc($rr['xchan_hash']) ); @@ -2236,6 +2241,10 @@ function zid($s,$address = '') { $mine = get_my_url(); $myaddr = (($address) ? $address : get_my_address()); + // FIXME checking against our own channel url is no longer reliable. We may have a lot + // of urls attached to out channel. Should probably match against our site, since we + // will not need to remote authenticate on our own site anyway. + if($mine && $myaddr && (! link_compare($mine,$s))) $zurl = $s . (($num_slashes >= 3) ? '' : '/') . $achar . 'zid=' . urlencode($myaddr); else diff --git a/doc/html/Contact_8php.html b/doc/html/Contact_8php.html index a7a11c12f..4c7f6190c 100644 --- a/doc/html/Contact_8php.html +++ b/doc/html/Contact_8php.html @@ -407,7 +407,7 @@ Functions
-

Referenced by profile_sidebar().

+

Referenced by profile_sidebar().

diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index fa0bfc600..728d4d7fb 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -161,10 +161,10 @@ Functions    profile_load (&$a, $nickname, $profile= '')   - profile_create_sidebar (&$a) -  - profile_sidebar ($profile, $block=0) -  + profile_create_sidebar (&$a, $connect=true) +  + profile_sidebar ($profile, $block=0, $show_connect=true) +   get_birthdays ()    get_events () @@ -222,7 +222,7 @@ Variables   const ZOT_REVISION 1   -const DB_UPDATE_VERSION 1059 +const DB_UPDATE_VERSION 1064   const EOL '<br />' . "\r\n"   @@ -306,6 +306,8 @@ Variables   const PAGE_DIRECTORY_CHANNEL 0x0008   +const PAGE_PREMIUM 0x0010 +  const PAGE_REMOVED 0x8000   const PHOTO_NORMAL 0x0000 @@ -676,7 +678,7 @@ Variables
-

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

+

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

@@ -694,7 +696,7 @@ Variables
-

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

+

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

@@ -899,7 +901,7 @@ Variables
@@ -916,7 +918,7 @@ Variables
-

Referenced by FriendicaSmarty\__construct(), FriendicaSmartyEngine\__construct(), abook_toggle_flag(), allowed_public_recips(), api_apply_template(), api_format_items(), api_get_user(), api_statuses_home_timeline(), api_statuses_repeat(), api_user(), argc(), argv(), atom_entry(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), build_sync_packet(), call_hooks(), can_comment_on_post(), categories_widget(), change_channel(), channel_remove(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), cli_suggest_run(), common_friends_visitor_widget(), connections_content(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), dfrn_deliver(), drop_item(), event_store(), fetch_url(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), format_event_diaspora(), get_account_id(), get_best_language(), get_birthdays(), get_events(), get_feed_for(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_observer_hash(), get_plink(), get_theme_config_file(), get_theme_screenshot(), gprobe_run(), group_select(), guess_image_type(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), import_channel_photo(), import_post(), import_profile_photo(), info(), is_site_admin(), item_message_id(), item_photo_menu(), item_redir_and_replace_images(), items_fetch(), load_contact_links(), load_hooks(), login(), FKOAuth1\loginUser(), lrdd(), manage_content(), map_scope(), nav_set_selected(), new_contact(), notice(), notification(), notifier_run(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), onepoll_run(), ping_init(), poco_load(), poller_run(), post_activity_item(), post_url(), preg_heart(), prepare_body(), proc_run(), process_delivery(), profile_activity(), profile_sidebar(), public_permissions_sql(), replace_macros(), rmagic_init(), saved_searches(), scale_external_images(), search(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), smilies(), tag_deliver(), terminate_friendship(), tgroup_check(), theme_include(), tt(), update_suggestions(), user_allow(), vcard_from_xchan(), what_next(), z_fetch_url(), and zot_finger().

+

Referenced by FriendicaSmarty\__construct(), FriendicaSmartyEngine\__construct(), abook_toggle_flag(), allowed_public_recips(), api_apply_template(), api_format_items(), api_get_user(), api_statuses_home_timeline(), api_statuses_repeat(), api_user(), argc(), argv(), atom_entry(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), 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(), common_friends_visitor_widget(), connections_content(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), dfrn_deliver(), drop_item(), event_store(), fetch_url(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), format_event_diaspora(), get_account_id(), get_best_language(), get_birthdays(), get_events(), get_feed_for(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_observer_hash(), get_plink(), get_theme_config_file(), get_theme_screenshot(), gprobe_run(), group_select(), guess_image_type(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), import_channel_photo(), import_post(), import_profile_photo(), info(), is_site_admin(), item_message_id(), item_photo_menu(), item_redir_and_replace_images(), items_fetch(), load_contact_links(), load_hooks(), login(), FKOAuth1\loginUser(), lrdd(), manage_content(), map_scope(), nav_set_selected(), new_contact(), notice(), notification(), notifier_run(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), onepoll_run(), ping_init(), poco_load(), poller_run(), post_activity_item(), post_url(), preg_heart(), prepare_body(), proc_run(), process_delivery(), profile_activity(), profile_sidebar(), public_permissions_sql(), replace_macros(), rmagic_init(), saved_searches(), scale_external_images(), search(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), smilies(), tag_deliver(), terminate_friendship(), tgroup_check(), theme_include(), tt(), update_suggestions(), user_allow(), vcard_from_xchan(), what_next(), z_fetch_url(), and zot_finger().

@@ -1014,7 +1016,7 @@ Variables @@ -1047,7 +1049,7 @@ Variables
-

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

+

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

@@ -1080,7 +1082,7 @@ Variables @@ -1184,7 +1186,7 @@ Variables
-

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

+

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

@@ -1236,7 +1238,7 @@ Variables
-

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

+

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

@@ -1258,11 +1260,11 @@ Variables

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

$cmd and string args are surrounded with ""

-

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

+

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

- + @@ -1315,11 +1327,11 @@ Variables

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

load/reload current theme info

-

Referenced by channel_init(), common_init(), hcard_init(), lastpost_init(), page_init(), profile_init(), profile_photo_init(), profiles_init(), profperm_init(), viewconnections_init(), and webpages_content().

+

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

- + @@ -1459,7 +1477,7 @@ Variables
-

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

+

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

@@ -1527,7 +1545,7 @@ Variables
-

Referenced by allowed_public_recips(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), chanview_content(), check_config(), connections_content(), conversation(), create_identity(), deliver_run(), directory_content(), display_content(), event_store(), follow_init(), format_css_if_exists(), format_js_if_exists(), group_post(), App\head_get_icon(), head_get_icon(), hostxrd_init(), import_post(), import_xchan(), intro_post(), invite_content(), item_photo_menu(), item_store(), lastpost_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), manage_content(), menu_content(), menu_post(), mitem_content(), mitem_post(), mood_init(), navbar_complete(), network_content(), new_channel_post(), notification(), notifications_post(), notifier_run(), photo_upload(), photos_album_widget(), photos_create_item(), post_init(), profile_activity(), public_recips(), redir_init(), register_post(), removeme_content(), rmagic_init(), rmagic_post(), search_content(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), sync_directories(), tagger_content(), thing_init(), update_suggestions(), user_allow(), vcard_from_xchan(), webpages_content(), wfinger_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().

+

Referenced by allowed_public_recips(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), chanview_content(), check_config(), connect_post(), connections_content(), conversation(), create_identity(), deliver_run(), directory_content(), display_content(), event_store(), follow_init(), format_css_if_exists(), format_js_if_exists(), group_post(), App\head_get_icon(), head_get_icon(), hostxrd_init(), import_post(), import_xchan(), intro_post(), invite_content(), item_photo_menu(), item_store(), lastpost_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), manage_content(), menu_content(), menu_post(), mitem_content(), mitem_post(), mood_init(), navbar_complete(), network_content(), new_channel_post(), notification(), notifications_post(), notifier_run(), photo_upload(), photos_album_widget(), photos_create_item(), post_init(), profile_activity(), profile_sidebar(), public_recips(), redir_init(), register_post(), removeme_content(), rmagic_init(), rmagic_post(), search_content(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), sync_directories(), tagger_content(), thing_init(), update_suggestions(), user_allow(), vcard_from_xchan(), webpages_content(), wfinger_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().

@@ -1565,7 +1583,7 @@ Variables
Returns
string

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

-

Referenced by bb_ShareAttributes(), conversation(), dirfind_content(), intro_content(), like_puller(), localize_item(), match_content(), menu_render(), notifications_content(), and viewconnections_content().

+

Referenced by bb_ShareAttributes(), conversation(), dirfind_content(), intro_content(), like_puller(), localize_item(), match_content(), menu_render(), new_contact(), notifications_content(), and viewconnections_content().

@@ -1668,7 +1686,7 @@ Variables @@ -2306,7 +2324,7 @@ Variables
- +
const DB_UPDATE_VERSION 1059const DB_UPDATE_VERSION 1064
@@ -2420,7 +2438,7 @@ Variables
-

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

+

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

@@ -2873,7 +2891,7 @@ Variables @@ -3654,6 +3672,20 @@ Variables

Referenced by create_identity().

+ + + +
+
+ + + + +
const PAGE_PREMIUM 0x0010
+
@@ -3722,7 +3754,7 @@ Variables @@ -3835,7 +3867,7 @@ Variables @@ -3877,7 +3909,7 @@ Variables @@ -3933,7 +3965,7 @@ Variables diff --git a/doc/html/boot_8php.js b/doc/html/boot_8php.js index 2a5705c57..9ca39c30f 100644 --- a/doc/html/boot_8php.js +++ b/doc/html/boot_8php.js @@ -35,9 +35,9 @@ var boot_8php = [ "login", "boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4", null ], [ "notice", "boot_8php.html#a9255af5ae9c887520091ea04763c1a88", null ], [ "proc_run", "boot_8php.html#ab346a2ece14993861f3e4206befa94f0", null ], - [ "profile_create_sidebar", "boot_8php.html#a5b45d647da3743a7fc8c6223350b4d67", null ], + [ "profile_create_sidebar", "boot_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620", null ], [ "profile_load", "boot_8php.html#a4751b522ea913d0e7ed43e03d22e9e68", null ], - [ "profile_sidebar", "boot_8php.html#a646123ebbb10eb6f5b6ff26f4288da9b", null ], + [ "profile_sidebar", "boot_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc", null ], [ "profile_tabs", "boot_8php.html#a1dfcb5146e9d1eca4528bc580ad5d273", null ], [ "remote_user", "boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209", null ], [ "startup", "boot_8php.html#aca47505b8732177f52bb2d647eb2741c", null ], @@ -199,6 +199,7 @@ var boot_8php = [ "PAGE_DIRECTORY_CHANNEL", "boot_8php.html#a5b8484922918946d041e5e0515dbe718", null ], [ "PAGE_HIDDEN", "boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640", null ], [ "PAGE_NORMAL", "boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3", null ], + [ "PAGE_PREMIUM", "boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8", null ], [ "PAGE_REMOVED", "boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6", null ], [ "PERMS_A_DELEGATE", "boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b", null ], [ "PERMS_CONTACTS", "boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6", null ], diff --git a/doc/html/crypto_8php.html b/doc/html/crypto_8php.html index 795c4c937..25c416ed9 100644 --- a/doc/html/crypto_8php.html +++ b/doc/html/crypto_8php.html @@ -252,7 +252,7 @@ Functions diff --git a/doc/html/datetime_8php.html b/doc/html/datetime_8php.html index 0ad53d55e..e937b29a4 100644 --- a/doc/html/datetime_8php.html +++ b/doc/html/datetime_8php.html @@ -332,7 +332,7 @@ Functions
-

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

+

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

diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html index f00f839aa..65d7f4a07 100644 --- a/doc/html/dba__driver_8php.html +++ b/doc/html/dba__driver_8php.html @@ -202,7 +202,7 @@ Functions
-

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

+

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

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

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

-

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

+

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

diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html index a4d398156..da9e2070d 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html @@ -126,6 +126,8 @@ Files   file  community.php   +file  connect.php +  file  connections.php   file  contactgroup.php diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js index b1fbf1f1a..a06750c26 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js @@ -11,6 +11,7 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "chanview.php", "chanview_8php.html", "chanview_8php" ], [ "common.php", "common_8php.html", "common_8php" ], [ "community.php", "community_8php.html", "community_8php" ], + [ "connect.php", "connect_8php.html", "connect_8php" ], [ "connections.php", "connections_8php.html", "connections_8php" ], [ "contactgroup.php", "contactgroup_8php.html", "contactgroup_8php" ], [ "crepair.php", "crepair_8php.html", "crepair_8php" ], diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html index 0b425b088..7d5ce9435 100644 --- a/doc/html/extract_8php.html +++ b/doc/html/extract_8php.html @@ -132,7 +132,7 @@ Variables
-

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

+

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

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

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

+

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

diff --git a/doc/html/features_8php.html b/doc/html/features_8php.html index 11699c8c0..6d9159820 100644 --- a/doc/html/features_8php.html +++ b/doc/html/features_8php.html @@ -142,7 +142,7 @@ Functions diff --git a/doc/html/files.html b/doc/html/files.html index ce48497ec..c5c58f247 100644 --- a/doc/html/files.html +++ b/doc/html/files.html @@ -196,109 +196,110 @@ $(document).ready(function(){initNavTree('files.html','');}); |o*chanview.php |o*common.php |o*community.php -|o*connections.php -|o*contactgroup.php -|o*crepair.php -|o*delegate.php -|o*directory.php -|o*dirfind.php -|o*dirsearch.php -|o*display.php -|o*editpost.php -|o*editwebpage.php -|o*events.php -|o*fbrowser.php -|o*feed.php -|o*filer.php -|o*filerm.php -|o*follow.php -|o*fsuggest.php -|o*group.php -|o*hcard.php -|o*help.php -|o*home.php -|o*hostxrd.php -|o*import.php -|o*intro.php -|o*invite.php -|o*item.php -|o*lastpost.php -|o*like.php -|o*lockview.php -|o*login.php -|o*lostpass.php -|o*magic.php -|o*manage.php -|o*match.php -|o*menu.php -|o*message.php -|o*mitem.php -|o*mood.php -|o*msearch.php -|o*network.php -|o*new_channel.php -|o*nogroup.php -|o*notifications.php -|o*notify.php -|o*oembed.php -|o*oexchange.php -|o*opensearch.php -|o*page.php -|o*parse_url.php -|o*photo.php -|o*photos.php -|o*php.php -|o*ping.php -|o*poco.php -|o*poke.php -|o*post.php -|o*pretheme.php -|o*probe.php -|o*profile.php -|o*profile_photo.php -|o*profiles.php -|o*profperm.php -|o*qsearch.php -|o*randprof.php -|o*redir.php -|o*register.php -|o*regmod.php -|o*removeme.php -|o*rmagic.php -|o*rsd_xml.php -|o*search.php -|o*search_ac.php -|o*settings.php -|o*setup.php -|o*share.php -|o*siteinfo.php -|o*sitelist.php -|o*smilies.php -|o*starred.php -|o*subthread.php -|o*suggest.php -|o*tagger.php -|o*tagrm.php -|o*thing.php -|o*toggle_mobile.php -|o*uexport.php -|o*update_channel.php -|o*update_community.php -|o*update_display.php -|o*update_network.php -|o*update_search.php -|o*view.php -|o*viewconnections.php -|o*viewsrc.php -|o*wall_attach.php -|o*wall_upload.php -|o*webfinger.php -|o*webpages.php -|o*wfinger.php -|o*xchan.php -|o*xrd.php -|o*zfinger.php -|\*zotfeed.php +|o*connect.php +|o*connections.php +|o*contactgroup.php +|o*crepair.php +|o*delegate.php +|o*directory.php +|o*dirfind.php +|o*dirsearch.php +|o*display.php +|o*editpost.php +|o*editwebpage.php +|o*events.php +|o*fbrowser.php +|o*feed.php +|o*filer.php +|o*filerm.php +|o*follow.php +|o*fsuggest.php +|o*group.php +|o*hcard.php +|o*help.php +|o*home.php +|o*hostxrd.php +|o*import.php +|o*intro.php +|o*invite.php +|o*item.php +|o*lastpost.php +|o*like.php +|o*lockview.php +|o*login.php +|o*lostpass.php +|o*magic.php +|o*manage.php +|o*match.php +|o*menu.php +|o*message.php +|o*mitem.php +|o*mood.php +|o*msearch.php +|o*network.php +|o*new_channel.php +|o*nogroup.php +|o*notifications.php +|o*notify.php +|o*oembed.php +|o*oexchange.php +|o*opensearch.php +|o*page.php +|o*parse_url.php +|o*photo.php +|o*photos.php +|o*php.php +|o*ping.php +|o*poco.php +|o*poke.php +|o*post.php +|o*pretheme.php +|o*probe.php +|o*profile.php +|o*profile_photo.php +|o*profiles.php +|o*profperm.php +|o*qsearch.php +|o*randprof.php +|o*redir.php +|o*register.php +|o*regmod.php +|o*removeme.php +|o*rmagic.php +|o*rsd_xml.php +|o*search.php +|o*search_ac.php +|o*settings.php +|o*setup.php +|o*share.php +|o*siteinfo.php +|o*sitelist.php +|o*smilies.php +|o*starred.php +|o*subthread.php +|o*suggest.php +|o*tagger.php +|o*tagrm.php +|o*thing.php +|o*toggle_mobile.php +|o*uexport.php +|o*update_channel.php +|o*update_community.php +|o*update_display.php +|o*update_network.php +|o*update_search.php +|o*view.php +|o*viewconnections.php +|o*viewsrc.php +|o*wall_attach.php +|o*wall_upload.php +|o*webfinger.php +|o*webpages.php +|o*wfinger.php +|o*xchan.php +|o*xrd.php +|o*zfinger.php +|\*zotfeed.php o+util |o+fpostit ||\*fpostit.php diff --git a/doc/html/globals_0x63.html b/doc/html/globals_0x63.html index d52fcc6d0..016b26fa8 100644 --- a/doc/html/globals_0x63.html +++ b/doc/html/globals_0x63.html @@ -306,6 +306,15 @@ $(document).ready(function(){initNavTree('globals_0x63.html','');});
  • completeurl() : parse_url.php
  • +
  • connect_content() +: connect.php +
  • +
  • connect_init() +: connect.php +
  • +
  • connect_post() +: connect.php +
  • connections_aside() : connections.php
  • diff --git a/doc/html/globals_0x6e.html b/doc/html/globals_0x6e.html index ec7c86eaa..e4ff51d56 100644 --- a/doc/html/globals_0x6e.html +++ b/doc/html/globals_0x6e.html @@ -265,7 +265,7 @@ $(document).ready(function(){initNavTree('globals_0x6e.html','');}); : new_channel.php
  • new_contact() -: follow.php +: follow.php
  • new_cookie() : session.php diff --git a/doc/html/globals_0x70.html b/doc/html/globals_0x70.html index 97d26ea3e..0c07fb2cf 100644 --- a/doc/html/globals_0x70.html +++ b/doc/html/globals_0x70.html @@ -170,6 +170,9 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
  • PAGE_NORMAL : boot.php
  • +
  • PAGE_PREMIUM +: boot.php +
  • PAGE_REMOVED : boot.php
  • @@ -432,7 +435,7 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');}); : profile.php
  • profile_create_sidebar() -: boot.php +: boot.php
  • profile_init() : profile.php @@ -450,7 +453,7 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');}); : profile_photo.php
  • profile_sidebar() -: boot.php +: boot.php
  • profile_tabs() : boot.php diff --git a/doc/html/globals_0x73.html b/doc/html/globals_0x73.html index d2eab4bd5..3b97b548f 100644 --- a/doc/html/globals_0x73.html +++ b/doc/html/globals_0x73.html @@ -231,6 +231,9 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
  • showForm() : fpostit.php
  • +
  • site_default_perms() +: permissions.php +
  • siteinfo_content() : siteinfo.php
  • diff --git a/doc/html/globals_func_0x63.html b/doc/html/globals_func_0x63.html index 03e6e7dad..a963fc5ef 100644 --- a/doc/html/globals_func_0x63.html +++ b/doc/html/globals_func_0x63.html @@ -296,6 +296,15 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');});
  • completeurl() : parse_url.php
  • +
  • connect_content() +: connect.php +
  • +
  • connect_init() +: connect.php +
  • +
  • connect_post() +: connect.php +
  • connections_aside() : connections.php
  • diff --git a/doc/html/globals_func_0x6e.html b/doc/html/globals_func_0x6e.html index 7b18010ec..10a7c856b 100644 --- a/doc/html/globals_func_0x6e.html +++ b/doc/html/globals_func_0x6e.html @@ -177,7 +177,7 @@ $(document).ready(function(){initNavTree('globals_func_0x6e.html','');}); : new_channel.php
  • new_contact() -: follow.php +: follow.php
  • new_cookie() : session.php diff --git a/doc/html/globals_func_0x70.html b/doc/html/globals_func_0x70.html index dd4b4cb9e..8dbccb4e8 100644 --- a/doc/html/globals_func_0x70.html +++ b/doc/html/globals_func_0x70.html @@ -330,7 +330,7 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');}); : profile.php
  • profile_create_sidebar() -: boot.php +: boot.php
  • profile_init() : profile.php @@ -348,7 +348,7 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');}); : profile_photo.php
  • profile_sidebar() -: boot.php +: boot.php
  • profile_tabs() : boot.php diff --git a/doc/html/globals_func_0x73.html b/doc/html/globals_func_0x73.html index 124dd85d5..2b6e1a481 100644 --- a/doc/html/globals_func_0x73.html +++ b/doc/html/globals_func_0x73.html @@ -230,6 +230,9 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');});
  • showForm() : fpostit.php
  • +
  • site_default_perms() +: permissions.php +
  • siteinfo_content() : siteinfo.php
  • diff --git a/doc/html/globals_vars_0x70.html b/doc/html/globals_vars_0x70.html index cd83fa987..7f84f42d6 100644 --- a/doc/html/globals_vars_0x70.html +++ b/doc/html/globals_vars_0x70.html @@ -159,6 +159,9 @@ $(document).ready(function(){initNavTree('globals_vars_0x70.html','');});
  • PAGE_NORMAL : boot.php
  • +
  • PAGE_PREMIUM +: boot.php +
  • PAGE_REMOVED : boot.php
  • diff --git a/doc/html/include_2attach_8php.html b/doc/html/include_2attach_8php.html index 886ea944b..31955e83b 100644 --- a/doc/html/include_2attach_8php.html +++ b/doc/html/include_2attach_8php.html @@ -180,7 +180,7 @@ Functions
    -

    Referenced by item_post().

    +

    Referenced by item_post(), and send_message().

    @@ -326,7 +326,7 @@ Functions diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html index 00d8dd5a9..a85836821 100644 --- a/doc/html/include_2config_8php.html +++ b/doc/html/include_2config_8php.html @@ -256,7 +256,7 @@ Functions
    -

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

    +

    Referenced by admin_page_dbsync(), admin_page_logs(), admin_page_site(), admin_page_summary(), admin_page_themes(), allowed_email(), allowed_url(), api_statuses_mentions(), api_statusnet_config(), attach_store(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), community_content(), create_account(), create_identity(), detect_language(), dfrn_deliver(), directory_content(), directory_run(), dirfind_content(), dirsearch_content(), display_content(), dlogger(), dob(), editpost_content(), encode_item(), encode_mail(), events_content(), expire_run(), feed_init(), fetch_url(), fetch_xrd_links(), findpeople_widget(), Item\get_comment_box(), get_item_elements(), get_mail_elements(), group_content(), hcard_init(), hostxrd_init(), photo_gd\imageString(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), item_store(), lastpost_content(), photo_imagick\load(), logger(), login(), lostpass_content(), lostpass_post(), match_content(), nav(), navbar_complete(), FKOAuthDataStore\new_access_token(), new_channel_post(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), parse_url_content(), photo_upload(), photos_content(), photos_init(), poco_init(), poller_run(), post_post(), post_url(), prepare_body(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), proc_run(), profile_content(), profile_create_sidebar(), profile_photo_post(), profiles_content(), profperm_content(), qsearch_init(), register_content(), register_post(), reload_plugins(), 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(), update_suggestions(), upgrade_link(), user_allow(), valid_email(), validate_email(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_import(), and zotfeed_init().

    @@ -324,7 +324,7 @@ Functions @@ -508,7 +508,7 @@ Functions diff --git a/doc/html/include_2follow_8php.html b/doc/html/include_2follow_8php.html index ed557fda9..8b42bcb0a 100644 --- a/doc/html/include_2follow_8php.html +++ b/doc/html/include_2follow_8php.html @@ -112,11 +112,11 @@ $(document).ready(function(){initNavTree('include_2follow_8php.html','');}); - - + +

    Functions

     new_contact ($uid, $url, $channel, $interactive=false)
     
     new_contact ($uid, $url, $channel, $interactive=false, $confirm=false)
     

    Function Documentation

    - +
    @@ -142,7 +142,13 @@ Functions - + + + + + + + diff --git a/doc/html/include_2follow_8php.js b/doc/html/include_2follow_8php.js index a44d66d5b..7d72af074 100644 --- a/doc/html/include_2follow_8php.js +++ b/doc/html/include_2follow_8php.js @@ -1,4 +1,4 @@ var include_2follow_8php = [ - [ "new_contact", "include_2follow_8php.html#a6553a7650fae55f95660510d90983144", null ] + [ "new_contact", "include_2follow_8php.html#ae387d4ae097c23d69f3247e7f08140c7", null ] ]; \ No newline at end of file diff --git a/doc/html/include_2group_8php.html b/doc/html/include_2group_8php.html index a14ed0d39..aa452e406 100644 --- a/doc/html/include_2group_8php.html +++ b/doc/html/include_2group_8php.html @@ -226,7 +226,7 @@ Functions
     $interactive = false $interactive = false,
     $confirm = false 
    @@ -300,7 +300,7 @@ Functions
    -

    Referenced by new_contact().

    +

    Referenced by new_contact().

    diff --git a/doc/html/include_2menu_8php.html b/doc/html/include_2menu_8php.html index d9229d2de..ff4e76c14 100644 --- a/doc/html/include_2menu_8php.html +++ b/doc/html/include_2menu_8php.html @@ -358,7 +358,7 @@ Functions
    -

    Referenced by mitem_content(), and profile_sidebar().

    +

    Referenced by mitem_content(), and profile_sidebar().

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

    Referenced by mitem_content(), and profile_sidebar().

    +

    Referenced by mitem_content(), and profile_sidebar().

    diff --git a/doc/html/include_2network_8php.html b/doc/html/include_2network_8php.html index 985eb92a5..4a505fa69 100644 --- a/doc/html/include_2network_8php.html +++ b/doc/html/include_2network_8php.html @@ -224,7 +224,7 @@ Functions
    -

    Referenced by new_contact().

    +

    Referenced by new_contact().

    diff --git a/doc/html/items_8php.html b/doc/html/items_8php.html index a78bfc16a..45632a5d3 100644 --- a/doc/html/items_8php.html +++ b/doc/html/items_8php.html @@ -236,7 +236,7 @@ Functions diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html index 6d9fecb17..661fc4688 100644 --- a/doc/html/language_8php.html +++ b/doc/html/language_8php.html @@ -280,7 +280,7 @@ Functions
    -

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

    +

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

    diff --git a/doc/html/navtree.js b/doc/html/navtree.js index 1796ca3f0..697310d81 100644 --- a/doc/html/navtree.js +++ b/doc/html/navtree.js @@ -36,13 +36,13 @@ var NAVTREE = var NAVTREEINDEX = [ "BaseObject_8php.html", -"boot_8php.html#aa3425e2de85b08f7041656d3a8502cb6", -"classItem.html#a632185dd25c5caf277067c76230a4320", -"dir_55dbaf9b7b53c4fc605c9011743a7353.html", -"include_2api_8php.html#a8969e8d9c683f12ba17dcd4b059e020d", -"mod_2directory_8php.html", -"removeme_8php.html", -"wall__upload_8php.html" +"boot_8php.html#aa3679df31c8dad1b71816b0322d5baff", +"classItem.html#a5d29ddecc073151a65a8e2ea2f6e4189", +"deliver_8php.html#a397afcb9afecf0c1816b0951189dd346", +"include_2api_8php.html#a6951c690d87775eb37e569c66011988e", +"mod_2api_8php.html#a02ae0f60e240dc806b860edb7d582117", +"register_8php.html", +"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js index 348c4c035..03379b597 100644 --- a/doc/html/navtreeindex0.js +++ b/doc/html/navtreeindex0.js @@ -91,7 +91,7 @@ var NAVTREEINDEX0 = "boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[5,0,4,131], "boot_8php.html#a01353c9abebc3544ea080ac161729632":[5,0,4,42], "boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[5,0,4,144], -"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[5,0,4,231], +"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[5,0,4,232], "boot_8php.html#a032bbd6d0321e99e9117332c9ed2b1b8":[5,0,4,60], "boot_8php.html#a03d19251c245587de7ed959300b87bdf":[5,0,4,160], "boot_8php.html#a0450389f24c632906fbc24347700a543":[5,0,4,53], @@ -100,9 +100,9 @@ var NAVTREEINDEX0 = "boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[5,0,4,198], "boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[5,0,4,73], "boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[5,0,4,164], -"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[5,0,4,247], -"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[5,0,4,243], -"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[5,0,4,246], +"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[5,0,4,248], +"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[5,0,4,244], +"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[5,0,4,247], "boot_8php.html#a0e4701c9742c3ef88f02ac450a042a84":[5,0,4,25], "boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[5,0,4,65], "boot_8php.html#a0e6db7e365f2b041a828b93786f694bc":[5,0,4,15], @@ -114,72 +114,72 @@ var NAVTREEINDEX0 = "boot_8php.html#a17b4ea23d9ecf628d9c8f53b7abcb805":[5,0,4,143], "boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[5,0,4,139], "boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[5,0,4,163], -"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[5,0,4,250], -"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[5,0,4,251], +"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[5,0,4,251], +"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[5,0,4,252], "boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[5,0,4,167], "boot_8php.html#a1da180f961f49a11573cac4ff6c62c05":[5,0,4,82], -"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[5,0,4,208], +"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[5,0,4,209], "boot_8php.html#a1dfcb5146e9d1eca4528bc580ad5d273":[5,0,4,38], "boot_8php.html#a1f5906598e90b5ea2b4245f682be4348":[5,0,4,110], "boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[5,0,4,150], "boot_8php.html#a20f0eed431d25870b624b8937a07a59f":[5,0,4,183], -"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[5,0,4,227], +"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[5,0,4,228], "boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5":[5,0,4,48], "boot_8php.html#a24a7a70afedd5d85fe0eadc85afa9f77":[5,0,4,24], "boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8":[5,0,4,106], "boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f":[5,0,4,98], -"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[5,0,4,236], +"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[5,0,4,237], "boot_8php.html#a285732e7889fa7f333cbe431111e1029":[5,0,4,186], "boot_8php.html#a29528a2544373cc19a378f350040c6a1":[5,0,4,89], "boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[5,0,4,126], -"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[5,0,4,206], +"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[5,0,4,207], "boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3":[5,0,4,111], "boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[5,0,4,182], "boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d":[5,0,4,124], "boot_8php.html#a2e90096fede6acce16abf0da8cb2febe":[5,0,4,74], "boot_8php.html#a2f8f25b13480c37a5f22511f53da8bab":[5,0,4,79], -"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[5,0,4,213], +"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[5,0,4,214], "boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[5,0,4,137], "boot_8php.html#a34c756469ebed32e2fc987bcde62d382":[5,0,4,50], "boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[5,0,4,117], "boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[5,0,4,152], -"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[5,0,4,253], +"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[5,0,4,254], "boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[5,0,4,171], "boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[5,0,4,112], -"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[5,0,4,252], -"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[5,0,4,204], +"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[5,0,4,253], +"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[5,0,4,205], "boot_8php.html#a3e0930933fb2c0bf8211cc7ab4e1c3b4":[5,0,4,12], "boot_8php.html#a3e2ea123d29a72012db1241f96280b0e":[5,0,4,66], "boot_8php.html#a3f40aa5bafff8c4eebdc62e5121daf77":[5,0,4,96], "boot_8php.html#a400519fa181591cd6fdbb8f25fbcba0a":[5,0,4,58], "boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb":[5,0,4,127], -"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[5,0,4,200], +"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[5,0,4,201], +"boot_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc":[5,0,4,37], "boot_8php.html#a43296b1b4398aacbf92a4b2d56bab91e":[5,0,4,181], "boot_8php.html#a43c6c7d84d880e9500bd4f8f8ecc5731":[5,0,4,95], "boot_8php.html#a444ce608ce34efb82ee11852f36e825f":[5,0,4,157], "boot_8php.html#a44ae1542a805ffd7f826fb511db07374":[5,0,4,147], "boot_8php.html#a44d069c8a1cfcc6d2007c506a17ff28f":[5,0,4,77], -"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[5,0,4,244], +"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[5,0,4,245], "boot_8php.html#a4751b522ea913d0e7ed43e03d22e9e68":[5,0,4,36], "boot_8php.html#a490972c02fdb638c52ec0e012a30bfd2":[5,0,4,19], "boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[5,0,4,169], "boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[5,0,4,109], -"boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4":[5,0,4,221], +"boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4":[5,0,4,222], "boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[5,0,4,168], "boot_8php.html#a4c02d88e66852a01bd5a1feecb7c3ce3":[5,0,4,6], -"boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[5,0,4,199], -"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[5,0,4,217], +"boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[5,0,4,200], +"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[5,0,4,218], "boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[5,0,4,193], "boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[5,0,4,151], "boot_8php.html#a52b599cd13e152ebc80d7e4413683195":[5,0,4,49], "boot_8php.html#a53e4bdb6f225da55115acb9277f75e53":[5,0,4,88], "boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209":[5,0,4,39], "boot_8php.html#a56fd673eaa7014150297ce1162502db5":[5,0,4,185], -"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[5,0,4,216], +"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[5,0,4,217], "boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1":[5,0,4,23], "boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[5,0,4,67], "boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[5,0,4,175], -"boot_8php.html#a5b45d647da3743a7fc8c6223350b4d67":[5,0,4,35], "boot_8php.html#a5b815330f3d177ab383af37a6c12e532":[5,0,4,46], "boot_8php.html#a5b8484922918946d041e5e0515dbe718":[5,0,4,196], "boot_8php.html#a5c3747e0f505f0d5271dc4c54e3feaf4":[5,0,4,85], @@ -187,31 +187,30 @@ var NAVTREEINDEX0 = "boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640":[5,0,4,197], "boot_8php.html#a623e49c79943f3e7bdb770d021683cf7":[5,0,4,21], "boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5":[5,0,4,81], -"boot_8php.html#a646123ebbb10eb6f5b6ff26f4288da9b":[5,0,4,37], -"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[5,0,4,240], +"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[5,0,4,241], "boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[5,0,4,161], "boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[5,0,4,135], "boot_8php.html#a680fbafc2db023c5b1309e0180e81315":[5,0,4,47], "boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11":[5,0,4,138], "boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155":[5,0,4,52], "boot_8php.html#a6969947145a139ec374ce098224d8e81":[5,0,4,141], -"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[5,0,4,229], -"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[5,0,4,220], -"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[5,0,4,214], +"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[5,0,4,230], +"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[5,0,4,221], +"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[5,0,4,215], "boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd":[5,0,4,107], "boot_8php.html#a6c5e9e293c8242dcb9bc2c3ea2fee2c9":[5,0,4,99], -"boot_8php.html#a6df1102664f64b274810db85197c2755":[5,0,4,202], -"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[5,0,4,228], +"boot_8php.html#a6df1102664f64b274810db85197c2755":[5,0,4,203], +"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[5,0,4,229], "boot_8php.html#a719c7f3972d5f9268f37a41c76cd4ef6":[5,0,4,30], "boot_8php.html#a7236b2cdcf59f02a42302e893a99013b":[5,0,4,176], "boot_8php.html#a749144d8dd9c1366596a0213c277d050":[5,0,4,129], "boot_8php.html#a74bf27f7564c9a37975e7b37d973dcab":[5,0,4,78], "boot_8php.html#a75a90b0eadd0df510f7e63210733634d":[5,0,4,2], -"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[5,0,4,248], +"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[5,0,4,249], "boot_8php.html#a768f00b7d66be0daf7ef4eea2e862006":[5,0,4,4], "boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966":[5,0,4,80], "boot_8php.html#a781916f83fcc8ff1035649afa45f0292":[5,0,4,93], -"boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383":[5,0,4,223], +"boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383":[5,0,4,224], "boot_8php.html#a7aa57438db03834aaa0b468bdce773a6":[5,0,4,71], "boot_8php.html#a7af107fab8d62b9a73801713b774ed30":[5,0,4,128], "boot_8php.html#a7b8f8ad9dbe82711257d23891ef6b133":[5,0,4,156], @@ -224,30 +223,31 @@ var NAVTREEINDEX0 = "boot_8php.html#a84057c5bfa1bca5fba8497fe005ee4d8":[5,0,4,59], "boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688":[5,0,4,63], "boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[5,0,4,122], -"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[5,0,4,239], -"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[5,0,4,238], +"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[5,0,4,240], +"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[5,0,4,239], "boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[5,0,4,174], "boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[5,0,4,104], -"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[5,0,4,218], +"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[5,0,4,219], "boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[5,0,4,125], "boot_8php.html#a8da836617174eed9fc2ac8054125354b":[5,0,4,119], -"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[5,0,4,225], +"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[5,0,4,226], "boot_8php.html#a9255af5ae9c887520091ea04763c1a88":[5,0,4,33], "boot_8php.html#a926cad0b3d8b9d9ee5da1898fc063ba3":[5,0,4,11], "boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[5,0,4,142], "boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[5,0,4,123], "boot_8php.html#a949116d9a295b214293006c060ca4848":[5,0,4,121], -"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[5,0,4,226], +"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[5,0,4,227], "boot_8php.html#a97769915c9f14adc4f8ab1ea2cecfd90":[5,0,4,18], "boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[5,0,4,188], -"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[5,0,4,219], +"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[5,0,4,220], "boot_8php.html#a9c80420e5a063a4a87ce4831f086134d":[5,0,4,55], "boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e":[5,0,4,5], -"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[5,0,4,211], +"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[5,0,4,212], "boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[5,0,4,189], -"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[5,0,4,241], -"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[5,0,4,210], +"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[5,0,4,242], +"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[5,0,4,211], "boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[5,0,4,177], "boot_8php.html#aa1e828bbbcba170265eb2668d8daf42e":[5,0,4,28], -"boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[5,0,4,195] +"boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[5,0,4,195], +"boot_8php.html#aa3425e2de85b08f7041656d3a8502cb6":[5,0,4,51] }; diff --git a/doc/html/navtreeindex1.js b/doc/html/navtreeindex1.js index cb5ffdb49..8a1396f5d 100644 --- a/doc/html/navtreeindex1.js +++ b/doc/html/navtreeindex1.js @@ -1,23 +1,23 @@ var NAVTREEINDEX1 = { -"boot_8php.html#aa3425e2de85b08f7041656d3a8502cb6":[5,0,4,51], "boot_8php.html#aa3679df31c8dad1b71816b0322d5baff":[5,0,4,149], "boot_8php.html#aa4221641e5c21db69fa52c426b9017f5":[5,0,4,9], "boot_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec":[5,0,4,20], "boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2":[5,0,4,146], "boot_8php.html#aa74438cf71e48e37bf7b440b94243985":[5,0,4,92], "boot_8php.html#aa8a2b61e70900139d1ca28e46f1da49d":[5,0,4,101], -"boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[5,0,4,215], +"boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[5,0,4,216], "boot_8php.html#aad33b494084f729b6ee3b0bc457718a1":[5,0,4,133], "boot_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3":[5,0,4,22], "boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14":[5,0,4,72], "boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[5,0,4,180], "boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[5,0,4,114], -"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[5,0,4,201], +"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[5,0,4,202], "boot_8php.html#ab346a2ece14993861f3e4206befa94f0":[5,0,4,34], -"boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0":[5,0,4,222], +"boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8":[5,0,4,199], +"boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0":[5,0,4,223], "boot_8php.html#ab4bddb41a0cf407178ec5278b950c393":[5,0,4,173], -"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[5,0,4,205], +"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[5,0,4,206], "boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764":[5,0,4,113], "boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[5,0,4,134], "boot_8php.html#ab55e545b72ec8c097e052ea7d373491f":[5,0,4,43], @@ -27,17 +27,17 @@ var NAVTREEINDEX1 = "boot_8php.html#ab7d65a7e7417825a4db62906bb600729":[5,0,4,103], "boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda":[5,0,4,44], "boot_8php.html#abc0a90a1a77f5b668aa7e4b57d1776a7":[5,0,4,3], -"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[5,0,4,245], +"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[5,0,4,246], "boot_8php.html#abdcdfc873ace4e0902177bad934de0c0":[5,0,4,70], "boot_8php.html#abedd940e664017c61b48c6efa31d0cb8":[5,0,4,102], "boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450":[5,0,4,120], "boot_8php.html#ac17fc8a416ea79e9d5cb4dc9a8ff8c5c":[5,0,4,27], "boot_8php.html#ac195fc9003298923ea81f144388e24b1":[5,0,4,159], -"boot_8php.html#ac43182e0d8bae7576a30b603774974f8":[5,0,4,224], +"boot_8php.html#ac43182e0d8bae7576a30b603774974f8":[5,0,4,225], "boot_8php.html#ac59a18a4838710d6c2de37aed6b21f03":[5,0,4,100], "boot_8php.html#ac608a34f3bc180e7724192e0fd31f9b0":[5,0,4,41], "boot_8php.html#ac8400313df2c831653f9036f71ebd86d":[5,0,4,62], -"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[5,0,4,249], +"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[5,0,4,250], "boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20":[5,0,4,116], "boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[5,0,4,118], "boot_8php.html#aca08bc4f1554ba877500f6abcc99e1e8":[5,0,4,187], @@ -45,7 +45,7 @@ var NAVTREEINDEX1 = "boot_8php.html#aca5e42678e178c6b9034610d66666fd7":[5,0,4,13], "boot_8php.html#acc4e0c910af066148b810e5fde55fff1":[5,0,4,8], "boot_8php.html#acca19aae62e1a6951a856b945de20d67":[5,0,4,162], -"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[5,0,4,212], +"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[5,0,4,213], "boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3":[5,0,4,69], "boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8":[5,0,4,145], "boot_8php.html#ad11f30a6590d3d77f0c5e1e3909af8f5":[5,0,4,153], @@ -53,44 +53,45 @@ var NAVTREEINDEX1 = "boot_8php.html#ad2c97627a313d53df1a1c7b4215ddb51":[5,0,4,16], "boot_8php.html#ad302cb26b838898d475f57f61b0fcc9f":[5,0,4,76], "boot_8php.html#ad34c1547020a305915bcc39707744690":[5,0,4,91], +"boot_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620":[5,0,4,35], "boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44":[5,0,4,31], -"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[5,0,4,207], -"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[5,0,4,230], +"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[5,0,4,208], +"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[5,0,4,231], "boot_8php.html#ada72d88ae39a7e3b45baea201cb49a29":[5,0,4,97], "boot_8php.html#adaeb4f590c56326b2dca3b19f31b6272":[5,0,4,130], -"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[5,0,4,233], +"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[5,0,4,234], "boot_8php.html#add517a0958ac684792c62142a3877f81":[5,0,4,45], "boot_8php.html#adfb2fc7be5a4226c0a8e24131da9d498":[5,0,4,26], -"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[5,0,4,237], +"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[5,0,4,238], "boot_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312":[5,0,4,17], "boot_8php.html#ae3cef7b63e25e7bafea3fcf6b99fad0e":[5,0,4,170], "boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[5,0,4,148], "boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[5,0,4,178], "boot_8php.html#aea7fc57a4d8e9dcb42f2601b0b9b761c":[5,0,4,29], -"boot_8php.html#aead84fa27d7516b855220fe004964a45":[5,0,4,242], -"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[5,0,4,209], +"boot_8php.html#aead84fa27d7516b855220fe004964a45":[5,0,4,243], +"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[5,0,4,210], "boot_8php.html#aed0dfb35f7dd00dc9e4f868ea7f7ff53":[5,0,4,154], "boot_8php.html#aedfb9501ed408278667995524e0d15cf":[5,0,4,105], "boot_8php.html#aee324eca9de4e0fedf01ab5f92e27c67":[5,0,4,165], "boot_8php.html#aef4b6c558c68c88c10f13c5a00c20e3d":[5,0,4,179], "boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[5,0,4,132], "boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4":[5,0,4,32], -"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[5,0,4,234], +"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[5,0,4,235], "boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[5,0,4,172], "boot_8php.html#af3a4271630aabd8be592213f925d6a36":[5,0,4,64], "boot_8php.html#af3bdfc20979c16f15bb9c60446a480f9":[5,0,4,57], "boot_8php.html#af489d0c3166551b93e63a79ff2c9be35":[5,0,4,136], "boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461":[5,0,4,192], "boot_8php.html#af6f6f6f40139f12fc09ec47373b30919":[5,0,4,94], -"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[5,0,4,232], +"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[5,0,4,233], "boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d":[5,0,4,184], "boot_8php.html#afaf93b7026f784b113b4f8921745891e":[5,0,4,166], -"boot_8php.html#afb97615e985a013799839b68b99018d7":[5,0,4,235], +"boot_8php.html#afb97615e985a013799839b68b99018d7":[5,0,4,236], "boot_8php.html#afbb1fe1b2c8c730ec8e08da93b6512c4":[5,0,4,54], "boot_8php.html#afe084c30a1810c10442edb4fbcbc0086":[5,0,4,86], "boot_8php.html#afe63ae69ba55299f813766e54df06ede":[5,0,4,140], "boot_8php.html#afe88b920aa285982edb817a0dd44eb37":[5,0,4,14], -"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[5,0,4,203], +"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[5,0,4,204], "cache_8php.html":[5,0,0,11], "channel_8php.html":[5,0,1,7], "channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1":[5,0,1,7,1], @@ -248,6 +249,5 @@ var NAVTREEINDEX1 = "classItem.html#a4b92e3a9d6212c553aa2661489bd95d8":[4,0,17,15], "classItem.html#a5b2fafdca55aefeaa08993a5a60529f0":[4,0,17,19], "classItem.html#a5b561415861f5b89b0733aacfe0428d1":[4,0,17,36], -"classItem.html#a5cfa6cf964f433a917a81cab079ff9d8":[4,0,17,39], -"classItem.html#a5d29ddecc073151a65a8e2ea2f6e4189":[4,0,17,41] +"classItem.html#a5cfa6cf964f433a917a81cab079ff9d8":[4,0,17,39] }; diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js index be5a0d8c8..47d9925ac 100644 --- a/doc/html/navtreeindex2.js +++ b/doc/html/navtreeindex2.js @@ -1,5 +1,6 @@ var NAVTREEINDEX2 = { +"classItem.html#a5d29ddecc073151a65a8e2ea2f6e4189":[4,0,17,41], "classItem.html#a632185dd25c5caf277067c76230a4320":[4,0,17,4], "classItem.html#a67892aa23d19f4431bb2e5f43c74000e":[4,0,17,12], "classItem.html#a7f7bc059de377319282cb4ef4a828480":[4,0,17,37], @@ -158,12 +159,16 @@ var NAVTREEINDEX2 = "community_8php.html":[5,0,1,10], "community_8php.html#a1197aafd6a6b540dbb4a0c04ade3a25a":[5,0,1,10,0], "community_8php.html#a56c94ec978a38633c5628fa6f8e386d9":[5,0,1,10,1], -"connections_8php.html":[5,0,1,11], -"connections_8php.html#a1224058db8e3fb56463eb312f98e561d":[5,0,1,11,4], -"connections_8php.html#a15af118efee9c948b6f8294e54a73bb2":[5,0,1,11,1], -"connections_8php.html#a1f23623f802af7bd35e95b0e94e5d558":[5,0,1,11,3], -"connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c":[5,0,1,11,2], -"connections_8php.html#af48f7ad20914760ba9874c090384e35a":[5,0,1,11,0], +"connect_8php.html":[5,0,1,11], +"connect_8php.html#a417ec27afe33f21a929667a665e32ee2":[5,0,1,11,2], +"connect_8php.html#a489f0a66c660de6ec4d6917b27674f07":[5,0,1,11,0], +"connect_8php.html#ad46a38f32fd7a3d324b1fa26373efa36":[5,0,1,11,1], +"connections_8php.html":[5,0,1,12], +"connections_8php.html#a1224058db8e3fb56463eb312f98e561d":[5,0,1,12,4], +"connections_8php.html#a15af118efee9c948b6f8294e54a73bb2":[5,0,1,12,1], +"connections_8php.html#a1f23623f802af7bd35e95b0e94e5d558":[5,0,1,12,3], +"connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c":[5,0,1,12,2], +"connections_8php.html#af48f7ad20914760ba9874c090384e35a":[5,0,1,12,0], "contact__selectors_8php.html":[5,0,0,16], "contact__selectors_8php.html#a2c743d2eb526eb758d943a1490162d75":[5,0,0,16,1], "contact__selectors_8php.html#a9839e8fdaac7ffb37bf1420493f5c28f":[5,0,0,16,0], @@ -175,8 +180,8 @@ var NAVTREEINDEX2 = "contact__widgets_8php.html#a552f8544528cec0c995cea7287ea9d65":[5,0,0,17,1], "contact__widgets_8php.html#a57e73ebcfd62bb5d8c7a7b9e663726d6":[5,0,0,17,3], "contact__widgets_8php.html#af24e693532a045954caab515942cfc6f":[5,0,0,17,4], -"contactgroup_8php.html":[5,0,1,12], -"contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3":[5,0,1,12,0], +"contactgroup_8php.html":[5,0,1,13], +"contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3":[5,0,1,13,0], "conversation_8php.html":[5,0,0,18], "conversation_8php.html#a0891aaa4492cba2b51eda12fe01957f3":[5,0,0,18,7], "conversation_8php.html#a0ee05f15255fb1cc3d89f30bc378a654":[5,0,0,18,9], @@ -200,10 +205,10 @@ var NAVTREEINDEX2 = "conversation_8php.html#ae59703b07ce2ddf627b4172ff26058b6":[5,0,0,18,5], "conversation_8php.html#ae996eb116d397a2c6396c312d7b98664":[5,0,0,18,16], "conversation_8php.html#afe5b2f38d8b803edb0d7ec5fa2868db0":[5,0,0,18,12], -"crepair_8php.html":[5,0,1,13], -"crepair_8php.html#a29464c01838e209c8059cfcd2d195caa":[5,0,1,13,0], -"crepair_8php.html#ab089978e50df156bbfabf9f8f5ccd198":[5,0,1,13,1], -"crepair_8php.html#acc4493e1ffd1462a605dd9b870034513":[5,0,1,13,2], +"crepair_8php.html":[5,0,1,14], +"crepair_8php.html#a29464c01838e209c8059cfcd2d195caa":[5,0,1,14,0], +"crepair_8php.html#ab089978e50df156bbfabf9f8f5ccd198":[5,0,1,14,1], +"crepair_8php.html#acc4493e1ffd1462a605dd9b870034513":[5,0,1,14,2], "cronhooks_8php.html":[5,0,0,20], "cronhooks_8php.html#a4c4c1bbec4ecc9a0efa00dd6afd2c0ca":[5,0,0,20,0], "crypto_8php.html":[5,0,0,21], @@ -242,12 +247,7 @@ var NAVTREEINDEX2 = "dba__driver_8php.html#af531546fac5f0836a8557a4f6dfee930":[5,0,0,0,0,4], "dba__mysql_8php.html":[5,0,0,0,1], "dba__mysqli_8php.html":[5,0,0,0,2], -"delegate_8php.html":[5,0,1,14], -"delegate_8php.html#a943eea8996ef348eb845c498f9f354dd":[5,0,1,14,0], -"deliver_8php.html":[5,0,0,23], -"deliver_8php.html#a397afcb9afecf0c1816b0951189dd346":[5,0,0,23,0], -"dir_032dd9e2cfe278a2cfa5eb9547448eb9.html":[5,0,3,1,0,0], -"dir_0eaa4a0adae8ba4811e133c6e594aeee.html":[5,0,2,0], -"dir_21bc5169ff11430004758be31dcfc6c4.html":[5,0,0,0], -"dir_23ec12649285f9fabf3a6b7380226c28.html":[5,0,2] +"delegate_8php.html":[5,0,1,15], +"delegate_8php.html#a943eea8996ef348eb845c498f9f354dd":[5,0,1,15,0], +"deliver_8php.html":[5,0,0,23] }; diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js index c3beaf943..caffe4385 100644 --- a/doc/html/navtreeindex3.js +++ b/doc/html/navtreeindex3.js @@ -1,5 +1,10 @@ var NAVTREEINDEX3 = { +"deliver_8php.html#a397afcb9afecf0c1816b0951189dd346":[5,0,0,23,0], +"dir_032dd9e2cfe278a2cfa5eb9547448eb9.html":[5,0,3,1,0,0], +"dir_0eaa4a0adae8ba4811e133c6e594aeee.html":[5,0,2,0], +"dir_21bc5169ff11430004758be31dcfc6c4.html":[5,0,0,0], +"dir_23ec12649285f9fabf3a6b7380226c28.html":[5,0,2], "dir_55dbaf9b7b53c4fc605c9011743a7353.html":[5,0,3,1,0], "dir_6b44a0e797e2f12381093380e3e54763.html":[5,0,3,1,1,0], "dir_817f6d302394b98e59575acdb59998bc.html":[5,0,3,0], @@ -13,14 +18,14 @@ var NAVTREEINDEX3 = "dir_d41ce877eb409a4791b288730010abe2.html":[5,0,1], "dir_d44c64559bbebec7f509842c48db8b23.html":[5,0,0], "dir_d795dfe8933002397556cc7aa16eca15.html":[5,0,3,1,1], -"dirfind_8php.html":[5,0,1,16], -"dirfind_8php.html#ac689a812c84f161b3a0d42349f83981c":[5,0,1,16,1], -"dirfind_8php.html#af22b0283f928c4c32e62248a5ae67cee":[5,0,1,16,0], -"dirsearch_8php.html":[5,0,1,17], -"dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752":[5,0,1,17,1], -"dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c":[5,0,1,17,0], -"display_8php.html":[5,0,1,18], -"display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0":[5,0,1,18,0], +"dirfind_8php.html":[5,0,1,17], +"dirfind_8php.html#ac689a812c84f161b3a0d42349f83981c":[5,0,1,17,1], +"dirfind_8php.html#af22b0283f928c4c32e62248a5ae67cee":[5,0,1,17,0], +"dirsearch_8php.html":[5,0,1,18], +"dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752":[5,0,1,18,1], +"dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c":[5,0,1,18,0], +"display_8php.html":[5,0,1,19], +"display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0":[5,0,1,19,0], "docblox__errorchecker_8php.html":[5,0,2,2], "docblox__errorchecker_8php.html#a1659f0a629d408e0f849dbe4ee061e62":[5,0,2,2,3], "docblox__errorchecker_8php.html#a21b4bbe5aae2d85db33affc7126a67ec":[5,0,2,2,2], @@ -33,10 +38,10 @@ var NAVTREEINDEX3 = "docblox__errorchecker_8php.html#ab66bc0493d25f39bf8b4dcbb429f04e6":[5,0,2,2,4], "docblox__errorchecker_8php.html#ae9562cf60aa693114603d27b55d2185f":[5,0,2,2,1], "docblox__errorchecker_8php.html#af4ca738a05beffe9c8c23e1f7aea3c2d":[5,0,2,2,10], -"editpost_8php.html":[5,0,1,19], -"editpost_8php.html#a34011690864d122680c802e9e748ccfb":[5,0,1,19,0], -"editwebpage_8php.html":[5,0,1,20], -"editwebpage_8php.html#a375e945255fad79a71036528f7480650":[5,0,1,20,0], +"editpost_8php.html":[5,0,1,20], +"editpost_8php.html#a34011690864d122680c802e9e748ccfb":[5,0,1,20,0], +"editwebpage_8php.html":[5,0,1,21], +"editwebpage_8php.html#a375e945255fad79a71036528f7480650":[5,0,1,21,0], "enotify_8php.html":[5,0,0,26], "enotify_8php.html#a3e9a9355b243777c488d2a9883908dfc":[5,0,0,26,1], "event_8php.html":[5,0,0,27], @@ -47,9 +52,9 @@ var NAVTREEINDEX3 = "event_8php.html#a32ba1b9ddf7a744a9a1512b052e5f850":[5,0,0,27,2], "event_8php.html#a89ef533faf345db8d64a58d4856bde3a":[5,0,0,27,3], "event_8php.html#abb74206cf42d694307c3d7abb7af9869":[5,0,0,27,4], -"events_8php.html":[5,0,1,21], -"events_8php.html#a1d293fb217ae6bc9e3858c4b32e363ec":[5,0,1,21,0], -"events_8php.html#ab3e8a8f901175f8e40a8089eea45c075":[5,0,1,21,1], +"events_8php.html":[5,0,1,22], +"events_8php.html#a1d293fb217ae6bc9e3858c4b32e363ec":[5,0,1,22,0], +"events_8php.html#ab3e8a8f901175f8e40a8089eea45c075":[5,0,1,22,1], "expire_8php.html":[5,0,0,28], "expire_8php.html#a444e45c9b67727b27db4c779fd51a298":[5,0,0,28,0], "extract_8php.html":[5,0,2,3], @@ -57,17 +62,17 @@ var NAVTREEINDEX3 = "extract_8php.html#a50b05cf2e02ef0b67fcad97106dd7634":[5,0,2,3,2], "extract_8php.html#a63bb4c41bc532baacf6a4976cfaa0feb":[5,0,2,3,0], "extract_8php.html#a9590b15215a21e9b42eb546aeef79704":[5,0,2,3,1], -"fbrowser_8php.html":[5,0,1,22], -"fbrowser_8php.html#aee476addcf7a3e0fe9454f7dfd5a56c4":[5,0,1,22,0], +"fbrowser_8php.html":[5,0,1,23], +"fbrowser_8php.html#aee476addcf7a3e0fe9454f7dfd5a56c4":[5,0,1,23,0], "features_8php.html":[5,0,0,29], "features_8php.html#a52b5bdfb61b256713efecf7a7b20b0c0":[5,0,0,29,0], "features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c":[5,0,0,29,1], -"feed_8php.html":[5,0,1,23], -"feed_8php.html#af86137700b56f33d1d5f25c8dec22c04":[5,0,1,23,0], -"filer_8php.html":[5,0,1,24], -"filer_8php.html#a5fd5d7e61b2f9c43cb5f110c89dc4274":[5,0,1,24,0], -"filerm_8php.html":[5,0,1,25], -"filerm_8php.html#ae2eb28d2054fa2c37e38689882172208":[5,0,1,25,0], +"feed_8php.html":[5,0,1,24], +"feed_8php.html#af86137700b56f33d1d5f25c8dec22c04":[5,0,1,24,0], +"filer_8php.html":[5,0,1,25], +"filer_8php.html#a5fd5d7e61b2f9c43cb5f110c89dc4274":[5,0,1,25,0], +"filerm_8php.html":[5,0,1,26], +"filerm_8php.html#ae2eb28d2054fa2c37e38689882172208":[5,0,1,26,0], "files.html":[5,0], "fpostit_8php.html":[5,0,2,0,0], "fpostit_8php.html#a3f3ae3ae61578b5671673914fd894443":[5,0,2,0,0,0], @@ -89,9 +94,9 @@ var NAVTREEINDEX3 = "friendica-to-smarty-tpl_8py.html#aecf730e0884bb4ddc6c0deb1ef85f8eb":[5,0,2,4,4], "friendica-to-smarty-tpl_8py.html#af6b2c793958aae2aadc294577431f749":[5,0,2,4,3], "friendica__smarty_8php.html":[5,0,0,31], -"fsuggest_8php.html":[5,0,1,27], -"fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d":[5,0,1,27,1], -"fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998":[5,0,1,27,0], +"fsuggest_8php.html":[5,0,1,28], +"fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d":[5,0,1,28,1], +"fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998":[5,0,1,28,0], "full_8php.html":[5,0,3,0,1], "full_8php.html#a6fac1b4b8cdfde06ea1b7713479e92db":[5,0,3,0,1,0], "functions.html":[4,3,0], @@ -172,8 +177,8 @@ var NAVTREEINDEX3 = "globals_func_0x77.html":[5,1,1,23], "globals_func_0x78.html":[5,1,1,24], "globals_func_0x7a.html":[5,1,1,25], -"globals_vars.html":[5,1,2,0], "globals_vars.html":[5,1,2], +"globals_vars.html":[5,1,2,0], "globals_vars_0x61.html":[5,1,2,1], "globals_vars_0x63.html":[5,1,2,2], "globals_vars_0x64.html":[5,1,2,3], @@ -197,15 +202,15 @@ var NAVTREEINDEX3 = "globals_vars_0x7a.html":[5,1,2,21], "gprobe_8php.html":[5,0,0,32], "gprobe_8php.html#adf72cb0a70b5b9d99fdec1cc60e18ed1":[5,0,0,32,0], -"hcard_8php.html":[5,0,1,29], -"hcard_8php.html#a956c7cae2009652a37900306e5b7b73d":[5,0,1,29,0], -"hcard_8php.html#ac34f26b0e6a37eef44fa49bea135136d":[5,0,1,29,1], -"help_8php.html":[5,0,1,30], -"help_8php.html#af055e15f600ffa6fbca9386fdf715224":[5,0,1,30,0], +"hcard_8php.html":[5,0,1,30], +"hcard_8php.html#a956c7cae2009652a37900306e5b7b73d":[5,0,1,30,0], +"hcard_8php.html#ac34f26b0e6a37eef44fa49bea135136d":[5,0,1,30,1], +"help_8php.html":[5,0,1,31], +"help_8php.html#af055e15f600ffa6fbca9386fdf715224":[5,0,1,31,0], "hierarchy.html":[4,2], -"home_8php.html":[5,0,1,31], -"hostxrd_8php.html":[5,0,1,32], -"hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92":[5,0,1,32,0], +"home_8php.html":[5,0,1,32], +"hostxrd_8php.html":[5,0,1,33], +"hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92":[5,0,1,33,0], "html2bbcode_8php.html":[5,0,0,34], "html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7":[5,0,0,34,3], "html2bbcode_8php.html#a5ad726995ac4070213abdb3bd09f4837":[5,0,0,34,1], @@ -225,9 +230,9 @@ var NAVTREEINDEX3 = "identity_8php.html#abf6a9c6ed92d594f1d4513c4e22a7abd":[5,0,0,36,1], "identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[5,0,0,36,5], "identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[5,0,0,36,7], -"import_8php.html":[5,0,1,33], -"import_8php.html#af17fef0410518f7eac205d0ea416eaa2":[5,0,1,33,1], -"import_8php.html#afdf25ed70096d5dbf4f6d0ca79fea184":[5,0,1,33,0], +"import_8php.html":[5,0,1,34], +"import_8php.html#af17fef0410518f7eac205d0ea416eaa2":[5,0,1,34,1], +"import_8php.html#afdf25ed70096d5dbf4f6d0ca79fea184":[5,0,1,34,0], "include_2api_8php.html":[5,0,0,5], "include_2api_8php.html#a0991f72554f821255397d615e76f3203":[5,0,0,5,12], "include_2api_8php.html#a176c448d79c211ad41c2bbe3124658f5":[5,0,0,5,5], @@ -244,10 +249,5 @@ var NAVTREEINDEX3 = "include_2api_8php.html#a58cf4c02ef435996f5c3bc4283d3968d":[5,0,0,5,13], "include_2api_8php.html#a5990101034e7abf6404feba3cd273629":[5,0,0,5,4], "include_2api_8php.html#a623793229a7256dd31bcfd5ab90eef08":[5,0,0,5,45], -"include_2api_8php.html#a645397787618b5c548a31e8686e8cca4":[5,0,0,5,32], -"include_2api_8php.html#a6951c690d87775eb37e569c66011988e":[5,0,0,5,35], -"include_2api_8php.html#a6a04b48168ba1d9dd2de3081a630611f":[5,0,0,5,31], -"include_2api_8php.html#a72bfecac1970bc29b853073e816388ff":[5,0,0,5,6], -"include_2api_8php.html#a7759ccddc8dff012ad168e511ffe5af5":[5,0,0,5,9], -"include_2api_8php.html#a864191bb876a515ed71b17e260ef35ad":[5,0,0,5,2] +"include_2api_8php.html#a645397787618b5c548a31e8686e8cca4":[5,0,0,5,32] }; diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js index 14c133d33..637b88738 100644 --- a/doc/html/navtreeindex4.js +++ b/doc/html/navtreeindex4.js @@ -1,5 +1,10 @@ var NAVTREEINDEX4 = { +"include_2api_8php.html#a6951c690d87775eb37e569c66011988e":[5,0,0,5,35], +"include_2api_8php.html#a6a04b48168ba1d9dd2de3081a630611f":[5,0,0,5,31], +"include_2api_8php.html#a72bfecac1970bc29b853073e816388ff":[5,0,0,5,6], +"include_2api_8php.html#a7759ccddc8dff012ad168e511ffe5af5":[5,0,0,5,9], +"include_2api_8php.html#a864191bb876a515ed71b17e260ef35ad":[5,0,0,5,2], "include_2api_8php.html#a8969e8d9c683f12ba17dcd4b059e020d":[5,0,0,5,46], "include_2api_8php.html#a8b25a186bd0893f51aa72a62f655735e":[5,0,0,5,39], "include_2api_8php.html#a9160288b7ac220635942d8dc209b78c3":[5,0,0,5,10], @@ -56,7 +61,7 @@ var NAVTREEINDEX4 = "include_2directory_8php.html":[5,0,0,25], "include_2directory_8php.html#aa75d3b0697ca1456aaabdb37a74aa0f0":[5,0,0,25,0], "include_2follow_8php.html":[5,0,0,30], -"include_2follow_8php.html#a6553a7650fae55f95660510d90983144":[5,0,0,30,0], +"include_2follow_8php.html#ae387d4ae097c23d69f3247e7f08140c7":[5,0,0,30,0], "include_2group_8php.html":[5,0,0,33], "include_2group_8php.html#a0122ef312df2c5546b1a46b3e6c7b31b":[5,0,0,33,2], "include_2group_8php.html#a048f6892bfd28852de1b76470df411de":[5,0,0,33,10], @@ -139,19 +144,19 @@ var NAVTREEINDEX4 = "interfaceITemplateEngine.html":[4,0,18], "interfaceITemplateEngine.html#aaa7381c8becc3d1c1790b53988a0f243":[4,0,18,1], "interfaceITemplateEngine.html#aaf2698adbf46c073c24b162fe1b1c442":[4,0,18,0], -"intro_8php.html":[5,0,1,34], -"intro_8php.html#a3e2a523697633ddb4517b9266a515f5b":[5,0,1,34,1], -"intro_8php.html#abc3abf25da64f98f215126eb08c7936b":[5,0,1,34,0], -"intro_8php.html#af3681062183ccbdf065ae2647b07d6f1":[5,0,1,34,2], -"invite_8php.html":[5,0,1,35], -"invite_8php.html#a244385b28cfd021d308715f01158bfd9":[5,0,1,35,0], -"invite_8php.html#aeb0881c0f93c8e8552e5ed756ce6e5a5":[5,0,1,35,1], -"item_8php.html":[5,0,1,36], -"item_8php.html#a3daae7944f737bd30412a0d042207c0f":[5,0,1,36,0], -"item_8php.html#a693cd09805755ab85bbb5ecae69a48c3":[5,0,1,36,4], -"item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221":[5,0,1,36,3], -"item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[5,0,1,36,1], -"item_8php.html#abd0e603a6696051af16476eb968d52e7":[5,0,1,36,2], +"intro_8php.html":[5,0,1,35], +"intro_8php.html#a3e2a523697633ddb4517b9266a515f5b":[5,0,1,35,1], +"intro_8php.html#abc3abf25da64f98f215126eb08c7936b":[5,0,1,35,0], +"intro_8php.html#af3681062183ccbdf065ae2647b07d6f1":[5,0,1,35,2], +"invite_8php.html":[5,0,1,36], +"invite_8php.html#a244385b28cfd021d308715f01158bfd9":[5,0,1,36,0], +"invite_8php.html#aeb0881c0f93c8e8552e5ed756ce6e5a5":[5,0,1,36,1], +"item_8php.html":[5,0,1,37], +"item_8php.html#a3daae7944f737bd30412a0d042207c0f":[5,0,1,37,0], +"item_8php.html#a693cd09805755ab85bbb5ecae69a48c3":[5,0,1,37,4], +"item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221":[5,0,1,37,3], +"item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[5,0,1,37,1], +"item_8php.html#abd0e603a6696051af16476eb968d52e7":[5,0,1,37,2], "items_8php.html":[5,0,0,39], "items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[5,0,0,39,53], "items_8php.html#a016dd86c827d08db89061ea81d15c6cb":[5,0,0,39,2], @@ -217,37 +222,32 @@ var NAVTREEINDEX4 = "language_8php.html#ac9142ef1d01a235c760deb0f16643f5a":[5,0,0,40,5], "language_8php.html#ace67d6cad57da08d030ad9dc9b8c836e":[5,0,0,40,2], "language_8php.html#ae310fb3880484ee1cc4faefe0c63c06d":[5,0,0,40,8], -"lastpost_8php.html":[5,0,1,37], -"lastpost_8php.html#a6108289ef2a767495c7c85a24f364983":[5,0,1,37,0], -"lastpost_8php.html#a82f14cce5d3cfe27f40bdbd2c679d493":[5,0,1,37,1], -"lastpost_8php.html#ab4c6ebd25736af678e64d55ce508ce8c":[5,0,1,37,2], -"like_8php.html":[5,0,1,38], -"like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538":[5,0,1,38,0], -"lockview_8php.html":[5,0,1,39], -"lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44":[5,0,1,39,0], -"login_8php.html":[5,0,1,40], -"login_8php.html#a1d69ca88eb9005a7026e128b9a645904":[5,0,1,40,0], -"lostpass_8php.html":[5,0,1,41], -"lostpass_8php.html#a0314d94e48c789b1b3a201d740c9eab3":[5,0,1,41,0], -"lostpass_8php.html#a8ed35ba71a4404eaf4903da61d0321cc":[5,0,1,41,1], -"magic_8php.html":[5,0,1,42], -"magic_8php.html#acea2cc792849ca2d71d4b689f66518bf":[5,0,1,42,0], -"manage_8php.html":[5,0,1,43], -"manage_8php.html#a2bca247b5296827638959138367db4f5":[5,0,1,43,0], -"match_8php.html":[5,0,1,44], -"match_8php.html#a1dd853e959b9e70c1911bb2fb5f5130d":[5,0,1,44,0], +"lastpost_8php.html":[5,0,1,38], +"lastpost_8php.html#a6108289ef2a767495c7c85a24f364983":[5,0,1,38,0], +"lastpost_8php.html#a82f14cce5d3cfe27f40bdbd2c679d493":[5,0,1,38,1], +"lastpost_8php.html#ab4c6ebd25736af678e64d55ce508ce8c":[5,0,1,38,2], +"like_8php.html":[5,0,1,39], +"like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538":[5,0,1,39,0], +"lockview_8php.html":[5,0,1,40], +"lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44":[5,0,1,40,0], +"login_8php.html":[5,0,1,41], +"login_8php.html#a1d69ca88eb9005a7026e128b9a645904":[5,0,1,41,0], +"lostpass_8php.html":[5,0,1,42], +"lostpass_8php.html#a0314d94e48c789b1b3a201d740c9eab3":[5,0,1,42,0], +"lostpass_8php.html#a8ed35ba71a4404eaf4903da61d0321cc":[5,0,1,42,1], +"magic_8php.html":[5,0,1,43], +"magic_8php.html#acea2cc792849ca2d71d4b689f66518bf":[5,0,1,43,0], +"manage_8php.html":[5,0,1,44], +"manage_8php.html#a2bca247b5296827638959138367db4f5":[5,0,1,44,0], +"match_8php.html":[5,0,1,45], +"match_8php.html#a1dd853e959b9e70c1911bb2fb5f5130d":[5,0,1,45,0], "md_README.html":[2], "md_config.html":[0], "md_fresh.html":[1], "minimal_8php.html":[5,0,3,0,2], -"mitem_8php.html":[5,0,1,47], -"mitem_8php.html#a6ee694cca4b551a20d7c7a94b5243ec1":[5,0,1,47,2], -"mitem_8php.html#a7a31b702ecad18eeb6a38b243ff0037e":[5,0,1,47,0], -"mitem_8php.html#a9627cd857cafdf04e4fc0ae48c8e8518":[5,0,1,47,1], -"mod_2api_8php.html":[5,0,1,4], -"mod_2api_8php.html#a02ae0f60e240dc806b860edb7d582117":[5,0,1,4,2], -"mod_2api_8php.html#a33315b5bbf5418f6850b2038107b526d":[5,0,1,4,0], -"mod_2api_8php.html#a6fe77f05c07cb51048df0d557b4b9bd2":[5,0,1,4,1], -"mod_2attach_8php.html":[5,0,1,6], -"mod_2attach_8php.html#aa88eb5ad87aa1036a30e70339cc6c1b1":[5,0,1,6,0] +"mitem_8php.html":[5,0,1,48], +"mitem_8php.html#a6ee694cca4b551a20d7c7a94b5243ec1":[5,0,1,48,2], +"mitem_8php.html#a7a31b702ecad18eeb6a38b243ff0037e":[5,0,1,48,0], +"mitem_8php.html#a9627cd857cafdf04e4fc0ae48c8e8518":[5,0,1,48,1], +"mod_2api_8php.html":[5,0,1,4] }; diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js index 4528e698d..deba1f96a 100644 --- a/doc/html/navtreeindex5.js +++ b/doc/html/navtreeindex5.js @@ -1,54 +1,59 @@ var NAVTREEINDEX5 = { -"mod_2directory_8php.html":[5,0,1,15], -"mod_2directory_8php.html#a5ee59c213508b6b9787612a8219cb5bf":[5,0,1,15,2], -"mod_2directory_8php.html#aa1d928543212871491706216742dd73c":[5,0,1,15,0], -"mod_2directory_8php.html#aac79396570d759da2efac24fcedf5b44":[5,0,1,15,1], -"mod_2follow_8php.html":[5,0,1,26], -"mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a":[5,0,1,26,1], -"mod_2follow_8php.html#a4c540ea4e9f5c581c1a53516ac585592":[5,0,1,26,0], -"mod_2group_8php.html":[5,0,1,28], -"mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83":[5,0,1,28,1], -"mod_2group_8php.html#aeb0784dd928e53e6d8693513bec8928c":[5,0,1,28,0], -"mod_2group_8php.html#aed1f009b1221348021bb34761160ef35":[5,0,1,28,2], -"mod_2menu_8php.html":[5,0,1,45], -"mod_2menu_8php.html#a6fed23af14d71a78a4153c8363a685cf":[5,0,1,45,0], -"mod_2menu_8php.html#aaa491ef173868fe002aece4632bcf393":[5,0,1,45,1], -"mod_2message_8php.html":[5,0,1,46], -"mod_2message_8php.html#a0db7030362a7e9ed9549b341d7b35718":[5,0,1,46,2], -"mod_2message_8php.html#a3547ed86d09a4bb8fa64ec374a40ee79":[5,0,1,46,1], -"mod_2message_8php.html#af4ba72486117cc24335fd8e92a2112a7":[5,0,1,46,0], -"mod_2network_8php.html":[5,0,1,50], -"mod_2network_8php.html#a180fce90ad11d7e0e45be094da7149ec":[5,0,1,50,1], -"mod_2network_8php.html#a36e03af6f2efe62ecaa247509365bfad":[5,0,1,50,3], -"mod_2network_8php.html#a43f2f29b90c5e29072c561934bc8f8b4":[5,0,1,50,0], -"mod_2network_8php.html#aeaa518c1a317516a3da337b88d358666":[5,0,1,50,2], -"mod_2notify_8php.html":[5,0,1,54], -"mod_2notify_8php.html#a94f9a6a9d4b5fd704baafff0c34f41ae":[5,0,1,54,1], -"mod_2notify_8php.html#acdf3851688ebd6d6a575eb84ef9febe3":[5,0,1,54,0], -"mod_2oembed_8php.html":[5,0,1,55], -"mod_2oembed_8php.html#a9145025aaf057fb5d3f9f7011e5e1014":[5,0,1,55,0], -"mod_2photos_8php.html":[5,0,1,61], -"mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080":[5,0,1,61,2], -"mod_2photos_8php.html#aa87382611a66ec5effdb2d78f13f5812":[5,0,1,61,0], -"mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014":[5,0,1,61,1], +"mod_2api_8php.html#a02ae0f60e240dc806b860edb7d582117":[5,0,1,4,2], +"mod_2api_8php.html#a33315b5bbf5418f6850b2038107b526d":[5,0,1,4,0], +"mod_2api_8php.html#a6fe77f05c07cb51048df0d557b4b9bd2":[5,0,1,4,1], +"mod_2attach_8php.html":[5,0,1,6], +"mod_2attach_8php.html#aa88eb5ad87aa1036a30e70339cc6c1b1":[5,0,1,6,0], +"mod_2directory_8php.html":[5,0,1,16], +"mod_2directory_8php.html#a5ee59c213508b6b9787612a8219cb5bf":[5,0,1,16,2], +"mod_2directory_8php.html#aa1d928543212871491706216742dd73c":[5,0,1,16,0], +"mod_2directory_8php.html#aac79396570d759da2efac24fcedf5b44":[5,0,1,16,1], +"mod_2follow_8php.html":[5,0,1,27], +"mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a":[5,0,1,27,1], +"mod_2follow_8php.html#a4c540ea4e9f5c581c1a53516ac585592":[5,0,1,27,0], +"mod_2group_8php.html":[5,0,1,29], +"mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83":[5,0,1,29,1], +"mod_2group_8php.html#aeb0784dd928e53e6d8693513bec8928c":[5,0,1,29,0], +"mod_2group_8php.html#aed1f009b1221348021bb34761160ef35":[5,0,1,29,2], +"mod_2menu_8php.html":[5,0,1,46], +"mod_2menu_8php.html#a6fed23af14d71a78a4153c8363a685cf":[5,0,1,46,0], +"mod_2menu_8php.html#aaa491ef173868fe002aece4632bcf393":[5,0,1,46,1], +"mod_2message_8php.html":[5,0,1,47], +"mod_2message_8php.html#a0db7030362a7e9ed9549b341d7b35718":[5,0,1,47,2], +"mod_2message_8php.html#a3547ed86d09a4bb8fa64ec374a40ee79":[5,0,1,47,1], +"mod_2message_8php.html#af4ba72486117cc24335fd8e92a2112a7":[5,0,1,47,0], +"mod_2network_8php.html":[5,0,1,51], +"mod_2network_8php.html#a180fce90ad11d7e0e45be094da7149ec":[5,0,1,51,1], +"mod_2network_8php.html#a36e03af6f2efe62ecaa247509365bfad":[5,0,1,51,3], +"mod_2network_8php.html#a43f2f29b90c5e29072c561934bc8f8b4":[5,0,1,51,0], +"mod_2network_8php.html#aeaa518c1a317516a3da337b88d358666":[5,0,1,51,2], +"mod_2notify_8php.html":[5,0,1,55], +"mod_2notify_8php.html#a94f9a6a9d4b5fd704baafff0c34f41ae":[5,0,1,55,1], +"mod_2notify_8php.html#acdf3851688ebd6d6a575eb84ef9febe3":[5,0,1,55,0], +"mod_2oembed_8php.html":[5,0,1,56], +"mod_2oembed_8php.html#a9145025aaf057fb5d3f9f7011e5e1014":[5,0,1,56,0], +"mod_2photos_8php.html":[5,0,1,62], +"mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080":[5,0,1,62,2], +"mod_2photos_8php.html#aa87382611a66ec5effdb2d78f13f5812":[5,0,1,62,0], +"mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014":[5,0,1,62,1], "mod__import_8php.html":[5,0,3,0,3], "mod__import_8php.html#a8db1899eeeb44dabd0904065b63627bb":[5,0,3,0,3,0], "mod__new__channel_8php.html":[5,0,3,0,4], "mod__new__channel_8php.html#a8db1899eeeb44dabd0904065b63627bb":[5,0,3,0,4,0], "mod__register_8php.html":[5,0,3,0,5], "mod__register_8php.html#a8db1899eeeb44dabd0904065b63627bb":[5,0,3,0,5,0], -"mood_8php.html":[5,0,1,48], -"mood_8php.html#a721b9b6703b3234a005641c92d409b8f":[5,0,1,48,0], -"mood_8php.html#a7ae136dd7476865b4828136175db5022":[5,0,1,48,1], -"msearch_8php.html":[5,0,1,49], -"msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[5,0,1,49,0], +"mood_8php.html":[5,0,1,49], +"mood_8php.html#a721b9b6703b3234a005641c92d409b8f":[5,0,1,49,0], +"mood_8php.html#a7ae136dd7476865b4828136175db5022":[5,0,1,49,1], +"msearch_8php.html":[5,0,1,50], +"msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[5,0,1,50,0], "namespaceFriendica.html":[3,0,1], "namespaceFriendica.html":[4,0,1], "namespaceacl__selectors.html":[4,0,0], "namespaceacl__selectors.html":[3,0,0], -"namespacefriendica-to-smarty-tpl.html":[4,0,2], "namespacefriendica-to-smarty-tpl.html":[3,0,2], +"namespacefriendica-to-smarty-tpl.html":[4,0,2], "namespacemembers.html":[3,1,0], "namespacemembers_func.html":[3,1,1], "namespacemembers_vars.html":[3,1,2], @@ -60,47 +65,48 @@ var NAVTREEINDEX5 = "nav_8php.html":[5,0,0,43], "nav_8php.html#a43be0df73b90647ea70947ce004e231e":[5,0,0,43,0], "nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a":[5,0,0,43,1], -"new__channel_8php.html":[5,0,1,51], -"new__channel_8php.html#a180b0646957db8290482f02454ad7f23":[5,0,1,51,2], -"new__channel_8php.html#a1ad7f99e4366a32942c6b954aba3a164":[5,0,1,51,1], -"new__channel_8php.html#ae585191610f79da129492482ce8e2fee":[5,0,1,51,0], -"nogroup_8php.html":[5,0,1,52], -"nogroup_8php.html#a099cb353bf62e8453069ce107b763212":[5,0,1,52,1], -"nogroup_8php.html#a52085b183f97c552f1db5c4926e8ec30":[5,0,1,52,0], -"notifications_8php.html":[5,0,1,53], -"notifications_8php.html#a5baffec7b2e625c9f9cefbc097550d33":[5,0,1,53,1], -"notifications_8php.html#aadd0b5525bd8c283a5d8a37982bbfe62":[5,0,1,53,0], +"new__channel_8php.html":[5,0,1,52], +"new__channel_8php.html#a180b0646957db8290482f02454ad7f23":[5,0,1,52,2], +"new__channel_8php.html#a1ad7f99e4366a32942c6b954aba3a164":[5,0,1,52,1], +"new__channel_8php.html#ae585191610f79da129492482ce8e2fee":[5,0,1,52,0], +"nogroup_8php.html":[5,0,1,53], +"nogroup_8php.html#a099cb353bf62e8453069ce107b763212":[5,0,1,53,1], +"nogroup_8php.html#a52085b183f97c552f1db5c4926e8ec30":[5,0,1,53,0], +"notifications_8php.html":[5,0,1,54], +"notifications_8php.html#a5baffec7b2e625c9f9cefbc097550d33":[5,0,1,54,1], +"notifications_8php.html#aadd0b5525bd8c283a5d8a37982bbfe62":[5,0,1,54,0], "notifier_8php.html":[5,0,0,45], "notifier_8php.html#a568c502f626cff95e344c0748938b85d":[5,0,0,45,0], "oauth_8php.html":[5,0,0,47], "oauth_8php.html#a7a32a5990f113ac9465b03b29175cf16":[5,0,0,47,3], "oauth_8php.html#ad343cab37aa860d2d14dc86b7f5ca0c6":[5,0,0,47,2], -"oexchange_8php.html":[5,0,1,56], -"oexchange_8php.html#a2d8b785cd7d041a4e6274f5af370cf26":[5,0,1,56,0], -"oexchange_8php.html#ac8e2e469ddc3db984b0c1b44558aca59":[5,0,1,56,1], +"oexchange_8php.html":[5,0,1,57], +"oexchange_8php.html#a2d8b785cd7d041a4e6274f5af370cf26":[5,0,1,57,0], +"oexchange_8php.html#ac8e2e469ddc3db984b0c1b44558aca59":[5,0,1,57,1], "onepoll_8php.html":[5,0,0,49], "onepoll_8php.html#a72753b2fdec79b37c7f432035c91fb6d":[5,0,0,49,0], -"opensearch_8php.html":[5,0,1,57], -"opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9":[5,0,1,57,0], -"page_8php.html":[5,0,1,58], -"page_8php.html#a4d89800c0366a239191b1692c09635cf":[5,0,1,58,1], -"page_8php.html#a91a5f649f68406149108bded1dc90b22":[5,0,1,58,0], +"opensearch_8php.html":[5,0,1,58], +"opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9":[5,0,1,58,0], +"page_8php.html":[5,0,1,59], +"page_8php.html#a4d89800c0366a239191b1692c09635cf":[5,0,1,59,1], +"page_8php.html#a91a5f649f68406149108bded1dc90b22":[5,0,1,59,0], "page__widgets_8php.html":[5,0,0,50], "page__widgets_8php.html#a1a1e729da27f252cab6678288a17958f":[5,0,0,50,1], "page__widgets_8php.html#ad82011c1ed90d9de8b9f34c12af5c6f0":[5,0,0,50,0], "pages.html":[], -"parse__url_8php.html":[5,0,1,59], -"parse__url_8php.html#a05a9e8944380ba3cf6bbf5893dd4b74b":[5,0,1,59,2], -"parse__url_8php.html#a25635549f2c22955d72465f4d2e58993":[5,0,1,59,3], -"parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a":[5,0,1,59,1], -"parse__url_8php.html#aa7dd8f961bea042d62726ed909e4a868":[5,0,1,59,0], +"parse__url_8php.html":[5,0,1,60], +"parse__url_8php.html#a05a9e8944380ba3cf6bbf5893dd4b74b":[5,0,1,60,2], +"parse__url_8php.html#a25635549f2c22955d72465f4d2e58993":[5,0,1,60,3], +"parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a":[5,0,1,60,1], +"parse__url_8php.html#aa7dd8f961bea042d62726ed909e4a868":[5,0,1,60,0], "permissions_8php.html":[5,0,0,51], "permissions_8php.html#a040fd3d3b8517658b1668ae0cd093972":[5,0,0,51,2], "permissions_8php.html#a0f5bd9f7f4c8fb7ba4b2c1ed048b4dc7":[5,0,0,51,0], "permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835":[5,0,0,51,3], +"permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d":[5,0,0,51,4], "permissions_8php.html#aeca9b280f3dc3358c89976d81d690008":[5,0,0,51,1], -"photo_8php.html":[5,0,1,60], -"photo_8php.html#a582779d24882b0d31ee909a91d70a448":[5,0,1,60,0], +"photo_8php.html":[5,0,1,61], +"photo_8php.html#a582779d24882b0d31ee909a91d70a448":[5,0,1,61,0], "photo__driver_8php.html":[5,0,0,1,0], "photo__driver_8php.html#a102f3f26f67e0e38f4322a771951c1ca":[5,0,0,1,0,3], "photo__driver_8php.html#a1d0bc7161dec0d177b7d3bbe4421af9a":[5,0,0,1,0,2], @@ -120,10 +126,10 @@ var NAVTREEINDEX5 = "php_2default_8php.html":[5,0,3,0,0], "php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762":[5,0,3,0,0,0], "php_2theme__init_8php.html":[5,0,3,0,6], -"php_8php.html":[5,0,1,62], -"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[5,0,1,62,0], -"ping_8php.html":[5,0,1,63], -"ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[5,0,1,63,0], +"php_8php.html":[5,0,1,63], +"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[5,0,1,63,0], +"ping_8php.html":[5,0,1,64], +"ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[5,0,1,64,0], "plugin_8php.html":[5,0,0,53], "plugin_8php.html#a030cec6793b909c439c0336ba39b1571":[5,0,0,53,17], "plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76":[5,0,0,53,20], @@ -153,52 +159,52 @@ var NAVTREEINDEX5 = "plugin_8php.html#aff0178bd8d0b34a94d5efddc883edd35":[5,0,0,53,5], "po2php_8php.html":[5,0,2,6], "po2php_8php.html#a3b75e36f913198299e99559b175cd8b4":[5,0,2,6,0], -"poco_8php.html":[5,0,1,64], -"poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498":[5,0,1,64,0], -"poke_8php.html":[5,0,1,65], -"poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b":[5,0,1,65,1], -"poke_8php.html#ac9190563a8da9c07a16f9dcd71cf6993":[5,0,1,65,0], +"poco_8php.html":[5,0,1,65], +"poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498":[5,0,1,65,0], +"poke_8php.html":[5,0,1,66], +"poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b":[5,0,1,66,1], +"poke_8php.html#ac9190563a8da9c07a16f9dcd71cf6993":[5,0,1,66,0], "poller_8php.html":[5,0,0,54], "poller_8php.html#a5f12df3a4738124b6c039971e87e76da":[5,0,0,54,0], -"post_8php.html":[5,0,1,66], -"post_8php.html#af4b48181ce773ef0cdfc972441445c34":[5,0,1,66,0], -"post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[5,0,1,66,1], -"pretheme_8php.html":[5,0,1,67], -"pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[5,0,1,67,0], -"probe_8php.html":[5,0,1,68], -"probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[5,0,1,68,0], -"profile_8php.html":[5,0,1,69], -"profile_8php.html#a1a2482b775476f2f64ea5e8f4fc3fd1e":[5,0,1,69,0], -"profile_8php.html#a3775cf6eef6587e5143133356a7b76c0":[5,0,1,69,1], -"profile_8php.html#ab5d0246be0552e2182a585c1206d22a5":[5,0,1,69,2], +"post_8php.html":[5,0,1,67], +"post_8php.html#af4b48181ce773ef0cdfc972441445c34":[5,0,1,67,0], +"post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[5,0,1,67,1], +"pretheme_8php.html":[5,0,1,68], +"pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[5,0,1,68,0], +"probe_8php.html":[5,0,1,69], +"probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[5,0,1,69,0], +"profile_8php.html":[5,0,1,70], +"profile_8php.html#a1a2482b775476f2f64ea5e8f4fc3fd1e":[5,0,1,70,0], +"profile_8php.html#a3775cf6eef6587e5143133356a7b76c0":[5,0,1,70,1], +"profile_8php.html#ab5d0246be0552e2182a585c1206d22a5":[5,0,1,70,2], "profile__advanced_8php.html":[5,0,0,55], "profile__advanced_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4":[5,0,0,55,0], -"profile__photo_8php.html":[5,0,1,70], -"profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02":[5,0,1,70,1], -"profile__photo_8php.html#a4b80234074bd603221aa5364f330e479":[5,0,1,70,2], -"profile__photo_8php.html#ac9cd968a767e2ae1b88383b6cdd6dbe3":[5,0,1,70,0], +"profile__photo_8php.html":[5,0,1,71], +"profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02":[5,0,1,71,1], +"profile__photo_8php.html#a4b80234074bd603221aa5364f330e479":[5,0,1,71,2], +"profile__photo_8php.html#ac9cd968a767e2ae1b88383b6cdd6dbe3":[5,0,1,71,0], "profile__selectors_8php.html":[5,0,0,56], "profile__selectors_8php.html#a3b50b3ea4ea4bdbebebfffc5d1b157c7":[5,0,0,56,2], "profile__selectors_8php.html#a7473dd095987e1cdcc79d4f0bb5e6798":[5,0,0,56,1], "profile__selectors_8php.html#ae2b2c087e6530c61c0b256fd26d52355":[5,0,0,56,0], -"profiles_8php.html":[5,0,1,71], -"profiles_8php.html#a2a3ac90f51941ff78b85e9389304969c":[5,0,1,71,0], -"profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e":[5,0,1,71,2], -"profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00":[5,0,1,71,1], -"profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04":[5,0,1,71,3], -"profperm_8php.html":[5,0,1,72], -"profperm_8php.html#a17fb64ec05edee1dc94d95438807d6c6":[5,0,1,72,2], -"profperm_8php.html#a77fd398ae7c25142e1d9ad724ec347cc":[5,0,1,72,0], -"profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023":[5,0,1,72,1], -"qsearch_8php.html":[5,0,1,73], -"qsearch_8php.html#a0501887b95bd8fa21018b2936a668894":[5,0,1,73,0], +"profiles_8php.html":[5,0,1,72], +"profiles_8php.html#a2a3ac90f51941ff78b85e9389304969c":[5,0,1,72,0], +"profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e":[5,0,1,72,2], +"profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00":[5,0,1,72,1], +"profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04":[5,0,1,72,3], +"profperm_8php.html":[5,0,1,73], +"profperm_8php.html#a17fb64ec05edee1dc94d95438807d6c6":[5,0,1,73,2], +"profperm_8php.html#a77fd398ae7c25142e1d9ad724ec347cc":[5,0,1,73,0], +"profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023":[5,0,1,73,1], +"qsearch_8php.html":[5,0,1,74], +"qsearch_8php.html#a0501887b95bd8fa21018b2936a668894":[5,0,1,74,0], "queue_8php.html":[5,0,0,58], "queue_8php.html#af8c93de86d866c3200174c8450a0f341":[5,0,0,58,0], "queue__fn_8php.html":[5,0,0,59], "queue__fn_8php.html#a4c2876181f75a4a61e85b7f00dfdbba1":[5,0,0,59,1], "queue__fn_8php.html#a8fe71e981399bbf5d000a6ca42f57b24":[5,0,0,59,0], -"randprof_8php.html":[5,0,1,74], -"randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[5,0,1,74,0], +"randprof_8php.html":[5,0,1,75], +"randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[5,0,1,75,0], "redbasic_2php_2style_8php.html":[5,0,3,1,0,0,1], "redbasic_2php_2style_8php.html#a02d39b683a42fffbb27823d3860283bd":[5,0,3,1,0,0,1,14], "redbasic_2php_2style_8php.html#a03a72942b7428fd9af1224770d20a8ba":[5,0,3,1,0,0,1,5], @@ -222,8 +228,8 @@ var NAVTREEINDEX5 = "redbasic_2php_2style_8php.html#af3a16c5f0dd7a74cf9acf6a49fff73a7":[5,0,3,1,0,0,1,18], "redbasic_2php_2theme_8php.html":[5,0,3,1,0,0,2], "redbasic_2php_2theme_8php.html#af6eb813e9fc7e2d76ac1b82bc5c0ed9b":[5,0,3,1,0,0,2,0], -"redir_8php.html":[5,0,1,75], -"redir_8php.html#a9ac266c3f5cf0d94ef63e6d0f2edf1f5":[5,0,1,75,0], +"redir_8php.html":[5,0,1,76], +"redir_8php.html#a9ac266c3f5cf0d94ef63e6d0f2edf1f5":[5,0,1,76,0], "redstrap_2php_2style_8php.html":[5,0,3,1,1,0,2], "redstrap_2php_2style_8php.html#a02d39b683a42fffbb27823d3860283bd":[5,0,3,1,1,0,2,13], "redstrap_2php_2style_8php.html#a03a72942b7428fd9af1224770d20a8ba":[5,0,3,1,1,0,2,5], @@ -243,11 +249,5 @@ var NAVTREEINDEX5 = "redstrap_2php_2style_8php.html#addf42c3d02e53f8e4153f3bb9dabfcda":[5,0,3,1,1,0,2,9], "redstrap_2php_2style_8php.html#aef266cfcb27c6ddb3292584c945bab33":[5,0,3,1,1,0,2,7], "redstrap_2php_2theme_8php.html":[5,0,3,1,1,0,3], -"redstrap_2php_2theme_8php.html#a4dac61d466b4261deca2846f548e484a":[5,0,3,1,1,0,3,0], -"register_8php.html":[5,0,1,76], -"register_8php.html#a0e91f57f111407ea8d3223a05022bb2a":[5,0,1,76,0], -"register_8php.html#a51731dcc1917c58a790eb1c0f6132271":[5,0,1,76,2], -"register_8php.html#ae20c0cd40f738d6295de58b9202c83d5":[5,0,1,76,1], -"regmod_8php.html":[5,0,1,77], -"regmod_8php.html#a7953df4e32e63946565e90cdd5d50409":[5,0,1,77,0] +"redstrap_2php_2theme_8php.html#a4dac61d466b4261deca2846f548e484a":[5,0,3,1,1,0,3,0] }; diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index eda4b9d0e..e010fec30 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -1,21 +1,27 @@ var NAVTREEINDEX6 = { -"removeme_8php.html":[5,0,1,78], -"removeme_8php.html#a065a589caa2aa84c60f7073a28f0ad9c":[5,0,1,78,0], -"removeme_8php.html#a7be08738beca44bb98a79e01cdb2ee88":[5,0,1,78,1], -"rmagic_8php.html":[5,0,1,79], -"rmagic_8php.html#a3e28db1e5cfa7e5c2617f90222c1caef":[5,0,1,79,0], -"rmagic_8php.html#a869de069d081b3c4e98b957d06bbf08f":[5,0,1,79,2], -"rmagic_8php.html#a95455edd43f1bff39446a57388cdde16":[5,0,1,79,1], -"rsd__xml_8php.html":[5,0,1,80], -"rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82":[5,0,1,80,0], -"search_8php.html":[5,0,1,81], -"search_8php.html#a230ec9681ddee3b5b8b40c8d550f32f7":[5,0,1,81,2], -"search_8php.html#aa911f7c7f0cdb0284e35d0ed610f19c6":[5,0,1,81,3], -"search_8php.html#ab2568591359edde5b483a6cd9a24b2cc":[5,0,1,81,0], -"search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[5,0,1,81,1], -"search__ac_8php.html":[5,0,1,82], -"search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[5,0,1,82,0], +"register_8php.html":[5,0,1,77], +"register_8php.html#a0e91f57f111407ea8d3223a05022bb2a":[5,0,1,77,0], +"register_8php.html#a51731dcc1917c58a790eb1c0f6132271":[5,0,1,77,2], +"register_8php.html#ae20c0cd40f738d6295de58b9202c83d5":[5,0,1,77,1], +"regmod_8php.html":[5,0,1,78], +"regmod_8php.html#a7953df4e32e63946565e90cdd5d50409":[5,0,1,78,0], +"removeme_8php.html":[5,0,1,79], +"removeme_8php.html#a065a589caa2aa84c60f7073a28f0ad9c":[5,0,1,79,0], +"removeme_8php.html#a7be08738beca44bb98a79e01cdb2ee88":[5,0,1,79,1], +"rmagic_8php.html":[5,0,1,80], +"rmagic_8php.html#a3e28db1e5cfa7e5c2617f90222c1caef":[5,0,1,80,0], +"rmagic_8php.html#a869de069d081b3c4e98b957d06bbf08f":[5,0,1,80,2], +"rmagic_8php.html#a95455edd43f1bff39446a57388cdde16":[5,0,1,80,1], +"rsd__xml_8php.html":[5,0,1,81], +"rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82":[5,0,1,81,0], +"search_8php.html":[5,0,1,82], +"search_8php.html#a230ec9681ddee3b5b8b40c8d550f32f7":[5,0,1,82,2], +"search_8php.html#aa911f7c7f0cdb0284e35d0ed610f19c6":[5,0,1,82,3], +"search_8php.html#ab2568591359edde5b483a6cd9a24b2cc":[5,0,1,82,0], +"search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[5,0,1,82,1], +"search__ac_8php.html":[5,0,1,83], +"search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[5,0,1,83,0], "security_8php.html":[5,0,0,60], "security_8php.html#a20f8b9851f23ee8894b8925584ef6821":[5,0,0,60,2], "security_8php.html#a444ac867dfa8c37cf0a7a226412bee28":[5,0,0,60,4], @@ -39,37 +45,37 @@ var NAVTREEINDEX6 = "session_8php.html#ac95373f4966862a028033dd2f94d4da1":[5,0,0,61,3], "session_8php.html#af0100a2642a5268594bbd5742a03d885":[5,0,0,61,9], "session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052":[5,0,0,61,2], -"settings_8php.html":[5,0,1,83], -"settings_8php.html#a39abc76ff5459c57e3b957664f273f18":[5,0,1,83,0], -"settings_8php.html#a3a4cde287482fced008583f54ba2a722":[5,0,1,83,2], -"settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586":[5,0,1,83,3], -"settings_8php.html#ae5aebccb006bee1300078576baaf5582":[5,0,1,83,1], -"setup_8php.html":[5,0,1,84], -"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[5,0,1,84,2], -"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[5,0,1,84,13], -"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[5,0,1,84,5], -"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[5,0,1,84,12], -"setup_8php.html#a2b375ddc555140236fc500135de99371":[5,0,1,84,9], -"setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f":[5,0,1,84,3], -"setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e":[5,0,1,84,1], -"setup_8php.html#a8652788e8589778c5f81634a9d5b9429":[5,0,1,84,7], -"setup_8php.html#a88247384a96e14516f474d7af6a465c1":[5,0,1,84,11], -"setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76":[5,0,1,84,4], -"setup_8php.html#abe405d227ba7232971964a706d4f3bce":[5,0,1,84,10], -"setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a":[5,0,1,84,8], -"setup_8php.html#addb24714bc2542aa4f4215e98fe48432":[5,0,1,84,15], -"setup_8php.html#ae8e4d9279a61de74d5f39962cb7b6ca1":[5,0,1,84,0], -"setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58":[5,0,1,84,14], -"setup_8php.html#afd8b0b3ade1507c45325caf377bf459d":[5,0,1,84,6], -"share_8php.html":[5,0,1,85], -"share_8php.html#afeb26046bdd02567ecd29ab5f188b249":[5,0,1,85,0], -"siteinfo_8php.html":[5,0,1,86], -"siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[5,0,1,86,1], -"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[5,0,1,86,0], -"sitelist_8php.html":[5,0,1,87], -"sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1":[5,0,1,87,0], -"smilies_8php.html":[5,0,1,88], -"smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[5,0,1,88,0], +"settings_8php.html":[5,0,1,84], +"settings_8php.html#a39abc76ff5459c57e3b957664f273f18":[5,0,1,84,0], +"settings_8php.html#a3a4cde287482fced008583f54ba2a722":[5,0,1,84,2], +"settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586":[5,0,1,84,3], +"settings_8php.html#ae5aebccb006bee1300078576baaf5582":[5,0,1,84,1], +"setup_8php.html":[5,0,1,85], +"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[5,0,1,85,2], +"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[5,0,1,85,13], +"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[5,0,1,85,5], +"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[5,0,1,85,12], +"setup_8php.html#a2b375ddc555140236fc500135de99371":[5,0,1,85,9], +"setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f":[5,0,1,85,3], +"setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e":[5,0,1,85,1], +"setup_8php.html#a8652788e8589778c5f81634a9d5b9429":[5,0,1,85,7], +"setup_8php.html#a88247384a96e14516f474d7af6a465c1":[5,0,1,85,11], +"setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76":[5,0,1,85,4], +"setup_8php.html#abe405d227ba7232971964a706d4f3bce":[5,0,1,85,10], +"setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a":[5,0,1,85,8], +"setup_8php.html#addb24714bc2542aa4f4215e98fe48432":[5,0,1,85,15], +"setup_8php.html#ae8e4d9279a61de74d5f39962cb7b6ca1":[5,0,1,85,0], +"setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58":[5,0,1,85,14], +"setup_8php.html#afd8b0b3ade1507c45325caf377bf459d":[5,0,1,85,6], +"share_8php.html":[5,0,1,86], +"share_8php.html#afeb26046bdd02567ecd29ab5f188b249":[5,0,1,86,0], +"siteinfo_8php.html":[5,0,1,87], +"siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[5,0,1,87,1], +"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[5,0,1,87,0], +"sitelist_8php.html":[5,0,1,88], +"sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1":[5,0,1,88,0], +"smilies_8php.html":[5,0,1,89], +"smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[5,0,1,89,0], "socgraph_8php.html":[5,0,0,62], "socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586":[5,0,0,62,0], "socgraph_8php.html#a5ef8bef37161df53718a21e93d02fbd6":[5,0,0,62,6], @@ -80,21 +86,21 @@ var NAVTREEINDEX6 = "socgraph_8php.html#ac343a846241d36cdf046b08f3396cfe9":[5,0,0,62,2], "socgraph_8php.html#af175807406d94407a5e11742a3287746":[5,0,0,62,5], "socgraph_8php.html#af29d056beec10b4e38e5209c92452894":[5,0,0,62,3], -"starred_8php.html":[5,0,1,89], -"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[5,0,1,89,0], -"subthread_8php.html":[5,0,1,90], -"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[5,0,1,90,0], -"suggest_8php.html":[5,0,1,91], -"suggest_8php.html#a4df91c84594d51ba56b5918de414230d":[5,0,1,91,0], -"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[5,0,1,91,1], -"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[5,0,1,91,2], +"starred_8php.html":[5,0,1,90], +"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[5,0,1,90,0], +"subthread_8php.html":[5,0,1,91], +"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[5,0,1,91,0], +"suggest_8php.html":[5,0,1,92], +"suggest_8php.html#a4df91c84594d51ba56b5918de414230d":[5,0,1,92,0], +"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[5,0,1,92,1], +"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[5,0,1,92,2], "system__unavailable_8php.html":[5,0,0,63], "system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa":[5,0,0,63,0], -"tagger_8php.html":[5,0,1,92], -"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[5,0,1,92,0], -"tagrm_8php.html":[5,0,1,93], -"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[5,0,1,93,1], -"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[5,0,1,93,0], +"tagger_8php.html":[5,0,1,93], +"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[5,0,1,93,0], +"tagrm_8php.html":[5,0,1,94], +"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[5,0,1,94,1], +"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[5,0,1,94,0], "taxonomy_8php.html":[5,0,0,64], "taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce":[5,0,0,64,6], "taxonomy_8php.html#a061b3db9426d4b074395f5824062cad4":[5,0,0,64,8], @@ -195,11 +201,11 @@ var NAVTREEINDEX6 = "theme_2redstrap_2php_2default_8php.html":[5,0,3,1,1,0,1], "theme_2redstrap_2php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762":[5,0,3,1,1,0,1,0], "theme_2redstrap_2php_2theme__init_8php.html":[5,0,3,1,1,0,4], -"thing_8php.html":[5,0,1,94], -"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[5,0,1,94,0], -"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[5,0,1,94,1], -"toggle__mobile_8php.html":[5,0,1,95], -"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[5,0,1,95,0], +"thing_8php.html":[5,0,1,95], +"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[5,0,1,95,0], +"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[5,0,1,95,1], +"toggle__mobile_8php.html":[5,0,1,96], +"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[5,0,1,96,0], "tpldebug_8php.html":[5,0,2,7], "tpldebug_8php.html#a44778457a6c02554812fbfad19d32ba3":[5,0,2,7,0], "tpldebug_8php.html#a5358407d65f2ca826f96356a6642d149":[5,0,2,7,1], @@ -213,18 +219,18 @@ var NAVTREEINDEX6 = "typohelper_8php.html":[5,0,2,9], "typohelper_8php.html#a7542d95618011800c61773127fa625cf":[5,0,2,9,0], "typohelper_8php.html#ab6fd357fb5b2a3ba8aab9e8b98c6a805":[5,0,2,9,1], -"uexport_8php.html":[5,0,1,96], -"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[5,0,1,96,0], -"update__channel_8php.html":[5,0,1,97], -"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[5,0,1,97,0], -"update__community_8php.html":[5,0,1,98], -"update__community_8php.html#abdcc5c4ecebbe0b5fcba2755c69cb3b1":[5,0,1,98,0], -"update__display_8php.html":[5,0,1,99], -"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[5,0,1,99,0], -"update__network_8php.html":[5,0,1,100], -"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[5,0,1,100,0], -"update__search_8php.html":[5,0,1,101], -"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[5,0,1,101,0], +"uexport_8php.html":[5,0,1,97], +"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[5,0,1,97,0], +"update__channel_8php.html":[5,0,1,98], +"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[5,0,1,98,0], +"update__community_8php.html":[5,0,1,99], +"update__community_8php.html#abdcc5c4ecebbe0b5fcba2755c69cb3b1":[5,0,1,99,0], +"update__display_8php.html":[5,0,1,100], +"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[5,0,1,100,0], +"update__network_8php.html":[5,0,1,101], +"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[5,0,1,101,0], +"update__search_8php.html":[5,0,1,102], +"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[5,0,1,102,0], "updatetpl_8py.html":[5,0,2,10], "updatetpl_8py.html#a52a85ffa6b6d63d840b185a133478c12":[5,0,2,10,5], "updatetpl_8py.html#a79c20eb62d568c999b56eb08530355d3":[5,0,2,10,2], @@ -240,14 +246,8 @@ var NAVTREEINDEX6 = "view_2theme_2redstrap_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[5,0,3,1,1,0,0,1], "view_2theme_2redstrap_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[5,0,3,1,1,0,0,2], "view_2theme_2redstrap_2php_2config_8php.html#af58e97b437c1e98a5e434886494cc70e":[5,0,3,1,1,0,0,0], -"view_8php.html":[5,0,1,102], -"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[5,0,1,102,0], -"viewconnections_8php.html":[5,0,1,103], -"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[5,0,1,103,2], -"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[5,0,1,103,1], -"viewconnections_8php.html#ae330cea4cddd091559659f8b469617b6":[5,0,1,103,0], -"viewsrc_8php.html":[5,0,1,104], -"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[5,0,1,104,0], -"wall__attach_8php.html":[5,0,1,105], -"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[5,0,1,105,0] +"view_8php.html":[5,0,1,103], +"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[5,0,1,103,0], +"viewconnections_8php.html":[5,0,1,104], +"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[5,0,1,104,2] }; diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js index 622c205b8..374967c34 100644 --- a/doc/html/navtreeindex7.js +++ b/doc/html/navtreeindex7.js @@ -1,19 +1,25 @@ var NAVTREEINDEX7 = { -"wall__upload_8php.html":[5,0,1,106], -"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[5,0,1,106,0], -"webfinger_8php.html":[5,0,1,107], -"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[5,0,1,107,0], -"webpages_8php.html":[5,0,1,108], -"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[5,0,1,108,0], -"wfinger_8php.html":[5,0,1,109], -"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[5,0,1,109,0], -"xchan_8php.html":[5,0,1,110], -"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[5,0,1,110,0], -"xrd_8php.html":[5,0,1,111], -"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[5,0,1,111,0], -"zfinger_8php.html":[5,0,1,112], -"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[5,0,1,112,0], +"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[5,0,1,104,1], +"viewconnections_8php.html#ae330cea4cddd091559659f8b469617b6":[5,0,1,104,0], +"viewsrc_8php.html":[5,0,1,105], +"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[5,0,1,105,0], +"wall__attach_8php.html":[5,0,1,106], +"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[5,0,1,106,0], +"wall__upload_8php.html":[5,0,1,107], +"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[5,0,1,107,0], +"webfinger_8php.html":[5,0,1,108], +"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[5,0,1,108,0], +"webpages_8php.html":[5,0,1,109], +"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[5,0,1,109,0], +"wfinger_8php.html":[5,0,1,110], +"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[5,0,1,110,0], +"xchan_8php.html":[5,0,1,111], +"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[5,0,1,111,0], +"xrd_8php.html":[5,0,1,112], +"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[5,0,1,112,0], +"zfinger_8php.html":[5,0,1,113], +"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[5,0,1,113,0], "zot_8php.html":[5,0,0,67], "zot_8php.html#a083aec6c900d244e1bfc1406f9461465":[5,0,0,67,11], "zot_8php.html#a22e3f9b97b7969ddbe43ccf0db93a19c":[5,0,0,67,20], @@ -41,6 +47,6 @@ var NAVTREEINDEX7 = "zot_8php.html#ac34e479d27f32b82dd6b33542f81a6a7":[5,0,0,67,1], "zot_8php.html#acdea9362d78a63dce948fdf0ea73ef0e":[5,0,0,67,18], "zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72":[5,0,0,67,2], -"zotfeed_8php.html":[5,0,1,113], -"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,113,0] +"zotfeed_8php.html":[5,0,1,114], +"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,114,0] }; diff --git a/doc/html/permissions_8php.html b/doc/html/permissions_8php.html index 9e0fc20d4..795dcf39e 100644 --- a/doc/html/permissions_8php.html +++ b/doc/html/permissions_8php.html @@ -120,6 +120,8 @@ Functions    check_list_permissions ($uid, $arr, $perm)   + site_default_perms () + 

    Function Documentation

    @@ -212,7 +214,7 @@ Functions @@ -246,7 +248,24 @@ Functions + + +
    +
    + + + + + + + +
    site_default_perms ()
    +
    + +

    Referenced by create_identity().

    diff --git a/doc/html/permissions_8php.js b/doc/html/permissions_8php.js index a05203458..49747cfd8 100644 --- a/doc/html/permissions_8php.js +++ b/doc/html/permissions_8php.js @@ -3,5 +3,6 @@ var permissions_8php = [ "check_list_permissions", "permissions_8php.html#a0f5bd9f7f4c8fb7ba4b2c1ed048b4dc7", null ], [ "get_all_perms", "permissions_8php.html#aeca9b280f3dc3358c89976d81d690008", null ], [ "get_perms", "permissions_8php.html#a040fd3d3b8517658b1668ae0cd093972", null ], - [ "perm_is_allowed", "permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835", null ] + [ "perm_is_allowed", "permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835", null ], + [ "site_default_perms", "permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d", null ] ]; \ No newline at end of file diff --git a/doc/html/php2po_8php.html b/doc/html/php2po_8php.html index ab6a8167a..e0c1ec29e 100644 --- a/doc/html/php2po_8php.html +++ b/doc/html/php2po_8php.html @@ -168,7 +168,7 @@ Variables
    -

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

    +

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

    diff --git a/doc/html/plugin_8php.html b/doc/html/plugin_8php.html index 59d637f3a..a02505013 100644 --- a/doc/html/plugin_8php.html +++ b/doc/html/plugin_8php.html @@ -190,7 +190,7 @@ Functions
    -

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

    +

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

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

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

    +

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

    @@ -558,7 +558,7 @@ Functions @@ -734,7 +734,7 @@ Functions diff --git a/doc/html/redbasic_2php_2style_8php.html b/doc/html/redbasic_2php_2style_8php.html index d8fdb6b9a..a636a96f7 100644 --- a/doc/html/redbasic_2php_2style_8php.html +++ b/doc/html/redbasic_2php_2style_8php.html @@ -386,7 +386,7 @@ Variables
    -

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

    +

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

    @@ -400,7 +400,7 @@ Variables
    -

    Referenced by Template\_replcb_for(), Template\_replcb_if(), account_remove(), acl_init(), activity_sanitise(), admin_page_themes(), aes_encapsulate(), argv(), array_sanitise(), attach_store(), autoname(), build_sync_packet(), change_channel(), channel_content(), check_config(), check_form_security_token(), check_list_permissions(), check_webbie(), common_init(), construct_page(), conversation(), crepair_post(), photo_gd\cropImage(), photo_imagick\cropImage(), datesel(), datesel_format(), decode_tags(), deliver_run(), directory_content(), directory_run(), dirfind_content(), display_content(), email_header_encode(), encode_item(), encode_mail(), event_store(), expand_groups(), feature_enabled(), fetch_post_tags(), find_xchan_in_array(), findpeople_widget(), fix_private_photos(), fix_system_urls(), photo_gd\flip(), fsuggest_post(), generate_user_guid(), get_all_perms(), get_item_elements(), get_mail_elements(), get_mentions(), get_profile_elements(), get_terms_oftype(), gprobe_run(), ids_to_querystr(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), json_decode_plus(), json_return_and_die(), lastpost_content(), legal_webbie(), lrdd(), magic_init(), manage_content(), match_content(), menu_content(), menu_delete_id(), menu_fetch(), menu_render(), message_post(), navbar_complete(), network_content(), network_init(), new_channel_init(), new_contact(), notification(), notifier_run(), oembed_fetch_url(), onepoll_run(), parse_xml_string(), perm_is_allowed(), photos_post(), ping_init(), poco_load(), poller_run(), post_init(), post_post(), preg_heart(), prepare_body(), print_template(), private_messages_list(), proc_run(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), public_recips(), dba_mysql\q(), dba_mysqli\q(), randprof_init(), remove_community_tag(), photo_driver\save(), search_ac_init(), send_status_notifications(), App\set_widget(), smilies(), photo_driver\store(), stringify_array_elms(), sync_directories(), tag_deliver(), tagadelic(), tagrm_content(), tagrm_post(), theme_status(), timesel(), toggle_theme(), upgrade_bool_message(), upgrade_message(), valid_email(), webpages_content(), xchan_query(), xmlify(), zfinger_init(), zot_process_response(), zot_refresh(), and zot_register_hub().

    +

    Referenced by Template\_replcb_for(), Template\_replcb_if(), account_remove(), acl_init(), activity_sanitise(), admin_page_themes(), aes_encapsulate(), argv(), array_sanitise(), attach_store(), autoname(), build_sync_packet(), change_channel(), channel_content(), check_config(), check_form_security_token(), check_list_permissions(), check_webbie(), common_init(), construct_page(), conversation(), crepair_post(), photo_gd\cropImage(), photo_imagick\cropImage(), datesel(), datesel_format(), decode_tags(), deliver_run(), directory_content(), directory_run(), dirfind_content(), display_content(), email_header_encode(), encode_item(), encode_mail(), event_store(), expand_groups(), feature_enabled(), fetch_post_tags(), find_xchan_in_array(), findpeople_widget(), fix_private_photos(), fix_system_urls(), photo_gd\flip(), fsuggest_post(), generate_user_guid(), get_all_perms(), get_item_elements(), get_mail_elements(), get_mentions(), get_profile_elements(), get_terms_oftype(), gprobe_run(), ids_to_querystr(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), json_decode_plus(), json_return_and_die(), lastpost_content(), legal_webbie(), lrdd(), magic_init(), manage_content(), match_content(), menu_content(), menu_delete_id(), menu_fetch(), menu_render(), message_post(), navbar_complete(), network_content(), network_init(), new_channel_init(), new_contact(), notification(), notifier_run(), oembed_fetch_url(), onepoll_run(), parse_xml_string(), perm_is_allowed(), photos_post(), ping_init(), poco_load(), poller_run(), post_init(), post_post(), preg_heart(), prepare_body(), print_template(), private_messages_list(), proc_run(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), public_recips(), dba_mysql\q(), dba_mysqli\q(), randprof_init(), remove_community_tag(), photo_driver\save(), search_ac_init(), send_status_notifications(), App\set_widget(), site_default_perms(), smilies(), photo_driver\store(), stringify_array_elms(), sync_directories(), tag_deliver(), tagadelic(), tagrm_content(), tagrm_post(), theme_status(), timesel(), toggle_theme(), upgrade_bool_message(), upgrade_message(), valid_email(), webpages_content(), xchan_query(), xmlify(), zfinger_init(), zot_process_response(), zot_refresh(), and zot_register_hub().

    diff --git a/doc/html/search/all_63.js b/doc/html/search/all_63.js index 548f22635..ec3323a11 100644 --- a/doc/html/search/all_63.js +++ b/doc/html/search/all_63.js @@ -73,6 +73,10 @@ var searchData= ['config_2ephp',['config.php',['../include_2config_8php.html',1,'']]], ['config_2ephp',['config.php',['../view_2theme_2redbasic_2php_2config_8php.html',1,'']]], ['connect',['connect',['../classdba__driver.html#ae533e62a240a793f17aef5ab4ef10edc',1,'dba_driver\connect()'],['../classdba__mysql.html#a1887338627ce0e28786839363014bd0b',1,'dba_mysql\connect()'],['../classdba__mysqli.html#add062bd93961e5f0194d94820e9a51b1',1,'dba_mysqli\connect()']]], + ['connect_2ephp',['connect.php',['../connect_8php.html',1,'']]], + ['connect_5fcontent',['connect_content',['../connect_8php.html#a489f0a66c660de6ec4d6917b27674f07',1,'connect.php']]], + ['connect_5finit',['connect_init',['../connect_8php.html#ad46a38f32fd7a3d324b1fa26373efa36',1,'connect.php']]], + ['connect_5fpost',['connect_post',['../connect_8php.html#a417ec27afe33f21a929667a665e32ee2',1,'connect.php']]], ['connections_2ephp',['connections.php',['../connections_8php.html',1,'']]], ['connections_5faside',['connections_aside',['../connections_8php.html#af48f7ad20914760ba9874c090384e35a',1,'connections.php']]], ['connections_5fclone',['connections_clone',['../connections_8php.html#a15af118efee9c948b6f8294e54a73bb2',1,'connections.php']]], diff --git a/doc/html/search/all_6e.js b/doc/html/search/all_6e.js index 0b53b31f3..5fc653c57 100644 --- a/doc/html/search/all_6e.js +++ b/doc/html/search/all_6e.js @@ -46,7 +46,7 @@ var searchData= ['new_5fchannel_5fcontent',['new_channel_content',['../new__channel_8php.html#ae585191610f79da129492482ce8e2fee',1,'new_channel.php']]], ['new_5fchannel_5finit',['new_channel_init',['../new__channel_8php.html#a1ad7f99e4366a32942c6b954aba3a164',1,'new_channel.php']]], ['new_5fchannel_5fpost',['new_channel_post',['../new__channel_8php.html#a180b0646957db8290482f02454ad7f23',1,'new_channel.php']]], - ['new_5fcontact',['new_contact',['../include_2follow_8php.html#a6553a7650fae55f95660510d90983144',1,'follow.php']]], + ['new_5fcontact',['new_contact',['../include_2follow_8php.html#ae387d4ae097c23d69f3247e7f08140c7',1,'follow.php']]], ['new_5fcookie',['new_cookie',['../session_8php.html#a4c0ead624f95483e386bc80abf570a8f',1,'session.php']]], ['new_5fkeypair',['new_keypair',['../crypto_8php.html#aae0ab70d6a199b29555b1ac3cf250d6a',1,'crypto.php']]], ['new_5frequest_5ftoken',['new_request_token',['../classFKOAuthDataStore.html#a431b44d70e3da6a8256ab38f710e3050',1,'FKOAuthDataStore']]], diff --git a/doc/html/search/all_70.js b/doc/html/search/all_70.js index 7a849e892..d4b358207 100644 --- a/doc/html/search/all_70.js +++ b/doc/html/search/all_70.js @@ -9,6 +9,7 @@ var searchData= ['page_5fhidden',['PAGE_HIDDEN',['../boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640',1,'boot.php']]], ['page_5finit',['page_init',['../page_8php.html#a4d89800c0366a239191b1692c09635cf',1,'page.php']]], ['page_5fnormal',['PAGE_NORMAL',['../boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3',1,'boot.php']]], + ['page_5fpremium',['PAGE_PREMIUM',['../boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8',1,'boot.php']]], ['page_5fremoved',['PAGE_REMOVED',['../boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6',1,'boot.php']]], ['page_5fwidgets_2ephp',['page_widgets.php',['../page__widgets_8php.html',1,'']]], ['pagelist_5fwidget',['pagelist_widget',['../page__widgets_8php.html#ad82011c1ed90d9de8b9f34c12af5c6f0',1,'page_widgets.php']]], @@ -124,7 +125,7 @@ var searchData= ['profile_5fadvanced_2ephp',['profile_advanced.php',['../profile__advanced_8php.html',1,'']]], ['profile_5faside',['profile_aside',['../profile_8php.html#a1a2482b775476f2f64ea5e8f4fc3fd1e',1,'profile.php']]], ['profile_5fcontent',['profile_content',['../profile_8php.html#a3775cf6eef6587e5143133356a7b76c0',1,'profile.php']]], - ['profile_5fcreate_5fsidebar',['profile_create_sidebar',['../boot_8php.html#a5b45d647da3743a7fc8c6223350b4d67',1,'boot.php']]], + ['profile_5fcreate_5fsidebar',['profile_create_sidebar',['../boot_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620',1,'boot.php']]], ['profile_5finit',['profile_init',['../profile_8php.html#ab5d0246be0552e2182a585c1206d22a5',1,'profile.php']]], ['profile_5fload',['profile_load',['../boot_8php.html#a4751b522ea913d0e7ed43e03d22e9e68',1,'boot.php']]], ['profile_5fphoto_2ephp',['profile_photo.php',['../profile__photo_8php.html',1,'']]], @@ -132,7 +133,7 @@ var searchData= ['profile_5fphoto_5finit',['profile_photo_init',['../profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02',1,'profile_photo.php']]], ['profile_5fphoto_5fpost',['profile_photo_post',['../profile__photo_8php.html#a4b80234074bd603221aa5364f330e479',1,'profile_photo.php']]], ['profile_5fselectors_2ephp',['profile_selectors.php',['../profile__selectors_8php.html',1,'']]], - ['profile_5fsidebar',['profile_sidebar',['../boot_8php.html#a646123ebbb10eb6f5b6ff26f4288da9b',1,'boot.php']]], + ['profile_5fsidebar',['profile_sidebar',['../boot_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc',1,'boot.php']]], ['profile_5ftabs',['profile_tabs',['../boot_8php.html#a1dfcb5146e9d1eca4528bc580ad5d273',1,'boot.php']]], ['profiler',['profiler',['../text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6',1,'text.php']]], ['profiles_2ephp',['profiles.php',['../profiles_8php.html',1,'']]], diff --git a/doc/html/search/all_73.js b/doc/html/search/all_73.js index c5992262e..b8c8f7800 100644 --- a/doc/html/search/all_73.js +++ b/doc/html/search/all_73.js @@ -64,6 +64,7 @@ var searchData= ['share_2ephp',['share.php',['../share_8php.html',1,'']]], ['share_5finit',['share_init',['../share_8php.html#afeb26046bdd02567ecd29ab5f188b249',1,'share.php']]], ['showform',['showForm',['../fpostit_8php.html#a3f3ae3ae61578b5671673914fd894443',1,'fpostit.php']]], + ['site_5fdefault_5fperms',['site_default_perms',['../permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d',1,'permissions.php']]], ['siteinfo_2ephp',['siteinfo.php',['../siteinfo_8php.html',1,'']]], ['siteinfo_5fcontent',['siteinfo_content',['../siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656',1,'siteinfo.php']]], ['siteinfo_5finit',['siteinfo_init',['../siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0',1,'siteinfo.php']]], diff --git a/doc/html/search/files_63.js b/doc/html/search/files_63.js index 7c3df25dc..45806b907 100644 --- a/doc/html/search/files_63.js +++ b/doc/html/search/files_63.js @@ -11,6 +11,7 @@ var searchData= ['config_2ephp',['config.php',['../include_2config_8php.html',1,'']]], ['config_2ephp',['config.php',['../view_2theme_2redbasic_2php_2config_8php.html',1,'']]], ['config_2ephp',['config.php',['../view_2theme_2redstrap_2php_2config_8php.html',1,'']]], + ['connect_2ephp',['connect.php',['../connect_8php.html',1,'']]], ['connections_2ephp',['connections.php',['../connections_8php.html',1,'']]], ['contact_2ephp',['Contact.php',['../Contact_8php.html',1,'']]], ['contact_5fselectors_2ephp',['contact_selectors.php',['../contact__selectors_8php.html',1,'']]], diff --git a/doc/html/search/functions_63.js b/doc/html/search/functions_63.js index 536f97495..5d56e9a5f 100644 --- a/doc/html/search/functions_63.js +++ b/doc/html/search/functions_63.js @@ -58,6 +58,9 @@ var searchData= ['compare_5fpermissions',['compare_permissions',['../items_8php.html#a0790a4550b829e85504af548623002ca',1,'items.php']]], ['completeurl',['completeurl',['../parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a',1,'parse_url.php']]], ['connect',['connect',['../classdba__driver.html#ae533e62a240a793f17aef5ab4ef10edc',1,'dba_driver\connect()'],['../classdba__mysql.html#a1887338627ce0e28786839363014bd0b',1,'dba_mysql\connect()'],['../classdba__mysqli.html#add062bd93961e5f0194d94820e9a51b1',1,'dba_mysqli\connect()']]], + ['connect_5fcontent',['connect_content',['../connect_8php.html#a489f0a66c660de6ec4d6917b27674f07',1,'connect.php']]], + ['connect_5finit',['connect_init',['../connect_8php.html#ad46a38f32fd7a3d324b1fa26373efa36',1,'connect.php']]], + ['connect_5fpost',['connect_post',['../connect_8php.html#a417ec27afe33f21a929667a665e32ee2',1,'connect.php']]], ['connections_5faside',['connections_aside',['../connections_8php.html#af48f7ad20914760ba9874c090384e35a',1,'connections.php']]], ['connections_5fclone',['connections_clone',['../connections_8php.html#a15af118efee9c948b6f8294e54a73bb2',1,'connections.php']]], ['connections_5fcontent',['connections_content',['../connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c',1,'connections.php']]], diff --git a/doc/html/search/functions_6e.js b/doc/html/search/functions_6e.js index ebcd30df0..6bdcef685 100644 --- a/doc/html/search/functions_6e.js +++ b/doc/html/search/functions_6e.js @@ -12,7 +12,7 @@ var searchData= ['new_5fchannel_5fcontent',['new_channel_content',['../new__channel_8php.html#ae585191610f79da129492482ce8e2fee',1,'new_channel.php']]], ['new_5fchannel_5finit',['new_channel_init',['../new__channel_8php.html#a1ad7f99e4366a32942c6b954aba3a164',1,'new_channel.php']]], ['new_5fchannel_5fpost',['new_channel_post',['../new__channel_8php.html#a180b0646957db8290482f02454ad7f23',1,'new_channel.php']]], - ['new_5fcontact',['new_contact',['../include_2follow_8php.html#a6553a7650fae55f95660510d90983144',1,'follow.php']]], + ['new_5fcontact',['new_contact',['../include_2follow_8php.html#ae387d4ae097c23d69f3247e7f08140c7',1,'follow.php']]], ['new_5fcookie',['new_cookie',['../session_8php.html#a4c0ead624f95483e386bc80abf570a8f',1,'session.php']]], ['new_5fkeypair',['new_keypair',['../crypto_8php.html#aae0ab70d6a199b29555b1ac3cf250d6a',1,'crypto.php']]], ['new_5frequest_5ftoken',['new_request_token',['../classFKOAuthDataStore.html#a431b44d70e3da6a8256ab38f710e3050',1,'FKOAuthDataStore']]], diff --git a/doc/html/search/functions_70.js b/doc/html/search/functions_70.js index dd9bcd53f..82636bdb5 100644 --- a/doc/html/search/functions_70.js +++ b/doc/html/search/functions_70.js @@ -63,13 +63,13 @@ var searchData= ['profile_5factivity',['profile_activity',['../activities_8php.html#a80134e807719b3c54aba971958d2e132',1,'activities.php']]], ['profile_5faside',['profile_aside',['../profile_8php.html#a1a2482b775476f2f64ea5e8f4fc3fd1e',1,'profile.php']]], ['profile_5fcontent',['profile_content',['../profile_8php.html#a3775cf6eef6587e5143133356a7b76c0',1,'profile.php']]], - ['profile_5fcreate_5fsidebar',['profile_create_sidebar',['../boot_8php.html#a5b45d647da3743a7fc8c6223350b4d67',1,'boot.php']]], + ['profile_5fcreate_5fsidebar',['profile_create_sidebar',['../boot_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620',1,'boot.php']]], ['profile_5finit',['profile_init',['../profile_8php.html#ab5d0246be0552e2182a585c1206d22a5',1,'profile.php']]], ['profile_5fload',['profile_load',['../boot_8php.html#a4751b522ea913d0e7ed43e03d22e9e68',1,'boot.php']]], ['profile_5fphoto_5faside',['profile_photo_aside',['../profile__photo_8php.html#ac9cd968a767e2ae1b88383b6cdd6dbe3',1,'profile_photo.php']]], ['profile_5fphoto_5finit',['profile_photo_init',['../profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02',1,'profile_photo.php']]], ['profile_5fphoto_5fpost',['profile_photo_post',['../profile__photo_8php.html#a4b80234074bd603221aa5364f330e479',1,'profile_photo.php']]], - ['profile_5fsidebar',['profile_sidebar',['../boot_8php.html#a646123ebbb10eb6f5b6ff26f4288da9b',1,'boot.php']]], + ['profile_5fsidebar',['profile_sidebar',['../boot_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc',1,'boot.php']]], ['profile_5ftabs',['profile_tabs',['../boot_8php.html#a1dfcb5146e9d1eca4528bc580ad5d273',1,'boot.php']]], ['profiler',['profiler',['../text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6',1,'text.php']]], ['profiles_5faside',['profiles_aside',['../profiles_8php.html#a2a3ac90f51941ff78b85e9389304969c',1,'profiles.php']]], diff --git a/doc/html/search/functions_73.js b/doc/html/search/functions_73.js index fbf07d011..208720a2c 100644 --- a/doc/html/search/functions_73.js +++ b/doc/html/search/functions_73.js @@ -57,6 +57,7 @@ var searchData= ['sexpref_5fselector',['sexpref_selector',['../profile__selectors_8php.html#a3b50b3ea4ea4bdbebebfffc5d1b157c7',1,'profile_selectors.php']]], ['share_5finit',['share_init',['../share_8php.html#afeb26046bdd02567ecd29ab5f188b249',1,'share.php']]], ['showform',['showForm',['../fpostit_8php.html#a3f3ae3ae61578b5671673914fd894443',1,'fpostit.php']]], + ['site_5fdefault_5fperms',['site_default_perms',['../permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d',1,'permissions.php']]], ['siteinfo_5fcontent',['siteinfo_content',['../siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656',1,'siteinfo.php']]], ['siteinfo_5finit',['siteinfo_init',['../siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0',1,'siteinfo.php']]], ['sitelist_5finit',['sitelist_init',['../sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1',1,'sitelist.php']]], diff --git a/doc/html/search/variables_70.js b/doc/html/search/variables_70.js index 3b6d5ed63..e26b79358 100644 --- a/doc/html/search/variables_70.js +++ b/doc/html/search/variables_70.js @@ -6,6 +6,7 @@ var searchData= ['page_5fdirectory_5fchannel',['PAGE_DIRECTORY_CHANNEL',['../boot_8php.html#a5b8484922918946d041e5e0515dbe718',1,'boot.php']]], ['page_5fhidden',['PAGE_HIDDEN',['../boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640',1,'boot.php']]], ['page_5fnormal',['PAGE_NORMAL',['../boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3',1,'boot.php']]], + ['page_5fpremium',['PAGE_PREMIUM',['../boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8',1,'boot.php']]], ['page_5fremoved',['PAGE_REMOVED',['../boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6',1,'boot.php']]], ['path',['path',['../namespacefriendica-to-smarty-tpl.html#a68d15934660cd1f4301ce251b1646f09',1,'friendica-to-smarty-tpl.path()'],['../namespaceupdatetpl.html#ae694f5e1f25f8a92a945eb90c432dfe6',1,'updatetpl.path()']]], ['perms_5fa_5fdelegate',['PERMS_A_DELEGATE',['../boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b',1,'boot.php']]], diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index d00a44abb..00695b9e3 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -581,7 +581,7 @@ Variables
    -

    Referenced by profile_sidebar().

    +

    Referenced by profile_sidebar().

    @@ -651,7 +651,7 @@ Variables
    Returns
    string
    -

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

    +

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

    @@ -1027,7 +1027,7 @@ Variables @@ -1140,7 +1140,7 @@ Variables
    -

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

    +

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

    @@ -1418,7 +1418,7 @@ Variables @@ -1597,7 +1597,7 @@ Variables
    Returns
    string substituted string
    -

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

    +

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

    diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html index caf849b49..836bff6a1 100644 --- a/doc/html/typo_8php.html +++ b/doc/html/typo_8php.html @@ -134,7 +134,7 @@ Variables
    -

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

    +

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

    diff --git a/doc/html/zot_8php.html b/doc/html/zot_8php.html index 3f633c9d8..ce7997d6d 100644 --- a/doc/html/zot_8php.html +++ b/doc/html/zot_8php.html @@ -345,7 +345,7 @@ Functions @@ -695,7 +695,7 @@ Functions
    Returns
    : array => see z_post_url and mod/zfinger.php
    -

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

    +

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

    diff --git a/util/messages.po b/util/messages.po index b3a7ee42e..2a36c8757 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2013-08-16.407\n" +"Project-Id-Version: 2013-08-23.414\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-16 00:01-0700\n" +"POT-Creation-Date: 2013-08-23 00:01-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -242,47 +242,47 @@ msgstr "" msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: ../../include/Contact.php:80 ../../include/contact_widgets.php:9 +#: ../../include/Contact.php:87 ../../include/contact_widgets.php:9 #: ../../mod/directory.php:163 ../../mod/match.php:58 ../../mod/suggest.php:56 -#: ../../boot.php:1630 +#: ../../boot.php:1631 msgid "Connect" msgstr "" -#: ../../include/Contact.php:96 +#: ../../include/Contact.php:103 msgid "New window" msgstr "" -#: ../../include/Contact.php:97 +#: ../../include/Contact.php:104 msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/Contact.php:455 ../../include/conversation.php:887 +#: ../../include/Contact.php:462 ../../include/conversation.php:904 msgid "Poke" msgstr "" -#: ../../include/Contact.php:456 ../../include/conversation.php:881 +#: ../../include/Contact.php:463 ../../include/conversation.php:898 msgid "View Status" msgstr "" -#: ../../include/Contact.php:457 ../../include/nav.php:75 -#: ../../include/conversation.php:882 ../../mod/connections.php:295 +#: ../../include/Contact.php:464 ../../include/nav.php:75 +#: ../../include/conversation.php:899 ../../mod/connections.php:295 #: ../../mod/connections.php:402 msgid "View Profile" msgstr "" -#: ../../include/Contact.php:458 ../../include/conversation.php:883 +#: ../../include/Contact.php:465 ../../include/conversation.php:900 msgid "View Photos" msgstr "" -#: ../../include/Contact.php:459 ../../include/conversation.php:884 +#: ../../include/Contact.php:466 ../../include/conversation.php:901 msgid "Network Posts" msgstr "" -#: ../../include/Contact.php:460 ../../include/conversation.php:885 +#: ../../include/Contact.php:467 ../../include/conversation.php:902 msgid "Edit Contact" msgstr "" -#: ../../include/Contact.php:461 ../../include/conversation.php:886 +#: ../../include/Contact.php:468 ../../include/conversation.php:903 msgid "Send PM" msgstr "" @@ -347,7 +347,7 @@ msgid "RSS/Atom" msgstr "" #: ../../include/contact_selectors.php:77 ../../mod/admin.php:636 -#: ../../mod/admin.php:645 ../../boot.php:1369 +#: ../../mod/admin.php:645 ../../boot.php:1366 msgid "Email" msgstr "" @@ -431,7 +431,7 @@ msgstr "" msgid "Invite Friends" msgstr "" -#: ../../include/contact_widgets.php:61 ../../include/features.php:59 +#: ../../include/contact_widgets.php:61 ../../include/features.php:58 msgid "Saved Folders" msgstr "" @@ -546,7 +546,7 @@ msgid "Finishes:" msgstr "" #: ../../include/event.php:40 ../../include/bb2diaspora.php:455 -#: ../../mod/events.php:450 ../../mod/directory.php:138 ../../boot.php:1675 +#: ../../mod/events.php:450 ../../mod/directory.php:138 ../../boot.php:1681 msgid "Location:" msgstr "" @@ -594,140 +594,150 @@ msgstr "" msgid "Enable Expert Mode to provide advanced configuration options" msgstr "" -#: ../../include/features.php:36 +#: ../../include/features.php:30 +msgid "Premium Channel" +msgstr "" + +#: ../../include/features.php:30 +msgid "" +"Allows you to set restrictions and terms on those that connect with your " +"channel" +msgstr "" + +#: ../../include/features.php:35 msgid "Post Composition Features" msgstr "" -#: ../../include/features.php:37 +#: ../../include/features.php:36 msgid "Richtext Editor" msgstr "" -#: ../../include/features.php:37 +#: ../../include/features.php:36 msgid "Enable richtext editor" msgstr "" -#: ../../include/features.php:38 +#: ../../include/features.php:37 msgid "Post Preview" msgstr "" -#: ../../include/features.php:38 +#: ../../include/features.php:37 msgid "Allow previewing posts and comments before publishing them" msgstr "" -#: ../../include/features.php:43 +#: ../../include/features.php:42 msgid "Network and Stream Filtering" msgstr "" -#: ../../include/features.php:44 +#: ../../include/features.php:43 msgid "Search by Date" msgstr "" -#: ../../include/features.php:44 +#: ../../include/features.php:43 msgid "Ability to select posts by date ranges" msgstr "" -#: ../../include/features.php:45 +#: ../../include/features.php:44 msgid "Collections Filter" msgstr "" -#: ../../include/features.php:45 +#: ../../include/features.php:44 msgid "Enable widget to display Network posts only from selected collections" msgstr "" -#: ../../include/features.php:46 ../../mod/network.php:150 +#: ../../include/features.php:45 ../../mod/network.php:150 #: ../../mod/search.php:17 msgid "Saved Searches" msgstr "" -#: ../../include/features.php:46 +#: ../../include/features.php:45 msgid "Save search terms for re-use" msgstr "" -#: ../../include/features.php:47 +#: ../../include/features.php:46 msgid "Network Personal Tab" msgstr "" -#: ../../include/features.php:47 +#: ../../include/features.php:46 msgid "Enable tab to display only Network posts that you've interacted on" msgstr "" -#: ../../include/features.php:48 +#: ../../include/features.php:47 msgid "Network New Tab" msgstr "" -#: ../../include/features.php:48 +#: ../../include/features.php:47 msgid "Enable tab to display all new Network activity" msgstr "" -#: ../../include/features.php:49 +#: ../../include/features.php:48 msgid "Affinity Tool" msgstr "" -#: ../../include/features.php:49 +#: ../../include/features.php:48 msgid "Filter stream activity by depth of relationships" msgstr "" -#: ../../include/features.php:54 +#: ../../include/features.php:53 msgid "Post/Comment Tools" msgstr "" -#: ../../include/features.php:55 +#: ../../include/features.php:54 msgid "Multiple Deletion" msgstr "" -#: ../../include/features.php:55 +#: ../../include/features.php:54 msgid "Select and delete multiple posts/comments at once" msgstr "" -#: ../../include/features.php:56 +#: ../../include/features.php:55 msgid "Edit Sent Posts" msgstr "" -#: ../../include/features.php:56 +#: ../../include/features.php:55 msgid "Edit and correct posts and comments after sending" msgstr "" -#: ../../include/features.php:57 +#: ../../include/features.php:56 msgid "Tagging" msgstr "" -#: ../../include/features.php:57 +#: ../../include/features.php:56 msgid "Ability to tag existing posts" msgstr "" -#: ../../include/features.php:58 +#: ../../include/features.php:57 msgid "Post Categories" msgstr "" -#: ../../include/features.php:58 +#: ../../include/features.php:57 msgid "Add categories to your posts" msgstr "" -#: ../../include/features.php:59 +#: ../../include/features.php:58 msgid "Ability to file posts under folders" msgstr "" -#: ../../include/features.php:60 +#: ../../include/features.php:59 msgid "Dislike Posts" msgstr "" -#: ../../include/features.php:60 +#: ../../include/features.php:59 msgid "Ability to dislike posts/comments" msgstr "" -#: ../../include/features.php:61 +#: ../../include/features.php:60 msgid "Star Posts" msgstr "" -#: ../../include/features.php:61 +#: ../../include/features.php:60 msgid "Ability to mark special posts with a star indicator" msgstr "" -#: ../../include/features.php:62 +#: ../../include/features.php:61 msgid "Tag Cloud" msgstr "" -#: ../../include/features.php:62 +#: ../../include/features.php:61 msgid "Provide a personal tag cloud on your channel page" msgstr "" @@ -865,19 +875,19 @@ msgstr "" msgid "timeago.numbers" msgstr "" -#: ../../include/message.php:17 +#: ../../include/message.php:18 msgid "No recipient provided." msgstr "" -#: ../../include/message.php:22 +#: ../../include/message.php:23 msgid "[no subject]" msgstr "" -#: ../../include/message.php:37 +#: ../../include/message.php:38 msgid "Unable to determine sender." msgstr "" -#: ../../include/message.php:106 +#: ../../include/message.php:138 msgid "Stored post could not be verified." msgstr "" @@ -897,12 +907,12 @@ msgstr "" msgid "Profile" msgstr "" -#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1017 +#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1031 msgid "Full Name:" msgstr "" #: ../../include/profile_advanced.php:17 ../../mod/directory.php:140 -#: ../../boot.php:1677 +#: ../../boot.php:1683 msgid "Gender:" msgstr "" @@ -923,7 +933,7 @@ msgid "Age:" msgstr "" #: ../../include/profile_advanced.php:37 ../../mod/directory.php:142 -#: ../../boot.php:1678 +#: ../../boot.php:1684 msgid "Status:" msgstr "" @@ -937,7 +947,7 @@ msgid "Sexual Preference:" msgstr "" #: ../../include/profile_advanced.php:48 ../../mod/directory.php:144 -#: ../../boot.php:1679 +#: ../../boot.php:1685 msgid "Homepage:" msgstr "" @@ -1005,7 +1015,7 @@ msgstr "" msgid "School/education:" msgstr "" -#: ../../include/nav.php:71 ../../include/nav.php:86 ../../boot.php:1366 +#: ../../include/nav.php:71 ../../include/nav.php:86 ../../boot.php:1363 msgid "Logout" msgstr "" @@ -1034,7 +1044,7 @@ msgstr "" msgid "Manage/Edit Profiles" msgstr "" -#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2107 +#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2119 msgid "Photos" msgstr "" @@ -1042,7 +1052,7 @@ msgstr "" msgid "Your photos" msgstr "" -#: ../../include/nav.php:84 ../../boot.php:1367 +#: ../../include/nav.php:84 ../../boot.php:1364 msgid "Login" msgstr "" @@ -1063,7 +1073,7 @@ msgstr "" msgid "Home Page" msgstr "" -#: ../../include/nav.php:120 ../../mod/register.php:181 ../../boot.php:1342 +#: ../../include/nav.php:120 ../../mod/register.php:181 ../../boot.php:1339 msgid "Register" msgstr "" @@ -1184,7 +1194,7 @@ msgstr "" msgid "New Message" msgstr "" -#: ../../include/nav.php:169 ../../mod/events.php:348 ../../boot.php:2118 +#: ../../include/nav.php:169 ../../mod/events.php:348 ../../boot.php:2130 msgid "Events" msgstr "" @@ -1208,7 +1218,7 @@ msgstr "" msgid "Manage Your Channels" msgstr "" -#: ../../include/nav.php:175 ../../mod/settings.php:107 +#: ../../include/nav.php:175 ../../mod/settings.php:120 #: ../../mod/admin.php:728 ../../mod/admin.php:933 msgid "Settings" msgstr "" @@ -1262,12 +1272,12 @@ msgstr "" #: ../../include/attach.php:133 ../../include/attach.php:189 #: ../../include/attach.php:204 ../../include/attach.php:237 #: ../../include/attach.php:251 ../../include/attach.php:272 -#: ../../include/attach.php:464 ../../include/items.php:3298 +#: ../../include/attach.php:464 ../../include/items.php:3316 #: ../../mod/common.php:43 ../../mod/events.php:134 ../../mod/invite.php:13 #: ../../mod/invite.php:102 ../../mod/allfriends.php:10 #: ../../mod/webpages.php:40 ../../mod/api.php:26 ../../mod/api.php:31 #: ../../mod/lastpost.php:93 ../../mod/page.php:33 ../../mod/setup.php:181 -#: ../../mod/settings.php:584 ../../mod/viewconnections.php:33 +#: ../../mod/settings.php:598 ../../mod/viewconnections.php:33 #: ../../mod/viewconnections.php:38 ../../mod/delegate.php:6 #: ../../mod/mitem.php:92 ../../mod/group.php:15 ../../mod/photos.php:74 #: ../../mod/photos.php:644 ../../mod/viewsrc.php:12 ../../mod/menu.php:40 @@ -1302,7 +1312,7 @@ msgstr "" msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:287 ../../boot.php:2110 +#: ../../include/photos.php:287 ../../boot.php:2122 msgid "Photo Albums" msgstr "" @@ -1455,7 +1465,7 @@ msgstr "" msgid "Sex Addict" msgstr "" -#: ../../include/profile_selectors.php:42 ../../include/identity.php:224 +#: ../../include/profile_selectors.php:42 ../../include/identity.php:236 #: ../../mod/network.php:364 ../../mod/connections.php:368 msgid "Friends" msgstr "" @@ -1565,11 +1575,11 @@ msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "" -#: ../../include/identity.php:143 +#: ../../include/identity.php:154 msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/identity.php:199 +#: ../../include/identity.php:211 msgid "Default Profile" msgstr "" @@ -1593,7 +1603,7 @@ msgstr "" msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:560 +#: ../../include/zot.php:569 #, php-format msgid "Unable to verify site signature for %s" msgstr "" @@ -1632,7 +1642,7 @@ msgid "Registration request at %s" msgstr "" #: ../../include/account.php:274 ../../include/account.php:301 -#: ../../include/account.php:358 ../../boot.php:1207 +#: ../../include/account.php:358 ../../boot.php:1204 msgid "Administrator" msgstr "" @@ -1701,7 +1711,7 @@ msgstr "" msgid "poke" msgstr "" -#: ../../include/text.php:742 ../../include/conversation.php:227 +#: ../../include/text.php:742 ../../include/conversation.php:230 msgid "poked" msgstr "" @@ -1901,16 +1911,16 @@ msgstr "" msgid "December" msgstr "" -#: ../../include/text.php:1029 +#: ../../include/text.php:1029 ../../mod/message.php:400 msgid "unknown.???" msgstr "" -#: ../../include/text.php:1030 +#: ../../include/text.php:1030 ../../mod/message.php:401 msgid "bytes" msgstr "" #: ../../include/text.php:1066 ../../include/text.php:1081 -#: ../../include/conversation.php:787 +#: ../../include/conversation.php:804 msgid "remove" msgstr "" @@ -1918,11 +1928,11 @@ msgstr "" msgid "[remove]" msgstr "" -#: ../../include/text.php:1069 ../../include/conversation.php:649 +#: ../../include/text.php:1069 ../../include/conversation.php:652 msgid "Categories:" msgstr "" -#: ../../include/text.php:1084 ../../include/conversation.php:650 +#: ../../include/text.php:1084 ../../include/conversation.php:653 msgid "Filed under:" msgstr "" @@ -2002,11 +2012,11 @@ msgstr "" msgid "Response from remote channel was incomplete." msgstr "" -#: ../../include/follow.php:124 +#: ../../include/follow.php:129 msgid "local account not found." msgstr "" -#: ../../include/follow.php:133 +#: ../../include/follow.php:138 msgid "Cannot connect to yourself." msgstr "" @@ -2160,19 +2170,19 @@ msgid "Private Message" msgstr "" #: ../../include/ItemObject.php:92 ../../mod/webpages.php:81 -#: ../../mod/settings.php:669 ../../mod/menu.php:52 +#: ../../mod/settings.php:683 ../../mod/menu.php:52 #: ../../mod/editwebpage.php:101 ../../mod/editpost.php:76 msgid "Edit" msgstr "" -#: ../../include/ItemObject.php:104 ../../include/conversation.php:613 -#: ../../mod/settings.php:670 ../../mod/group.php:182 -#: ../../mod/photos.php:1162 ../../mod/admin.php:640 -#: ../../mod/connections.php:335 +#: ../../include/ItemObject.php:104 ../../include/conversation.php:616 +#: ../../mod/settings.php:684 ../../mod/group.php:182 +#: ../../mod/photos.php:1162 ../../mod/connections.php:335 +#: ../../mod/admin.php:640 msgid "Delete" msgstr "" -#: ../../include/ItemObject.php:110 ../../include/conversation.php:612 +#: ../../include/ItemObject.php:110 ../../include/conversation.php:615 msgid "Select" msgstr "" @@ -2233,14 +2243,14 @@ msgstr "" msgid "via Wall-To-Wall:" msgstr "" -#: ../../include/ItemObject.php:206 ../../include/conversation.php:659 +#: ../../include/ItemObject.php:206 ../../include/conversation.php:662 #, php-format msgid " from %s" msgstr "" -#: ../../include/ItemObject.php:233 ../../include/conversation.php:678 -#: ../../include/conversation.php:1034 ../../mod/photos.php:1052 -#: ../../mod/message.php:297 ../../mod/message.php:430 +#: ../../include/ItemObject.php:233 ../../include/conversation.php:681 +#: ../../include/conversation.php:1051 ../../mod/photos.php:1052 +#: ../../mod/message.php:298 ../../mod/message.php:461 #: ../../mod/editwebpage.php:110 ../../mod/editpost.php:85 msgid "Please wait" msgstr "" @@ -2259,17 +2269,17 @@ msgstr "" #: ../../include/ItemObject.php:505 ../../mod/events.php:458 #: ../../mod/thing.php:190 ../../mod/invite.php:153 ../../mod/setup.php:283 -#: ../../mod/setup.php:326 ../../mod/settings.php:607 -#: ../../mod/settings.php:719 ../../mod/settings.php:747 -#: ../../mod/settings.php:771 ../../mod/settings.php:842 -#: ../../mod/settings.php:1009 ../../mod/group.php:87 ../../mod/photos.php:675 -#: ../../mod/photos.php:769 ../../mod/photos.php:1031 +#: ../../mod/setup.php:326 ../../mod/settings.php:621 +#: ../../mod/settings.php:733 ../../mod/settings.php:761 +#: ../../mod/settings.php:785 ../../mod/settings.php:856 +#: ../../mod/settings.php:1023 ../../mod/connect.php:96 ../../mod/group.php:87 +#: ../../mod/photos.php:675 ../../mod/photos.php:769 ../../mod/photos.php:1031 #: ../../mod/photos.php:1070 ../../mod/photos.php:1108 -#: ../../mod/photos.php:1135 ../../mod/message.php:298 -#: ../../mod/message.php:429 ../../mod/admin.php:409 ../../mod/admin.php:633 +#: ../../mod/photos.php:1135 ../../mod/message.php:299 +#: ../../mod/message.php:460 ../../mod/connections.php:412 +#: ../../mod/profiles.php:529 ../../mod/admin.php:409 ../../mod/admin.php:633 #: ../../mod/admin.php:769 ../../mod/admin.php:968 ../../mod/admin.php:1055 -#: ../../mod/connections.php:412 ../../mod/profiles.php:529 -#: ../../mod/import.php:356 ../../mod/crepair.php:166 ../../mod/poke.php:166 +#: ../../mod/import.php:381 ../../mod/crepair.php:166 ../../mod/poke.php:166 #: ../../mod/fsuggest.php:108 ../../mod/mood.php:135 #: ../../view/theme/redbasic/php/config.php:136 #: ../../view/theme/redbasic/php/config.php:154 @@ -2309,7 +2319,7 @@ msgstr "" msgid "Video" msgstr "" -#: ../../include/ItemObject.php:514 ../../include/conversation.php:1052 +#: ../../include/ItemObject.php:514 ../../include/conversation.php:1069 #: ../../mod/photos.php:1071 ../../mod/editwebpage.php:130 #: ../../mod/editpost.php:105 msgid "Preview" @@ -2319,216 +2329,217 @@ msgstr "" msgid "channel" msgstr "" -#: ../../include/conversation.php:155 ../../mod/like.php:133 +#: ../../include/conversation.php:155 ../../mod/like.php:134 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../include/conversation.php:158 ../../mod/like.php:135 +#: ../../include/conversation.php:158 ../../mod/like.php:136 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "" -#: ../../include/conversation.php:192 +#: ../../include/conversation.php:195 #, php-format msgid "%1$s is now connected with %2$s" msgstr "" -#: ../../include/conversation.php:223 +#: ../../include/conversation.php:226 #, php-format msgid "%1$s poked %2$s" msgstr "" -#: ../../include/conversation.php:245 ../../mod/mood.php:63 +#: ../../include/conversation.php:248 ../../mod/mood.php:63 #, php-format msgid "%1$s is currently %2$s" msgstr "" -#: ../../include/conversation.php:637 +#: ../../include/conversation.php:640 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:676 +#: ../../include/conversation.php:679 msgid "View in context" msgstr "" -#: ../../include/conversation.php:791 +#: ../../include/conversation.php:808 msgid "Loading..." msgstr "" -#: ../../include/conversation.php:792 +#: ../../include/conversation.php:809 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:880 +#: ../../include/conversation.php:897 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:949 +#: ../../include/conversation.php:966 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:949 +#: ../../include/conversation.php:966 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:953 +#: ../../include/conversation.php:970 #, php-format msgid "%2$d people like this." msgstr "" -#: ../../include/conversation.php:955 +#: ../../include/conversation.php:972 #, php-format msgid "%2$d people don't like this." msgstr "" -#: ../../include/conversation.php:961 +#: ../../include/conversation.php:978 msgid "and" msgstr "" -#: ../../include/conversation.php:964 +#: ../../include/conversation.php:981 #, php-format msgid ", and %d other people" msgstr "" -#: ../../include/conversation.php:965 +#: ../../include/conversation.php:982 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:965 +#: ../../include/conversation.php:982 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:990 +#: ../../include/conversation.php:1007 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:991 ../../mod/message.php:253 -#: ../../mod/message.php:364 +#: ../../include/conversation.php:1008 ../../mod/message.php:253 +#: ../../mod/message.php:365 msgid "Please enter a link URL:" msgstr "" -#: ../../include/conversation.php:992 +#: ../../include/conversation.php:1009 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:993 +#: ../../include/conversation.php:1010 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:994 +#: ../../include/conversation.php:1011 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:995 ../../mod/filer.php:35 +#: ../../include/conversation.php:1012 ../../mod/filer.php:35 msgid "Save to Folder:" msgstr "" -#: ../../include/conversation.php:996 +#: ../../include/conversation.php:1013 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1011 ../../mod/photos.php:1051 +#: ../../include/conversation.php:1028 ../../mod/photos.php:1051 msgid "Share" msgstr "" -#: ../../include/conversation.php:1013 +#: ../../include/conversation.php:1030 msgid "Page link title" msgstr "" -#: ../../include/conversation.php:1015 ../../mod/message.php:295 -#: ../../mod/message.php:427 ../../mod/editwebpage.php:102 +#: ../../include/conversation.php:1032 ../../mod/message.php:295 +#: ../../mod/message.php:457 ../../mod/editwebpage.php:102 #: ../../mod/editpost.php:77 msgid "Upload photo" msgstr "" -#: ../../include/conversation.php:1016 +#: ../../include/conversation.php:1033 msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1017 ../../mod/editwebpage.php:103 +#: ../../include/conversation.php:1034 ../../mod/message.php:296 +#: ../../mod/message.php:458 ../../mod/editwebpage.php:103 #: ../../mod/editpost.php:78 msgid "Attach file" msgstr "" -#: ../../include/conversation.php:1018 +#: ../../include/conversation.php:1035 msgid "attach file" msgstr "" -#: ../../include/conversation.php:1019 ../../mod/message.php:296 -#: ../../mod/message.php:428 ../../mod/editwebpage.php:104 +#: ../../include/conversation.php:1036 ../../mod/message.php:297 +#: ../../mod/message.php:459 ../../mod/editwebpage.php:104 #: ../../mod/editpost.php:79 msgid "Insert web link" msgstr "" -#: ../../include/conversation.php:1020 +#: ../../include/conversation.php:1037 msgid "web link" msgstr "" -#: ../../include/conversation.php:1021 +#: ../../include/conversation.php:1038 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:1022 +#: ../../include/conversation.php:1039 msgid "video link" msgstr "" -#: ../../include/conversation.php:1023 +#: ../../include/conversation.php:1040 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:1024 +#: ../../include/conversation.php:1041 msgid "audio link" msgstr "" -#: ../../include/conversation.php:1025 ../../mod/editwebpage.php:108 +#: ../../include/conversation.php:1042 ../../mod/editwebpage.php:108 #: ../../mod/editpost.php:83 msgid "Set your location" msgstr "" -#: ../../include/conversation.php:1026 +#: ../../include/conversation.php:1043 msgid "set location" msgstr "" -#: ../../include/conversation.php:1027 ../../mod/editwebpage.php:109 +#: ../../include/conversation.php:1044 ../../mod/editwebpage.php:109 #: ../../mod/editpost.php:84 msgid "Clear browser location" msgstr "" -#: ../../include/conversation.php:1028 +#: ../../include/conversation.php:1045 msgid "clear location" msgstr "" -#: ../../include/conversation.php:1030 ../../mod/editwebpage.php:122 +#: ../../include/conversation.php:1047 ../../mod/editwebpage.php:122 #: ../../mod/editpost.php:97 msgid "Set title" msgstr "" -#: ../../include/conversation.php:1033 ../../mod/editwebpage.php:124 +#: ../../include/conversation.php:1050 ../../mod/editwebpage.php:124 #: ../../mod/editpost.php:99 msgid "Categories (comma-separated list)" msgstr "" -#: ../../include/conversation.php:1035 ../../mod/editwebpage.php:111 +#: ../../include/conversation.php:1052 ../../mod/editwebpage.php:111 #: ../../mod/editpost.php:86 msgid "Permission settings" msgstr "" -#: ../../include/conversation.php:1036 +#: ../../include/conversation.php:1053 msgid "permissions" msgstr "" -#: ../../include/conversation.php:1044 ../../mod/editwebpage.php:119 +#: ../../include/conversation.php:1061 ../../mod/editwebpage.php:119 #: ../../mod/editpost.php:94 msgid "Public post" msgstr "" -#: ../../include/conversation.php:1046 ../../mod/editwebpage.php:125 +#: ../../include/conversation.php:1063 ../../mod/editwebpage.php:125 #: ../../mod/editpost.php:100 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -2538,25 +2549,25 @@ msgstr "" msgid "Permission denied" msgstr "" -#: ../../include/items.php:3247 ../../mod/page.php:63 ../../mod/viewsrc.php:18 +#: ../../include/items.php:3265 ../../mod/page.php:63 ../../mod/viewsrc.php:18 #: ../../mod/home.php:64 ../../mod/admin.php:142 ../../mod/admin.php:677 #: ../../mod/admin.php:876 ../../mod/display.php:33 msgid "Item not found." msgstr "" -#: ../../include/items.php:3419 +#: ../../include/items.php:3437 msgid "Archives" msgstr "" -#: ../../include/items.php:3580 ../../mod/group.php:44 ../../mod/group.php:146 +#: ../../include/items.php:3598 ../../mod/group.php:44 ../../mod/group.php:146 msgid "Collection not found." msgstr "" -#: ../../include/items.php:3590 +#: ../../include/items.php:3608 msgid "Collection has no members." msgstr "" -#: ../../include/items.php:3606 +#: ../../include/items.php:3624 msgid "Connection not found." msgstr "" @@ -2764,7 +2775,7 @@ msgid "Enter email addresses, one per line:" msgstr "" #: ../../mod/invite.php:141 ../../mod/message.php:292 -#: ../../mod/message.php:423 +#: ../../mod/message.php:453 msgid "Your message:" msgstr "" @@ -2803,7 +2814,8 @@ msgstr "" msgid "No friends to display." msgstr "" -#: ../../mod/webpages.php:8 ../../mod/profile.php:8 ../../boot.php:1540 +#: ../../mod/webpages.php:8 ../../mod/connect.php:13 ../../mod/profile.php:8 +#: ../../boot.php:1537 msgid "Requested profile is not available." msgstr "" @@ -2829,16 +2841,16 @@ msgid "" "and/or create new posts for you?" msgstr "" -#: ../../mod/api.php:105 ../../mod/settings.php:964 ../../mod/settings.php:969 -#: ../../mod/settings.php:992 ../../mod/settings.php:994 -#: ../../mod/settings.php:995 ../../mod/settings.php:996 +#: ../../mod/api.php:105 ../../mod/settings.php:978 ../../mod/settings.php:983 +#: ../../mod/settings.php:1006 ../../mod/settings.php:1008 +#: ../../mod/settings.php:1009 ../../mod/settings.php:1010 #: ../../mod/profiles.php:506 msgid "Yes" msgstr "" -#: ../../mod/api.php:106 ../../mod/settings.php:964 ../../mod/settings.php:969 -#: ../../mod/settings.php:992 ../../mod/settings.php:994 -#: ../../mod/settings.php:995 ../../mod/settings.php:996 +#: ../../mod/api.php:106 ../../mod/settings.php:978 ../../mod/settings.php:983 +#: ../../mod/settings.php:1006 ../../mod/settings.php:1008 +#: ../../mod/settings.php:1009 ../../mod/settings.php:1010 #: ../../mod/profiles.php:507 msgid "No" msgstr "" @@ -3222,423 +3234,427 @@ msgstr "" msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" -#: ../../mod/settings.php:49 +#: ../../mod/settings.php:51 msgid "Account settings" msgstr "" -#: ../../mod/settings.php:55 +#: ../../mod/settings.php:57 msgid "Channel settings" msgstr "" -#: ../../mod/settings.php:61 +#: ../../mod/settings.php:63 msgid "Additional features" msgstr "" -#: ../../mod/settings.php:67 +#: ../../mod/settings.php:69 msgid "Feature settings" msgstr "" -#: ../../mod/settings.php:73 +#: ../../mod/settings.php:75 msgid "Display settings" msgstr "" -#: ../../mod/settings.php:79 +#: ../../mod/settings.php:81 msgid "Connected apps" msgstr "" -#: ../../mod/settings.php:85 +#: ../../mod/settings.php:87 msgid "Export channel" msgstr "" -#: ../../mod/settings.php:97 +#: ../../mod/settings.php:99 msgid "Automatic Permissions (Advanced)" msgstr "" -#: ../../mod/settings.php:145 +#: ../../mod/settings.php:109 +msgid "Premium Channel Settings" +msgstr "" + +#: ../../mod/settings.php:158 msgid "Missing some important data!" msgstr "" -#: ../../mod/settings.php:148 ../../mod/settings.php:633 +#: ../../mod/settings.php:161 ../../mod/settings.php:647 msgid "Update" msgstr "" -#: ../../mod/settings.php:261 +#: ../../mod/settings.php:274 msgid "Passwords do not match. Password unchanged." msgstr "" -#: ../../mod/settings.php:265 +#: ../../mod/settings.php:278 msgid "Empty passwords are not allowed. Password unchanged." msgstr "" -#: ../../mod/settings.php:278 +#: ../../mod/settings.php:291 msgid "Password changed." msgstr "" -#: ../../mod/settings.php:280 +#: ../../mod/settings.php:293 msgid "Password update failed. Please try again." msgstr "" -#: ../../mod/settings.php:294 +#: ../../mod/settings.php:307 msgid "Not valid email." msgstr "" -#: ../../mod/settings.php:297 +#: ../../mod/settings.php:310 msgid "Protected email address. Cannot change to that email." msgstr "" -#: ../../mod/settings.php:306 +#: ../../mod/settings.php:319 msgid "System failure storing new email. Please try again." msgstr "" -#: ../../mod/settings.php:535 +#: ../../mod/settings.php:549 msgid "Settings updated." msgstr "" -#: ../../mod/settings.php:606 ../../mod/settings.php:632 -#: ../../mod/settings.php:668 +#: ../../mod/settings.php:620 ../../mod/settings.php:646 +#: ../../mod/settings.php:682 msgid "Add application" msgstr "" -#: ../../mod/settings.php:608 ../../mod/settings.php:634 +#: ../../mod/settings.php:622 ../../mod/settings.php:648 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/fbrowser.php:81 #: ../../mod/fbrowser.php:116 msgid "Cancel" msgstr "" -#: ../../mod/settings.php:609 ../../mod/settings.php:635 +#: ../../mod/settings.php:623 ../../mod/settings.php:649 #: ../../mod/admin.php:636 ../../mod/crepair.php:148 msgid "Name" msgstr "" -#: ../../mod/settings.php:610 ../../mod/settings.php:636 +#: ../../mod/settings.php:624 ../../mod/settings.php:650 msgid "Consumer Key" msgstr "" -#: ../../mod/settings.php:611 ../../mod/settings.php:637 +#: ../../mod/settings.php:625 ../../mod/settings.php:651 msgid "Consumer Secret" msgstr "" -#: ../../mod/settings.php:612 ../../mod/settings.php:638 +#: ../../mod/settings.php:626 ../../mod/settings.php:652 msgid "Redirect" msgstr "" -#: ../../mod/settings.php:613 ../../mod/settings.php:639 +#: ../../mod/settings.php:627 ../../mod/settings.php:653 msgid "Icon url" msgstr "" -#: ../../mod/settings.php:624 +#: ../../mod/settings.php:638 msgid "You can't edit this application." msgstr "" -#: ../../mod/settings.php:667 +#: ../../mod/settings.php:681 msgid "Connected Apps" msgstr "" -#: ../../mod/settings.php:671 +#: ../../mod/settings.php:685 msgid "Client key starts with" msgstr "" -#: ../../mod/settings.php:672 +#: ../../mod/settings.php:686 msgid "No name" msgstr "" -#: ../../mod/settings.php:673 +#: ../../mod/settings.php:687 msgid "Remove authorization" msgstr "" -#: ../../mod/settings.php:684 +#: ../../mod/settings.php:698 msgid "No feature settings configured" msgstr "" -#: ../../mod/settings.php:692 +#: ../../mod/settings.php:706 msgid "Feature Settings" msgstr "" -#: ../../mod/settings.php:715 +#: ../../mod/settings.php:729 msgid "Account Settings" msgstr "" -#: ../../mod/settings.php:716 +#: ../../mod/settings.php:730 msgid "Password Settings" msgstr "" -#: ../../mod/settings.php:717 +#: ../../mod/settings.php:731 msgid "New Password:" msgstr "" -#: ../../mod/settings.php:718 +#: ../../mod/settings.php:732 msgid "Confirm:" msgstr "" -#: ../../mod/settings.php:718 +#: ../../mod/settings.php:732 msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/settings.php:720 ../../mod/settings.php:1018 +#: ../../mod/settings.php:734 ../../mod/settings.php:1032 msgid "Email Address:" msgstr "" -#: ../../mod/settings.php:721 +#: ../../mod/settings.php:735 msgid "Remove Account" msgstr "" -#: ../../mod/settings.php:722 +#: ../../mod/settings.php:736 msgid "Warning: This action is permanent and cannot be reversed." msgstr "" -#: ../../mod/settings.php:738 +#: ../../mod/settings.php:752 msgid "Off" msgstr "" -#: ../../mod/settings.php:738 +#: ../../mod/settings.php:752 msgid "On" msgstr "" -#: ../../mod/settings.php:745 +#: ../../mod/settings.php:759 msgid "Additional Features" msgstr "" -#: ../../mod/settings.php:770 +#: ../../mod/settings.php:784 msgid "Connector Settings" msgstr "" -#: ../../mod/settings.php:800 ../../mod/admin.php:361 +#: ../../mod/settings.php:814 ../../mod/admin.php:361 msgid "No special theme for mobile devices" msgstr "" -#: ../../mod/settings.php:840 +#: ../../mod/settings.php:854 msgid "Display Settings" msgstr "" -#: ../../mod/settings.php:846 +#: ../../mod/settings.php:860 msgid "Display Theme:" msgstr "" -#: ../../mod/settings.php:847 +#: ../../mod/settings.php:861 msgid "Mobile Theme:" msgstr "" -#: ../../mod/settings.php:848 +#: ../../mod/settings.php:862 msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/settings.php:848 +#: ../../mod/settings.php:862 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/settings.php:849 +#: ../../mod/settings.php:863 msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../mod/settings.php:849 +#: ../../mod/settings.php:863 msgid "Maximum of 100 items" msgstr "" -#: ../../mod/settings.php:850 +#: ../../mod/settings.php:864 msgid "Don't show emoticons" msgstr "" -#: ../../mod/settings.php:886 +#: ../../mod/settings.php:900 msgid "Nobody except yourself" msgstr "" -#: ../../mod/settings.php:887 +#: ../../mod/settings.php:901 msgid "Only those you specifically allow" msgstr "" -#: ../../mod/settings.php:888 +#: ../../mod/settings.php:902 msgid "Anybody in your address book" msgstr "" -#: ../../mod/settings.php:889 +#: ../../mod/settings.php:903 msgid "Anybody on this website" msgstr "" -#: ../../mod/settings.php:890 +#: ../../mod/settings.php:904 msgid "Anybody in this network" msgstr "" -#: ../../mod/settings.php:891 +#: ../../mod/settings.php:905 msgid "Anybody on the internet" msgstr "" -#: ../../mod/settings.php:964 +#: ../../mod/settings.php:978 msgid "Publish your default profile in the network directory" msgstr "" -#: ../../mod/settings.php:969 +#: ../../mod/settings.php:983 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/settings.php:973 ../../mod/profile_photo.php:298 +#: ../../mod/settings.php:987 ../../mod/profile_photo.php:298 msgid "or" msgstr "" -#: ../../mod/settings.php:978 +#: ../../mod/settings.php:992 msgid "Your channel address is" msgstr "" -#: ../../mod/settings.php:989 +#: ../../mod/settings.php:1003 msgid "Automatically expire posts after this many days:" msgstr "" -#: ../../mod/settings.php:989 +#: ../../mod/settings.php:1003 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: ../../mod/settings.php:990 +#: ../../mod/settings.php:1004 msgid "Advanced expiration settings" msgstr "" -#: ../../mod/settings.php:991 +#: ../../mod/settings.php:1005 msgid "Advanced Expiration" msgstr "" -#: ../../mod/settings.php:992 +#: ../../mod/settings.php:1006 msgid "Expire posts:" msgstr "" -#: ../../mod/settings.php:994 +#: ../../mod/settings.php:1008 msgid "Expire starred posts:" msgstr "" -#: ../../mod/settings.php:995 +#: ../../mod/settings.php:1009 msgid "Expire photos:" msgstr "" -#: ../../mod/settings.php:996 +#: ../../mod/settings.php:1010 msgid "Only expire posts by others:" msgstr "" -#: ../../mod/settings.php:1007 +#: ../../mod/settings.php:1021 msgid "Channel Settings" msgstr "" -#: ../../mod/settings.php:1016 +#: ../../mod/settings.php:1030 msgid "Basic Settings" msgstr "" -#: ../../mod/settings.php:1019 +#: ../../mod/settings.php:1033 msgid "Your Timezone:" msgstr "" -#: ../../mod/settings.php:1020 +#: ../../mod/settings.php:1034 msgid "Default Post Location:" msgstr "" -#: ../../mod/settings.php:1021 +#: ../../mod/settings.php:1035 msgid "Use Browser Location:" msgstr "" -#: ../../mod/settings.php:1024 +#: ../../mod/settings.php:1038 msgid "Security and Privacy Settings" msgstr "" -#: ../../mod/settings.php:1026 +#: ../../mod/settings.php:1040 msgid "Quick Privacy Settings:" msgstr "" -#: ../../mod/settings.php:1027 +#: ../../mod/settings.php:1041 msgid "Very Public - extremely permissive" msgstr "" -#: ../../mod/settings.php:1028 +#: ../../mod/settings.php:1042 msgid "Typical - default public, privacy when desired" msgstr "" -#: ../../mod/settings.php:1029 +#: ../../mod/settings.php:1043 msgid "Private - default private, rarely open or public" msgstr "" -#: ../../mod/settings.php:1030 +#: ../../mod/settings.php:1044 msgid "Blocked - default blocked to/from everybody" msgstr "" -#: ../../mod/settings.php:1033 +#: ../../mod/settings.php:1047 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/settings.php:1033 +#: ../../mod/settings.php:1047 msgid "May reduce spam activity" msgstr "" -#: ../../mod/settings.php:1034 +#: ../../mod/settings.php:1048 msgid "Default Post Permissions" msgstr "" -#: ../../mod/settings.php:1035 +#: ../../mod/settings.php:1049 msgid "(click to open/close)" msgstr "" -#: ../../mod/settings.php:1048 +#: ../../mod/settings.php:1062 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../mod/settings.php:1048 +#: ../../mod/settings.php:1062 msgid "Useful to reduce spamming" msgstr "" -#: ../../mod/settings.php:1051 +#: ../../mod/settings.php:1065 msgid "Notification Settings" msgstr "" -#: ../../mod/settings.php:1052 +#: ../../mod/settings.php:1066 msgid "By default post a status message when:" msgstr "" -#: ../../mod/settings.php:1053 +#: ../../mod/settings.php:1067 msgid "accepting a friend request" msgstr "" -#: ../../mod/settings.php:1054 +#: ../../mod/settings.php:1068 msgid "joining a forum/community" msgstr "" -#: ../../mod/settings.php:1055 +#: ../../mod/settings.php:1069 msgid "making an interesting profile change" msgstr "" -#: ../../mod/settings.php:1056 +#: ../../mod/settings.php:1070 msgid "Send a notification email when:" msgstr "" -#: ../../mod/settings.php:1057 +#: ../../mod/settings.php:1071 msgid "You receive an introduction" msgstr "" -#: ../../mod/settings.php:1058 +#: ../../mod/settings.php:1072 msgid "Your introductions are confirmed" msgstr "" -#: ../../mod/settings.php:1059 +#: ../../mod/settings.php:1073 msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/settings.php:1060 +#: ../../mod/settings.php:1074 msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/settings.php:1061 +#: ../../mod/settings.php:1075 msgid "You receive a private message" msgstr "" -#: ../../mod/settings.php:1062 +#: ../../mod/settings.php:1076 msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/settings.php:1063 +#: ../../mod/settings.php:1077 msgid "You are tagged in a post" msgstr "" -#: ../../mod/settings.php:1064 +#: ../../mod/settings.php:1078 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../mod/settings.php:1067 +#: ../../mod/settings.php:1081 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../mod/settings.php:1068 +#: ../../mod/settings.php:1082 msgid "Change the behaviour of this account for special situations" msgstr "" @@ -3677,6 +3693,49 @@ msgstr "" msgid "Remove" msgstr "" +#: ../../mod/connect.php:59 ../../mod/connect.php:107 +msgid "Continue" +msgstr "" + +#: ../../mod/connect.php:88 +msgid "Premium Channel Setup" +msgstr "" + +#: ../../mod/connect.php:90 +msgid "Enable premium channel connection restrictions" +msgstr "" + +#: ../../mod/connect.php:91 +msgid "" +"Please enter your restrictions or conditions, such as paypal receipt, usage " +"guidelines, etc." +msgstr "" + +#: ../../mod/connect.php:93 ../../mod/connect.php:113 +msgid "" +"This channel may require additional steps or acknowledgement of the " +"following conditions prior to connecting:" +msgstr "" + +#: ../../mod/connect.php:94 +msgid "" +"Potential connections will then see the following text before proceeding:" +msgstr "" + +#: ../../mod/connect.php:95 ../../mod/connect.php:116 +msgid "" +"By continuing, I certify that I have complied with any instructions provided " +"on this page." +msgstr "" + +#: ../../mod/connect.php:104 +msgid "(No specific instructions have been provided by the channel owner.)" +msgstr "" + +#: ../../mod/connect.php:112 +msgid "Restricted or Premium Channel" +msgstr "" + #: ../../mod/delegate.php:95 msgid "No potential page delegates located." msgstr "" @@ -4048,11 +4107,11 @@ msgstr "" msgid "added your channel" msgstr "" -#: ../../mod/ping.php:230 ../../boot.php:1737 ../../boot.php:1817 +#: ../../mod/ping.php:230 ../../boot.php:1743 ../../boot.php:1823 msgid "g A l F d" msgstr "" -#: ../../mod/ping.php:252 ../../boot.php:1783 ../../boot.php:1858 +#: ../../mod/ping.php:252 ../../boot.php:1789 ../../boot.php:1864 msgid "[today]" msgstr "" @@ -4186,41 +4245,41 @@ msgstr "" msgid "Send Private Message" msgstr "" -#: ../../mod/message.php:283 ../../mod/message.php:418 +#: ../../mod/message.php:283 ../../mod/message.php:448 msgid "To:" msgstr "" -#: ../../mod/message.php:288 ../../mod/message.php:420 +#: ../../mod/message.php:288 ../../mod/message.php:450 msgid "Subject:" msgstr "" -#: ../../mod/message.php:316 +#: ../../mod/message.php:317 msgid "No messages." msgstr "" -#: ../../mod/message.php:332 ../../mod/message.php:389 +#: ../../mod/message.php:333 ../../mod/message.php:419 msgid "Delete message" msgstr "" -#: ../../mod/message.php:334 +#: ../../mod/message.php:335 msgid "D, d M Y - g:i A" msgstr "" -#: ../../mod/message.php:353 +#: ../../mod/message.php:354 msgid "Message not found." msgstr "" -#: ../../mod/message.php:411 +#: ../../mod/message.php:441 msgid "Delete conversation" msgstr "" -#: ../../mod/message.php:413 +#: ../../mod/message.php:443 msgid "" "No secure communications available. You may be able to " "respond from the sender's profile page." msgstr "" -#: ../../mod/message.php:417 +#: ../../mod/message.php:447 msgid "Send Reply" msgstr "" @@ -4364,524 +4423,16 @@ msgstr "" msgid "Invalid contact." msgstr "" -#: ../../mod/admin.php:48 -msgid "Theme settings updated." -msgstr "" - -#: ../../mod/admin.php:83 ../../mod/admin.php:408 -msgid "Site" -msgstr "" - -#: ../../mod/admin.php:84 ../../mod/admin.php:632 ../../mod/admin.php:644 -msgid "Users" -msgstr "" - -#: ../../mod/admin.php:85 ../../mod/admin.php:726 ../../mod/admin.php:768 -msgid "Plugins" -msgstr "" - -#: ../../mod/admin.php:86 ../../mod/admin.php:931 ../../mod/admin.php:967 -msgid "Themes" -msgstr "" - -#: ../../mod/admin.php:87 -msgid "DB updates" -msgstr "" - -#: ../../mod/admin.php:101 ../../mod/admin.php:108 ../../mod/admin.php:1054 -msgid "Logs" -msgstr "" - -#: ../../mod/admin.php:107 -msgid "Plugin Features" -msgstr "" - -#: ../../mod/admin.php:109 -msgid "User registrations waiting for confirmation" -msgstr "" - -#: ../../mod/admin.php:180 -msgid "Message queues" -msgstr "" - -#: ../../mod/admin.php:185 ../../mod/admin.php:407 ../../mod/admin.php:631 -#: ../../mod/admin.php:725 ../../mod/admin.php:767 ../../mod/admin.php:930 -#: ../../mod/admin.php:966 ../../mod/admin.php:1053 -msgid "Administration" -msgstr "" - -#: ../../mod/admin.php:186 -msgid "Summary" -msgstr "" - -#: ../../mod/admin.php:188 -msgid "Registered users" -msgstr "" - -#: ../../mod/admin.php:190 -msgid "Pending registrations" -msgstr "" - -#: ../../mod/admin.php:191 -msgid "Version" -msgstr "" - -#: ../../mod/admin.php:193 -msgid "Active plugins" -msgstr "" - -#: ../../mod/admin.php:332 -msgid "Site settings updated." -msgstr "" - -#: ../../mod/admin.php:363 -msgid "No special theme for accessibility" -msgstr "" - -#: ../../mod/admin.php:388 -msgid "Closed" -msgstr "" - -#: ../../mod/admin.php:389 -msgid "Requires approval" -msgstr "" - -#: ../../mod/admin.php:390 -msgid "Open" -msgstr "" - -#: ../../mod/admin.php:395 -msgid "Private" -msgstr "" - -#: ../../mod/admin.php:396 -msgid "Paid Access" -msgstr "" - -#: ../../mod/admin.php:397 -msgid "Free Access" -msgstr "" - -#: ../../mod/admin.php:401 -msgid "No SSL policy, links will track page SSL state" -msgstr "" - -#: ../../mod/admin.php:402 -msgid "Force all links to use SSL" -msgstr "" - -#: ../../mod/admin.php:410 ../../mod/register.php:166 -msgid "Registration" -msgstr "" - -#: ../../mod/admin.php:411 -msgid "File upload" -msgstr "" - -#: ../../mod/admin.php:412 -msgid "Policies" -msgstr "" - -#: ../../mod/admin.php:413 -msgid "Advanced" -msgstr "" - -#: ../../mod/admin.php:417 -msgid "Site name" -msgstr "" - -#: ../../mod/admin.php:418 -msgid "Banner/Logo" -msgstr "" - -#: ../../mod/admin.php:419 -msgid "System language" -msgstr "" - -#: ../../mod/admin.php:420 -msgid "System theme" -msgstr "" - -#: ../../mod/admin.php:420 -msgid "" -"Default system theme - may be over-ridden by user profiles - change theme settings" -msgstr "" - -#: ../../mod/admin.php:421 -msgid "Mobile system theme" -msgstr "" - -#: ../../mod/admin.php:421 -msgid "Theme for mobile devices" -msgstr "" - -#: ../../mod/admin.php:422 -msgid "Accessibility system theme" -msgstr "" - -#: ../../mod/admin.php:422 -msgid "Accessibility theme" -msgstr "" - -#: ../../mod/admin.php:423 -msgid "Channel to use for this website's static pages" -msgstr "" - -#: ../../mod/admin.php:423 -msgid "Site Channel" -msgstr "" - -#: ../../mod/admin.php:424 -msgid "SSL link policy" -msgstr "" - -#: ../../mod/admin.php:424 -msgid "Determines whether generated links should be forced to use SSL" -msgstr "" - -#: ../../mod/admin.php:425 -msgid "Maximum image size" -msgstr "" - -#: ../../mod/admin.php:425 -msgid "" -"Maximum size in bytes of uploaded images. Default is 0, which means no " -"limits." -msgstr "" - -#: ../../mod/admin.php:426 -msgid "Register policy" -msgstr "" - -#: ../../mod/admin.php:427 -msgid "Access policy" -msgstr "" - -#: ../../mod/admin.php:428 -msgid "Register text" -msgstr "" - -#: ../../mod/admin.php:428 -msgid "Will be displayed prominently on the registration page." -msgstr "" - -#: ../../mod/admin.php:429 -msgid "Accounts abandoned after x days" -msgstr "" - -#: ../../mod/admin.php:429 -msgid "" -"Will not waste system resources polling external sites for abandonded " -"accounts. Enter 0 for no time limit." -msgstr "" - -#: ../../mod/admin.php:430 -msgid "Allowed friend domains" -msgstr "" - -#: ../../mod/admin.php:430 -msgid "" -"Comma separated list of domains which are allowed to establish friendships " -"with this site. Wildcards are accepted. Empty to allow any domains" -msgstr "" - -#: ../../mod/admin.php:431 -msgid "Allowed email domains" -msgstr "" - -#: ../../mod/admin.php:431 -msgid "" -"Comma separated list of domains which are allowed in email addresses for " -"registrations to this site. Wildcards are accepted. Empty to allow any " -"domains" -msgstr "" - -#: ../../mod/admin.php:432 -msgid "Block public" -msgstr "" - -#: ../../mod/admin.php:432 -msgid "" -"Check to block public access to all otherwise public personal pages on this " -"site unless you are currently logged in." -msgstr "" - -#: ../../mod/admin.php:433 -msgid "Force publish" -msgstr "" - -#: ../../mod/admin.php:433 -msgid "" -"Check to force all profiles on this site to be listed in the site directory." -msgstr "" - -#: ../../mod/admin.php:435 -msgid "Proxy user" -msgstr "" - -#: ../../mod/admin.php:436 -msgid "Proxy URL" -msgstr "" - -#: ../../mod/admin.php:437 -msgid "Network timeout" -msgstr "" - -#: ../../mod/admin.php:437 -msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." -msgstr "" - -#: ../../mod/admin.php:438 -msgid "Delivery interval" -msgstr "" - -#: ../../mod/admin.php:438 -msgid "" -"Delay background delivery processes by this many seconds to reduce system " -"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " -"for large dedicated servers." -msgstr "" - -#: ../../mod/admin.php:439 -msgid "Poll interval" -msgstr "" - -#: ../../mod/admin.php:439 -msgid "" -"Delay background polling processes by this many seconds to reduce system " -"load. If 0, use delivery interval." -msgstr "" - -#: ../../mod/admin.php:440 -msgid "Maximum Load Average" -msgstr "" - -#: ../../mod/admin.php:440 -msgid "" -"Maximum system load before delivery and poll processes are deferred - " -"default 50." -msgstr "" - -#: ../../mod/admin.php:456 -msgid "Update has been marked successful" -msgstr "" - -#: ../../mod/admin.php:466 -#, php-format -msgid "Executing %s failed. Check system logs." -msgstr "" - -#: ../../mod/admin.php:469 -#, php-format -msgid "Update %s was successfully applied." -msgstr "" - -#: ../../mod/admin.php:473 -#, php-format -msgid "Update %s did not return a status. Unknown if it succeeded." -msgstr "" - -#: ../../mod/admin.php:476 -#, php-format -msgid "Update function %s could not be found." -msgstr "" - -#: ../../mod/admin.php:491 -msgid "No failed updates." -msgstr "" - -#: ../../mod/admin.php:495 -msgid "Failed Updates" -msgstr "" - -#: ../../mod/admin.php:497 -msgid "Mark success (if update was manually applied)" -msgstr "" - -#: ../../mod/admin.php:498 -msgid "Attempt to execute this update step automatically" -msgstr "" - -#: ../../mod/admin.php:524 -#, php-format -msgid "%s user blocked/unblocked" -msgid_plural "%s users blocked/unblocked" -msgstr[0] "" -msgstr[1] "" - -#: ../../mod/admin.php:531 -#, php-format -msgid "%s user deleted" -msgid_plural "%s users deleted" -msgstr[0] "" -msgstr[1] "" - -#: ../../mod/admin.php:562 -msgid "Account not found" -msgstr "" - -#: ../../mod/admin.php:573 -#, php-format -msgid "User '%s' deleted" -msgstr "" - -#: ../../mod/admin.php:582 -#, php-format -msgid "User '%s' unblocked" -msgstr "" - -#: ../../mod/admin.php:582 -#, php-format -msgid "User '%s' blocked" -msgstr "" - -#: ../../mod/admin.php:613 -msgid "Normal Account" -msgstr "" - -#: ../../mod/admin.php:614 -msgid "Soapbox Account" -msgstr "" - -#: ../../mod/admin.php:615 -msgid "Community/Celebrity Account" -msgstr "" - -#: ../../mod/admin.php:616 -msgid "Automatic Friend Account" -msgstr "" - -#: ../../mod/admin.php:634 -msgid "select all" -msgstr "" - -#: ../../mod/admin.php:635 -msgid "User registrations waiting for confirm" -msgstr "" - -#: ../../mod/admin.php:636 -msgid "Request date" -msgstr "" - -#: ../../mod/admin.php:637 -msgid "No registrations." -msgstr "" - -#: ../../mod/admin.php:638 ../../mod/intro.php:11 ../../mod/intro.php:98 +#: ../../mod/intro.php:11 ../../mod/intro.php:98 ../../mod/admin.php:638 #: ../../mod/notifications.php:159 ../../mod/notifications.php:206 msgid "Approve" msgstr "" -#: ../../mod/admin.php:639 -msgid "Deny" -msgstr "" - -#: ../../mod/admin.php:641 ../../mod/intro.php:14 ../../mod/intro.php:99 -#: ../../mod/connections.php:309 ../../mod/connections.php:450 +#: ../../mod/intro.php:14 ../../mod/intro.php:99 ../../mod/connections.php:309 +#: ../../mod/connections.php:450 ../../mod/admin.php:641 msgid "Block" msgstr "" -#: ../../mod/admin.php:642 ../../mod/connections.php:309 -#: ../../mod/connections.php:450 -msgid "Unblock" -msgstr "" - -#: ../../mod/admin.php:645 -msgid "Register date" -msgstr "" - -#: ../../mod/admin.php:645 -msgid "Last login" -msgstr "" - -#: ../../mod/admin.php:645 -msgid "Service Class" -msgstr "" - -#: ../../mod/admin.php:647 -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:648 -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:689 -#, php-format -msgid "Plugin %s disabled." -msgstr "" - -#: ../../mod/admin.php:693 -#, php-format -msgid "Plugin %s enabled." -msgstr "" - -#: ../../mod/admin.php:703 ../../mod/admin.php:901 -msgid "Disable" -msgstr "" - -#: ../../mod/admin.php:705 ../../mod/admin.php:903 -msgid "Enable" -msgstr "" - -#: ../../mod/admin.php:727 ../../mod/admin.php:932 -msgid "Toggle" -msgstr "" - -#: ../../mod/admin.php:735 ../../mod/admin.php:942 -msgid "Author: " -msgstr "" - -#: ../../mod/admin.php:736 ../../mod/admin.php:943 -msgid "Maintainer: " -msgstr "" - -#: ../../mod/admin.php:865 -msgid "No themes found." -msgstr "" - -#: ../../mod/admin.php:924 -msgid "Screenshot" -msgstr "" - -#: ../../mod/admin.php:972 -msgid "[Experimental]" -msgstr "" - -#: ../../mod/admin.php:973 -msgid "[Unsupported]" -msgstr "" - -#: ../../mod/admin.php:1000 -msgid "Log settings updated." -msgstr "" - -#: ../../mod/admin.php:1056 -msgid "Clear" -msgstr "" - -#: ../../mod/admin.php:1062 -msgid "Debugging" -msgstr "" - -#: ../../mod/admin.php:1063 -msgid "Log file" -msgstr "" - -#: ../../mod/admin.php:1063 -msgid "" -"Must be writable by web server. Relative to your Red top-level directory." -msgstr "" - -#: ../../mod/admin.php:1064 -msgid "Log level" -msgstr "" - #: ../../mod/intro.php:17 ../../mod/intro.php:100 #: ../../mod/connections.php:316 ../../mod/connections.php:451 #: ../../mod/notifications.php:51 ../../mod/notifications.php:162 @@ -5012,6 +4563,11 @@ msgstr "" msgid "Fetch updated permissions" msgstr "" +#: ../../mod/connections.php:309 ../../mod/connections.php:450 +#: ../../mod/admin.php:642 +msgid "Unblock" +msgstr "" + #: ../../mod/connections.php:312 msgid "Block or Unblock this connection" msgstr "" @@ -5562,23 +5118,23 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:624 ../../boot.php:1639 +#: ../../mod/profiles.php:624 ../../boot.php:1645 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:625 ../../boot.php:1646 +#: ../../mod/profiles.php:625 ../../boot.php:1652 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:636 ../../boot.php:1660 +#: ../../mod/profiles.php:636 ../../boot.php:1666 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:639 ../../boot.php:1663 +#: ../../mod/profiles.php:639 ../../boot.php:1669 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:640 ../../boot.php:1664 +#: ../../mod/profiles.php:640 ../../boot.php:1670 msgid "Edit visibility" msgstr "" @@ -5619,6 +5175,509 @@ msgid "" "Or import an existing channel from another location" msgstr "" +#: ../../mod/admin.php:48 +msgid "Theme settings updated." +msgstr "" + +#: ../../mod/admin.php:83 ../../mod/admin.php:408 +msgid "Site" +msgstr "" + +#: ../../mod/admin.php:84 ../../mod/admin.php:632 ../../mod/admin.php:644 +msgid "Users" +msgstr "" + +#: ../../mod/admin.php:85 ../../mod/admin.php:726 ../../mod/admin.php:768 +msgid "Plugins" +msgstr "" + +#: ../../mod/admin.php:86 ../../mod/admin.php:931 ../../mod/admin.php:967 +msgid "Themes" +msgstr "" + +#: ../../mod/admin.php:87 +msgid "DB updates" +msgstr "" + +#: ../../mod/admin.php:101 ../../mod/admin.php:108 ../../mod/admin.php:1054 +msgid "Logs" +msgstr "" + +#: ../../mod/admin.php:107 +msgid "Plugin Features" +msgstr "" + +#: ../../mod/admin.php:109 +msgid "User registrations waiting for confirmation" +msgstr "" + +#: ../../mod/admin.php:180 +msgid "Message queues" +msgstr "" + +#: ../../mod/admin.php:185 ../../mod/admin.php:407 ../../mod/admin.php:631 +#: ../../mod/admin.php:725 ../../mod/admin.php:767 ../../mod/admin.php:930 +#: ../../mod/admin.php:966 ../../mod/admin.php:1053 +msgid "Administration" +msgstr "" + +#: ../../mod/admin.php:186 +msgid "Summary" +msgstr "" + +#: ../../mod/admin.php:188 +msgid "Registered users" +msgstr "" + +#: ../../mod/admin.php:190 +msgid "Pending registrations" +msgstr "" + +#: ../../mod/admin.php:191 +msgid "Version" +msgstr "" + +#: ../../mod/admin.php:193 +msgid "Active plugins" +msgstr "" + +#: ../../mod/admin.php:332 +msgid "Site settings updated." +msgstr "" + +#: ../../mod/admin.php:363 +msgid "No special theme for accessibility" +msgstr "" + +#: ../../mod/admin.php:388 +msgid "Closed" +msgstr "" + +#: ../../mod/admin.php:389 +msgid "Requires approval" +msgstr "" + +#: ../../mod/admin.php:390 +msgid "Open" +msgstr "" + +#: ../../mod/admin.php:395 +msgid "Private" +msgstr "" + +#: ../../mod/admin.php:396 +msgid "Paid Access" +msgstr "" + +#: ../../mod/admin.php:397 +msgid "Free Access" +msgstr "" + +#: ../../mod/admin.php:401 +msgid "No SSL policy, links will track page SSL state" +msgstr "" + +#: ../../mod/admin.php:402 +msgid "Force all links to use SSL" +msgstr "" + +#: ../../mod/admin.php:410 ../../mod/register.php:166 +msgid "Registration" +msgstr "" + +#: ../../mod/admin.php:411 +msgid "File upload" +msgstr "" + +#: ../../mod/admin.php:412 +msgid "Policies" +msgstr "" + +#: ../../mod/admin.php:413 +msgid "Advanced" +msgstr "" + +#: ../../mod/admin.php:417 +msgid "Site name" +msgstr "" + +#: ../../mod/admin.php:418 +msgid "Banner/Logo" +msgstr "" + +#: ../../mod/admin.php:419 +msgid "System language" +msgstr "" + +#: ../../mod/admin.php:420 +msgid "System theme" +msgstr "" + +#: ../../mod/admin.php:420 +msgid "" +"Default system theme - may be over-ridden by user profiles - change theme settings" +msgstr "" + +#: ../../mod/admin.php:421 +msgid "Mobile system theme" +msgstr "" + +#: ../../mod/admin.php:421 +msgid "Theme for mobile devices" +msgstr "" + +#: ../../mod/admin.php:422 +msgid "Accessibility system theme" +msgstr "" + +#: ../../mod/admin.php:422 +msgid "Accessibility theme" +msgstr "" + +#: ../../mod/admin.php:423 +msgid "Channel to use for this website's static pages" +msgstr "" + +#: ../../mod/admin.php:423 +msgid "Site Channel" +msgstr "" + +#: ../../mod/admin.php:424 +msgid "SSL link policy" +msgstr "" + +#: ../../mod/admin.php:424 +msgid "Determines whether generated links should be forced to use SSL" +msgstr "" + +#: ../../mod/admin.php:425 +msgid "Maximum image size" +msgstr "" + +#: ../../mod/admin.php:425 +msgid "" +"Maximum size in bytes of uploaded images. Default is 0, which means no " +"limits." +msgstr "" + +#: ../../mod/admin.php:426 +msgid "Register policy" +msgstr "" + +#: ../../mod/admin.php:427 +msgid "Access policy" +msgstr "" + +#: ../../mod/admin.php:428 +msgid "Register text" +msgstr "" + +#: ../../mod/admin.php:428 +msgid "Will be displayed prominently on the registration page." +msgstr "" + +#: ../../mod/admin.php:429 +msgid "Accounts abandoned after x days" +msgstr "" + +#: ../../mod/admin.php:429 +msgid "" +"Will not waste system resources polling external sites for abandonded " +"accounts. Enter 0 for no time limit." +msgstr "" + +#: ../../mod/admin.php:430 +msgid "Allowed friend domains" +msgstr "" + +#: ../../mod/admin.php:430 +msgid "" +"Comma separated list of domains which are allowed to establish friendships " +"with this site. Wildcards are accepted. Empty to allow any domains" +msgstr "" + +#: ../../mod/admin.php:431 +msgid "Allowed email domains" +msgstr "" + +#: ../../mod/admin.php:431 +msgid "" +"Comma separated list of domains which are allowed in email addresses for " +"registrations to this site. Wildcards are accepted. Empty to allow any " +"domains" +msgstr "" + +#: ../../mod/admin.php:432 +msgid "Block public" +msgstr "" + +#: ../../mod/admin.php:432 +msgid "" +"Check to block public access to all otherwise public personal pages on this " +"site unless you are currently logged in." +msgstr "" + +#: ../../mod/admin.php:433 +msgid "Force publish" +msgstr "" + +#: ../../mod/admin.php:433 +msgid "" +"Check to force all profiles on this site to be listed in the site directory." +msgstr "" + +#: ../../mod/admin.php:435 +msgid "Proxy user" +msgstr "" + +#: ../../mod/admin.php:436 +msgid "Proxy URL" +msgstr "" + +#: ../../mod/admin.php:437 +msgid "Network timeout" +msgstr "" + +#: ../../mod/admin.php:437 +msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." +msgstr "" + +#: ../../mod/admin.php:438 +msgid "Delivery interval" +msgstr "" + +#: ../../mod/admin.php:438 +msgid "" +"Delay background delivery processes by this many seconds to reduce system " +"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " +"for large dedicated servers." +msgstr "" + +#: ../../mod/admin.php:439 +msgid "Poll interval" +msgstr "" + +#: ../../mod/admin.php:439 +msgid "" +"Delay background polling processes by this many seconds to reduce system " +"load. If 0, use delivery interval." +msgstr "" + +#: ../../mod/admin.php:440 +msgid "Maximum Load Average" +msgstr "" + +#: ../../mod/admin.php:440 +msgid "" +"Maximum system load before delivery and poll processes are deferred - " +"default 50." +msgstr "" + +#: ../../mod/admin.php:456 +msgid "Update has been marked successful" +msgstr "" + +#: ../../mod/admin.php:466 +#, php-format +msgid "Executing %s failed. Check system logs." +msgstr "" + +#: ../../mod/admin.php:469 +#, php-format +msgid "Update %s was successfully applied." +msgstr "" + +#: ../../mod/admin.php:473 +#, php-format +msgid "Update %s did not return a status. Unknown if it succeeded." +msgstr "" + +#: ../../mod/admin.php:476 +#, php-format +msgid "Update function %s could not be found." +msgstr "" + +#: ../../mod/admin.php:491 +msgid "No failed updates." +msgstr "" + +#: ../../mod/admin.php:495 +msgid "Failed Updates" +msgstr "" + +#: ../../mod/admin.php:497 +msgid "Mark success (if update was manually applied)" +msgstr "" + +#: ../../mod/admin.php:498 +msgid "Attempt to execute this update step automatically" +msgstr "" + +#: ../../mod/admin.php:524 +#, php-format +msgid "%s user blocked/unblocked" +msgid_plural "%s users blocked/unblocked" +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/admin.php:531 +#, php-format +msgid "%s user deleted" +msgid_plural "%s users deleted" +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/admin.php:562 +msgid "Account not found" +msgstr "" + +#: ../../mod/admin.php:573 +#, php-format +msgid "User '%s' deleted" +msgstr "" + +#: ../../mod/admin.php:582 +#, php-format +msgid "User '%s' unblocked" +msgstr "" + +#: ../../mod/admin.php:582 +#, php-format +msgid "User '%s' blocked" +msgstr "" + +#: ../../mod/admin.php:613 +msgid "Normal Account" +msgstr "" + +#: ../../mod/admin.php:614 +msgid "Soapbox Account" +msgstr "" + +#: ../../mod/admin.php:615 +msgid "Community/Celebrity Account" +msgstr "" + +#: ../../mod/admin.php:616 +msgid "Automatic Friend Account" +msgstr "" + +#: ../../mod/admin.php:634 +msgid "select all" +msgstr "" + +#: ../../mod/admin.php:635 +msgid "User registrations waiting for confirm" +msgstr "" + +#: ../../mod/admin.php:636 +msgid "Request date" +msgstr "" + +#: ../../mod/admin.php:637 +msgid "No registrations." +msgstr "" + +#: ../../mod/admin.php:639 +msgid "Deny" +msgstr "" + +#: ../../mod/admin.php:645 +msgid "Register date" +msgstr "" + +#: ../../mod/admin.php:645 +msgid "Last login" +msgstr "" + +#: ../../mod/admin.php:645 +msgid "Service Class" +msgstr "" + +#: ../../mod/admin.php:647 +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:648 +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:689 +#, php-format +msgid "Plugin %s disabled." +msgstr "" + +#: ../../mod/admin.php:693 +#, php-format +msgid "Plugin %s enabled." +msgstr "" + +#: ../../mod/admin.php:703 ../../mod/admin.php:901 +msgid "Disable" +msgstr "" + +#: ../../mod/admin.php:705 ../../mod/admin.php:903 +msgid "Enable" +msgstr "" + +#: ../../mod/admin.php:727 ../../mod/admin.php:932 +msgid "Toggle" +msgstr "" + +#: ../../mod/admin.php:735 ../../mod/admin.php:942 +msgid "Author: " +msgstr "" + +#: ../../mod/admin.php:736 ../../mod/admin.php:943 +msgid "Maintainer: " +msgstr "" + +#: ../../mod/admin.php:865 +msgid "No themes found." +msgstr "" + +#: ../../mod/admin.php:924 +msgid "Screenshot" +msgstr "" + +#: ../../mod/admin.php:972 +msgid "[Experimental]" +msgstr "" + +#: ../../mod/admin.php:973 +msgid "[Unsupported]" +msgstr "" + +#: ../../mod/admin.php:1000 +msgid "Log settings updated." +msgstr "" + +#: ../../mod/admin.php:1056 +msgid "Clear" +msgstr "" + +#: ../../mod/admin.php:1062 +msgid "Debugging" +msgstr "" + +#: ../../mod/admin.php:1063 +msgid "Log file" +msgstr "" + +#: ../../mod/admin.php:1063 +msgid "" +"Must be writable by web server. Relative to your Red top-level directory." +msgstr "" + +#: ../../mod/admin.php:1064 +msgid "Log level" +msgstr "" + #: ../../mod/lostpass.php:15 msgid "No valid account found." msgstr "" @@ -5643,7 +5702,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1377 +#: ../../mod/lostpass.php:85 ../../boot.php:1374 msgid "Password Reset" msgstr "" @@ -5717,19 +5776,19 @@ msgstr "" msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../mod/import.php:327 +#: ../../mod/import.php:352 msgid "Import completed." msgstr "" -#: ../../mod/import.php:340 +#: ../../mod/import.php:365 msgid "You must be logged in to use this feature." msgstr "" -#: ../../mod/import.php:345 +#: ../../mod/import.php:370 msgid "Import Channel" msgstr "" -#: ../../mod/import.php:346 +#: ../../mod/import.php:371 msgid "" "Use this form to import an existing channel from a different server/hub. You " "may retrieve the channel identity from the old server/hub via the network or " @@ -5737,27 +5796,27 @@ msgid "" "imported. Importation of content is not yet available." msgstr "" -#: ../../mod/import.php:347 +#: ../../mod/import.php:372 msgid "File to Upload" msgstr "" -#: ../../mod/import.php:348 +#: ../../mod/import.php:373 msgid "Or provide the old server/hub details" msgstr "" -#: ../../mod/import.php:349 +#: ../../mod/import.php:374 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../mod/import.php:350 +#: ../../mod/import.php:375 msgid "Your old login email address" msgstr "" -#: ../../mod/import.php:351 +#: ../../mod/import.php:376 msgid "Your old login password" msgstr "" -#: ../../mod/import.php:352 +#: ../../mod/import.php:377 msgid "" "For either option, please choose whether to make this hub your new primary " "address, or whether your old location should continue this role. You will be " @@ -5765,7 +5824,7 @@ msgid "" "location for files, photos, and media." msgstr "" -#: ../../mod/import.php:353 +#: ../../mod/import.php:378 msgid "Make this hub my primary location" msgstr "" @@ -5874,7 +5933,7 @@ msgstr "" msgid "invalid target signature" msgstr "" -#: ../../mod/follow.php:24 +#: ../../mod/follow.php:25 msgid "Channel added." msgstr "" @@ -6396,104 +6455,104 @@ msgstr "" msgid "0-99 default: 5" msgstr "" -#: ../../boot.php:1201 +#: ../../boot.php:1198 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1204 +#: ../../boot.php:1201 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1341 +#: ../../boot.php:1338 msgid "Create a New Account" msgstr "" -#: ../../boot.php:1370 +#: ../../boot.php:1367 msgid "Password" msgstr "" -#: ../../boot.php:1371 +#: ../../boot.php:1368 msgid "Remember me" msgstr "" -#: ../../boot.php:1376 +#: ../../boot.php:1373 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1495 +#: ../../boot.php:1492 msgid "Requested channel is not available." msgstr "" -#: ../../boot.php:1507 +#: ../../boot.php:1504 msgid " Sorry, you don't have the permission to view this profile. " msgstr "" -#: ../../boot.php:1645 +#: ../../boot.php:1651 msgid "Profiles" msgstr "" -#: ../../boot.php:1645 +#: ../../boot.php:1651 msgid "Manage/edit profiles" msgstr "" -#: ../../boot.php:1649 +#: ../../boot.php:1655 msgid "Edit Profile" msgstr "" -#: ../../boot.php:1738 ../../boot.php:1818 +#: ../../boot.php:1744 ../../boot.php:1824 msgid "F d" msgstr "" -#: ../../boot.php:1795 +#: ../../boot.php:1801 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1796 +#: ../../boot.php:1802 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1851 +#: ../../boot.php:1857 msgid "[No description]" msgstr "" -#: ../../boot.php:1869 +#: ../../boot.php:1875 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1870 +#: ../../boot.php:1876 msgid "Events this week:" msgstr "" -#: ../../boot.php:2093 +#: ../../boot.php:2105 msgid "Channel" msgstr "" -#: ../../boot.php:2096 +#: ../../boot.php:2108 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:2100 +#: ../../boot.php:2112 msgid "About" msgstr "" -#: ../../boot.php:2103 +#: ../../boot.php:2115 msgid "Profile Details" msgstr "" -#: ../../boot.php:2121 +#: ../../boot.php:2133 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:2126 +#: ../../boot.php:2138 msgid "Webpages" msgstr "" -#: ../../boot.php:2129 +#: ../../boot.php:2141 msgid "Manage Webpages" msgstr "" -#: ../../boot.php:2356 +#: ../../boot.php:2368 msgid "toggle mobile" msgstr "" diff --git a/version.inc b/version.inc index eef8ef12b..41f5190b7 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-08-22.413 +2013-08-24.415 From 4925f7fc53e5971541e1fcfcbd38597a7536a2e8 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 24 Aug 2013 17:05:01 -0700 Subject: [PATCH 024/330] another issue with site rename --- boot.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index 11e805e8b..c0911cc19 100755 --- a/boot.php +++ b/boot.php @@ -1284,8 +1284,8 @@ function fix_system_urls($oldurl,$newurl) { // that they can clean up their hubloc tables (this includes directories). // It's a very expensive operation so you don't want to have to do it often or after your site gets to be large. - $r = q("select * from xchan left join channel on channel_hash = xchan_hash where xchan_url = '%s'", - dbesc($oldurl) + $r = q("select * from xchan left join channel on channel_hash = xchan_hash where xchan_url like '%s'", + dbesc($oldurl . '%') ); if($r) { foreach($r as $rr) { From 1c17d1b69c2b3db9f9c3ffd0dee4ca9ea57af05a Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 24 Aug 2013 18:55:07 -0700 Subject: [PATCH 025/330] start timestamping hubloc connections so we can eventually remove dead ones --- boot.php | 7 +++++-- mod/post.php | 12 +++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index c0911cc19..f27410d3e 100755 --- a/boot.php +++ b/boot.php @@ -1284,7 +1284,7 @@ function fix_system_urls($oldurl,$newurl) { // that they can clean up their hubloc tables (this includes directories). // It's a very expensive operation so you don't want to have to do it often or after your site gets to be large. - $r = q("select * from xchan left join channel on channel_hash = xchan_hash where xchan_url like '%s'", + $r = q("select xchan.*, channel.* from xchan left join channel on channel_hash = xchan_hash where xchan_url like '%s'", dbesc($oldurl . '%') ); if($r) { @@ -1317,7 +1317,10 @@ function fix_system_urls($oldurl,$newurl) { dbesc($newurl . '/post'), dbesc($rr['xchan_hash']), dbesc($oldurl) - ); + ); + + proc_run('php', 'include/notifier.php', 'refresh_all', $rr['channel_id']); + } } } diff --git a/mod/post.php b/mod/post.php index 07f2cd083..847af0fe9 100644 --- a/mod/post.php +++ b/mod/post.php @@ -297,13 +297,23 @@ function post_post(&$a) { // (!!) this will validate the sender $result = zot_register_hub($sender); - if((! $result['success']) || (! zot_gethub($sender))) { + if((! $result['success']) || (! ($hub = zot_gethub($sender)))) { $ret['message'] = 'Hub not available.'; logger('mod_zot: no hub'); json_return_and_die($ret); } } + + // Update our DB to show when we last communicated successfully with this hub + // This will allow us to prune dead hubs from using up resources + + $r = q("update hubloc set hubloc_connected = '%s' where hubloc_id = %d limit 1", + dbesc(datetime_convert()), + intval($hub['hubloc_id']) + ); + + // TODO: check which hub is primary and take action if mismatched if(array_key_exists('recipients',$data)) From c2fe299d16f6766f66a8213f44e51e97b10d9aad Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 24 Aug 2013 18:56:26 -0700 Subject: [PATCH 026/330] missing doc files --- doc/html/connect_8php.html | 173 +++++++++++++++++++++++++++++++++++++ doc/html/connect_8php.js | 6 ++ 2 files changed, 179 insertions(+) create mode 100644 doc/html/connect_8php.html create mode 100644 doc/html/connect_8php.js diff --git a/doc/html/connect_8php.html b/doc/html/connect_8php.html new file mode 100644 index 000000000..f2c267101 --- /dev/null +++ b/doc/html/connect_8php.html @@ -0,0 +1,173 @@ + + + + + + +The Red Matrix: mod/connect.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    + +
    +
    connect.php File Reference
    +
    +
    + + + + + + + + +

    +Functions

     connect_init (&$a)
     
     connect_post (&$a)
     
     connect_content (&$a)
     
    +

    Function Documentation

    + +
    +
    + + + + + + + + +
    connect_content ($a)
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    connect_init ($a)
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    connect_post ($a)
    +
    + +
    +
    +
    +
    + diff --git a/doc/html/connect_8php.js b/doc/html/connect_8php.js new file mode 100644 index 000000000..208ea22b3 --- /dev/null +++ b/doc/html/connect_8php.js @@ -0,0 +1,6 @@ +var connect_8php = +[ + [ "connect_content", "connect_8php.html#a489f0a66c660de6ec4d6917b27674f07", null ], + [ "connect_init", "connect_8php.html#ad46a38f32fd7a3d324b1fa26373efa36", null ], + [ "connect_post", "connect_8php.html#a417ec27afe33f21a929667a665e32ee2", null ] +]; \ No newline at end of file From df3cf811f044fe49173ea4b1b9d19bcdff76bc26 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 25 Aug 2013 20:02:24 -0700 Subject: [PATCH 027/330] always use system provided baseurl if configured --- boot.php | 22 ++++++++++++++++++++++ version.inc | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/boot.php b/boot.php index f27410d3e..f28021b60 100755 --- a/boot.php +++ b/boot.php @@ -289,6 +289,14 @@ define ( 'MENU_ITEM_ZID', 0x0001); define ( 'MENU_ITEM_NEWWIN', 0x0002); +/** + * Poll/Survey types + */ + +define ( 'POLL_SIMPLE_RATING', 0x0001); +define ( 'POLL_MULTIPLE_CHOICE', 0x0002); + + /** * Maximum number of "people who like (or don't like) this" that we will list by name */ @@ -744,6 +752,18 @@ class App { } function get_baseurl($ssl = false) { + + + if(is_array($this->config) + && array_key_exists('system',$this->config) + && is_array($this->config['system']) + && array_key_exists('baseurl',$this->config['system']) + && strlen($this->config['system']['baseurl'])) { + $url = $this->config['system']['baseurl']; + return $url; + } + + $scheme = $this->scheme; if((x($this->config,'system')) && (x($this->config['system'],'ssl_policy'))) { @@ -1277,6 +1297,8 @@ function fix_system_urls($oldurl,$newurl) { require_once('include/crypto.php'); + logger('fix_system_urls: renaming ' . $oldurl . ' to ' . $newurl); + // Basically a site rename, but this can happen if you change from http to https for instance - even if the site name didn't change // This should fix URL changes on our site, but other sites will end up with orphan hublocs which they will try to contact and will // cause wasted communications. diff --git a/version.inc b/version.inc index 41f5190b7..e6cafa871 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-08-24.415 +2013-08-25.416 From 754611738865eacba7f4acc235c03bad85dfa2c3 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 25 Aug 2013 20:11:49 -0700 Subject: [PATCH 028/330] Try to ensure full paths don't leak into xchan_addr and hubloc_addr --- boot.php | 5 +++++ include/zot.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/boot.php b/boot.php index f28021b60..a4fe8d3ad 100755 --- a/boot.php +++ b/boot.php @@ -1316,6 +1316,11 @@ function fix_system_urls($oldurl,$newurl) { if(! $parsed) continue; $newhost = $parsed['host']; + // sometimes parse_url returns unexpected results. + + if(strpos($newhost,'/') !== false) + $newhost = substr($newhost,0,strpos($newhost,'/')); + $rhs = $newhost . (($parsed['port']) ? ':' . $parsed['port'] : '') . (($parsed['path']) ? $parsed['path'] : ''); $x = q("update xchan set xchan_addr = '%s', xchan_url = '%s', xchan_connurl = '%s', xchan_follow = '%s', xchan_connpage = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s' where xchan_hash = '%s' limit 1", diff --git a/include/zot.php b/include/zot.php index c7049dee6..051fa5078 100644 --- a/include/zot.php +++ b/include/zot.php @@ -138,7 +138,7 @@ function zot_finger($webbie,$channel) { $r = q("select xchan.*, hubloc.* from xchan left join hubloc on xchan_hash = hubloc_hash where xchan_addr = '%s' and (hubloc_flags & %d) limit 1", - dbesc($xchan_address), + dbesc($xchan_addr), intval(HUBLOC_FLAGS_PRIMARY) ); From e9125ce06534736290e461508b5f5092ca73b02d Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 25 Aug 2013 20:17:45 -0700 Subject: [PATCH 029/330] try to fix bad addresses that got into the network --- include/zot.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/zot.php b/include/zot.php index 051fa5078..be5b0d9c0 100644 --- a/include/zot.php +++ b/include/zot.php @@ -444,6 +444,8 @@ function import_xchan($arr) { if(! array_key_exists('connect_url', $arr)) $arr['connect_url'] = ''; + if(strpos($arr['address'],'/') !== false) + $arr['address'] = substr($arr['address'],0,strpos($arr['address'],'/')); if($r) { if($r[0]['xchan_photo_date'] != $arr['photo_updated']) @@ -466,6 +468,7 @@ function import_xchan($arr) { else $new_flags = $r[0]['xchan_flags']; + if(($r[0]['xchan_name_date'] != $arr['name_updated']) || ($r[0]['xchan_connurl'] != $arr['connections_url']) || ($r[0]['xchan_flags'] != $new_flags) From 2f2a316b27221759d433a786fb3485238f032a37 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 26 Aug 2013 03:54:27 -0700 Subject: [PATCH 030/330] regex patch --- boot.php | 1 + include/bbcode.php | 2 +- version.inc | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index a4fe8d3ad..7902313e6 100755 --- a/boot.php +++ b/boot.php @@ -295,6 +295,7 @@ define ( 'MENU_ITEM_NEWWIN', 0x0002); define ( 'POLL_SIMPLE_RATING', 0x0001); define ( 'POLL_MULTIPLE_CHOICE', 0x0002); +define ( 'POLL_OVERWRITE', 0x8000); // If you vote twice remove the prior entry /** diff --git a/include/bbcode.php b/include/bbcode.php index a0a53a310..9f9489893 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -271,7 +271,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { $urlchars = '[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]'; if (strpos($Text,'http') !== false) { - $Text = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/$urlchars+)/ism", '$1$2', $Text); + $Text = preg_replace("/([^\"\]\='".'"'."]|^)(https?\:\/\/$urlchars+)/ism", '$1$2', $Text); } if (strpos($Text,'[/share]') !== false) { $Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism","bb_ShareAttributes",$Text); diff --git a/version.inc b/version.inc index e6cafa871..009ce6d57 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-08-25.416 +2013-08-26.417 From 7a8363c328d69b53a0c949bc2d8a047d2536d911 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 26 Aug 2013 17:06:19 -0700 Subject: [PATCH 031/330] more cleanup from the mess yesterday - you might have a look for xchan_addr and hubloc_addr with slashes in them and fix them - especially getting rid of ip addresses and the /channel/xyz in the addr fields --- include/zot.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/zot.php b/include/zot.php index be5b0d9c0..b74892b19 100644 --- a/include/zot.php +++ b/include/zot.php @@ -606,6 +606,9 @@ function import_xchan($arr) { continue; } + if(strpos($location['address'],'/') !== false) + $location['address'] = substr($location['address'],0,strpos($location['address'],'/')); + // new hub claiming to be primary. Make it so. if(intval($location['primary'])) { From 2e72b136c558652ca9a9b755b29cdb99ee27ee7f Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 26 Aug 2013 17:48:05 -0700 Subject: [PATCH 032/330] fix profile change activity where the change is a solitary url - and includes a stray right quote --- include/activities.php | 2 ++ include/bbcode.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/activities.php b/include/activities.php index 10a01792f..7ef26abeb 100644 --- a/include/activities.php +++ b/include/activities.php @@ -45,6 +45,8 @@ function profile_activity($changed, $value) { $prof = '[url=' . z_root() . '/profile/' . $self['channel_address'] . ']' . t('public profile') . '[/url]'; if($t == 1 && strlen($value)) { + // if it's a url, the HTML quotes will mess it up, so link it and don't try and zidify it because we don't know what it points to. + $value = linkify($value); $message = sprintf( t('%1$s changed %2$s to “%3$s”'), $A, $changes, $value); $message .= "\n\n" . sprintf( t('Visit %1$s\'s %2$s'), $A, $prof); } diff --git a/include/bbcode.php b/include/bbcode.php index 9f9489893..a0a53a310 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -271,7 +271,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { $urlchars = '[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]'; if (strpos($Text,'http') !== false) { - $Text = preg_replace("/([^\"\]\='".'"'."]|^)(https?\:\/\/$urlchars+)/ism", '$1$2', $Text); + $Text = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/$urlchars+)/ism", '$1$2', $Text); } if (strpos($Text,'[/share]') !== false) { $Text = preg_replace_callback("/\[share(.*?)\](.*?)\[\/share\]/ism","bb_ShareAttributes",$Text); From 7dfd9435f78939166326755792ed8b319e5b5983 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 26 Aug 2013 18:15:30 -0700 Subject: [PATCH 033/330] found the bugger --- boot.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 7902313e6..d5210df95 100755 --- a/boot.php +++ b/boot.php @@ -1317,12 +1317,16 @@ function fix_system_urls($oldurl,$newurl) { if(! $parsed) continue; $newhost = $parsed['host']; + // sometimes parse_url returns unexpected results. if(strpos($newhost,'/') !== false) $newhost = substr($newhost,0,strpos($newhost,'/')); - $rhs = $newhost . (($parsed['port']) ? ':' . $parsed['port'] : '') . (($parsed['path']) ? $parsed['path'] : ''); + $rhs = $newhost . (($parsed['port']) ? ':' . $parsed['port'] : ''); + + // paths aren't going to work. You have to be at the (sub)domain root + // . (($parsed['path']) ? $parsed['path'] : ''); $x = q("update xchan set xchan_addr = '%s', xchan_url = '%s', xchan_connurl = '%s', xchan_follow = '%s', xchan_connpage = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s' where xchan_hash = '%s' limit 1", dbesc($channel . '@' . $rhs), From 31b934eb5e65abc0181918cb21b8e51390966a3d Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 26 Aug 2013 20:58:07 -0700 Subject: [PATCH 034/330] clone sync was trying to update xchan info in the abook loop. --- boot.php | 5 +++-- include/zot.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index d5210df95..0676c3c95 100755 --- a/boot.php +++ b/boot.php @@ -293,8 +293,9 @@ define ( 'MENU_ITEM_NEWWIN', 0x0002); * Poll/Survey types */ -define ( 'POLL_SIMPLE_RATING', 0x0001); -define ( 'POLL_MULTIPLE_CHOICE', 0x0002); +define ( 'POLL_SIMPLE_RATING', 0x0001); // 1-5 +define ( 'POLL_TENSCALE', 0x0002); // 1-10 +define ( 'POLL_MULTIPLE_CHOICE', 0x0004); define ( 'POLL_OVERWRITE', 0x8000); // If you vote twice remove the prior entry diff --git a/include/zot.php b/include/zot.php index b74892b19..beff1b139 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1715,7 +1715,7 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) { $clean = array(); foreach($arr['abook'] as $abook) { foreach($abook as $k => $v) { - if(in_array($k,$disallowed)) + if(in_array($k,$disallowed) || (strpos($k,'abook') !== 0)) continue; $clean[$k] = $v; } From 6a2cb837afc41dfe2e535164edb1865d4b0278a4 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 27 Aug 2013 02:27:36 -0700 Subject: [PATCH 035/330] get rid of ssl_policy - it's implicit in the site url --- boot.php | 10 +++++----- include/items.php | 30 +++++++++++++++--------------- mod/admin.php | 14 +++++++------- version.inc | 2 +- view/tpl/admin_site.tpl | 8 ++++---- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/boot.php b/boot.php index 0676c3c95..fc5408887 100755 --- a/boot.php +++ b/boot.php @@ -768,11 +768,11 @@ class App { $scheme = $this->scheme; - if((x($this->config,'system')) && (x($this->config['system'],'ssl_policy'))) { - if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL)) { - $scheme = 'https'; - } - } +// if((x($this->config,'system')) && (x($this->config['system'],'ssl_policy'))) { +// if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL)) { +// $scheme = 'https'; +// } +// } $this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' ); return $this->baseurl; diff --git a/include/items.php b/include/items.php index 10bdcb38f..c695a9b72 100755 --- a/include/items.php +++ b/include/items.php @@ -2320,21 +2320,21 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) { if(! $rino_enable) $rino = 0; - $ssl_val = intval(get_config('system','ssl_policy')); - $ssl_policy = ''; +// $ssl_val = intval(get_config('system','ssl_policy')); +// $ssl_policy = ''; - switch($ssl_val){ - case SSL_POLICY_FULL: - $ssl_policy = 'full'; - break; - case SSL_POLICY_SELFSIGN: - $ssl_policy = 'self'; - break; - case SSL_POLICY_NONE: - default: - $ssl_policy = 'none'; - break; - } +// switch($ssl_val){ +// case SSL_POLICY_FULL: +// $ssl_policy = 'full'; +// break; +// case SSL_POLICY_SELFSIGN: +// $ssl_policy = 'self'; +// break; +// case SSL_POLICY_NONE: +// default: +// $ssl_policy = 'none'; +// break; +// } $url = $contact['notify'] . '&dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino=1' : ''); @@ -2423,7 +2423,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) { $postvars['perm'] = 'r'; } - $postvars['ssl_policy'] = $ssl_policy; +// $postvars['ssl_policy'] = $ssl_policy; if($page) $postvars['page'] = $page; diff --git a/mod/admin.php b/mod/admin.php index 7e8f7a301..fb1a9ab53 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -235,7 +235,7 @@ function admin_page_site_post(&$a){ $timeout = ((x($_POST,'timeout')) ? intval(trim($_POST['timeout'])) : 60); $delivery_interval = ((x($_POST,'delivery_interval'))? intval(trim($_POST['delivery_interval'])) : 0); $poll_interval = ((x($_POST,'poll_interval'))? intval(trim($_POST['poll_interval'])) : 0); - $ssl_policy = ((x($_POST,'ssl_policy')) ? intval($_POST['ssl_policy']) : 0); +// $ssl_policy = ((x($_POST,'ssl_policy')) ? intval($_POST['ssl_policy']) : 0); /* if($ssl_policy != intval(get_config('system','ssl_policy'))) { if($ssl_policy == SSL_POLICY_FULL) { @@ -278,7 +278,7 @@ function admin_page_site_post(&$a){ } } */ - set_config('system','ssl_policy',$ssl_policy); +// set_config('system','ssl_policy',$ssl_policy); set_config('system','delivery_interval',$delivery_interval); set_config('system','poll_interval',$poll_interval); set_config('system','maxloadavg',$maxloadavg); @@ -397,10 +397,10 @@ function admin_page_site(&$a) { ACCESS_FREE => t("Free Access") ); - $ssl_choices = array( - SSL_POLICY_NONE => t("No SSL policy, links will track page SSL state"), - SSL_POLICY_FULL => t("Force all links to use SSL") - ); +// $ssl_choices = array( +// SSL_POLICY_NONE => t("No SSL policy, links will track page SSL state"), +// SSL_POLICY_FULL => t("Force all links to use SSL") +// ); $t = get_markup_template("admin_site.tpl"); return replace_macros($t, array( @@ -421,7 +421,7 @@ function admin_page_site(&$a) { '$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile_theme'), t("Theme for mobile devices"), $theme_choices_mobile), '$theme_accessibility' => array('theme_accessibility', t("Accessibility system theme"), get_config('system','accessibility_theme'), t("Accessibility theme"), $theme_choices_accessibility), '$site_channel' => array('site_channel', t("Channel to use for this website's static pages"), get_config('system','site_channel'), t("Site Channel")), - '$ssl_policy' => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices), +// '$ssl_policy' => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices), '$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")), '$register_policy' => array('register_policy', t("Register policy"), get_config('system','register_policy'), "", $register_choices), '$access_policy' => array('access_policy', t("Access policy"), get_config('system','access_policy'), "", $access_choices), diff --git a/version.inc b/version.inc index 009ce6d57..9f3318c88 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-08-26.417 +2013-08-27.418 diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 76dae6ea1..32c5db8fc 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -44,10 +44,10 @@ {{include file="field_textarea.tpl" field=$banner}} {{include file="field_select.tpl" field=$language}} {{include file="field_select.tpl" field=$theme}} - {{include file="field_select.tpl" field=$theme_mobile}} - {{include file="field_select.tpl" field=$theme_accessibility}} - {{include file="field_input.tpl" field=$site_channel}} - {{include file="field_select.tpl" field=$ssl_policy}} + {{include file="field_select.tpl" field=$theme_mobile}} + {{include file="field_select.tpl" field=$theme_accessibility}} + {{include file="field_input.tpl" field=$site_channel}} +
    From c6e527f6fec7f3a5350f8cf794decfd35cea134a Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 27 Aug 2013 05:02:40 -0700 Subject: [PATCH 036/330] when using the bbcode mimetype a space is just a space. A return is a return. But as opposed to HTML, two spaces are now non-breaking. A tab (assuming you can figure out how to enter one in a text field) is now four non-breaking spaces. This should let us insert code snippets with much more readable indentation. --- include/bbcode.php | 1 + 1 file changed, 1 insertion(+) diff --git a/include/bbcode.php b/include/bbcode.php index a0a53a310..4647b8567 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -259,6 +259,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { $Text = str_replace(array("\n","\r"), array('',''),$Text); + $Text = str_replace(array("\t"," "),array("    ","  "),$Text); // Set up the parameters for a URL search string $URLSearchString = "^\[\]"; From c8e27b54ecbbe2e22919d51d8d6f646977a8452c Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 27 Aug 2013 17:08:59 -0700 Subject: [PATCH 037/330] update hubloc_timestamps --- include/zot.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/include/zot.php b/include/zot.php index beff1b139..49f58c3bd 100644 --- a/include/zot.php +++ b/include/zot.php @@ -589,10 +589,16 @@ function import_xchan($arr) { ); if($r) { logger('import_xchan: hub exists: ' . $location['url']); + // update connection timestamp + q("update hubloc set hubloc_connected = '%s' where hubloc_id = %d limit 1", + dbesc(datetime_convert()), + intval($r[0]['hubloc_id']) + ); if((($r[0]['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY) && (! $location['primary'])) || ((! ($r[0]['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY)) && ($location['primary']))) { - $r = q("update hubloc set hubloc_flags = (hubloc_flags ^ %d) where hubloc_id = %d limit 1", + $r = q("update hubloc set hubloc_flags = (hubloc_flags ^ %d), hubloc_updated = '%s' where hubloc_id = %d limit 1", intval(HUBLOC_FLAGS_PRIMARY), + dbesc(datetime_convert()), intval($r[0]['hubloc_id']) ); update_modtime($xchan_hash); @@ -612,15 +618,16 @@ function import_xchan($arr) { // new hub claiming to be primary. Make it so. if(intval($location['primary'])) { - $r = q("update hubloc set hubloc_flags = (hubloc_flags ^ %d) where hubloc_hash = '%s' and (hubloc_flags & %d )", + $r = q("update hubloc set hubloc_flags = (hubloc_flags ^ %d), hubloc_updated = '%s' where hubloc_hash = '%s' and (hubloc_flags & %d )", intval(HUBLOC_FLAGS_PRIMARY), + dbesc(datetime_convert()), dbesc($xchan_hash), intval(HUBLOC_FLAGS_PRIMARY) ); } logger('import_xchan: new hub: ' . $location['url']); - $r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_flags, hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey) - values ( '%s','%s','%s','%s', %d ,'%s','%s','%s','%s','%s')", + $r = q("insert into hubloc ( hubloc_guid, hubloc_guid_sig, hubloc_hash, hubloc_addr, hubloc_flags, hubloc_url, hubloc_url_sig, hubloc_host, hubloc_callback, hubloc_sitekey, hubloc_updated, hubloc_connected) + values ( '%s','%s','%s','%s', %d ,'%s','%s','%s','%s','%s','%s','%s')", dbesc($arr['guid']), dbesc($arr['guid_sig']), dbesc($xchan_hash), @@ -630,7 +637,9 @@ function import_xchan($arr) { dbesc($location['url_sig']), dbesc($location['host']), dbesc($location['callback']), - dbesc($location['sitekey']) + dbesc($location['sitekey']), + dbesc(datetime_convert()), + dbesc(datetime_convert()) ); update_modtime($xchan_hash); $changed = true; From b77eaebb3a424247ca3fc7bef5c79b775a2db0e2 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 27 Aug 2013 17:19:52 -0700 Subject: [PATCH 038/330] force webbies to lowercase --- include/identity.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/identity.php b/include/identity.php index 1658669d6..8db6355c0 100644 --- a/include/identity.php +++ b/include/identity.php @@ -81,7 +81,7 @@ function create_identity($arr) { return $ret; } - $nick = trim($arr['nickname']); + $nick = mb_strtolower(trim($arr['nickname'])); $name = escape_tags($arr['name']); $pageflags = ((x($arr,'pageflags')) ? intval($arr['pageflags']) : PAGE_NORMAL); From 390a1ce552d57fe5eea6bc2ed43ea0b8bb07c77b Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 27 Aug 2013 18:40:33 -0700 Subject: [PATCH 039/330] more loose ends --- include/conversation.php | 5 ++++- mod/acl.php | 5 ++--- mod/photos.php | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 6e6ffef94..f6a5b90da 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -93,7 +93,10 @@ function localize_item(&$item){ if (activity_match($item['verb'],ACTIVITY_LIKE) || activity_match($item['verb'],ACTIVITY_DISLIKE)){ - $obj = json_decode_plus($item['object']); + if(is_array($item['object'])) + $obj = $item['object']; + else + $obj = json_decode_plus($item['object']); if($obj['author'] && $obj['author']['link']) $author_link = get_rel_link($obj['author']['link'],'alternate'); diff --git a/mod/acl.php b/mod/acl.php index 143b8098e..1b7a1ea8b 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -77,9 +77,8 @@ function acl_init(&$a){ // autocomplete for Contacts - $r = q("SELECT COUNT(`id`) AS c FROM `contact` - WHERE `uid` = %d AND `self` = 0 - AND `pending` = 0 $sql_extra2" , + $r = q("SELECT COUNT(abook_id) AS c FROM abook left join xchan on abook_xchan = xchan_hash + WHERE abook_channel = %d $sql_extra2" , intval(local_user()) ); $contact_count = (int)$r[0]['c']; diff --git a/mod/photos.php b/mod/photos.php index 789e26949..5573f6a87 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -184,12 +184,13 @@ function photos_post(&$a) { intval($page_owner_uid), dbesc($r[0]['resource_id']) ); - $i = q("SELECT * FROM `item` WHERE `resource_id` = '%s' AND `uid` = %d LIMIT 1", + $i = q("SELECT * FROM `item` WHERE `resource_id` = '%s' AND resource_type = 'photo' and `uid` = %d LIMIT 1", dbesc($r[0]['resource_id']), intval($page_owner_uid) ); if(count($i)) { - q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent_mid` = '%s' AND `uid` = %d", + q("UPDATE `item` SET item_restrict = (item_restrict & %d), `edited` = '%s', `changed` = '%s' WHERE `parent_mid` = '%s' AND `uid` = %d", + intval(ITEM_DELETED), dbesc(datetime_convert()), dbesc(datetime_convert()), dbesc($i[0]['mid']), From 7bb92899218a2a0de261d3caeed1d723a508cc13 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 27 Aug 2013 21:06:11 -0700 Subject: [PATCH 040/330] Preparatory work for photo conversations (third time). Also take away unused "post new activity" preferences until they actually do something. --- include/conversation.php | 19 ++++++++++++------- mod/connections.php | 9 +++++++++ mod/photos.php | 18 +++++++----------- view/tpl/settings.tpl | 6 +++--- view/tpl/threaded_conversation.tpl | 3 +++ 5 files changed, 34 insertions(+), 21 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index f6a5b90da..bd1e12c4e 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -93,10 +93,7 @@ function localize_item(&$item){ if (activity_match($item['verb'],ACTIVITY_LIKE) || activity_match($item['verb'],ACTIVITY_DISLIKE)){ - if(is_array($item['object'])) - $obj = $item['object']; - else - $obj = json_decode_plus($item['object']); + $obj = json_decode_plus($item['object']); if($obj['author'] && $obj['author']['link']) $author_link = get_rel_link($obj['author']['link'],'alternate'); @@ -397,6 +394,7 @@ function visible_activity($item) { function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { $tstart = dba_timer(); + $content_html = ''; require_once('bbcode.php'); @@ -494,10 +492,16 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { } - else if($mode === 'search') { + elseif($mode === 'search') { $live_update_div = '' . "\r\n"; } - + elseif($mode === 'photos') { + $profile_onwer = $a->profile['profile_uid']; + $page_writeable = ($profile_owner == local_user()); + $live_update_div = '
    ' . "\r\n"; + // for photos we've already formatted the top-level item (the photo) + $content_html = $a->data['photo_html']; + } $page_dropping = ((local_user() && local_user() == $profile_owner) ? true : false); @@ -801,8 +805,9 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { // logger('nouveau: ' . print_r($threads,true)); - $o = replace_macros($page_template, array( + $o .= replace_macros($page_template, array( '$baseurl' => $a->get_baseurl($ssl_state), + '$photo_item' => $content_html, '$live_update' => $live_update_div, '$remove' => t('remove'), '$mode' => $mode, diff --git a/mod/connections.php b/mod/connections.php index 7c4d8acc1..47c8d9c44 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -99,9 +99,11 @@ function connections_post(&$a) { } $abook_flags = $orig_record[0]['abook_flags']; + $new_friend = false; if(($_REQUEST['pending']) && ($abook_flags & ABOOK_FLAG_PENDING)) { $abook_flags = ( $abook_flags ^ ABOOK_FLAG_PENDING ); + $new_friend = true; } $r = q("UPDATE abook SET abook_profile = '%s', abook_my_perms = %d , abook_closeness = %d, abook_flags = %d @@ -123,6 +125,13 @@ function connections_post(&$a) { proc_run('php', 'include/notifier.php', 'permission_update', $contact_id); } + if($new_friend) { + // Check if settings permit ("post new friend activity" is allowed, and + // friends in general or this friend in particular aren't hidden) + // and send out a new friend activity + // TODO + } + // Refresh the structure in memory with the new data $r = q("SELECT abook.*, xchan.* diff --git a/mod/photos.php b/mod/photos.php index 5573f6a87..a248feaf5 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -852,7 +852,7 @@ function photos_content(&$a) { // fetch image, item containing image, then comments - $ph = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource_id` = '%s' + $ph = q("SELECT aid,uid,xchan,resource_id,created,edited,title,desc,album,filename,type,height,width,size,scale,profile,photo_flags,allow_cid,allow_gid,deny_cid,deny_gid FROM `photo` WHERE `uid` = %d AND `resource_id` = '%s' and (photo_flags = %d or photo_flags = %d ) $sql_extra ORDER BY `scale` ASC ", intval($owner_uid), dbesc($datum), @@ -874,7 +874,7 @@ function photos_content(&$a) { intval(PHOTO_PROFILE) ); if($ph) - notice( t('Permission denied. Access to this item may be restricted.')); + notice( t('Permission denied. Access to this item may be restricted.') . EOL); else notice( t('Photo not available') . EOL ); return; @@ -1140,15 +1140,9 @@ function photos_content(&$a) { } - if(local_user() && ($item['contact-uid'] == local_user()) - && ($item['network'] == 'dfrn') && (! $item['self'] )) { - $profile_url = $redirect_url; - $sparkle = ' sparkle'; - } - else { - $profile_url = $item['url']; - $sparkle = ''; - } + $profile_url = $item['url']; + $sparkle = ''; + $diff_author = (($item['url'] !== $item['author-link']) ? true : false); @@ -1210,6 +1204,8 @@ function photos_content(&$a) { '$comments' => $comments, '$paginate' => $paginate, )); + + $a->data['photo_html'] = $o; return $o; } diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 194b90e80..0471546a6 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -100,9 +100,9 @@
    {{$activity_options}}
    - -{{include file="field_checkbox.tpl" field=$post_newfriend}} -{{include file="field_checkbox.tpl" field=$post_joingroup}} +{{*the next two aren't yet implemented *}} +{{*include file="field_checkbox.tpl" field=$post_newfriend*}} +{{*include file="field_checkbox.tpl" field=$post_joingroup*}} {{include file="field_checkbox.tpl" field=$post_profilechange}} diff --git a/view/tpl/threaded_conversation.tpl b/view/tpl/threaded_conversation.tpl index 4bfcde896..2d71f01ab 100755 --- a/view/tpl/threaded_conversation.tpl +++ b/view/tpl/threaded_conversation.tpl @@ -1,3 +1,6 @@ +{{if $photo_item}} +{{$photo_item}} +{{/if}} {{foreach $threads as $thread_item}} {{include file="{{$thread_item.template}}" item=$thread_item}} {{/foreach}} From e8a0005d29244e4897ca7806f24424a8f63d1dd8 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 27 Aug 2013 21:30:45 -0700 Subject: [PATCH 041/330] put backticks on mysql reseved words which we unfortunately used for row names a long time ago --- mod/photos.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/photos.php b/mod/photos.php index a248feaf5..e122203eb 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -852,7 +852,7 @@ function photos_content(&$a) { // fetch image, item containing image, then comments - $ph = q("SELECT aid,uid,xchan,resource_id,created,edited,title,desc,album,filename,type,height,width,size,scale,profile,photo_flags,allow_cid,allow_gid,deny_cid,deny_gid FROM `photo` WHERE `uid` = %d AND `resource_id` = '%s' + $ph = q("SELECT aid,uid,xchan,resource_id,created,edited,title,`desc`,album,filename,`type`,height,width,`size`,scale,profile,photo_flags,allow_cid,allow_gid,deny_cid,deny_gid FROM `photo` WHERE `uid` = %d AND `resource_id` = '%s' and (photo_flags = %d or photo_flags = %d ) $sql_extra ORDER BY `scale` ASC ", intval($owner_uid), dbesc($datum), From e8cd3b70407b4c33d82d21cc3a470b2a58852e4f Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 27 Aug 2013 22:30:06 -0700 Subject: [PATCH 042/330] bring back mail list and cleanup some issues which popped out with full PHP warnings --- boot.php | 4 +++- include/contact_widgets.php | 4 ++-- include/dba/dba_mysqli.php | 2 +- mod/acl.php | 4 ++-- mod/network.php | 2 +- view/theme/redbasic/css/style.css | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/boot.php b/boot.php index fc5408887..d3226c804 100755 --- a/boot.php +++ b/boot.php @@ -2327,7 +2327,9 @@ function argc() { } function argv($x) { - return get_app()->argv[$x]; + if(array_key_exists($x,get_app()->argv)) + return get_app()->argv[$x]; + return ''; } function dba_timer() { diff --git a/include/contact_widgets.php b/include/contact_widgets.php index ca212796f..e5f778e49 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -70,11 +70,11 @@ function fileas_widget($baseurl,$selected = '') { function categories_widget($baseurl,$selected = '') { + $a = get_app(); + if(! feature_enabled($a->profile['profile_uid'],'categories')) return ''; - $a = get_app(); - $terms = array(); $r = q("select distinct(term) from term where uid = %d and type = %d order by term asc", intval($a->profile['profile_uid']), diff --git a/include/dba/dba_mysqli.php b/include/dba/dba_mysqli.php index f1a50cc3f..19907705b 100755 --- a/include/dba/dba_mysqli.php +++ b/include/dba/dba_mysqli.php @@ -70,7 +70,7 @@ class dba_mysqli extends dba_driver { function close() { if($this->db) $this->db->close(); - $this->connected = flase; + $this->connected = false; } } \ No newline at end of file diff --git a/mod/acl.php b/mod/acl.php index 1b7a1ea8b..b886b7e58 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -51,7 +51,7 @@ function acl_init(&$a){ $r = q("SELECT COUNT(abook_id) AS c FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND not ( abook_flags & %d ) $sql_extra2" , intval(local_user()), - intval(ABOOK_FLAG_SELF|ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVE) + intval(ABOOK_FLAG_SELF|ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED) ); $contact_count = (int)$r[0]['c']; } @@ -127,7 +127,7 @@ function acl_init(&$a){ FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND not ( abook_flags & %d ) $sql_extra2 order by xchan_name asc" , intval(local_user()), - intval(ABOOK_FLAG_SELF|ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVE) + intval(ABOOK_FLAG_SELF|ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED) ); } elseif($type == 'm') { diff --git a/mod/network.php b/mod/network.php index e44a604de..39e6fe215 100644 --- a/mod/network.php +++ b/mod/network.php @@ -386,7 +386,7 @@ function network_content(&$a, $update = 0, $load = false) { nav_set_selected('network'); - $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); + $celeb = false; $x = array( 'is_owner' => true, diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 1105bb4bb..4d0f6bbcf 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3495,7 +3495,7 @@ ul.menu-popup { .shared_header img { margin-right: 10px; } -.mail-list-wrapper { +#mail-list-wrapper { border-bottom: 1px solid #ccc; padding: 20px; From 95fcf773be12a9307eeefe7f392277bf44036946 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 28 Aug 2013 16:39:43 -0700 Subject: [PATCH 043/330] right - here's how we're going to link comanche with webpages --- boot.php | 2 +- include/comanche.php | 48 ++++++++++++++++++++++++++++++++++++++++++++ version.inc | 2 +- 3 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 include/comanche.php diff --git a/boot.php b/boot.php index d3226c804..e8d6d2020 100755 --- a/boot.php +++ b/boot.php @@ -462,7 +462,7 @@ define ( 'ITEM_UNPUBLISHED', 0x0020); define ( 'ITEM_WEBPAGE', 0x0040); // is a static web page, not a conversational item define ( 'ITEM_DELAYED_PUBLISH', 0x0080); define ( 'ITEM_BUILDBLOCK', 0x0100); // Named thusly to make sure nobody confuses this with ITEM_BLOCKED - +define ( 'ITEM_PDL', 0x0200); // Page Description Language - e.g. Comanche /** * Item Flags */ diff --git a/include/comanche.php b/include/comanche.php new file mode 100644 index 000000000..33e93d2c9 --- /dev/null +++ b/include/comanche.php @@ -0,0 +1,48 @@ + $uid, 'current' => $current, 'entries' => $r); + call_hooks('pdl_selector',$arr); + + $entries = $arr['entries']; + $current = $arr['current']; + + $o .= "'; + return $o; +} + diff --git a/version.inc b/version.inc index 9f3318c88..6733945d4 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-08-27.418 +2013-08-28.419 From c877d8f9fae246812930c2f2c45db40a52b09366 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 28 Aug 2013 17:57:45 -0700 Subject: [PATCH 044/330] It's a wretched mess, but at least photo comments show up again when viewing the photo. This is just temporary until these conversations are merged into the common conversation viewer, so it's not worth spending a lot of time cleaning up the remnants. --- include/conversation.php | 1 + mod/photos.php | 119 +++++++++++++++++---------------------- 2 files changed, 52 insertions(+), 68 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index bd1e12c4e..8648209e9 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1150,6 +1150,7 @@ function conv_sort($arr,$order) { elseif(stristr($order,'ascending')) usort($parents,'sort_thr_created_rev'); + if(count($parents)) foreach($parents as $i=>$_x) $parents[$i]['children'] = get_item_children($arr, $_x); diff --git a/mod/photos.php b/mod/photos.php index e122203eb..7da3d3e92 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -976,14 +976,14 @@ function photos_content(&$a) { $sql_extra LIMIT 1", dbesc($datum) ); + if($linked_items) { $link_item = $linked_items[0]; - $r = q("select * from item where parent_mid = '%s' and mid != '%s' + $r = q("select * from item where parent_mid = '%s' and item_restrict = 0 and uid = %d $sql_extra ", dbesc($link_item['mid']), - dbesc($link_item['mid']), intval($link_item['uid']) ); @@ -1004,6 +1004,9 @@ function photos_content(&$a) { } } + // FIXME - remove this when we move to conversation module + + $r = $r[0]['children']; $edit = null; if($can_post) { @@ -1094,6 +1097,52 @@ function photos_content(&$a) { + foreach($r as $item) { + $comment = ''; + $template = $tpl; + $sparkle = ''; + + if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent'])) + continue; + + $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ; + + + $profile_url = zid($item['author']['xchan_url']); + $sparkle = ''; + + + $profile_name = $item['author']['xchan_name']; + $profile_avatar = $item['author']['xchan_photo_m']; + + $profile_link = $profile_url; + + $drop = ''; + + if(($item['contact-id'] == $contact_id) || ($item['uid'] == local_user())) + $drop = replace_macros(get_markup_template('photo_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete'))); + + + $name_e = $profile_name; + $title_e = $item['title']; + $body_e = bbcode($item['body']); + + $comments .= replace_macros($template,array( + '$id' => $item['item_id'], + '$profile_url' => $profile_link, + '$name' => $name_e, + '$thumb' => $profile_avatar, + '$sparkle' => $sparkle, + '$title' => $title_e, + '$body' => $body_e, + '$ago' => relative_date($item['created']), + '$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''), + '$drop' => $drop, + '$comment' => $comment + )); + + } + if($can_post || $a->data['perms']['post_comments']) { $comments .= replace_macros($cmnt_tpl,array( '$return_path' => '', @@ -1111,73 +1160,7 @@ function photos_content(&$a) { )); } - foreach($r as $item) { - $comment = ''; - $template = $tpl; - $sparkle = ''; - - if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent'])) - continue; - - $redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ; - - if($can_post || $a->data['perms']['post_comments']) { - $comments .= replace_macros($cmnt_tpl,array( - '$return_path' => '', - '$jsreload' => $return_url, - '$type' => 'wall-comment', - '$id' => $item['item_id'], - '$parent' => $item['parent'], - '$profile_uid' => $owner_uid, - '$mylink' => $contact['url'], - '$mytitle' => t('This is you'), - '$myphoto' => $contact['thumb'], - '$comment' => t('Comment'), - '$submit' => t('Submit'), - '$sourceapp' => t($a->sourcename), - '$ww' => '' - )); - } - - - $profile_url = $item['url']; - $sparkle = ''; - - - $diff_author = (($item['url'] !== $item['author-link']) ? true : false); - - $profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']); - $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $item['thumb']); - - $profile_link = $profile_url; - - $drop = ''; - - if(($item['contact-id'] == $contact_id) || ($item['uid'] == local_user())) - $drop = replace_macros(get_markup_template('photo_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete'))); - - - $name_e = $profile_name; - $title_e = $item['title']; - $body_e = bbcode($item['body']); - - - $comments .= replace_macros($template,array( - '$id' => $item['item_id'], - '$profile_url' => $profile_link, - '$name' => $name_e, - '$thumb' => $profile_avatar, - '$sparkle' => $sparkle, - '$title' => $title_e, - '$body' => $body_e, - '$ago' => relative_date($item['created']), - '$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''), - '$drop' => $drop, - '$comment' => $comment - )); - } } - $paginate = paginate($a); } From 1dbfb311b711e0e345909945a9ec7ede249d798e Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 28 Aug 2013 19:29:22 -0700 Subject: [PATCH 045/330] some basic mappings between comanche pages and normal pages so normal pages will still work --- boot.php | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/boot.php b/boot.php index e8d6d2020..ed378a45b 100755 --- a/boot.php +++ b/boot.php @@ -538,7 +538,7 @@ class App { public $channel = null; // channel record public $observer = null; // xchan record public $profile_uid = 0; // If applicable, the uid of the person whose stuff this is. - + public $layout = array(); // Comanche parsed template private $perms = null; // observer permissions @@ -627,6 +627,8 @@ class App { private $cached_profile_image; private $cached_profile_picdate; + + function __construct() { @@ -1996,6 +1998,9 @@ function current_theme(){ $page_theme = $r[0]['channel_theme']; } + if(array_key_exists('theme', $a->layout) && $a->layout['theme']) + $page_theme = $a->layout['theme']; + // Allow folks to over-rule channel themes and always use their own on their own site. // The default is for channel themes to take precedence over your own on pages belonging // to that channel. @@ -2006,8 +2011,6 @@ function current_theme(){ } -// $mobile_detect = new Mobile_Detect(); -// $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet(); $is_mobile = $a->is_mobile || $a->is_tablet; if($is_mobile) { @@ -2033,6 +2036,7 @@ function current_theme(){ if($page_theme) $theme_name = $page_theme; } + if($theme_name && (file_exists('view/theme/' . $theme_name . '/css/style.css') || @@ -2361,9 +2365,18 @@ function curPageURL() { return $pageURL; } +function get_custom_nav(&$a,$navname) { + if(! $navname) + return $a->page['nav']; + // load custom nav menu by name here + +} + function construct_page(&$a) { - + + $comanche = ((count($a->layout)) ? true : false); + /** * Build the page - now that we have all the components */ @@ -2372,8 +2385,15 @@ function construct_page(&$a) { if($a->module == 'setup') $installing = true; - else + else { nav($a); + } + + if($comanche) { + if($a->layout['nav']) { + $a->page['nav'] = get_custom_nav($a->layout['nav']); + } + } require_once(theme_include('theme_init.php')); @@ -2402,6 +2422,13 @@ function construct_page(&$a) { $a->page[$x['location']] .= $x['html']; } } + if($comanche) { + foreach($a->layout as $k => $v) { + if(strpos($k,'region_') === 0) { + $a->data[substr($k,0,7)] = $v; + } + } + } if($a->is_mobile || $a->is_tablet) { if(isset($_SESSION['show_mobile']) && !$_SESSION['show_mobile']) { From 03e1a0cc152ec8ea8fccefa746686d05758c7f5b Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 28 Aug 2013 20:03:01 -0700 Subject: [PATCH 046/330] really truly bare-bones comanche --- include/comanche.php | 58 ++++++++++++++++++++++++++++++++++++++++++++ include/menu.php | 1 + 2 files changed, 59 insertions(+) diff --git a/include/comanche.php b/include/comanche.php index 33e93d2c9..21182175e 100644 --- a/include/comanche.php +++ b/include/comanche.php @@ -46,3 +46,61 @@ function pdl_selector($uid,$current="") { return $o; } + + +function comanche_parser(&$a,$s) { + + + $cnt = preg_match("/\[layout\](.*?)\[\/layout\]/ism", $matches, $s); + if($cnt) + $a->page['template'] = trim($matches[1]); + + $cnt = preg_match("/\[theme\](.*?)\[\/theme\]/ism", $matches, $s); + if($cnt) + $a->layout['theme'] = trim($matches[1]); + + $cnt = preg_match_all("/\[region=(.*?)\](.*?)\[\/region\]/ism", $matches, $s, PREG_SET_ORDER); + if($cnt) { + foreach($matches as $mtch) { + $a->layout['region_' . $mtch[1]] = comanche_region($a,$mtch[2]); + } + } + +} + + +function comanche_menu($name) { + $a = get_app(); + $m = menu_fetch($name,$a->profile['profile_uid'],get_observer_hash()); + return render_menu($m); +} + +function comanche_widget($name) { + $a = get_app(); + // placeholder for now + $m = menu_fetch($name,$a->profile['profile_uid'],get_observer_hash()); + return render_menu($m); +} + + +function comanche_region(&$a,$s) { + + + $cnt = preg_match_all("/\[menu\](.*?)\[\/menu\]/ism", $matches, $s, PREG_SET_ORDER); + if($cnt) { + foreach($matches as $mtch) { + $s = str_replace($mtch[0],comanche_menu(trim($mtch[1])),$s); + } + } + + // need to modify this to accept parameters + + $cnt = preg_match_all("/\[widget\](.*?)\[\/widget\]/ism", $matches, $s, PREG_SET_ORDER); + if($cnt) { + foreach($matches as $mtch) { + $s = str_replace($mtch[0],comanche_widget(trim($mtch[1])),$s); + } + } + + return $s; +} \ No newline at end of file diff --git a/include/menu.php b/include/menu.php index 8d4664385..6d614055a 100644 --- a/include/menu.php +++ b/include/menu.php @@ -40,6 +40,7 @@ function menu_render($menu) { } + function menu_fetch_id($menu_id,$channel_id) { $r = q("select * from menu where menu_id = %d and menu_channel_id = %d limit 1", From 7b27add5468ae38534b8bceb458520e6c603da75 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 28 Aug 2013 20:51:08 -0700 Subject: [PATCH 047/330] issue #106 --- mod/like.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/like.php b/mod/like.php index 90005eca3..0de65f129 100755 --- a/mod/like.php +++ b/mod/like.php @@ -100,7 +100,7 @@ function like_content(&$a) { $mid = item_message_id(); - $post_type = (($item['resource_type'] === 'photo') ? $t('photo') : t('status')); + $post_type = (($item['resource_type'] === 'photo') ? t('photo') : t('status')); $links = array(array('rel' => 'alternate','type' => 'text/html', 'href' => $item['plink'])); $objtype = (($item['resource_type'] === 'photo') ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE ); From b4bd518e4032661cdfba4e17acdb94e19b23fdd2 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 28 Aug 2013 21:56:01 -0700 Subject: [PATCH 048/330] silence some warnings at php E_ALL levels --- include/conversation.php | 2 ++ include/friendica_smarty.php | 2 +- mod/network.php | 12 +++++++----- mod/update_network.php | 4 ++-- view/theme/redbasic/php/theme.php | 6 +----- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 8648209e9..82010b153 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -394,7 +394,9 @@ function visible_activity($item) { function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') { $tstart = dba_timer(); + $t0 = $t1 = $t2 = $t3 = $t4 = $t5 = $t6 = null; $content_html = ''; + $o = ''; require_once('bbcode.php'); diff --git a/include/friendica_smarty.php b/include/friendica_smarty.php index 1e8ef5406..12a789c9a 100755 --- a/include/friendica_smarty.php +++ b/include/friendica_smarty.php @@ -49,7 +49,7 @@ class FriendicaSmartyEngine implements ITemplateEngine { public function __construct(){ $a = get_app(); - $basecompiledir = $a->config['system']['smarty3_folder']; + $basecompiledir = ((array_key_exists('smarty3_folder',$a->config['system'])) ? $a->config['system']['smarty3_folder'] : ''); if (!$basecompiledir) $basecompiledir = dirname(__dir__)."/view/tpl/smarty3"; if (!is_dir($basecompiledir)) { echo "ERROR: folder $basecompiledir does not exist."; killme(); diff --git a/mod/network.php b/mod/network.php index 39e6fe215..b2ff671c7 100644 --- a/mod/network.php +++ b/mod/network.php @@ -325,9 +325,9 @@ function network_content(&$a, $update = 0, $load = false) { // save selected tab, but only if not in search or file mode - if(!x($_GET,'search') && !x($_GET,'file')) { - set_pconfig( local_user(), 'network.view','tab.selected',array($all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) ); - } +// if(!x($_GET,'search') && !x($_GET,'file')) { +// set_pconfig( local_user(), 'network.view','tab.selected',array($all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) ); +// } $contact_id = $a->cid; @@ -500,7 +500,7 @@ function network_content(&$a, $update = 0, $load = false) { '$nouveau' => (($nouveau) ? $nouveau : '0'), '$wall' => '0', '$page' => (($a->pager['page'] != 1) ? $a->pager['page'] : 1), - '$search' => $search, + '$search' => (($search) ? $search : ''), '$order' => $order, '$file' => $file, '$cats' => '', @@ -641,6 +641,8 @@ function network_content(&$a, $update = 0, $load = false) { $first = dba_timer(); // Then fetch all the children of the parents that are on this page + $parents_str = ''; + $update_unseen = ''; if($r) { @@ -699,7 +701,7 @@ function network_content(&$a, $update = 0, $load = false) { $sixth = dba_timer(); - if(! $update) + if(($items) && (! $update)) $o .= alt_pager($a,count($items)); if($load) { diff --git a/mod/update_network.php b/mod/update_network.php index bb6245f65..0021af876 100644 --- a/mod/update_network.php +++ b/mod/update_network.php @@ -11,7 +11,7 @@ function update_network_content(&$a) { $load = (((argc() > 1) && (argv(1) == 'load')) ? 1 : 0); header("Content-type: text/html"); echo "\r\n"; - echo (($_GET['msie'] == 1) ? '
    ' : '
    '); + echo ((array_key_exists('msie',$_GET) && $_GET['msie'] == 1) ? '
    ' : '
    '); $text = network_content($a,$profile_uid, $load); @@ -32,7 +32,7 @@ function update_network_content(&$a) { } echo str_replace("\t",' ',$text); - echo (($_GET['msie'] == 1) ? '
    ' : '
    '); + echo ((array_key_exists('msie',$_GET) && $_GET['msie'] == 1) ? '
    ' : ''); echo "\r\n"; // logger('update_network: ' . $text); killme(); diff --git a/view/theme/redbasic/php/theme.php b/view/theme/redbasic/php/theme.php index 3d69a7e22..ca280ef6a 100644 --- a/view/theme/redbasic/php/theme.php +++ b/view/theme/redbasic/php/theme.php @@ -1,9 +1,5 @@ config['system']['theme_engine']) - $a->set_template_engine($a->config['system']['theme_engine']); - else - $a->set_template_engine('smarty3'); -// head_add_js('redbasic.js'); + } From 70c0beb857d879b8c2c74ac0922f82b37717c989 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 29 Aug 2013 16:46:22 -0700 Subject: [PATCH 049/330] block attempts to set the baseurl to an ip address if it was previously a dns name --- boot.php | 16 ++++++++++++++-- mod/page.php | 17 +++++++++-------- mod/settings.php | 2 +- version.inc | 2 +- 4 files changed, 25 insertions(+), 12 deletions(-) diff --git a/boot.php b/boot.php index ed378a45b..a5ff7ea0b 100755 --- a/boot.php +++ b/boot.php @@ -1164,9 +1164,21 @@ function check_config(&$a) { set_config('system','urlverify',bin2hex(z_root())); if(($saved) && ($saved != bin2hex(z_root()))) { // our URL changed. Do something. + $oldurl = hex2bin($saved); - fix_system_urls($oldurl,z_root()); - set_config('system','urlverify',bin2hex(z_root())); + + $oldhost = substr($oldurl,strpos($oldurl,'//')+2); + $host = substr(z_root(),strpos(z_root(),'//')+2); + + $is_ip_addr = ((preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/",$host)) ? true : false); + $was_ip_addr = ((preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/",$oldhost)) ? true : false); + // only change the url to an ip address if it was already an ip and not a dns name + if((! $is_ip_addr) || ($is_ip_addr && $was_ip_addr)) { + fix_system_urls($oldurl,z_root()); + set_config('system','urlverify',bin2hex(z_root())); + } + else + logger('Attempt to change baseurl from a DNS name to an IP address was refused.'); } // This will actually set the url to the one stored in .htconfig, and ignore what diff --git a/mod/page.php b/mod/page.php index 4b2b95b6a..110d9699c 100644 --- a/mod/page.php +++ b/mod/page.php @@ -6,16 +6,17 @@ require_once('include/page_widgets.php'); function page_init(&$a) { // We need this to make sure the channel theme is always loaded. - $which = argv(1); - $profile = 0; - $channel = $a->get_channel(); - if((local_user()) && (argc() > 2) && (argv(2) === 'view')) { - $which = $channel['channel_address']; - $profile = argv(1); - } + $which = argv(1); + $profile = 0; + $channel = $a->get_channel(); - profile_load($a,$which,$profile); + if((local_user()) && (argc() > 2) && (argv(2) === 'view')) { + $which = $channel['channel_address']; + $profile = argv(1); + } + + profile_load($a,$which,$profile); } diff --git a/mod/settings.php b/mod/settings.php index 2a3a64581..6b21066b1 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -997,7 +997,7 @@ function settings_content(&$a) { $stpl = get_markup_template('settings.tpl'); - $celeb = ((($a->user['page-flags'] == PAGE_SOAPBOX) || ($a->user['page-flags'] == PAGE_COMMUNITY)) ? true : false); + $celeb = false; $expire_arr = array( 'days' => array('expire', t("Automatically expire posts after this many days:"), $expire, t('If empty, posts will not expire. Expired posts will be deleted')), diff --git a/version.inc b/version.inc index 6733945d4..06ed318a0 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-08-28.419 +2013-08-29.420 From be289a96ad3abe1f373517920c89613cf80076a9 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 29 Aug 2013 17:48:31 -0700 Subject: [PATCH 050/330] implement a 'ping' message type to respond if we're still here and whether our URL or keys have changed. --- mod/post.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/mod/post.php b/mod/post.php index 847af0fe9..70dd4dc19 100644 --- a/mod/post.php +++ b/mod/post.php @@ -175,6 +175,19 @@ function post_post(&$a) { $msgtype = ((array_key_exists('type',$data)) ? $data['type'] : ''); + if($msgtype === 'ping') { + + // Useful to get a health check on a remote site. + // This will let us know if any important communication details + // that we may have stored are no longer valid, regardless of xchan details. + + $ret['success'] = true; + $ret['site'] = array(); + $ret['site']['url'] = z_root(); + $ret['site']['url_sig'] = base64url_encode(rsa_sign(z_root(),get_config('system','prvkey'))); + $ret['site']['sitekey'] = get_config('system','pubkey'); + json_return_and_die($ret); + } if($msgtype === 'pickup') { From 85e291f5357bc28b108378816af97b545aacca3f Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 29 Aug 2013 18:17:15 -0700 Subject: [PATCH 051/330] figure out why poller isn't picking up old posts which failed to deliver --- include/onepoll.php | 9 +++++---- include/poller.php | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/onepoll.php b/include/onepoll.php index a225edfd8..50c2566be 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -69,7 +69,7 @@ function onepoll_run($argv, $argc){ $last_update = (($contact['abook_updated'] === '0000-00-00 00:00:00') ? datetime_convert('UTC','UTC','now - 7 days') - : datetime_convert('UTC','UTC',$contact['abook_updated']) + : datetime_convert('UTC','UTC',$contact['abook_updated'] . ' - 2 days') ); // update permissions @@ -98,11 +98,12 @@ function onepoll_run($argv, $argc){ return; if($contact['xchan_connurl']) { - $feedurl = str_replace('/poco/','/zotfeed/',$channel['xchan_connurl']); - - $x = z_fetch_url($feedurl . '?f=$mindate=' . $last_update); + $feedurl = str_replace('/poco/','/zotfeed/',$channel['xchan_connurl']); + $x = z_fetch_url($feedurl . '?f=&mindate=' . $last_update); if($x['success']) { $total = 0; + logger('onepoll: feed update ' . $contact['xchan_name']); + $j = json_decode($x['body'],true); if($j['success'] && $j['messages']) { foreach($j['messages'] as $message) { diff --git a/include/poller.php b/include/poller.php index 7a6aaeb22..bdb0388ac 100644 --- a/include/poller.php +++ b/include/poller.php @@ -224,7 +224,7 @@ function poller_run($argv, $argc){ $update = true; } } -dbg(0); + if((! $update) && (! $force)) continue; From 74582630177b104f35113cee77d2c7ac5f74f412 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 29 Aug 2013 20:54:42 -0700 Subject: [PATCH 052/330] I've got a pretty good idea of how to bootstrap, parse and render Comanche now. This does not mean it's close to being presentable - far from it. --- boot.php | 17 ++++++++++++++++- include/comanche.php | 27 ++++++++++++++++++++++----- mod/page.php | 15 ++++++--------- 3 files changed, 44 insertions(+), 15 deletions(-) diff --git a/boot.php b/boot.php index a5ff7ea0b..5e8b52d0d 100755 --- a/boot.php +++ b/boot.php @@ -2386,6 +2386,7 @@ function get_custom_nav(&$a,$navname) { function construct_page(&$a) { + require_once('include/comanche.php'); $comanche = ((count($a->layout)) ? true : false); @@ -2434,9 +2435,23 @@ function construct_page(&$a) { $a->page[$x['location']] .= $x['html']; } } + + // Let's say we have a comanche declaration '[region_nav][/region_nav][region_content]$region_nav $region_section[/region_content]'. + // The text 'region_' identifies a section of the layout by that name (without the 'region_' text). + // So what we want to do here is leave $a->page['nav'] empty and put the default content from $a->page['nav'] and $a->page['section'] + // into a new region called $a->data['content']. It is presumed that the chosen layout file for this comanche page + // has a '' element instead of a '
    '. + + // This way the Comanche layout can include any existing content, alter the layout by adding stuff around it or changing the + // layout completely with a new layout definition, or replace/remove existing content. + if($comanche) { foreach($a->layout as $k => $v) { - if(strpos($k,'region_') === 0) { + if((strpos($k,'region_') === 0) && strlen($v)) { + if(strpos($v,'$region_') !== false) { + $v = preg_replace_callback('/\$region_([a-zA-Z0-9]*?)/ism','comanche_replace_region',$v); + + } $a->data[substr($k,0,7)] = $v; } } diff --git a/include/comanche.php b/include/comanche.php index 21182175e..cf7ecd7c5 100644 --- a/include/comanche.php +++ b/include/comanche.php @@ -75,11 +75,21 @@ function comanche_menu($name) { return render_menu($m); } -function comanche_widget($name) { +function comanche_replace_region($match) { $a = get_app(); - // placeholder for now - $m = menu_fetch($name,$a->profile['profile_uid'],get_observer_hash()); - return render_menu($m); + if(array_key_exists($match[1],$a->page)) + return $a->page[$match[1]]; +} + +// Widgets will have to get any operational arguments from the session, +// the global app environment, or config storage until we implement argument passing + + +function comanche_widget($name,$args = null) { + $a = get_app(); + $func = 'widget_' . trim($name); + if(function_exists($func)) + return $func($args); } @@ -103,4 +113,11 @@ function comanche_region(&$a,$s) { } return $s; -} \ No newline at end of file +} + + +function widget_profile($args) { + $a = get_app(); + $block = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false); + return profile_sidebar($a->profile, $block, true); +} diff --git a/mod/page.php b/mod/page.php index 110d9699c..c63932b5e 100644 --- a/mod/page.php +++ b/mod/page.php @@ -9,15 +9,11 @@ function page_init(&$a) { $which = argv(1); $profile = 0; - $channel = $a->get_channel(); - - if((local_user()) && (argc() > 2) && (argv(2) === 'view')) { - $which = $channel['channel_address']; - $profile = argv(1); - } - profile_load($a,$which,$profile); + if($a->profile['profile_uid']) + head_set_icon($a->profile['thumb']); + } @@ -65,7 +61,8 @@ function page_content(&$a) { return; } -// Use of widgets should be determined by Comanchie, but we don't have it yet, so... + // Use of widgets should be determined by Comanche, but we don't have it yet, so... + if ($perms['write_pages']) { $chan = $a->channel['channel_id']; $who = $channel_address; @@ -75,7 +72,7 @@ function page_content(&$a) { xchan_query($r); $r = fetch_post_tags($r,true); - $a->profile = array('profile_uid' => $u[0]['channel_id']); + $o .= prepare_page($r[0]); return $o; From d43a7659854c4bb6052c05a932b257883ea72748 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 31 Aug 2013 04:19:26 -0700 Subject: [PATCH 053/330] more debugging on localize_item top find out why likes are not translated in notifications, but are in displayed posts (using 'new' on matrix page) - in one case we're successfully pulling stuff from item['object'] and in the other we aren't - and it's the same object. --- doc/html/boot_8php.html | 137 +++- doc/html/boot_8php.js | 6 + doc/html/classApp-members.html | 129 ++-- doc/html/classApp.html | 14 + doc/html/classApp.js | 1 + doc/html/datetime_8php.html | 2 +- doc/html/dba__driver_8php.html | 6 +- .../dir_d41ce877eb409a4791b288730010abe2.html | 2 + .../dir_d41ce877eb409a4791b288730010abe2.js | 1 + .../dir_d44c64559bbebec7f509842c48db8b23.html | 2 + .../dir_d44c64559bbebec7f509842c48db8b23.js | 1 + doc/html/extract_8php.html | 4 +- doc/html/files.html | 128 ++-- doc/html/functions.html | 3 + doc/html/functions_vars.html | 3 + doc/html/globals_0x63.html | 15 + doc/html/globals_0x67.html | 3 + doc/html/globals_0x69.html | 3 + doc/html/globals_0x70.html | 15 + doc/html/globals_0x76.html | 9 + doc/html/globals_0x77.html | 3 + doc/html/globals_func_0x63.html | 15 + doc/html/globals_func_0x67.html | 3 + doc/html/globals_func_0x70.html | 3 + doc/html/globals_func_0x76.html | 9 + doc/html/globals_func_0x77.html | 3 + doc/html/globals_vars_0x69.html | 3 + doc/html/globals_vars_0x70.html | 12 + doc/html/include_2config_8php.html | 4 +- doc/html/include_2menu_8php.html | 2 +- doc/html/language_8php.html | 2 +- doc/html/navtree.js | 14 +- doc/html/navtreeindex0.js | 350 +++++----- doc/html/navtreeindex1.js | 240 +++---- doc/html/navtreeindex2.js | 150 ++--- doc/html/navtreeindex3.js | 116 ++-- doc/html/navtreeindex4.js | 354 +++++----- doc/html/navtreeindex5.js | 152 ++--- doc/html/navtreeindex6.js | 296 ++++----- doc/html/navtreeindex7.js | 109 +-- doc/html/php2po_8php.html | 2 +- doc/html/plugin_8php.html | 4 +- doc/html/redbasic_2php_2style_8php.html | 2 +- doc/html/search/all_24.js | 1 + doc/html/search/all_63.js | 8 +- doc/html/search/all_67.js | 3 +- doc/html/search/all_69.js | 1 + doc/html/search/all_70.js | 5 + doc/html/search/all_76.js | 6 +- doc/html/search/all_77.js | 1 + doc/html/search/files_63.js | 1 + doc/html/search/files_76.js | 3 +- doc/html/search/functions_63.js | 5 + doc/html/search/functions_67.js | 1 + doc/html/search/functions_70.js | 1 + doc/html/search/functions_76.js | 5 +- doc/html/search/functions_77.js | 1 + doc/html/search/variables_24.js | 1 + doc/html/search/variables_69.js | 1 + doc/html/search/variables_70.js | 6 +- doc/html/security_8php.html | 2 +- doc/html/text_8php.html | 6 +- doc/html/typo_8php.html | 2 +- include/conversation.php | 8 +- util/messages.po | 620 +++++++++--------- version.inc | 2 +- 66 files changed, 1658 insertions(+), 1364 deletions(-) diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index 728d4d7fb..fbc70bf6f 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -203,6 +203,8 @@ Functions    curPageURL ()   + get_custom_nav (&$a, $navname) +   construct_page (&$a)    appdirpath () @@ -418,6 +420,14 @@ Variables   const MENU_ITEM_NEWWIN 0x0002   +const POLL_SIMPLE_RATING 0x0001 +  +const POLL_TENSCALE 0x0002 +  +const POLL_MULTIPLE_CHOICE 0x0004 +  +const POLL_OVERWRITE 0x8000 +  const MAX_LIKERS 75   const ZCURL_TIMEOUT (-1) @@ -604,6 +614,8 @@ Variables   const ITEM_BUILDBLOCK 0x0100   +const ITEM_PDL 0x0200 +  const ITEM_ORIGIN 0x0001   const ITEM_UNSEEN 0x0002 @@ -678,7 +690,7 @@ Variables
    -

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

    +

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

    @@ -918,7 +930,7 @@ Variables
    -

    Referenced by FriendicaSmarty\__construct(), FriendicaSmartyEngine\__construct(), abook_toggle_flag(), allowed_public_recips(), api_apply_template(), api_format_items(), api_get_user(), api_statuses_home_timeline(), api_statuses_repeat(), api_user(), argc(), argv(), atom_entry(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), build_sync_packet(), call_hooks(), can_comment_on_post(), categories_widget(), change_channel(), channel_remove(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), cli_suggest_run(), common_friends_visitor_widget(), connections_content(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), dfrn_deliver(), drop_item(), event_store(), fetch_url(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), format_event_diaspora(), get_account_id(), get_best_language(), get_birthdays(), get_events(), get_feed_for(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_observer_hash(), get_plink(), get_theme_config_file(), get_theme_screenshot(), gprobe_run(), group_select(), guess_image_type(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), import_channel_photo(), import_post(), import_profile_photo(), info(), is_site_admin(), item_message_id(), item_photo_menu(), item_redir_and_replace_images(), items_fetch(), load_contact_links(), load_hooks(), login(), FKOAuth1\loginUser(), lrdd(), manage_content(), map_scope(), nav_set_selected(), new_contact(), notice(), notification(), notifier_run(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), onepoll_run(), ping_init(), poco_load(), poller_run(), post_activity_item(), post_url(), preg_heart(), prepare_body(), proc_run(), process_delivery(), profile_activity(), profile_sidebar(), public_permissions_sql(), replace_macros(), rmagic_init(), saved_searches(), scale_external_images(), search(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), smilies(), tag_deliver(), terminate_friendship(), tgroup_check(), theme_include(), tt(), update_suggestions(), user_allow(), vcard_from_xchan(), what_next(), z_fetch_url(), and zot_finger().

    +

    Referenced by FriendicaSmarty\__construct(), FriendicaSmartyEngine\__construct(), abook_toggle_flag(), allowed_public_recips(), api_apply_template(), api_format_items(), api_get_user(), api_statuses_home_timeline(), api_statuses_repeat(), api_user(), argc(), argv(), atom_entry(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), 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_menu(), comanche_replace_region(), comanche_widget(), common_friends_visitor_widget(), connections_content(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), dfrn_deliver(), drop_item(), event_store(), fetch_url(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), format_event_diaspora(), get_account_id(), get_best_language(), get_birthdays(), get_events(), get_feed_for(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_observer_hash(), get_plink(), get_theme_config_file(), get_theme_screenshot(), gprobe_run(), group_select(), guess_image_type(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), import_channel_photo(), import_post(), import_profile_photo(), info(), is_site_admin(), item_message_id(), item_photo_menu(), item_redir_and_replace_images(), items_fetch(), load_contact_links(), load_hooks(), login(), FKOAuth1\loginUser(), lrdd(), manage_content(), map_scope(), nav_set_selected(), new_contact(), notice(), notification(), notifier_run(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), onepoll_run(), ping_init(), poco_load(), poller_run(), post_activity_item(), post_url(), preg_heart(), prepare_body(), proc_run(), process_delivery(), profile_activity(), profile_sidebar(), public_permissions_sql(), replace_macros(), rmagic_init(), saved_searches(), scale_external_images(), search(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), smilies(), tag_deliver(), terminate_friendship(), tgroup_check(), theme_include(), tt(), update_suggestions(), user_allow(), vcard_from_xchan(), what_next(), widget_profile(), z_fetch_url(), and zot_finger().

    @@ -935,6 +947,34 @@ Variables
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + +
    get_custom_nav ($a,
     $navname 
    )
    +
    + +

    Referenced by construct_page().

    +
    @@ -1016,7 +1056,7 @@ Variables @@ -1082,7 +1122,7 @@ Variables @@ -1186,7 +1226,7 @@ Variables
    -

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

    +

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

    @@ -1260,7 +1300,7 @@ Variables

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

    $cmd and string args are surrounded with ""

    -

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

    +

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

    @@ -1365,7 +1405,7 @@ Variables

    : array $profile

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

    -

    Referenced by profile_create_sidebar().

    +

    Referenced by profile_create_sidebar(), and widget_profile().

    @@ -1416,7 +1456,7 @@ Variables @@ -1477,7 +1517,7 @@ Variables
    -

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

    +

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

    @@ -1545,7 +1585,7 @@ Variables
    -

    Referenced by allowed_public_recips(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), chanview_content(), check_config(), connect_post(), connections_content(), conversation(), create_identity(), deliver_run(), directory_content(), display_content(), event_store(), follow_init(), format_css_if_exists(), format_js_if_exists(), group_post(), App\head_get_icon(), head_get_icon(), hostxrd_init(), import_post(), import_xchan(), intro_post(), invite_content(), item_photo_menu(), item_store(), lastpost_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), manage_content(), menu_content(), menu_post(), mitem_content(), mitem_post(), mood_init(), navbar_complete(), network_content(), new_channel_post(), notification(), notifications_post(), notifier_run(), photo_upload(), photos_album_widget(), photos_create_item(), post_init(), profile_activity(), profile_sidebar(), public_recips(), redir_init(), register_post(), removeme_content(), rmagic_init(), rmagic_post(), search_content(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), sync_directories(), tagger_content(), thing_init(), update_suggestions(), user_allow(), vcard_from_xchan(), webpages_content(), wfinger_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().

    +

    Referenced by allowed_public_recips(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), chanview_content(), check_config(), connect_post(), connections_content(), conversation(), create_identity(), deliver_run(), directory_content(), display_content(), event_store(), follow_init(), format_css_if_exists(), format_js_if_exists(), group_post(), App\head_get_icon(), head_get_icon(), hostxrd_init(), import_post(), import_xchan(), intro_post(), invite_content(), item_photo_menu(), item_store(), lastpost_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), manage_content(), menu_content(), menu_post(), mitem_content(), mitem_post(), mood_init(), navbar_complete(), network_content(), new_channel_post(), notification(), notifications_post(), notifier_run(), photo_upload(), photos_album_widget(), photos_create_item(), post_init(), post_post(), profile_activity(), profile_sidebar(), public_recips(), redir_init(), register_post(), removeme_content(), rmagic_init(), rmagic_post(), search_content(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), sync_directories(), tagger_content(), thing_init(), update_suggestions(), user_allow(), vcard_from_xchan(), webpages_content(), wfinger_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().

    @@ -1616,7 +1656,7 @@ Variables @@ -2559,7 +2599,7 @@ Variables @@ -2674,6 +2714,20 @@ Variables

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

    + + + +
    +
    + + + + +
    const ITEM_PDL 0x0200
    +
    + +

    Referenced by pdl_selector().

    +
    @@ -4065,6 +4119,59 @@ Variables

    Referenced by photo_gd\imageString(), and photo_imagick\load().

    + + + +
    +
    + + + + +
    const POLL_MULTIPLE_CHOICE 0x0004
    +
    + +
    +
    + +
    +
    + + + + +
    const POLL_OVERWRITE 0x8000
    +
    + +

    Referenced by vote_post().

    + +
    +
    + +
    +
    + + + + +
    const POLL_SIMPLE_RATING 0x0001
    +
    +

    Poll/Survey types

    + +

    Referenced by vote_content().

    + +
    +
    + +
    +
    + + + + +
    const POLL_TENSCALE 0x0002
    +
    +
    @@ -4152,7 +4259,7 @@ Variables @@ -4167,8 +4274,6 @@ Variables

    SSL redirection policies

    -

    Referenced by admin_page_site(), and dfrn_deliver().

    -
    @@ -4181,7 +4286,7 @@ Variables diff --git a/doc/html/boot_8php.js b/doc/html/boot_8php.js index 9ca39c30f..2730739d6 100644 --- a/doc/html/boot_8php.js +++ b/doc/html/boot_8php.js @@ -17,6 +17,7 @@ var boot_8php = [ "get_account_id", "boot_8php.html#afe88b920aa285982edb817a0dd44eb37", null ], [ "get_app", "boot_8php.html#a0e6db7e365f2b041a828b93786f694bc", null ], [ "get_birthdays", "boot_8php.html#ad2c97627a313d53df1a1c7b4215ddb51", null ], + [ "get_custom_nav", "boot_8php.html#a899d24fd074594ceebbf72e1feff335f", null ], [ "get_events", "boot_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312", null ], [ "get_max_import_size", "boot_8php.html#a97769915c9f14adc4f8ab1ea2cecfd90", null ], [ "get_my_address", "boot_8php.html#a490972c02fdb638c52ec0e012a30bfd2", null ], @@ -126,6 +127,7 @@ var boot_8php = [ "ITEM_NSFW", "boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08", null ], [ "ITEM_OBSCURED", "boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d", null ], [ "ITEM_ORIGIN", "boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7", null ], + [ "ITEM_PDL", "boot_8php.html#a6e57d913634d033b4d5ad72d99fd3e9d", null ], [ "ITEM_RELAY", "boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221", null ], [ "ITEM_SPAM", "boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb", null ], [ "ITEM_STARRED", "boot_8php.html#a7af107fab8d62b9a73801713b774ed30", null ], @@ -227,6 +229,10 @@ var boot_8php = [ "PHOTO_THING", "boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383", null ], [ "PHOTO_XCHAN", "boot_8php.html#ac43182e0d8bae7576a30b603774974f8", null ], [ "PNG_QUALITY", "boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce", null ], + [ "POLL_MULTIPLE_CHOICE", "boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86", null ], + [ "POLL_OVERWRITE", "boot_8php.html#a2b525996e4426bdddbcec277778bde08", null ], + [ "POLL_SIMPLE_RATING", "boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5", null ], + [ "POLL_TENSCALE", "boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc", null ], [ "RED_PLATFORM", "boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4", null ], [ "RED_VERSION", "boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3", null ], [ "REGISTER_APPROVE", "boot_8php.html#a7176c0f9f1c98421b97735d892cf6252", null ], diff --git a/doc/html/classApp-members.html b/doc/html/classApp-members.html index 57efce016..495c1683e 100644 --- a/doc/html/classApp-members.html +++ b/doc/html/classApp-members.html @@ -141,70 +141,71 @@ $(document).ready(function(){initNavTree('classApp.html','');}); $interactiveApp $js_sourcesApp $languageApp - $ldelimAppprivate - $moduleApp - $module_loadedApp - $nav_selApp - $observerApp - $pageApp - $pagerApp - $pathAppprivate - $permsAppprivate - $pluginsApp - $profileApp - $profile_uidApp - $query_stringApp - $rdelimAppprivate - $schemeAppprivate - $sourcenameApp - $stringsApp - $template_engine_instanceApp - $template_enginesApp - $themeAppprivate - $theme_infoApp - $theme_thread_allowApp - $timezoneApp - $userApp - $videoheightApp - $videowidthApp - $widgetlistAppprivate - $widgetsAppprivate - __construct()App - build_pagehead()App - get_account()App - get_apps()App - get_baseurl($ssl=false)App - get_channel()App - get_curl_code()App - get_curl_headers()App - get_groups()App - get_hostname()App - get_observer()App - get_path()App - get_perms()App - get_template_engine()App - get_template_ldelim($engine= 'smarty3')App - get_template_rdelim($engine= 'smarty3')App - get_widgets($location= '')App - head_get_icon()App - head_set_icon($icon)App - register_template_engine($class, $name= '')App - set_account($acct)App - set_apps($arr)App - set_baseurl($url)App - set_channel($channel)App - set_curl_code($code)App - set_curl_headers($headers)App - set_groups($g)App - set_hostname($h)App - set_observer($xchan)App - set_pager_itemspage($n)App - set_pager_total($n)App - set_path($p)App - set_perms($perms)App - set_template_engine($engine= 'smarty3')App - set_widget($title, $html, $location= 'aside')App - template_engine($name= '')App + $layoutApp + $ldelimAppprivate + $moduleApp + $module_loadedApp + $nav_selApp + $observerApp + $pageApp + $pagerApp + $pathAppprivate + $permsAppprivate + $pluginsApp + $profileApp + $profile_uidApp + $query_stringApp + $rdelimAppprivate + $schemeAppprivate + $sourcenameApp + $stringsApp + $template_engine_instanceApp + $template_enginesApp + $themeAppprivate + $theme_infoApp + $theme_thread_allowApp + $timezoneApp + $userApp + $videoheightApp + $videowidthApp + $widgetlistAppprivate + $widgetsAppprivate + __construct()App + build_pagehead()App + get_account()App + get_apps()App + get_baseurl($ssl=false)App + get_channel()App + get_curl_code()App + get_curl_headers()App + get_groups()App + get_hostname()App + get_observer()App + get_path()App + get_perms()App + get_template_engine()App + get_template_ldelim($engine= 'smarty3')App + get_template_rdelim($engine= 'smarty3')App + get_widgets($location= '')App + head_get_icon()App + head_set_icon($icon)App + register_template_engine($class, $name= '')App + set_account($acct)App + set_apps($arr)App + set_baseurl($url)App + set_channel($channel)App + set_curl_code($code)App + set_curl_headers($headers)App + set_groups($g)App + set_hostname($h)App + set_observer($xchan)App + set_pager_itemspage($n)App + set_pager_total($n)App + set_path($p)App + set_perms($perms)App + set_template_engine($engine= 'smarty3')App + set_widget($title, $html, $location= 'aside')App + template_engine($name= '')App diff --git a/doc/html/classApp.html b/doc/html/classApp.html index 2328b52bd..313a7fc85 100644 --- a/doc/html/classApp.html +++ b/doc/html/classApp.html @@ -200,6 +200,8 @@ Public Attributes    $profile_uid = 0   + $layout = array() +   $groups    $language @@ -1360,6 +1362,18 @@ Private Attributes
    +
    + + +
    +
    + + + + +
    App::$layout = array()
    +
    +
    diff --git a/doc/html/classApp.js b/doc/html/classApp.js index 958b1fb6a..599db1c69 100644 --- a/doc/html/classApp.js +++ b/doc/html/classApp.js @@ -65,6 +65,7 @@ var classApp = [ "$interactive", "classApp.html#a4c7cfc62d39508086cf300dc2e39c4df", null ], [ "$js_sources", "classApp.html#a11e24b3ed9b33ffee7dd41d110b4366d", null ], [ "$language", "classApp.html#a1a297e70b3667b83f4460aa7ed9f5d6f", null ], + [ "$layout", "classApp.html#a58ac598544892ff7c32890291b72635e", null ], [ "$ldelim", "classApp.html#a59dd4b665c70e7dbd80682c014ff7145", null ], [ "$module", "classApp.html#a9bf62f8e39585c0aa48fcffc3bf3484d", null ], [ "$module_loaded", "classApp.html#a6e4f0fbfa3cf6c11baebe22a03db6165", null ], diff --git a/doc/html/datetime_8php.html b/doc/html/datetime_8php.html index e937b29a4..e334d6286 100644 --- a/doc/html/datetime_8php.html +++ b/doc/html/datetime_8php.html @@ -332,7 +332,7 @@ Functions
    -

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

    +

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

    diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html index 65d7f4a07..7a209c87a 100644 --- a/doc/html/dba__driver_8php.html +++ b/doc/html/dba__driver_8php.html @@ -202,7 +202,7 @@ Functions
    -

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

    +

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

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

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

    -

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

    +

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

    diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html index da9e2070d..6fb9858af 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html @@ -316,6 +316,8 @@ Files   file  viewsrc.php   +file  vote.php +  file  wall_attach.php   file  wall_upload.php diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js index a06750c26..3f2fc9551 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js @@ -106,6 +106,7 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "view.php", "view_8php.html", "view_8php" ], [ "viewconnections.php", "viewconnections_8php.html", "viewconnections_8php" ], [ "viewsrc.php", "viewsrc_8php.html", "viewsrc_8php" ], + [ "vote.php", "vote_8php.html", "vote_8php" ], [ "wall_attach.php", "wall__attach_8php.html", "wall__attach_8php" ], [ "wall_upload.php", "wall__upload_8php.html", "wall__upload_8php" ], [ "webfinger.php", "webfinger_8php.html", "webfinger_8php" ], diff --git a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html index 8280e90c8..90fe2f89a 100644 --- a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html +++ b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html @@ -135,6 +135,8 @@ Files   file  cli_suggest.php   +file  comanche.php +  file  config.php   file  Contact.php diff --git a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js index eeb1d4c0f..ae8918d5b 100644 --- a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js +++ b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js @@ -18,6 +18,7 @@ var dir_d44c64559bbebec7f509842c48db8b23 = ] ], [ "cli_startup.php", "cli__startup_8php.html", "cli__startup_8php" ], [ "cli_suggest.php", "cli__suggest_8php.html", "cli__suggest_8php" ], + [ "comanche.php", "comanche_8php.html", "comanche_8php" ], [ "config.php", "include_2config_8php.html", "include_2config_8php" ], [ "Contact.php", "Contact_8php.html", "Contact_8php" ], [ "contact_selectors.php", "contact__selectors_8php.html", "contact__selectors_8php" ], diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html index 7d5ce9435..0a77759ef 100644 --- a/doc/html/extract_8php.html +++ b/doc/html/extract_8php.html @@ -132,7 +132,7 @@ Variables
    -

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

    +

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

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

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

    +

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

    diff --git a/doc/html/files.html b/doc/html/files.html index c5c58f247..4df59bda8 100644 --- a/doc/html/files.html +++ b/doc/html/files.html @@ -130,60 +130,61 @@ $(document).ready(function(){initNavTree('files.html','');}); |o*cache.php |o*cli_startup.php |o*cli_suggest.php -|o*config.php -|o*Contact.php -|o*contact_selectors.php -|o*contact_widgets.php -|o*conversation.php -|o*ConversationObject.php -|o*cronhooks.php -|o*crypto.php -|o*datetime.php -|o*deliver.php -|o*dir_fns.php -|o*directory.php -|o*enotify.php -|o*event.php -|o*expire.php -|o*features.php -|o*follow.php -|o*friendica_smarty.php -|o*gprobe.php -|o*group.php -|o*html2bbcode.php -|o*html2plain.php -|o*identity.php -|o*ItemObject.php -|o*ITemplateEngine.php -|o*items.php -|o*language.php -|o*menu.php -|o*message.php -|o*nav.php -|o*network.php -|o*notifier.php -|o*notify.php -|o*oauth.php -|o*oembed.php -|o*onepoll.php -|o*page_widgets.php -|o*permissions.php -|o*photos.php -|o*plugin.php -|o*poller.php -|o*profile_advanced.php -|o*profile_selectors.php -|o*ProtoDriver.php -|o*queue.php -|o*queue_fn.php -|o*security.php -|o*session.php -|o*socgraph.php -|o*system_unavailable.php -|o*taxonomy.php -|o*template_processor.php -|o*text.php -|\*zot.php +|o*comanche.php +|o*config.php +|o*Contact.php +|o*contact_selectors.php +|o*contact_widgets.php +|o*conversation.php +|o*ConversationObject.php +|o*cronhooks.php +|o*crypto.php +|o*datetime.php +|o*deliver.php +|o*dir_fns.php +|o*directory.php +|o*enotify.php +|o*event.php +|o*expire.php +|o*features.php +|o*follow.php +|o*friendica_smarty.php +|o*gprobe.php +|o*group.php +|o*html2bbcode.php +|o*html2plain.php +|o*identity.php +|o*ItemObject.php +|o*ITemplateEngine.php +|o*items.php +|o*language.php +|o*menu.php +|o*message.php +|o*nav.php +|o*network.php +|o*notifier.php +|o*notify.php +|o*oauth.php +|o*oembed.php +|o*onepoll.php +|o*page_widgets.php +|o*permissions.php +|o*photos.php +|o*plugin.php +|o*poller.php +|o*profile_advanced.php +|o*profile_selectors.php +|o*ProtoDriver.php +|o*queue.php +|o*queue_fn.php +|o*security.php +|o*session.php +|o*socgraph.php +|o*system_unavailable.php +|o*taxonomy.php +|o*template_processor.php +|o*text.php +|\*zot.php o+mod |o*_well_known.php |o*acl.php @@ -291,15 +292,16 @@ $(document).ready(function(){initNavTree('files.html','');}); |o*view.php |o*viewconnections.php |o*viewsrc.php -|o*wall_attach.php -|o*wall_upload.php -|o*webfinger.php -|o*webpages.php -|o*wfinger.php -|o*xchan.php -|o*xrd.php -|o*zfinger.php -|\*zotfeed.php +|o*vote.php +|o*wall_attach.php +|o*wall_upload.php +|o*webfinger.php +|o*webpages.php +|o*wfinger.php +|o*xchan.php +|o*xrd.php +|o*zfinger.php +|\*zotfeed.php o+util |o+fpostit ||\*fpostit.php diff --git a/doc/html/functions.html b/doc/html/functions.html index 786e54615..a1218aa43 100644 --- a/doc/html/functions.html +++ b/doc/html/functions.html @@ -270,6 +270,9 @@ $(document).ready(function(){initNavTree('functions.html','');});
  • $language : App
  • +
  • $layout +: App +
  • $ldelim : App
  • diff --git a/doc/html/functions_vars.html b/doc/html/functions_vars.html index 350e83b32..1fbd9bfd4 100644 --- a/doc/html/functions_vars.html +++ b/doc/html/functions_vars.html @@ -251,6 +251,9 @@ $(document).ready(function(){initNavTree('functions_vars.html','');});
  • $language : App
  • +
  • $layout +: App +
  • $ldelim : App
  • diff --git a/doc/html/globals_0x63.html b/doc/html/globals_0x63.html index 016b26fa8..ee4ef91b2 100644 --- a/doc/html/globals_0x63.html +++ b/doc/html/globals_0x63.html @@ -276,6 +276,21 @@ $(document).ready(function(){initNavTree('globals_0x63.html','');});
  • collecturls() : html2plain.php
  • +
  • comanche_menu() +: comanche.php +
  • +
  • comanche_parser() +: comanche.php +
  • +
  • comanche_region() +: comanche.php +
  • +
  • comanche_replace_region() +: comanche.php +
  • +
  • comanche_widget() +: comanche.php +
  • common_aside() : common.php
  • diff --git a/doc/html/globals_0x67.html b/doc/html/globals_0x67.html index f99e88eea..92372f3cb 100644 --- a/doc/html/globals_0x67.html +++ b/doc/html/globals_0x67.html @@ -183,6 +183,9 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');});
  • get_config_from_storage() : config.php
  • +
  • get_custom_nav() +: boot.php +
  • get_db_errno() : setup.php
  • diff --git a/doc/html/globals_0x69.html b/doc/html/globals_0x69.html index 35b8a079c..19b1d830d 100644 --- a/doc/html/globals_0x69.html +++ b/doc/html/globals_0x69.html @@ -275,6 +275,9 @@ $(document).ready(function(){initNavTree('globals_0x69.html','');});
  • ITEM_ORIGIN : boot.php
  • +
  • ITEM_PDL +: boot.php +
  • item_permissions_sql() : security.php
  • diff --git a/doc/html/globals_0x70.html b/doc/html/globals_0x70.html index 0c07fb2cf..f6a10e3e4 100644 --- a/doc/html/globals_0x70.html +++ b/doc/html/globals_0x70.html @@ -191,6 +191,9 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
  • parseurl_getsiteinfo() : parse_url.php
  • +
  • pdl_selector() +: comanche.php +
  • perm_is_allowed() : permissions.php
  • @@ -347,6 +350,18 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
  • poke_init() : poke.php
  • +
  • POLL_MULTIPLE_CHOICE +: boot.php +
  • +
  • POLL_OVERWRITE +: boot.php +
  • +
  • POLL_SIMPLE_RATING +: boot.php +
  • +
  • POLL_TENSCALE +: boot.php +
  • poller_run() : poller.php
  • diff --git a/doc/html/globals_0x76.html b/doc/html/globals_0x76.html index ca0b32391..324ca6f9c 100644 --- a/doc/html/globals_0x76.html +++ b/doc/html/globals_0x76.html @@ -177,6 +177,15 @@ $(document).ready(function(){initNavTree('globals_0x76.html','');});
  • visible_activity() : conversation.php
  • +
  • vote_content() +: vote.php +
  • +
  • vote_init() +: vote.php +
  • +
  • vote_post() +: vote.php +
  • diff --git a/doc/html/globals_0x77.html b/doc/html/globals_0x77.html index 52ae05c2f..bcbb2d949 100644 --- a/doc/html/globals_0x77.html +++ b/doc/html/globals_0x77.html @@ -171,6 +171,9 @@ $(document).ready(function(){initNavTree('globals_0x77.html','');});
  • while : docblox_errorchecker.php
  • +
  • widget_profile() +: comanche.php +
  • writepages_widget() : page_widgets.php
  • diff --git a/doc/html/globals_func_0x63.html b/doc/html/globals_func_0x63.html index a963fc5ef..818ce4c6d 100644 --- a/doc/html/globals_func_0x63.html +++ b/doc/html/globals_func_0x63.html @@ -266,6 +266,21 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');});
  • collecturls() : html2plain.php
  • +
  • comanche_menu() +: comanche.php +
  • +
  • comanche_parser() +: comanche.php +
  • +
  • comanche_region() +: comanche.php +
  • +
  • comanche_replace_region() +: comanche.php +
  • +
  • comanche_widget() +: comanche.php +
  • common_aside() : common.php
  • diff --git a/doc/html/globals_func_0x67.html b/doc/html/globals_func_0x67.html index 3eb23ebcd..23a3e869a 100644 --- a/doc/html/globals_func_0x67.html +++ b/doc/html/globals_func_0x67.html @@ -182,6 +182,9 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');});
  • get_config_from_storage() : config.php
  • +
  • get_custom_nav() +: boot.php +
  • get_db_errno() : setup.php
  • diff --git a/doc/html/globals_func_0x70.html b/doc/html/globals_func_0x70.html index 8dbccb4e8..29f8c1ee5 100644 --- a/doc/html/globals_func_0x70.html +++ b/doc/html/globals_func_0x70.html @@ -164,6 +164,9 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');});
  • parseurl_getsiteinfo() : parse_url.php
  • +
  • pdl_selector() +: comanche.php +
  • perm_is_allowed() : permissions.php
  • diff --git a/doc/html/globals_func_0x76.html b/doc/html/globals_func_0x76.html index 4fa8d511c..bf69a6911 100644 --- a/doc/html/globals_func_0x76.html +++ b/doc/html/globals_func_0x76.html @@ -176,6 +176,15 @@ $(document).ready(function(){initNavTree('globals_func_0x76.html','');});
  • visible_activity() : conversation.php
  • +
  • vote_content() +: vote.php +
  • +
  • vote_init() +: vote.php +
  • +
  • vote_post() +: vote.php +
  • diff --git a/doc/html/globals_func_0x77.html b/doc/html/globals_func_0x77.html index 925e4afa1..ef37d259d 100644 --- a/doc/html/globals_func_0x77.html +++ b/doc/html/globals_func_0x77.html @@ -167,6 +167,9 @@ $(document).ready(function(){initNavTree('globals_func_0x77.html','');});
  • what_next() : setup.php
  • +
  • widget_profile() +: comanche.php +
  • writepages_widget() : page_widgets.php
  • diff --git a/doc/html/globals_vars_0x69.html b/doc/html/globals_vars_0x69.html index 8656e480e..e25858a48 100644 --- a/doc/html/globals_vars_0x69.html +++ b/doc/html/globals_vars_0x69.html @@ -183,6 +183,9 @@ $(document).ready(function(){initNavTree('globals_vars_0x69.html','');});
  • ITEM_ORIGIN : boot.php
  • +
  • ITEM_PDL +: boot.php +
  • ITEM_RELAY : boot.php
  • diff --git a/doc/html/globals_vars_0x70.html b/doc/html/globals_vars_0x70.html index 7f84f42d6..9f1930d4c 100644 --- a/doc/html/globals_vars_0x70.html +++ b/doc/html/globals_vars_0x70.html @@ -243,6 +243,18 @@ $(document).ready(function(){initNavTree('globals_vars_0x70.html','');});
  • PNG_QUALITY : boot.php
  • +
  • POLL_MULTIPLE_CHOICE +: boot.php +
  • +
  • POLL_OVERWRITE +: boot.php +
  • +
  • POLL_SIMPLE_RATING +: boot.php +
  • +
  • POLL_TENSCALE +: boot.php +
  • diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html index a85836821..8565c7df3 100644 --- a/doc/html/include_2config_8php.html +++ b/doc/html/include_2config_8php.html @@ -256,7 +256,7 @@ Functions
    -

    Referenced by admin_page_dbsync(), admin_page_logs(), admin_page_site(), admin_page_summary(), admin_page_themes(), allowed_email(), allowed_url(), api_statuses_mentions(), api_statusnet_config(), attach_store(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), community_content(), create_account(), create_identity(), detect_language(), dfrn_deliver(), directory_content(), directory_run(), dirfind_content(), dirsearch_content(), display_content(), dlogger(), dob(), editpost_content(), encode_item(), encode_mail(), events_content(), expire_run(), feed_init(), fetch_url(), fetch_xrd_links(), findpeople_widget(), Item\get_comment_box(), get_item_elements(), get_mail_elements(), group_content(), hcard_init(), hostxrd_init(), photo_gd\imageString(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), item_store(), lastpost_content(), photo_imagick\load(), logger(), login(), lostpass_content(), lostpass_post(), match_content(), nav(), navbar_complete(), FKOAuthDataStore\new_access_token(), new_channel_post(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), parse_url_content(), photo_upload(), photos_content(), photos_init(), poco_init(), poller_run(), post_post(), post_url(), prepare_body(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), proc_run(), profile_content(), profile_create_sidebar(), profile_photo_post(), profiles_content(), profperm_content(), qsearch_init(), register_content(), register_post(), reload_plugins(), 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(), update_suggestions(), upgrade_link(), user_allow(), valid_email(), validate_email(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_import(), and zotfeed_init().

    +

    Referenced by admin_page_dbsync(), admin_page_logs(), admin_page_site(), admin_page_summary(), admin_page_themes(), allowed_email(), allowed_url(), api_statuses_mentions(), api_statusnet_config(), attach_store(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), community_content(), create_account(), create_identity(), detect_language(), dfrn_deliver(), directory_content(), directory_run(), dirfind_content(), dirsearch_content(), display_content(), dlogger(), dob(), editpost_content(), encode_item(), encode_mail(), events_content(), expire_run(), feed_init(), fetch_url(), fetch_xrd_links(), findpeople_widget(), Item\get_comment_box(), get_item_elements(), get_mail_elements(), group_content(), hcard_init(), hostxrd_init(), photo_gd\imageString(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), item_store(), lastpost_content(), photo_imagick\load(), logger(), login(), lostpass_content(), lostpass_post(), match_content(), nav(), navbar_complete(), FKOAuthDataStore\new_access_token(), new_channel_post(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), parse_url_content(), photo_upload(), photos_content(), photos_init(), poco_init(), poller_run(), post_post(), post_url(), prepare_body(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), proc_run(), profile_content(), profile_create_sidebar(), profile_photo_post(), profiles_content(), profperm_content(), qsearch_init(), register_content(), register_post(), reload_plugins(), 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(), update_suggestions(), upgrade_link(), user_allow(), valid_email(), validate_email(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), widget_profile(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_import(), and zotfeed_init().

    @@ -508,7 +508,7 @@ Functions diff --git a/doc/html/include_2menu_8php.html b/doc/html/include_2menu_8php.html index ff4e76c14..3bf0af685 100644 --- a/doc/html/include_2menu_8php.html +++ b/doc/html/include_2menu_8php.html @@ -358,7 +358,7 @@ Functions diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html index 661fc4688..618626445 100644 --- a/doc/html/language_8php.html +++ b/doc/html/language_8php.html @@ -280,7 +280,7 @@ Functions
    -

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

    +

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

    diff --git a/doc/html/navtree.js b/doc/html/navtree.js index 697310d81..d2fb0acef 100644 --- a/doc/html/navtree.js +++ b/doc/html/navtree.js @@ -36,13 +36,13 @@ var NAVTREE = var NAVTREEINDEX = [ "BaseObject_8php.html", -"boot_8php.html#aa3679df31c8dad1b71816b0322d5baff", -"classItem.html#a5d29ddecc073151a65a8e2ea2f6e4189", -"deliver_8php.html#a397afcb9afecf0c1816b0951189dd346", -"include_2api_8php.html#a6951c690d87775eb37e569c66011988e", -"mod_2api_8php.html#a02ae0f60e240dc806b860edb7d582117", -"register_8php.html", -"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776" +"boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42", +"classItem.html#a3ee7667c2ec6cd7657328e27848c0bdf", +"db__update_8php.html", +"include_2api_8php.html#a176c448d79c211ad41c2bbe3124658f5", +"magic_8php.html", +"redstrap_2php_2style_8php.html#a232513bf4339fe34908c4c63cb93168b", +"updatetpl_8py.html#ab42dd79af65ee82201fd6f04715f62f6" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js index 03379b597..981c68690 100644 --- a/doc/html/navtreeindex0.js +++ b/doc/html/navtreeindex0.js @@ -1,27 +1,27 @@ var NAVTREEINDEX0 = { "BaseObject_8php.html":[5,0,0,8], -"Contact_8php.html":[5,0,0,15], -"Contact_8php.html#a024919623a830e8703ac4f23496dd66c":[5,0,0,15,2], -"Contact_8php.html#a228fc01f90ae9bfdde4c2ad0772bd7dc":[5,0,0,15,9], -"Contact_8php.html#a28e062c884331dbb5dfa713228c25ad6":[5,0,0,15,8], -"Contact_8php.html#a2f4f495d53f2a334ab75292af79d3c91":[5,0,0,15,11], -"Contact_8php.html#a2fc191067dd571a79603c66b04b1ca15":[5,0,0,15,14], -"Contact_8php.html#a38daa1c210b78385307123450ca9a1fc":[5,0,0,15,13], -"Contact_8php.html#a3a0844dac1e86d523de5d2f432cfeebc":[5,0,0,15,6], -"Contact_8php.html#a3eef54a5523e568a28257c1f9b1644d8":[5,0,0,15,3], -"Contact_8php.html#a483cda56f9e37c3a4a8773dcdfeb0258":[5,0,0,15,5], -"Contact_8php.html#a6348a532c9d26cd1c9afbc9aa6aa8960":[5,0,0,15,15], -"Contact_8php.html#a87e699f74a1102b25e8aa0432d86a91e":[5,0,0,15,7], -"Contact_8php.html#a91281b5d4bbbb2ed468e27ec82ca083c":[5,0,0,15,10], -"Contact_8php.html#acc12cda999c88c4d6185cca967c15125":[5,0,0,15,12], -"Contact_8php.html#ad46ff6764f12b6d3ab45c49b797f98aa":[5,0,0,15,4], -"Contact_8php.html#ad5b02c2a962ee55b1b7ca6c159d6e4c5":[5,0,0,15,1], -"Contact_8php.html#ae8803c330352cbf1e828eb7490edf47e":[5,0,0,15,0], -"ConversationObject_8php.html":[5,0,0,19], -"ITemplateEngine_8php.html":[5,0,0,38], -"ItemObject_8php.html":[5,0,0,37], -"ProtoDriver_8php.html":[5,0,0,57], +"Contact_8php.html":[5,0,0,16], +"Contact_8php.html#a024919623a830e8703ac4f23496dd66c":[5,0,0,16,2], +"Contact_8php.html#a228fc01f90ae9bfdde4c2ad0772bd7dc":[5,0,0,16,9], +"Contact_8php.html#a28e062c884331dbb5dfa713228c25ad6":[5,0,0,16,8], +"Contact_8php.html#a2f4f495d53f2a334ab75292af79d3c91":[5,0,0,16,11], +"Contact_8php.html#a2fc191067dd571a79603c66b04b1ca15":[5,0,0,16,14], +"Contact_8php.html#a38daa1c210b78385307123450ca9a1fc":[5,0,0,16,13], +"Contact_8php.html#a3a0844dac1e86d523de5d2f432cfeebc":[5,0,0,16,6], +"Contact_8php.html#a3eef54a5523e568a28257c1f9b1644d8":[5,0,0,16,3], +"Contact_8php.html#a483cda56f9e37c3a4a8773dcdfeb0258":[5,0,0,16,5], +"Contact_8php.html#a6348a532c9d26cd1c9afbc9aa6aa8960":[5,0,0,16,15], +"Contact_8php.html#a87e699f74a1102b25e8aa0432d86a91e":[5,0,0,16,7], +"Contact_8php.html#a91281b5d4bbbb2ed468e27ec82ca083c":[5,0,0,16,10], +"Contact_8php.html#acc12cda999c88c4d6185cca967c15125":[5,0,0,16,12], +"Contact_8php.html#ad46ff6764f12b6d3ab45c49b797f98aa":[5,0,0,16,4], +"Contact_8php.html#ad5b02c2a962ee55b1b7ca6c159d6e4c5":[5,0,0,16,1], +"Contact_8php.html#ae8803c330352cbf1e828eb7490edf47e":[5,0,0,16,0], +"ConversationObject_8php.html":[5,0,0,20], +"ITemplateEngine_8php.html":[5,0,0,39], +"ItemObject_8php.html":[5,0,0,38], +"ProtoDriver_8php.html":[5,0,0,58], "__well__known_8php.html":[5,0,1,0], "__well__known_8php.html#a6ebfa937a2024f0b5dab53f0ac90fed0":[5,0,1,0,0], "account_8php.html":[5,0,0,2], @@ -88,166 +88,166 @@ var NAVTREEINDEX0 = "bbcode_8php.html#a55b0cb6973f1ec731de0e726bcc0efa7":[5,0,0,10,5], "bbcode_8php.html#a8911e027907820df3db03b4f76724b50":[5,0,0,10,2], "boot_8php.html":[5,0,4], -"boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[5,0,4,131], -"boot_8php.html#a01353c9abebc3544ea080ac161729632":[5,0,4,42], -"boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[5,0,4,144], -"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[5,0,4,232], -"boot_8php.html#a032bbd6d0321e99e9117332c9ed2b1b8":[5,0,4,60], -"boot_8php.html#a03d19251c245587de7ed959300b87bdf":[5,0,4,160], -"boot_8php.html#a0450389f24c632906fbc24347700a543":[5,0,4,53], -"boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b":[5,0,4,108], +"boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[5,0,4,133], +"boot_8php.html#a01353c9abebc3544ea080ac161729632":[5,0,4,43], +"boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[5,0,4,146], +"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[5,0,4,238], +"boot_8php.html#a032bbd6d0321e99e9117332c9ed2b1b8":[5,0,4,61], +"boot_8php.html#a03d19251c245587de7ed959300b87bdf":[5,0,4,162], +"boot_8php.html#a0450389f24c632906fbc24347700a543":[5,0,4,54], +"boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b":[5,0,4,109], "boot_8php.html#a081307d681d7d04f17b9ced2076e7c85":[5,0,4,1], -"boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[5,0,4,198], -"boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[5,0,4,73], -"boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[5,0,4,164], -"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[5,0,4,248], -"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[5,0,4,244], -"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[5,0,4,247], -"boot_8php.html#a0e4701c9742c3ef88f02ac450a042a84":[5,0,4,25], -"boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[5,0,4,65], +"boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[5,0,4,200], +"boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[5,0,4,74], +"boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[5,0,4,166], +"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[5,0,4,254], +"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[5,0,4,250], +"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[5,0,4,253], +"boot_8php.html#a0e4701c9742c3ef88f02ac450a042a84":[5,0,4,26], +"boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[5,0,4,66], "boot_8php.html#a0e6db7e365f2b041a828b93786f694bc":[5,0,4,15], -"boot_8php.html#a0fb63e51c2a9814941842ae8f2f4dff8":[5,0,4,83], -"boot_8php.html#a12c781cefc20167231e2e3fd5866b1b5":[5,0,4,87], -"boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd":[5,0,4,84], -"boot_8php.html#a14d44d4a00223dc3db4ea962325db192":[5,0,4,190], -"boot_8php.html#a176664e78dcb9132e16be69418223eb2":[5,0,4,68], -"boot_8php.html#a17b4ea23d9ecf628d9c8f53b7abcb805":[5,0,4,143], -"boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[5,0,4,139], -"boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[5,0,4,163], -"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[5,0,4,251], -"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[5,0,4,252], -"boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[5,0,4,167], -"boot_8php.html#a1da180f961f49a11573cac4ff6c62c05":[5,0,4,82], -"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[5,0,4,209], -"boot_8php.html#a1dfcb5146e9d1eca4528bc580ad5d273":[5,0,4,38], -"boot_8php.html#a1f5906598e90b5ea2b4245f682be4348":[5,0,4,110], -"boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[5,0,4,150], -"boot_8php.html#a20f0eed431d25870b624b8937a07a59f":[5,0,4,183], -"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[5,0,4,228], -"boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5":[5,0,4,48], -"boot_8php.html#a24a7a70afedd5d85fe0eadc85afa9f77":[5,0,4,24], -"boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8":[5,0,4,106], -"boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f":[5,0,4,98], -"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[5,0,4,237], -"boot_8php.html#a285732e7889fa7f333cbe431111e1029":[5,0,4,186], -"boot_8php.html#a29528a2544373cc19a378f350040c6a1":[5,0,4,89], -"boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[5,0,4,126], -"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[5,0,4,207], -"boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3":[5,0,4,111], -"boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[5,0,4,182], -"boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d":[5,0,4,124], -"boot_8php.html#a2e90096fede6acce16abf0da8cb2febe":[5,0,4,74], -"boot_8php.html#a2f8f25b13480c37a5f22511f53da8bab":[5,0,4,79], -"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[5,0,4,214], -"boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[5,0,4,137], -"boot_8php.html#a34c756469ebed32e2fc987bcde62d382":[5,0,4,50], -"boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[5,0,4,117], -"boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[5,0,4,152], -"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[5,0,4,254], -"boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[5,0,4,171], -"boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[5,0,4,112], -"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[5,0,4,253], -"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[5,0,4,205], +"boot_8php.html#a0fb63e51c2a9814941842ae8f2f4dff8":[5,0,4,84], +"boot_8php.html#a12c781cefc20167231e2e3fd5866b1b5":[5,0,4,88], +"boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd":[5,0,4,85], +"boot_8php.html#a14d44d4a00223dc3db4ea962325db192":[5,0,4,192], +"boot_8php.html#a176664e78dcb9132e16be69418223eb2":[5,0,4,69], +"boot_8php.html#a17b4ea23d9ecf628d9c8f53b7abcb805":[5,0,4,145], +"boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[5,0,4,141], +"boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[5,0,4,165], +"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[5,0,4,257], +"boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc":[5,0,4,232], +"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[5,0,4,258], +"boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[5,0,4,169], +"boot_8php.html#a1da180f961f49a11573cac4ff6c62c05":[5,0,4,83], +"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[5,0,4,211], +"boot_8php.html#a1dfcb5146e9d1eca4528bc580ad5d273":[5,0,4,39], +"boot_8php.html#a1f5906598e90b5ea2b4245f682be4348":[5,0,4,111], +"boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[5,0,4,152], +"boot_8php.html#a20f0eed431d25870b624b8937a07a59f":[5,0,4,185], +"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[5,0,4,234], +"boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5":[5,0,4,49], +"boot_8php.html#a24a7a70afedd5d85fe0eadc85afa9f77":[5,0,4,25], +"boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8":[5,0,4,107], +"boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f":[5,0,4,99], +"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[5,0,4,243], +"boot_8php.html#a285732e7889fa7f333cbe431111e1029":[5,0,4,188], +"boot_8php.html#a29528a2544373cc19a378f350040c6a1":[5,0,4,90], +"boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[5,0,4,128], +"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[5,0,4,209], +"boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3":[5,0,4,112], +"boot_8php.html#a2b525996e4426bdddbcec277778bde08":[5,0,4,230], +"boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[5,0,4,184], +"boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d":[5,0,4,125], +"boot_8php.html#a2e90096fede6acce16abf0da8cb2febe":[5,0,4,75], +"boot_8php.html#a2f8f25b13480c37a5f22511f53da8bab":[5,0,4,80], +"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[5,0,4,216], +"boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[5,0,4,139], +"boot_8php.html#a34c756469ebed32e2fc987bcde62d382":[5,0,4,51], +"boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[5,0,4,118], +"boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[5,0,4,154], +"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[5,0,4,260], +"boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[5,0,4,173], +"boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[5,0,4,113], +"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[5,0,4,259], +"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[5,0,4,207], "boot_8php.html#a3e0930933fb2c0bf8211cc7ab4e1c3b4":[5,0,4,12], -"boot_8php.html#a3e2ea123d29a72012db1241f96280b0e":[5,0,4,66], -"boot_8php.html#a3f40aa5bafff8c4eebdc62e5121daf77":[5,0,4,96], -"boot_8php.html#a400519fa181591cd6fdbb8f25fbcba0a":[5,0,4,58], -"boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb":[5,0,4,127], -"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[5,0,4,201], -"boot_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc":[5,0,4,37], -"boot_8php.html#a43296b1b4398aacbf92a4b2d56bab91e":[5,0,4,181], -"boot_8php.html#a43c6c7d84d880e9500bd4f8f8ecc5731":[5,0,4,95], -"boot_8php.html#a444ce608ce34efb82ee11852f36e825f":[5,0,4,157], -"boot_8php.html#a44ae1542a805ffd7f826fb511db07374":[5,0,4,147], -"boot_8php.html#a44d069c8a1cfcc6d2007c506a17ff28f":[5,0,4,77], -"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[5,0,4,245], -"boot_8php.html#a4751b522ea913d0e7ed43e03d22e9e68":[5,0,4,36], -"boot_8php.html#a490972c02fdb638c52ec0e012a30bfd2":[5,0,4,19], -"boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[5,0,4,169], -"boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[5,0,4,109], -"boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4":[5,0,4,222], -"boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[5,0,4,168], +"boot_8php.html#a3e2ea123d29a72012db1241f96280b0e":[5,0,4,67], +"boot_8php.html#a3f40aa5bafff8c4eebdc62e5121daf77":[5,0,4,97], +"boot_8php.html#a400519fa181591cd6fdbb8f25fbcba0a":[5,0,4,59], +"boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb":[5,0,4,129], +"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[5,0,4,203], +"boot_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc":[5,0,4,38], +"boot_8php.html#a43296b1b4398aacbf92a4b2d56bab91e":[5,0,4,183], +"boot_8php.html#a43c6c7d84d880e9500bd4f8f8ecc5731":[5,0,4,96], +"boot_8php.html#a444ce608ce34efb82ee11852f36e825f":[5,0,4,159], +"boot_8php.html#a44ae1542a805ffd7f826fb511db07374":[5,0,4,149], +"boot_8php.html#a44d069c8a1cfcc6d2007c506a17ff28f":[5,0,4,78], +"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[5,0,4,251], +"boot_8php.html#a4751b522ea913d0e7ed43e03d22e9e68":[5,0,4,37], +"boot_8php.html#a490972c02fdb638c52ec0e012a30bfd2":[5,0,4,20], +"boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[5,0,4,171], +"boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[5,0,4,110], +"boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4":[5,0,4,224], +"boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[5,0,4,170], "boot_8php.html#a4c02d88e66852a01bd5a1feecb7c3ce3":[5,0,4,6], -"boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[5,0,4,200], -"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[5,0,4,218], -"boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[5,0,4,193], -"boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[5,0,4,151], -"boot_8php.html#a52b599cd13e152ebc80d7e4413683195":[5,0,4,49], -"boot_8php.html#a53e4bdb6f225da55115acb9277f75e53":[5,0,4,88], -"boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209":[5,0,4,39], -"boot_8php.html#a56fd673eaa7014150297ce1162502db5":[5,0,4,185], -"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[5,0,4,217], -"boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1":[5,0,4,23], -"boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[5,0,4,67], -"boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[5,0,4,175], -"boot_8php.html#a5b815330f3d177ab383af37a6c12e532":[5,0,4,46], -"boot_8php.html#a5b8484922918946d041e5e0515dbe718":[5,0,4,196], -"boot_8php.html#a5c3747e0f505f0d5271dc4c54e3feaf4":[5,0,4,85], -"boot_8php.html#a5df5359090d1f8e898c36d7cf8878ad2":[5,0,4,155], -"boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640":[5,0,4,197], -"boot_8php.html#a623e49c79943f3e7bdb770d021683cf7":[5,0,4,21], -"boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5":[5,0,4,81], -"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[5,0,4,241], -"boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[5,0,4,161], -"boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[5,0,4,135], -"boot_8php.html#a680fbafc2db023c5b1309e0180e81315":[5,0,4,47], -"boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11":[5,0,4,138], -"boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155":[5,0,4,52], -"boot_8php.html#a6969947145a139ec374ce098224d8e81":[5,0,4,141], -"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[5,0,4,230], -"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[5,0,4,221], -"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[5,0,4,215], -"boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd":[5,0,4,107], -"boot_8php.html#a6c5e9e293c8242dcb9bc2c3ea2fee2c9":[5,0,4,99], -"boot_8php.html#a6df1102664f64b274810db85197c2755":[5,0,4,203], -"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[5,0,4,229], -"boot_8php.html#a719c7f3972d5f9268f37a41c76cd4ef6":[5,0,4,30], -"boot_8php.html#a7236b2cdcf59f02a42302e893a99013b":[5,0,4,176], -"boot_8php.html#a749144d8dd9c1366596a0213c277d050":[5,0,4,129], -"boot_8php.html#a74bf27f7564c9a37975e7b37d973dcab":[5,0,4,78], +"boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[5,0,4,202], +"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[5,0,4,220], +"boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[5,0,4,195], +"boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[5,0,4,153], +"boot_8php.html#a52b599cd13e152ebc80d7e4413683195":[5,0,4,50], +"boot_8php.html#a53e4bdb6f225da55115acb9277f75e53":[5,0,4,89], +"boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209":[5,0,4,40], +"boot_8php.html#a56fd673eaa7014150297ce1162502db5":[5,0,4,187], +"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[5,0,4,219], +"boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1":[5,0,4,24], +"boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[5,0,4,68], +"boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[5,0,4,177], +"boot_8php.html#a5b815330f3d177ab383af37a6c12e532":[5,0,4,47], +"boot_8php.html#a5b8484922918946d041e5e0515dbe718":[5,0,4,198], +"boot_8php.html#a5c3747e0f505f0d5271dc4c54e3feaf4":[5,0,4,86], +"boot_8php.html#a5df5359090d1f8e898c36d7cf8878ad2":[5,0,4,157], +"boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640":[5,0,4,199], +"boot_8php.html#a623e49c79943f3e7bdb770d021683cf7":[5,0,4,22], +"boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5":[5,0,4,82], +"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[5,0,4,247], +"boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[5,0,4,163], +"boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[5,0,4,137], +"boot_8php.html#a680fbafc2db023c5b1309e0180e81315":[5,0,4,48], +"boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11":[5,0,4,140], +"boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155":[5,0,4,53], +"boot_8php.html#a6969947145a139ec374ce098224d8e81":[5,0,4,143], +"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[5,0,4,236], +"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[5,0,4,223], +"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[5,0,4,217], +"boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd":[5,0,4,108], +"boot_8php.html#a6c5e9e293c8242dcb9bc2c3ea2fee2c9":[5,0,4,100], +"boot_8php.html#a6df1102664f64b274810db85197c2755":[5,0,4,205], +"boot_8php.html#a6e57d913634d033b4d5ad72d99fd3e9d":[5,0,4,127], +"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[5,0,4,235], +"boot_8php.html#a719c7f3972d5f9268f37a41c76cd4ef6":[5,0,4,31], +"boot_8php.html#a7236b2cdcf59f02a42302e893a99013b":[5,0,4,178], +"boot_8php.html#a749144d8dd9c1366596a0213c277d050":[5,0,4,131], +"boot_8php.html#a74bf27f7564c9a37975e7b37d973dcab":[5,0,4,79], "boot_8php.html#a75a90b0eadd0df510f7e63210733634d":[5,0,4,2], -"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[5,0,4,249], +"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[5,0,4,255], "boot_8php.html#a768f00b7d66be0daf7ef4eea2e862006":[5,0,4,4], -"boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966":[5,0,4,80], -"boot_8php.html#a781916f83fcc8ff1035649afa45f0292":[5,0,4,93], -"boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383":[5,0,4,224], -"boot_8php.html#a7aa57438db03834aaa0b468bdce773a6":[5,0,4,71], -"boot_8php.html#a7af107fab8d62b9a73801713b774ed30":[5,0,4,128], -"boot_8php.html#a7b8f8ad9dbe82711257d23891ef6b133":[5,0,4,156], -"boot_8php.html#a7bff2278e68a71e524afd1c7c951e1e3":[5,0,4,75], -"boot_8php.html#a7ed4581ab66ebcde97f6b3730856b028":[5,0,4,158], -"boot_8php.html#a7f3474fec541e261fc8dff47313c4017":[5,0,4,56], -"boot_8php.html#a7f4264232dbb6c3b41f2617deecb1866":[5,0,4,90], -"boot_8php.html#a7fc4b291a7cdaa48b38e27344ea183cf":[5,0,4,115], -"boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed":[5,0,4,194], -"boot_8php.html#a84057c5bfa1bca5fba8497fe005ee4d8":[5,0,4,59], -"boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688":[5,0,4,63], -"boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[5,0,4,122], -"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[5,0,4,240], -"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[5,0,4,239], -"boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[5,0,4,174], -"boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[5,0,4,104], -"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[5,0,4,219], -"boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[5,0,4,125], -"boot_8php.html#a8da836617174eed9fc2ac8054125354b":[5,0,4,119], -"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[5,0,4,226], -"boot_8php.html#a9255af5ae9c887520091ea04763c1a88":[5,0,4,33], +"boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966":[5,0,4,81], +"boot_8php.html#a781916f83fcc8ff1035649afa45f0292":[5,0,4,94], +"boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383":[5,0,4,226], +"boot_8php.html#a7aa57438db03834aaa0b468bdce773a6":[5,0,4,72], +"boot_8php.html#a7af107fab8d62b9a73801713b774ed30":[5,0,4,130], +"boot_8php.html#a7b8f8ad9dbe82711257d23891ef6b133":[5,0,4,158], +"boot_8php.html#a7bff2278e68a71e524afd1c7c951e1e3":[5,0,4,76], +"boot_8php.html#a7ed4581ab66ebcde97f6b3730856b028":[5,0,4,160], +"boot_8php.html#a7f3474fec541e261fc8dff47313c4017":[5,0,4,57], +"boot_8php.html#a7f4264232dbb6c3b41f2617deecb1866":[5,0,4,91], +"boot_8php.html#a7fc4b291a7cdaa48b38e27344ea183cf":[5,0,4,116], +"boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed":[5,0,4,196], +"boot_8php.html#a84057c5bfa1bca5fba8497fe005ee4d8":[5,0,4,60], +"boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688":[5,0,4,64], +"boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[5,0,4,123], +"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[5,0,4,246], +"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[5,0,4,245], +"boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[5,0,4,176], +"boot_8php.html#a899d24fd074594ceebbf72e1feff335f":[5,0,4,17], +"boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[5,0,4,105], +"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[5,0,4,221], +"boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[5,0,4,126], +"boot_8php.html#a8da836617174eed9fc2ac8054125354b":[5,0,4,120], +"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[5,0,4,228], +"boot_8php.html#a9255af5ae9c887520091ea04763c1a88":[5,0,4,34], "boot_8php.html#a926cad0b3d8b9d9ee5da1898fc063ba3":[5,0,4,11], -"boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[5,0,4,142], -"boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[5,0,4,123], -"boot_8php.html#a949116d9a295b214293006c060ca4848":[5,0,4,121], -"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[5,0,4,227], -"boot_8php.html#a97769915c9f14adc4f8ab1ea2cecfd90":[5,0,4,18], -"boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[5,0,4,188], -"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[5,0,4,220], -"boot_8php.html#a9c80420e5a063a4a87ce4831f086134d":[5,0,4,55], +"boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[5,0,4,144], +"boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[5,0,4,124], +"boot_8php.html#a949116d9a295b214293006c060ca4848":[5,0,4,122], +"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[5,0,4,233], +"boot_8php.html#a97769915c9f14adc4f8ab1ea2cecfd90":[5,0,4,19], +"boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[5,0,4,190], +"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[5,0,4,222], +"boot_8php.html#a9c80420e5a063a4a87ce4831f086134d":[5,0,4,56], "boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e":[5,0,4,5], -"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[5,0,4,212], -"boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[5,0,4,189], -"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[5,0,4,242], -"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[5,0,4,211], -"boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[5,0,4,177], -"boot_8php.html#aa1e828bbbcba170265eb2668d8daf42e":[5,0,4,28], -"boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[5,0,4,195], -"boot_8php.html#aa3425e2de85b08f7041656d3a8502cb6":[5,0,4,51] +"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[5,0,4,214], +"boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[5,0,4,191], +"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[5,0,4,248], +"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[5,0,4,213] }; diff --git a/doc/html/navtreeindex1.js b/doc/html/navtreeindex1.js index 8a1396f5d..3fa6238e9 100644 --- a/doc/html/navtreeindex1.js +++ b/doc/html/navtreeindex1.js @@ -1,97 +1,103 @@ var NAVTREEINDEX1 = { -"boot_8php.html#aa3679df31c8dad1b71816b0322d5baff":[5,0,4,149], +"boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[5,0,4,179], +"boot_8php.html#aa1e828bbbcba170265eb2668d8daf42e":[5,0,4,29], +"boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[5,0,4,197], +"boot_8php.html#aa3425e2de85b08f7041656d3a8502cb6":[5,0,4,52], +"boot_8php.html#aa3679df31c8dad1b71816b0322d5baff":[5,0,4,151], "boot_8php.html#aa4221641e5c21db69fa52c426b9017f5":[5,0,4,9], -"boot_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec":[5,0,4,20], -"boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2":[5,0,4,146], -"boot_8php.html#aa74438cf71e48e37bf7b440b94243985":[5,0,4,92], -"boot_8php.html#aa8a2b61e70900139d1ca28e46f1da49d":[5,0,4,101], -"boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[5,0,4,216], -"boot_8php.html#aad33b494084f729b6ee3b0bc457718a1":[5,0,4,133], -"boot_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3":[5,0,4,22], -"boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14":[5,0,4,72], -"boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[5,0,4,180], -"boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[5,0,4,114], -"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[5,0,4,202], -"boot_8php.html#ab346a2ece14993861f3e4206befa94f0":[5,0,4,34], -"boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8":[5,0,4,199], -"boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0":[5,0,4,223], -"boot_8php.html#ab4bddb41a0cf407178ec5278b950c393":[5,0,4,173], -"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[5,0,4,206], -"boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764":[5,0,4,113], -"boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[5,0,4,134], -"boot_8php.html#ab55e545b72ec8c097e052ea7d373491f":[5,0,4,43], -"boot_8php.html#ab5ddbe69d3d03acd06e1fb281488cb78":[5,0,4,61], -"boot_8php.html#ab724491497ab2618b23a01d5da60aec0":[5,0,4,191], +"boot_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec":[5,0,4,21], +"boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2":[5,0,4,148], +"boot_8php.html#aa74438cf71e48e37bf7b440b94243985":[5,0,4,93], +"boot_8php.html#aa8a2b61e70900139d1ca28e46f1da49d":[5,0,4,102], +"boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[5,0,4,218], +"boot_8php.html#aad33b494084f729b6ee3b0bc457718a1":[5,0,4,135], +"boot_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3":[5,0,4,23], +"boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14":[5,0,4,73], +"boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[5,0,4,182], +"boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[5,0,4,115], +"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[5,0,4,204], +"boot_8php.html#ab346a2ece14993861f3e4206befa94f0":[5,0,4,35], +"boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8":[5,0,4,201], +"boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0":[5,0,4,225], +"boot_8php.html#ab4bddb41a0cf407178ec5278b950c393":[5,0,4,175], +"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[5,0,4,208], +"boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764":[5,0,4,114], +"boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[5,0,4,136], +"boot_8php.html#ab55e545b72ec8c097e052ea7d373491f":[5,0,4,44], +"boot_8php.html#ab5ddbe69d3d03acd06e1fb281488cb78":[5,0,4,62], +"boot_8php.html#ab724491497ab2618b23a01d5da60aec0":[5,0,4,193], "boot_8php.html#ab79b8b4555cae20d03f8200666d89d63":[5,0,4,7], -"boot_8php.html#ab7d65a7e7417825a4db62906bb600729":[5,0,4,103], -"boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda":[5,0,4,44], +"boot_8php.html#ab7d65a7e7417825a4db62906bb600729":[5,0,4,104], +"boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda":[5,0,4,45], +"boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86":[5,0,4,229], "boot_8php.html#abc0a90a1a77f5b668aa7e4b57d1776a7":[5,0,4,3], -"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[5,0,4,246], -"boot_8php.html#abdcdfc873ace4e0902177bad934de0c0":[5,0,4,70], -"boot_8php.html#abedd940e664017c61b48c6efa31d0cb8":[5,0,4,102], -"boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450":[5,0,4,120], -"boot_8php.html#ac17fc8a416ea79e9d5cb4dc9a8ff8c5c":[5,0,4,27], -"boot_8php.html#ac195fc9003298923ea81f144388e24b1":[5,0,4,159], -"boot_8php.html#ac43182e0d8bae7576a30b603774974f8":[5,0,4,225], -"boot_8php.html#ac59a18a4838710d6c2de37aed6b21f03":[5,0,4,100], -"boot_8php.html#ac608a34f3bc180e7724192e0fd31f9b0":[5,0,4,41], -"boot_8php.html#ac8400313df2c831653f9036f71ebd86d":[5,0,4,62], -"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[5,0,4,250], -"boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20":[5,0,4,116], -"boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[5,0,4,118], -"boot_8php.html#aca08bc4f1554ba877500f6abcc99e1e8":[5,0,4,187], -"boot_8php.html#aca47505b8732177f52bb2d647eb2741c":[5,0,4,40], +"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[5,0,4,252], +"boot_8php.html#abdcdfc873ace4e0902177bad934de0c0":[5,0,4,71], +"boot_8php.html#abedd940e664017c61b48c6efa31d0cb8":[5,0,4,103], +"boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450":[5,0,4,121], +"boot_8php.html#ac17fc8a416ea79e9d5cb4dc9a8ff8c5c":[5,0,4,28], +"boot_8php.html#ac195fc9003298923ea81f144388e24b1":[5,0,4,161], +"boot_8php.html#ac43182e0d8bae7576a30b603774974f8":[5,0,4,227], +"boot_8php.html#ac59a18a4838710d6c2de37aed6b21f03":[5,0,4,101], +"boot_8php.html#ac608a34f3bc180e7724192e0fd31f9b0":[5,0,4,42], +"boot_8php.html#ac8400313df2c831653f9036f71ebd86d":[5,0,4,63], +"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[5,0,4,256], +"boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20":[5,0,4,117], +"boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[5,0,4,119], +"boot_8php.html#aca08bc4f1554ba877500f6abcc99e1e8":[5,0,4,189], +"boot_8php.html#aca47505b8732177f52bb2d647eb2741c":[5,0,4,41], "boot_8php.html#aca5e42678e178c6b9034610d66666fd7":[5,0,4,13], "boot_8php.html#acc4e0c910af066148b810e5fde55fff1":[5,0,4,8], -"boot_8php.html#acca19aae62e1a6951a856b945de20d67":[5,0,4,162], -"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[5,0,4,213], -"boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3":[5,0,4,69], -"boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8":[5,0,4,145], -"boot_8php.html#ad11f30a6590d3d77f0c5e1e3909af8f5":[5,0,4,153], +"boot_8php.html#acca19aae62e1a6951a856b945de20d67":[5,0,4,164], +"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[5,0,4,215], +"boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3":[5,0,4,70], +"boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8":[5,0,4,147], +"boot_8php.html#ad11f30a6590d3d77f0c5e1e3909af8f5":[5,0,4,155], "boot_8php.html#ad206598b909e8eb67eb0e0bb5ef69c13":[5,0,4,10], "boot_8php.html#ad2c97627a313d53df1a1c7b4215ddb51":[5,0,4,16], -"boot_8php.html#ad302cb26b838898d475f57f61b0fcc9f":[5,0,4,76], -"boot_8php.html#ad34c1547020a305915bcc39707744690":[5,0,4,91], -"boot_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620":[5,0,4,35], -"boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44":[5,0,4,31], -"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[5,0,4,208], -"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[5,0,4,231], -"boot_8php.html#ada72d88ae39a7e3b45baea201cb49a29":[5,0,4,97], -"boot_8php.html#adaeb4f590c56326b2dca3b19f31b6272":[5,0,4,130], -"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[5,0,4,234], -"boot_8php.html#add517a0958ac684792c62142a3877f81":[5,0,4,45], -"boot_8php.html#adfb2fc7be5a4226c0a8e24131da9d498":[5,0,4,26], -"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[5,0,4,238], -"boot_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312":[5,0,4,17], -"boot_8php.html#ae3cef7b63e25e7bafea3fcf6b99fad0e":[5,0,4,170], -"boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[5,0,4,148], -"boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[5,0,4,178], -"boot_8php.html#aea7fc57a4d8e9dcb42f2601b0b9b761c":[5,0,4,29], -"boot_8php.html#aead84fa27d7516b855220fe004964a45":[5,0,4,243], -"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[5,0,4,210], -"boot_8php.html#aed0dfb35f7dd00dc9e4f868ea7f7ff53":[5,0,4,154], -"boot_8php.html#aedfb9501ed408278667995524e0d15cf":[5,0,4,105], -"boot_8php.html#aee324eca9de4e0fedf01ab5f92e27c67":[5,0,4,165], -"boot_8php.html#aef4b6c558c68c88c10f13c5a00c20e3d":[5,0,4,179], -"boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[5,0,4,132], -"boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4":[5,0,4,32], -"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[5,0,4,235], -"boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[5,0,4,172], -"boot_8php.html#af3a4271630aabd8be592213f925d6a36":[5,0,4,64], -"boot_8php.html#af3bdfc20979c16f15bb9c60446a480f9":[5,0,4,57], -"boot_8php.html#af489d0c3166551b93e63a79ff2c9be35":[5,0,4,136], -"boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461":[5,0,4,192], -"boot_8php.html#af6f6f6f40139f12fc09ec47373b30919":[5,0,4,94], -"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[5,0,4,233], -"boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d":[5,0,4,184], -"boot_8php.html#afaf93b7026f784b113b4f8921745891e":[5,0,4,166], -"boot_8php.html#afb97615e985a013799839b68b99018d7":[5,0,4,236], -"boot_8php.html#afbb1fe1b2c8c730ec8e08da93b6512c4":[5,0,4,54], -"boot_8php.html#afe084c30a1810c10442edb4fbcbc0086":[5,0,4,86], -"boot_8php.html#afe63ae69ba55299f813766e54df06ede":[5,0,4,140], +"boot_8php.html#ad302cb26b838898d475f57f61b0fcc9f":[5,0,4,77], +"boot_8php.html#ad34c1547020a305915bcc39707744690":[5,0,4,92], +"boot_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620":[5,0,4,36], +"boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44":[5,0,4,32], +"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[5,0,4,210], +"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[5,0,4,237], +"boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5":[5,0,4,231], +"boot_8php.html#ada72d88ae39a7e3b45baea201cb49a29":[5,0,4,98], +"boot_8php.html#adaeb4f590c56326b2dca3b19f31b6272":[5,0,4,132], +"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[5,0,4,240], +"boot_8php.html#add517a0958ac684792c62142a3877f81":[5,0,4,46], +"boot_8php.html#adfb2fc7be5a4226c0a8e24131da9d498":[5,0,4,27], +"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[5,0,4,244], +"boot_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312":[5,0,4,18], +"boot_8php.html#ae3cef7b63e25e7bafea3fcf6b99fad0e":[5,0,4,172], +"boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[5,0,4,150], +"boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[5,0,4,180], +"boot_8php.html#aea7fc57a4d8e9dcb42f2601b0b9b761c":[5,0,4,30], +"boot_8php.html#aead84fa27d7516b855220fe004964a45":[5,0,4,249], +"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[5,0,4,212], +"boot_8php.html#aed0dfb35f7dd00dc9e4f868ea7f7ff53":[5,0,4,156], +"boot_8php.html#aedfb9501ed408278667995524e0d15cf":[5,0,4,106], +"boot_8php.html#aee324eca9de4e0fedf01ab5f92e27c67":[5,0,4,167], +"boot_8php.html#aef4b6c558c68c88c10f13c5a00c20e3d":[5,0,4,181], +"boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[5,0,4,134], +"boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4":[5,0,4,33], +"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[5,0,4,241], +"boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[5,0,4,174], +"boot_8php.html#af3a4271630aabd8be592213f925d6a36":[5,0,4,65], +"boot_8php.html#af3bdfc20979c16f15bb9c60446a480f9":[5,0,4,58], +"boot_8php.html#af489d0c3166551b93e63a79ff2c9be35":[5,0,4,138], +"boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461":[5,0,4,194], +"boot_8php.html#af6f6f6f40139f12fc09ec47373b30919":[5,0,4,95], +"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[5,0,4,239], +"boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d":[5,0,4,186], +"boot_8php.html#afaf93b7026f784b113b4f8921745891e":[5,0,4,168], +"boot_8php.html#afb97615e985a013799839b68b99018d7":[5,0,4,242], +"boot_8php.html#afbb1fe1b2c8c730ec8e08da93b6512c4":[5,0,4,55], +"boot_8php.html#afe084c30a1810c10442edb4fbcbc0086":[5,0,4,87], +"boot_8php.html#afe63ae69ba55299f813766e54df06ede":[5,0,4,142], "boot_8php.html#afe88b920aa285982edb817a0dd44eb37":[5,0,4,14], -"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[5,0,4,204], +"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[5,0,4,206], "cache_8php.html":[5,0,0,11], "channel_8php.html":[5,0,1,7], "channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1":[5,0,1,7,1], @@ -104,71 +110,72 @@ var NAVTREEINDEX1 = "classApp.html#a050b0696118da47e8b30859ad1a2c149":[4,0,5,44], "classApp.html#a084e03c77686d8c13390fef3f7428a2b":[4,0,5,5], "classApp.html#a08bc87aff64f39fbc084e9d6545cee4d":[4,0,5,2], -"classApp.html#a08c24d6a6fc52fcc784b0f765f13b820":[4,0,5,76], +"classApp.html#a08c24d6a6fc52fcc784b0f765f13b820":[4,0,5,77], "classApp.html#a08f0537964d98958d218066364cff785":[4,0,5,1], "classApp.html#a0ce85be198e46570366cb3344f3c55b8":[4,0,5,54], "classApp.html#a11e24b3ed9b33ffee7dd41d110b4366d":[4,0,5,63], "classApp.html#a123b903dfe5d3488cc68db3471d36fd2":[4,0,5,34], -"classApp.html#a13710907ef62554a0b4dd8a5eaa2eb11":[4,0,5,80], +"classApp.html#a13710907ef62554a0b4dd8a5eaa2eb11":[4,0,5,81], "classApp.html#a14bd4b1c29f3aff371fe5d4cb11aeea3":[4,0,5,36], "classApp.html#a1a297e70b3667b83f4460aa7ed9f5d6f":[4,0,5,64], "classApp.html#a1ad3bb1b68439b3b7cbe630918e618d2":[4,0,5,10], "classApp.html#a20d1890cc16b22ba79eeb0cbf2f719f7":[4,0,5,33], "classApp.html#a230e975296cf164da2fee35ef720964f":[4,0,5,37], -"classApp.html#a244b2d53b21be269aad2269d23192f95":[4,0,5,78], +"classApp.html#a244b2d53b21be269aad2269d23192f95":[4,0,5,79], "classApp.html#a256360c9184fed6d7556e0bc0a835d7f":[4,0,5,52], -"classApp.html#a2e82da4aecfc2017a8d1d332ca501f9f":[4,0,5,77], +"classApp.html#a2e82da4aecfc2017a8d1d332ca501f9f":[4,0,5,78], "classApp.html#a2eb832a8577dee7d40b93abdf6d1d35a":[4,0,5,14], "classApp.html#a330410a288f3393d53772f5e98f857ea":[4,0,5,55], -"classApp.html#a33a8e90b60ec4438f6fbf299d0f6839c":[4,0,5,68], +"classApp.html#a33a8e90b60ec4438f6fbf299d0f6839c":[4,0,5,69], "classApp.html#a344d2b7dc2f276648d521aee4da1731c":[4,0,5,27], "classApp.html#a3694aa1907aa103a2adbc71f926f0fa0":[4,0,5,59], "classApp.html#a3d84af5e42082098672531cd1a618853":[4,0,5,26], "classApp.html#a4659785d13e4bac0bed50dbb1b0d4299":[4,0,5,8], "classApp.html#a4776d9322edea17fae56afa5d01a323e":[4,0,5,28], -"classApp.html#a4833bee2eae4ad1691a04fa19e11a766":[4,0,5,91], -"classApp.html#a487332f8de40414ca1a54a4265570b70":[4,0,5,86], +"classApp.html#a4833bee2eae4ad1691a04fa19e11a766":[4,0,5,92], +"classApp.html#a487332f8de40414ca1a54a4265570b70":[4,0,5,87], "classApp.html#a495ec082c2719314e536070ca1ce073d":[4,0,5,46], -"classApp.html#a4b67935096f66d1f14b657399a8461ac":[4,0,5,70], +"classApp.html#a4b67935096f66d1f14b657399a8461ac":[4,0,5,71], "classApp.html#a4bdd7bfed62f50515fce652127bf481b":[4,0,5,29], "classApp.html#a4c7cfc62d39508086cf300dc2e39c4df":[4,0,5,62], -"classApp.html#a4ffe529fb14389f7fedf5fdc5f722e7f":[4,0,5,69], +"classApp.html#a4ffe529fb14389f7fedf5fdc5f722e7f":[4,0,5,70], "classApp.html#a5293a8543ba338dcf38cd4ff3bc5d4be":[4,0,5,11], "classApp.html#a557d7b779d8259027f4724ebf7b248dc":[4,0,5,32], "classApp.html#a560189f048d3db2f526841963cc43e97":[4,0,5,30], -"classApp.html#a56b1a432c96aef8b1971f779c9d93c8c":[4,0,5,89], -"classApp.html#a57d041fcc003d08c127dfa99a02bc192":[4,0,5,75], -"classApp.html#a59dd4b665c70e7dbd80682c014ff7145":[4,0,5,65], +"classApp.html#a56b1a432c96aef8b1971f779c9d93c8c":[4,0,5,90], +"classApp.html#a57d041fcc003d08c127dfa99a02bc192":[4,0,5,76], +"classApp.html#a58ac598544892ff7c32890291b72635e":[4,0,5,65], +"classApp.html#a59dd4b665c70e7dbd80682c014ff7145":[4,0,5,66], "classApp.html#a5c63eabdc7fdd8b6e3348980ec16a3ad":[4,0,5,3], "classApp.html#a5cfc098c061b7d765add58fd2ca97445":[4,0,5,43], "classApp.html#a5e6a6bd641e4d9909df56f0283c03821":[4,0,5,24], -"classApp.html#a5f64620473a9727a48ebe9cf6f335a98":[4,0,5,81], +"classApp.html#a5f64620473a9727a48ebe9cf6f335a98":[4,0,5,82], "classApp.html#a604d659d6977a99de42a160343e5289a":[4,0,5,4], "classApp.html#a61ca6e3af82071ea25ff2fd5dbcddae2":[4,0,5,49], "classApp.html#a622eace13f8fc9f4b5672a68e2bc4396":[4,0,5,9], -"classApp.html#a6844aedad10e201b8c3d80cfc9e876d3":[4,0,5,82], -"classApp.html#a6859a4848a5c0049b4134cc4b34228b6":[4,0,5,83], -"classApp.html#a6bcb19cdc4907077da72864686d5a780":[4,0,5,71], -"classApp.html#a6e4f0fbfa3cf6c11baebe22a03db6165":[4,0,5,67], +"classApp.html#a6844aedad10e201b8c3d80cfc9e876d3":[4,0,5,83], +"classApp.html#a6859a4848a5c0049b4134cc4b34228b6":[4,0,5,84], +"classApp.html#a6bcb19cdc4907077da72864686d5a780":[4,0,5,72], +"classApp.html#a6e4f0fbfa3cf6c11baebe22a03db6165":[4,0,5,68], "classApp.html#a6f55d087e1ff4710132c1b0863faa2ee":[4,0,5,51], -"classApp.html#a764cc6cd7578132c21d2b4545de9301c":[4,0,5,84], +"classApp.html#a764cc6cd7578132c21d2b4545de9301c":[4,0,5,85], "classApp.html#a78788f6e9d8b713b138f81e457c5cd08":[4,0,5,22], "classApp.html#a7954862f44f606b0ff83d4c74d15e792":[4,0,5,61], "classApp.html#a871898becd0697d778f36d9336253ae8":[4,0,5,16], "classApp.html#a8863703a0305eaa45eb970dbd2046291":[4,0,5,18], "classApp.html#a89e9feb2bfb5253883a9720beaffe876":[4,0,5,23], -"classApp.html#a91fd3c8b89016113b05f3be24805ccff":[4,0,5,88], +"classApp.html#a91fd3c8b89016113b05f3be24805ccff":[4,0,5,89], "classApp.html#a94a1ed2dc493c58612d17035b74ae736":[4,0,5,35], "classApp.html#a9632092d9e8fdaa82a9fc4586433fd31":[4,0,5,25], "classApp.html#a98ef4cfd36693a3457c879b76bc6d694":[4,0,5,48], -"classApp.html#a9bf62f8e39585c0aa48fcffc3bf3484d":[4,0,5,66], -"classApp.html#aa5a87c46ab3fee21362c466bf78042ef":[4,0,5,92], +"classApp.html#a9bf62f8e39585c0aa48fcffc3bf3484d":[4,0,5,67], +"classApp.html#aa5a87c46ab3fee21362c466bf78042ef":[4,0,5,93], "classApp.html#aab23c59172310fd30f2d60dc039d3eea":[4,0,5,15], "classApp.html#aab4a685d15a363bb1d7edbbc20bfb94e":[4,0,5,42], -"classApp.html#ab35b01a366a2ea95725e97af278f87ab":[4,0,5,87], +"classApp.html#ab35b01a366a2ea95725e97af278f87ab":[4,0,5,88], "classApp.html#ab3da757abe5cb45bf88f07cc51a73b58":[4,0,5,39], "classApp.html#ab410451f132910773d0a02e35d0dced9":[4,0,5,6], -"classApp.html#ab47de68fa39806d1fb0976407e188b77":[4,0,5,73], +"classApp.html#ab47de68fa39806d1fb0976407e188b77":[4,0,5,74], "classApp.html#abaf2173711e861ae4aebf43a7f70157e":[4,0,5,7], "classApp.html#abe0e4fa91097f7a6588e1213a834121c":[4,0,5,41], "classApp.html#abea5a4f77dcd53c928dc4eed86616637":[4,0,5,21], @@ -177,18 +184,18 @@ var NAVTREEINDEX1 = "classApp.html#ac1d80a14492acc932715d54567d8a589":[4,0,5,50], "classApp.html#ac6e6b1c7d6df408580ff79977fcfa656":[4,0,5,58], "classApp.html#ac73dc90e4764497e2f1b7e6612c8fb88":[4,0,5,47], -"classApp.html#acad5896b7a79ae31433ad8f89606c728":[4,0,5,72], +"classApp.html#acad5896b7a79ae31433ad8f89606c728":[4,0,5,73], "classApp.html#acb27e607fe4c82603444676e25c36b70":[4,0,5,13], -"classApp.html#ad082d63acc078e5bf23825a03bdd6a76":[4,0,5,79], +"classApp.html#ad082d63acc078e5bf23825a03bdd6a76":[4,0,5,80], "classApp.html#ad1c8eb91a6fd470b94f34b7fdad3a2d0":[4,0,5,45], "classApp.html#ad5175536561021548ae8188e24c7b80c":[4,0,5,40], "classApp.html#adb060d5c7f35a521ec7ec0effbe08097":[4,0,5,31], "classApp.html#adb5a4bb657881e553978ff390babd01f":[4,0,5,12], -"classApp.html#adf2aaf95b062736a6fd5fc70fadf80e8":[4,0,5,90], +"classApp.html#adf2aaf95b062736a6fd5fc70fadf80e8":[4,0,5,91], "classApp.html#ae3f47830543d0d902f66913def8db66b":[4,0,5,57], -"classApp.html#ae9f96338f32187d308b67b980eea0008":[4,0,5,74], +"classApp.html#ae9f96338f32187d308b67b980eea0008":[4,0,5,75], "classApp.html#aeb1fe1c8ad9aa639909bd183ce578536":[4,0,5,20], -"classApp.html#aeca29fd4f7192ca07369b3c598c36e67":[4,0,5,85], +"classApp.html#aeca29fd4f7192ca07369b3c598c36e67":[4,0,5,86], "classApp.html#af17df107f2216ddf5ad2a7e0f2ba2166":[4,0,5,17], "classApp.html#af5007c42a693afd9c4899c243b2e1363":[4,0,5,53], "classApp.html#af58db526040829b1c8bd95561b329262":[4,0,5,38], @@ -242,12 +249,5 @@ var NAVTREEINDEX1 = "classItem.html#a1a1e42877e6ac7af50286142ceb483d2":[4,0,17,35], "classItem.html#a1cb6aa8abdf7ea7daca647e40c8ea3a2":[4,0,17,38], "classItem.html#a248f45871ecfe82a08d1d4c0769b2eb2":[4,0,17,0], -"classItem.html#a2ce70ef63f9f4d86a09c351678806925":[4,0,17,23], -"classItem.html#a3ee7667c2ec6cd7657328e27848c0bdf":[4,0,17,6], -"classItem.html#a428f448f89a8629055ea3294eb942aea":[4,0,17,16], -"classItem.html#a4a123ae98987c1e30ecb15c4edf5a3b8":[4,0,17,40], -"classItem.html#a4b92e3a9d6212c553aa2661489bd95d8":[4,0,17,15], -"classItem.html#a5b2fafdca55aefeaa08993a5a60529f0":[4,0,17,19], -"classItem.html#a5b561415861f5b89b0733aacfe0428d1":[4,0,17,36], -"classItem.html#a5cfa6cf964f433a917a81cab079ff9d8":[4,0,17,39] +"classItem.html#a2ce70ef63f9f4d86a09c351678806925":[4,0,17,23] }; diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js index 47d9925ac..ebd0cdfae 100644 --- a/doc/html/navtreeindex2.js +++ b/doc/html/navtreeindex2.js @@ -1,5 +1,12 @@ var NAVTREEINDEX2 = { +"classItem.html#a3ee7667c2ec6cd7657328e27848c0bdf":[4,0,17,6], +"classItem.html#a428f448f89a8629055ea3294eb942aea":[4,0,17,16], +"classItem.html#a4a123ae98987c1e30ecb15c4edf5a3b8":[4,0,17,40], +"classItem.html#a4b92e3a9d6212c553aa2661489bd95d8":[4,0,17,15], +"classItem.html#a5b2fafdca55aefeaa08993a5a60529f0":[4,0,17,19], +"classItem.html#a5b561415861f5b89b0733aacfe0428d1":[4,0,17,36], +"classItem.html#a5cfa6cf964f433a917a81cab079ff9d8":[4,0,17,39], "classItem.html#a5d29ddecc073151a65a8e2ea2f6e4189":[4,0,17,41], "classItem.html#a632185dd25c5caf277067c76230a4320":[4,0,17,4], "classItem.html#a67892aa23d19f4431bb2e5f43c74000e":[4,0,17,12], @@ -152,6 +159,14 @@ var NAVTREEINDEX2 = "cli__startup_8php.html#adfdde63686e33ccd4851fa5edc4fc70b":[5,0,0,12,0], "cli__suggest_8php.html":[5,0,0,13], "cli__suggest_8php.html#a8f3a60fc96f4bec7d3837c4efc7725f2":[5,0,0,13,0], +"comanche_8php.html":[5,0,0,14], +"comanche_8php.html#a028f004d5b8c23d6367816d899e17cfe":[5,0,0,14,3], +"comanche_8php.html#a1a208fdb40dd83d6298caec4290ee922":[5,0,0,14,1], +"comanche_8php.html#a1fe339e1454803aa502ac89379c17f5b":[5,0,0,14,0], +"comanche_8php.html#a45900dd1d6101b53e3d063db40eafa5e":[5,0,0,14,4], +"comanche_8php.html#a5718daeda40bf835345fe061e8808cdf":[5,0,0,14,2], +"comanche_8php.html#abd2e508a2a0b911c4a838e3cb7599923":[5,0,0,14,6], +"comanche_8php.html#af7150df735e5ff9d467994cd6f769c6e":[5,0,0,14,5], "common_8php.html":[5,0,1,9], "common_8php.html#a3b12ec67b3d3edcf595c8d195da5d14a":[5,0,1,9,0], "common_8php.html#ab63408f39abef7a6915186e8dabc5a96":[5,0,1,9,1], @@ -169,85 +184,70 @@ var NAVTREEINDEX2 = "connections_8php.html#a1f23623f802af7bd35e95b0e94e5d558":[5,0,1,12,3], "connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c":[5,0,1,12,2], "connections_8php.html#af48f7ad20914760ba9874c090384e35a":[5,0,1,12,0], -"contact__selectors_8php.html":[5,0,0,16], -"contact__selectors_8php.html#a2c743d2eb526eb758d943a1490162d75":[5,0,0,16,1], -"contact__selectors_8php.html#a9839e8fdaac7ffb37bf1420493f5c28f":[5,0,0,16,0], -"contact__selectors_8php.html#ad472e4716426dd1a9dd77b62962454be":[5,0,0,16,3], -"contact__selectors_8php.html#ae499960d6467bd30c78607b1018baf53":[5,0,0,16,2], -"contact__widgets_8php.html":[5,0,0,17], -"contact__widgets_8php.html#a165eb021e61c4dcab2a552f28628d353":[5,0,0,17,0], -"contact__widgets_8php.html#a1eda66319d170f60a8d07c7ece95533b":[5,0,0,17,2], -"contact__widgets_8php.html#a552f8544528cec0c995cea7287ea9d65":[5,0,0,17,1], -"contact__widgets_8php.html#a57e73ebcfd62bb5d8c7a7b9e663726d6":[5,0,0,17,3], -"contact__widgets_8php.html#af24e693532a045954caab515942cfc6f":[5,0,0,17,4], +"contact__selectors_8php.html":[5,0,0,17], +"contact__selectors_8php.html#a2c743d2eb526eb758d943a1490162d75":[5,0,0,17,1], +"contact__selectors_8php.html#a9839e8fdaac7ffb37bf1420493f5c28f":[5,0,0,17,0], +"contact__selectors_8php.html#ad472e4716426dd1a9dd77b62962454be":[5,0,0,17,3], +"contact__selectors_8php.html#ae499960d6467bd30c78607b1018baf53":[5,0,0,17,2], +"contact__widgets_8php.html":[5,0,0,18], +"contact__widgets_8php.html#a165eb021e61c4dcab2a552f28628d353":[5,0,0,18,0], +"contact__widgets_8php.html#a1eda66319d170f60a8d07c7ece95533b":[5,0,0,18,2], +"contact__widgets_8php.html#a552f8544528cec0c995cea7287ea9d65":[5,0,0,18,1], +"contact__widgets_8php.html#a57e73ebcfd62bb5d8c7a7b9e663726d6":[5,0,0,18,3], +"contact__widgets_8php.html#af24e693532a045954caab515942cfc6f":[5,0,0,18,4], "contactgroup_8php.html":[5,0,1,13], "contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3":[5,0,1,13,0], -"conversation_8php.html":[5,0,0,18], -"conversation_8php.html#a0891aaa4492cba2b51eda12fe01957f3":[5,0,0,18,7], -"conversation_8php.html#a0ee05f15255fb1cc3d89f30bc378a654":[5,0,0,18,9], -"conversation_8php.html#a1e97305a441dc143edbe09e17d1ceda1":[5,0,0,18,3], -"conversation_8php.html#a2a7d541854bba755eb8ada59af7dcb1a":[5,0,0,18,20], -"conversation_8php.html#a3d8e30cc94f9a175054c021305d3aca3":[5,0,0,18,6], -"conversation_8php.html#a40b9b5e7825bc73932a32e667f05e6f2":[5,0,0,18,15], -"conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c":[5,0,0,18,14], -"conversation_8php.html#a7eeaaf44506815576f3bd80053ef52c3":[5,0,0,18,21], -"conversation_8php.html#a7f6ef0dfa554bacf620e84c18d386e67":[5,0,0,18,8], -"conversation_8php.html#a9bd7f9fb6678736c581bcba3b17f471c":[5,0,0,18,13], -"conversation_8php.html#a9cc2a679606da9e535a06433f9f553a0":[5,0,0,18,19], -"conversation_8php.html#a9f909b8885259b79c6ac8da93afd8f11":[5,0,0,18,17], -"conversation_8php.html#aacbb12d372d5e9c3ab0735b4aea48fb3":[5,0,0,18,10], -"conversation_8php.html#ab2383dff4f823e580399ff469d90ab19":[5,0,0,18,4], -"conversation_8php.html#abed85a41f1160598de880b84021c9cf7":[5,0,0,18,2], -"conversation_8php.html#ac55e070f65f46fcc8e269f7896be4c7d":[5,0,0,18,18], -"conversation_8php.html#ad3e1d4b15e7d6d026ee182edd58f692b":[5,0,0,18,0], -"conversation_8php.html#ad470fc7766f0db66d138fa1916c7a8b7":[5,0,0,18,1], -"conversation_8php.html#adda79b75bf1ccf6ce9503aa310953533":[5,0,0,18,11], -"conversation_8php.html#ae59703b07ce2ddf627b4172ff26058b6":[5,0,0,18,5], -"conversation_8php.html#ae996eb116d397a2c6396c312d7b98664":[5,0,0,18,16], -"conversation_8php.html#afe5b2f38d8b803edb0d7ec5fa2868db0":[5,0,0,18,12], +"conversation_8php.html":[5,0,0,19], +"conversation_8php.html#a0891aaa4492cba2b51eda12fe01957f3":[5,0,0,19,7], +"conversation_8php.html#a0ee05f15255fb1cc3d89f30bc378a654":[5,0,0,19,9], +"conversation_8php.html#a1e97305a441dc143edbe09e17d1ceda1":[5,0,0,19,3], +"conversation_8php.html#a2a7d541854bba755eb8ada59af7dcb1a":[5,0,0,19,20], +"conversation_8php.html#a3d8e30cc94f9a175054c021305d3aca3":[5,0,0,19,6], +"conversation_8php.html#a40b9b5e7825bc73932a32e667f05e6f2":[5,0,0,19,15], +"conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c":[5,0,0,19,14], +"conversation_8php.html#a7eeaaf44506815576f3bd80053ef52c3":[5,0,0,19,21], +"conversation_8php.html#a7f6ef0dfa554bacf620e84c18d386e67":[5,0,0,19,8], +"conversation_8php.html#a9bd7f9fb6678736c581bcba3b17f471c":[5,0,0,19,13], +"conversation_8php.html#a9cc2a679606da9e535a06433f9f553a0":[5,0,0,19,19], +"conversation_8php.html#a9f909b8885259b79c6ac8da93afd8f11":[5,0,0,19,17], +"conversation_8php.html#aacbb12d372d5e9c3ab0735b4aea48fb3":[5,0,0,19,10], +"conversation_8php.html#ab2383dff4f823e580399ff469d90ab19":[5,0,0,19,4], +"conversation_8php.html#abed85a41f1160598de880b84021c9cf7":[5,0,0,19,2], +"conversation_8php.html#ac55e070f65f46fcc8e269f7896be4c7d":[5,0,0,19,18], +"conversation_8php.html#ad3e1d4b15e7d6d026ee182edd58f692b":[5,0,0,19,0], +"conversation_8php.html#ad470fc7766f0db66d138fa1916c7a8b7":[5,0,0,19,1], +"conversation_8php.html#adda79b75bf1ccf6ce9503aa310953533":[5,0,0,19,11], +"conversation_8php.html#ae59703b07ce2ddf627b4172ff26058b6":[5,0,0,19,5], +"conversation_8php.html#ae996eb116d397a2c6396c312d7b98664":[5,0,0,19,16], +"conversation_8php.html#afe5b2f38d8b803edb0d7ec5fa2868db0":[5,0,0,19,12], "crepair_8php.html":[5,0,1,14], "crepair_8php.html#a29464c01838e209c8059cfcd2d195caa":[5,0,1,14,0], "crepair_8php.html#ab089978e50df156bbfabf9f8f5ccd198":[5,0,1,14,1], "crepair_8php.html#acc4493e1ffd1462a605dd9b870034513":[5,0,1,14,2], -"cronhooks_8php.html":[5,0,0,20], -"cronhooks_8php.html#a4c4c1bbec4ecc9a0efa00dd6afd2c0ca":[5,0,0,20,0], -"crypto_8php.html":[5,0,0,21], -"crypto_8php.html#a2148d7aac7b30c720f7ebda7e9790286":[5,0,0,21,2], -"crypto_8php.html#a5c61821d205f95f127114159cbffa764":[5,0,0,21,1], -"crypto_8php.html#a920e5f222d0020f47556033d8b2b6552":[5,0,0,21,7], -"crypto_8php.html#aae0ab70d6a199b29555b1ac3cf250d6a":[5,0,0,21,4], -"crypto_8php.html#ab4f21d8f6b8ece0915e7c8bb73379f96":[5,0,0,21,8], -"crypto_8php.html#ac852ee41392d1358c3a54d54935e0bf9":[5,0,0,21,0], -"crypto_8php.html#ac95ac3b1b23b65b04a86613d4206ae85":[5,0,0,21,6], -"crypto_8php.html#aca7c3a574bfb6c6ef1f2403a56823914":[5,0,0,21,3], -"crypto_8php.html#ad5e51fd44cff93cfaa07a37e24a5edec":[5,0,0,21,5], -"datetime_8php.html":[5,0,0,22], -"datetime_8php.html#a03900dcf0f9e3c58793a031673a70326":[5,0,0,22,6], -"datetime_8php.html#a36d3d6dff8d76b5f295bb3d9c535a5b1":[5,0,0,22,11], -"datetime_8php.html#a3f2897db32e745fe2f3e70a6b46578f8":[5,0,0,22,5], -"datetime_8php.html#a5f29553799005b1fd4e9ce9d98ce05aa":[5,0,0,22,3], -"datetime_8php.html#a633dadba426fa2f60b25fabdb19ebc1f":[5,0,0,22,10], -"datetime_8php.html#a7df24d72ea05922d3127363e2295174c":[5,0,0,22,7], -"datetime_8php.html#a8ae8dc95ace7ac27fa5a1ecf42b78c82":[5,0,0,22,9], -"datetime_8php.html#aa51b5a7ea4f931b23acbdfcea46e9865":[5,0,0,22,12], -"datetime_8php.html#aba971b67f17fecf050813f1eba72367f":[5,0,0,22,8], -"datetime_8php.html#abc1652f96799cec6fce8797ba2ebc2df":[5,0,0,22,0], -"datetime_8php.html#ac265b86f384ee094ed5479aae02aa5c8":[5,0,0,22,2], -"datetime_8php.html#ad6301e74b0f9267d52f8d432b5beb226":[5,0,0,22,4], -"datetime_8php.html#aea356409ba69f9de412298c998595dd2":[5,0,0,22,1], -"db__update_8php.html":[5,0,2,1], -"dba__driver_8php.html":[5,0,0,0,0], -"dba__driver_8php.html#a2c09a731d3b4fef41fed0e83db01be1f":[5,0,0,0,0,8], -"dba__driver_8php.html#a55bf30d8176967e682656b5be4ad9249":[5,0,0,0,0,7], -"dba__driver_8php.html#a65b83462bd26968106aebd43f16540e4":[5,0,0,0,0,3], -"dba__driver_8php.html#aa377074e70981e8c4e82ca0accd068ee":[5,0,0,0,0,6], -"dba__driver_8php.html#aa6607893d8f60ade9122bcfbd1a53ffb":[5,0,0,0,0,5], -"dba__driver_8php.html#ab222aa1dbf9ea93b320f82028739127e":[5,0,0,0,0,2], -"dba__driver_8php.html#ac10e60f6e5b95bcf67bd82cb88f37947":[5,0,0,0,0,1], -"dba__driver_8php.html#af531546fac5f0836a8557a4f6dfee930":[5,0,0,0,0,4], -"dba__mysql_8php.html":[5,0,0,0,1], -"dba__mysqli_8php.html":[5,0,0,0,2], -"delegate_8php.html":[5,0,1,15], -"delegate_8php.html#a943eea8996ef348eb845c498f9f354dd":[5,0,1,15,0], -"deliver_8php.html":[5,0,0,23] +"cronhooks_8php.html":[5,0,0,21], +"cronhooks_8php.html#a4c4c1bbec4ecc9a0efa00dd6afd2c0ca":[5,0,0,21,0], +"crypto_8php.html":[5,0,0,22], +"crypto_8php.html#a2148d7aac7b30c720f7ebda7e9790286":[5,0,0,22,2], +"crypto_8php.html#a5c61821d205f95f127114159cbffa764":[5,0,0,22,1], +"crypto_8php.html#a920e5f222d0020f47556033d8b2b6552":[5,0,0,22,7], +"crypto_8php.html#aae0ab70d6a199b29555b1ac3cf250d6a":[5,0,0,22,4], +"crypto_8php.html#ab4f21d8f6b8ece0915e7c8bb73379f96":[5,0,0,22,8], +"crypto_8php.html#ac852ee41392d1358c3a54d54935e0bf9":[5,0,0,22,0], +"crypto_8php.html#ac95ac3b1b23b65b04a86613d4206ae85":[5,0,0,22,6], +"crypto_8php.html#aca7c3a574bfb6c6ef1f2403a56823914":[5,0,0,22,3], +"crypto_8php.html#ad5e51fd44cff93cfaa07a37e24a5edec":[5,0,0,22,5], +"datetime_8php.html":[5,0,0,23], +"datetime_8php.html#a03900dcf0f9e3c58793a031673a70326":[5,0,0,23,6], +"datetime_8php.html#a36d3d6dff8d76b5f295bb3d9c535a5b1":[5,0,0,23,11], +"datetime_8php.html#a3f2897db32e745fe2f3e70a6b46578f8":[5,0,0,23,5], +"datetime_8php.html#a5f29553799005b1fd4e9ce9d98ce05aa":[5,0,0,23,3], +"datetime_8php.html#a633dadba426fa2f60b25fabdb19ebc1f":[5,0,0,23,10], +"datetime_8php.html#a7df24d72ea05922d3127363e2295174c":[5,0,0,23,7], +"datetime_8php.html#a8ae8dc95ace7ac27fa5a1ecf42b78c82":[5,0,0,23,9], +"datetime_8php.html#aa51b5a7ea4f931b23acbdfcea46e9865":[5,0,0,23,12], +"datetime_8php.html#aba971b67f17fecf050813f1eba72367f":[5,0,0,23,8], +"datetime_8php.html#abc1652f96799cec6fce8797ba2ebc2df":[5,0,0,23,0], +"datetime_8php.html#ac265b86f384ee094ed5479aae02aa5c8":[5,0,0,23,2], +"datetime_8php.html#ad6301e74b0f9267d52f8d432b5beb226":[5,0,0,23,4], +"datetime_8php.html#aea356409ba69f9de412298c998595dd2":[5,0,0,23,1] }; diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js index caffe4385..2ef8ffdb0 100644 --- a/doc/html/navtreeindex3.js +++ b/doc/html/navtreeindex3.js @@ -1,6 +1,21 @@ var NAVTREEINDEX3 = { -"deliver_8php.html#a397afcb9afecf0c1816b0951189dd346":[5,0,0,23,0], +"db__update_8php.html":[5,0,2,1], +"dba__driver_8php.html":[5,0,0,0,0], +"dba__driver_8php.html#a2c09a731d3b4fef41fed0e83db01be1f":[5,0,0,0,0,8], +"dba__driver_8php.html#a55bf30d8176967e682656b5be4ad9249":[5,0,0,0,0,7], +"dba__driver_8php.html#a65b83462bd26968106aebd43f16540e4":[5,0,0,0,0,3], +"dba__driver_8php.html#aa377074e70981e8c4e82ca0accd068ee":[5,0,0,0,0,6], +"dba__driver_8php.html#aa6607893d8f60ade9122bcfbd1a53ffb":[5,0,0,0,0,5], +"dba__driver_8php.html#ab222aa1dbf9ea93b320f82028739127e":[5,0,0,0,0,2], +"dba__driver_8php.html#ac10e60f6e5b95bcf67bd82cb88f37947":[5,0,0,0,0,1], +"dba__driver_8php.html#af531546fac5f0836a8557a4f6dfee930":[5,0,0,0,0,4], +"dba__mysql_8php.html":[5,0,0,0,1], +"dba__mysqli_8php.html":[5,0,0,0,2], +"delegate_8php.html":[5,0,1,15], +"delegate_8php.html#a943eea8996ef348eb845c498f9f354dd":[5,0,1,15,0], +"deliver_8php.html":[5,0,0,24], +"deliver_8php.html#a397afcb9afecf0c1816b0951189dd346":[5,0,0,24,0], "dir_032dd9e2cfe278a2cfa5eb9547448eb9.html":[5,0,3,1,0,0], "dir_0eaa4a0adae8ba4811e133c6e594aeee.html":[5,0,2,0], "dir_21bc5169ff11430004758be31dcfc6c4.html":[5,0,0,0], @@ -9,10 +24,10 @@ var NAVTREEINDEX3 = "dir_6b44a0e797e2f12381093380e3e54763.html":[5,0,3,1,1,0], "dir_817f6d302394b98e59575acdb59998bc.html":[5,0,3,0], "dir_8543001e5d25368a6edede3e63efb554.html":[5,0,3,1], -"dir__fns_8php.html":[5,0,0,24], -"dir__fns_8php.html#a6cae22cfdd6edda5ddf09e07abb3242a":[5,0,0,24,2], -"dir__fns_8php.html#a8c15aa69da12f2d3476b9e93b82b337d":[5,0,0,24,0], -"dir__fns_8php.html#aa666e7df6ca8c332f4081c9b66b4bdf6":[5,0,0,24,1], +"dir__fns_8php.html":[5,0,0,25], +"dir__fns_8php.html#a6cae22cfdd6edda5ddf09e07abb3242a":[5,0,0,25,2], +"dir__fns_8php.html#a8c15aa69da12f2d3476b9e93b82b337d":[5,0,0,25,0], +"dir__fns_8php.html#aa666e7df6ca8c332f4081c9b66b4bdf6":[5,0,0,25,1], "dir_aae29906d7bfc07d076125f669c8352e.html":[5,0,0,1], "dir_b2f003339c516cc00c8cadcafbe82f13.html":[5,0,3], "dir_d41ce877eb409a4791b288730010abe2.html":[5,0,1], @@ -42,21 +57,21 @@ var NAVTREEINDEX3 = "editpost_8php.html#a34011690864d122680c802e9e748ccfb":[5,0,1,20,0], "editwebpage_8php.html":[5,0,1,21], "editwebpage_8php.html#a375e945255fad79a71036528f7480650":[5,0,1,21,0], -"enotify_8php.html":[5,0,0,26], -"enotify_8php.html#a3e9a9355b243777c488d2a9883908dfc":[5,0,0,26,1], -"event_8php.html":[5,0,0,27], -"event_8php.html#a018ea4484910a873a7c1eaa126de9b1a":[5,0,0,27,6], -"event_8php.html#a180cccd63c2a2f00ff432b03113531f3":[5,0,0,27,0], -"event_8php.html#a184d6b9690e5b6dee35a0aa9edd47279":[5,0,0,27,1], -"event_8php.html#a2ac9f1b08de03250ecd794f705781d17":[5,0,0,27,5], -"event_8php.html#a32ba1b9ddf7a744a9a1512b052e5f850":[5,0,0,27,2], -"event_8php.html#a89ef533faf345db8d64a58d4856bde3a":[5,0,0,27,3], -"event_8php.html#abb74206cf42d694307c3d7abb7af9869":[5,0,0,27,4], +"enotify_8php.html":[5,0,0,27], +"enotify_8php.html#a3e9a9355b243777c488d2a9883908dfc":[5,0,0,27,1], +"event_8php.html":[5,0,0,28], +"event_8php.html#a018ea4484910a873a7c1eaa126de9b1a":[5,0,0,28,6], +"event_8php.html#a180cccd63c2a2f00ff432b03113531f3":[5,0,0,28,0], +"event_8php.html#a184d6b9690e5b6dee35a0aa9edd47279":[5,0,0,28,1], +"event_8php.html#a2ac9f1b08de03250ecd794f705781d17":[5,0,0,28,5], +"event_8php.html#a32ba1b9ddf7a744a9a1512b052e5f850":[5,0,0,28,2], +"event_8php.html#a89ef533faf345db8d64a58d4856bde3a":[5,0,0,28,3], +"event_8php.html#abb74206cf42d694307c3d7abb7af9869":[5,0,0,28,4], "events_8php.html":[5,0,1,22], "events_8php.html#a1d293fb217ae6bc9e3858c4b32e363ec":[5,0,1,22,0], "events_8php.html#ab3e8a8f901175f8e40a8089eea45c075":[5,0,1,22,1], -"expire_8php.html":[5,0,0,28], -"expire_8php.html#a444e45c9b67727b27db4c779fd51a298":[5,0,0,28,0], +"expire_8php.html":[5,0,0,29], +"expire_8php.html#a444e45c9b67727b27db4c779fd51a298":[5,0,0,29,0], "extract_8php.html":[5,0,2,3], "extract_8php.html#a0cbe524ffc9a496114fd7ba9f423ef44":[5,0,2,3,3], "extract_8php.html#a50b05cf2e02ef0b67fcad97106dd7634":[5,0,2,3,2], @@ -64,9 +79,9 @@ var NAVTREEINDEX3 = "extract_8php.html#a9590b15215a21e9b42eb546aeef79704":[5,0,2,3,1], "fbrowser_8php.html":[5,0,1,23], "fbrowser_8php.html#aee476addcf7a3e0fe9454f7dfd5a56c4":[5,0,1,23,0], -"features_8php.html":[5,0,0,29], -"features_8php.html#a52b5bdfb61b256713efecf7a7b20b0c0":[5,0,0,29,0], -"features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c":[5,0,0,29,1], +"features_8php.html":[5,0,0,30], +"features_8php.html#a52b5bdfb61b256713efecf7a7b20b0c0":[5,0,0,30,0], +"features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c":[5,0,0,30,1], "feed_8php.html":[5,0,1,24], "feed_8php.html#af86137700b56f33d1d5f25c8dec22c04":[5,0,1,24,0], "filer_8php.html":[5,0,1,25], @@ -93,7 +108,7 @@ var NAVTREEINDEX3 = "friendica-to-smarty-tpl_8py.html#ae74419b16516956c66f7db714a93a6ac":[5,0,2,4,7], "friendica-to-smarty-tpl_8py.html#aecf730e0884bb4ddc6c0deb1ef85f8eb":[5,0,2,4,4], "friendica-to-smarty-tpl_8py.html#af6b2c793958aae2aadc294577431f749":[5,0,2,4,3], -"friendica__smarty_8php.html":[5,0,0,31], +"friendica__smarty_8php.html":[5,0,0,32], "fsuggest_8php.html":[5,0,1,28], "fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d":[5,0,1,28,1], "fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998":[5,0,1,28,0], @@ -200,8 +215,8 @@ var NAVTREEINDEX3 = "globals_vars_0x77.html":[5,1,2,19], "globals_vars_0x78.html":[5,1,2,20], "globals_vars_0x7a.html":[5,1,2,21], -"gprobe_8php.html":[5,0,0,32], -"gprobe_8php.html#adf72cb0a70b5b9d99fdec1cc60e18ed1":[5,0,0,32,0], +"gprobe_8php.html":[5,0,0,33], +"gprobe_8php.html#adf72cb0a70b5b9d99fdec1cc60e18ed1":[5,0,0,33,0], "hcard_8php.html":[5,0,1,30], "hcard_8php.html#a956c7cae2009652a37900306e5b7b73d":[5,0,1,30,0], "hcard_8php.html#ac34f26b0e6a37eef44fa49bea135136d":[5,0,1,30,1], @@ -211,43 +226,28 @@ var NAVTREEINDEX3 = "home_8php.html":[5,0,1,32], "hostxrd_8php.html":[5,0,1,33], "hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92":[5,0,1,33,0], -"html2bbcode_8php.html":[5,0,0,34], -"html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7":[5,0,0,34,3], -"html2bbcode_8php.html#a5ad726995ac4070213abdb3bd09f4837":[5,0,0,34,1], -"html2bbcode_8php.html#a71a07f135d196ec5943b13f7b2e6a9b2":[5,0,0,34,0], -"html2bbcode_8php.html#ad174afe0ccbd8c475e48f8a6ee2f27d8":[5,0,0,34,2], -"html2plain_8php.html":[5,0,0,35], -"html2plain_8php.html#a3214912e3d00cf0a948072daccf16740":[5,0,0,35,0], -"html2plain_8php.html#a56d29b254333d29abb9d96a9a903a4b0":[5,0,0,35,3], -"html2plain_8php.html#ab3e121fa9f3feb16f9f942e705bc6c04":[5,0,0,35,2], -"html2plain_8php.html#ae1c203d0f089d5678d73a6c64a395201":[5,0,0,35,1], -"identity_8php.html":[5,0,0,36], -"identity_8php.html#a345f4c943d84de502ec6e72d2c813945":[5,0,0,36,2], -"identity_8php.html#a3570a4eb77332b292d394c4132cb8f03":[5,0,0,36,3], -"identity_8php.html#a77d2237f1846964634b1c99089c27c7d":[5,0,0,36,0], -"identity_8php.html#a77ee7d66eb0758f7e7882f70ad0f9485":[5,0,0,36,4], -"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[5,0,0,36,6], -"identity_8php.html#abf6a9c6ed92d594f1d4513c4e22a7abd":[5,0,0,36,1], -"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[5,0,0,36,5], -"identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[5,0,0,36,7], +"html2bbcode_8php.html":[5,0,0,35], +"html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7":[5,0,0,35,3], +"html2bbcode_8php.html#a5ad726995ac4070213abdb3bd09f4837":[5,0,0,35,1], +"html2bbcode_8php.html#a71a07f135d196ec5943b13f7b2e6a9b2":[5,0,0,35,0], +"html2bbcode_8php.html#ad174afe0ccbd8c475e48f8a6ee2f27d8":[5,0,0,35,2], +"html2plain_8php.html":[5,0,0,36], +"html2plain_8php.html#a3214912e3d00cf0a948072daccf16740":[5,0,0,36,0], +"html2plain_8php.html#a56d29b254333d29abb9d96a9a903a4b0":[5,0,0,36,3], +"html2plain_8php.html#ab3e121fa9f3feb16f9f942e705bc6c04":[5,0,0,36,2], +"html2plain_8php.html#ae1c203d0f089d5678d73a6c64a395201":[5,0,0,36,1], +"identity_8php.html":[5,0,0,37], +"identity_8php.html#a345f4c943d84de502ec6e72d2c813945":[5,0,0,37,2], +"identity_8php.html#a3570a4eb77332b292d394c4132cb8f03":[5,0,0,37,3], +"identity_8php.html#a77d2237f1846964634b1c99089c27c7d":[5,0,0,37,0], +"identity_8php.html#a77ee7d66eb0758f7e7882f70ad0f9485":[5,0,0,37,4], +"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[5,0,0,37,6], +"identity_8php.html#abf6a9c6ed92d594f1d4513c4e22a7abd":[5,0,0,37,1], +"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[5,0,0,37,5], +"identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[5,0,0,37,7], "import_8php.html":[5,0,1,34], "import_8php.html#af17fef0410518f7eac205d0ea416eaa2":[5,0,1,34,1], "import_8php.html#afdf25ed70096d5dbf4f6d0ca79fea184":[5,0,1,34,0], "include_2api_8php.html":[5,0,0,5], -"include_2api_8php.html#a0991f72554f821255397d615e76f3203":[5,0,0,5,12], -"include_2api_8php.html#a176c448d79c211ad41c2bbe3124658f5":[5,0,0,5,5], -"include_2api_8php.html#a18cab7c6391df5c421753463f5d2a879":[5,0,0,5,18], -"include_2api_8php.html#a2c71b1226ef1283b5370bd1c200fee5f":[5,0,0,5,15], -"include_2api_8php.html#a2e94eab9d6c164bfef7a1b2ab87b339b":[5,0,0,5,0], -"include_2api_8php.html#a32f0dda848d0c11c727fe1c3e741c283":[5,0,0,5,44], -"include_2api_8php.html#a36344c80b8e9755da2f2dd3a0e28cce8":[5,0,0,5,16], -"include_2api_8php.html#a43c47de8565cc00c3369cb35c19cc75e":[5,0,0,5,49], -"include_2api_8php.html#a450d8732b7b608f7ac929aee61572b95":[5,0,0,5,38], -"include_2api_8php.html#a4c6fb9fb5203aa60f4b3afd4521db8ea":[5,0,0,5,19], -"include_2api_8php.html#a528d8070ee74ea800102936ce73cf366":[5,0,0,5,37], -"include_2api_8php.html#a53b0680b682ae6078f2e1ed18cfb3f74":[5,0,0,5,21], -"include_2api_8php.html#a58cf4c02ef435996f5c3bc4283d3968d":[5,0,0,5,13], -"include_2api_8php.html#a5990101034e7abf6404feba3cd273629":[5,0,0,5,4], -"include_2api_8php.html#a623793229a7256dd31bcfd5ab90eef08":[5,0,0,5,45], -"include_2api_8php.html#a645397787618b5c548a31e8686e8cca4":[5,0,0,5,32] +"include_2api_8php.html#a0991f72554f821255397d615e76f3203":[5,0,0,5,12] }; diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js index 637b88738..f3fa13f8d 100644 --- a/doc/html/navtreeindex4.js +++ b/doc/html/navtreeindex4.js @@ -1,5 +1,20 @@ var NAVTREEINDEX4 = { +"include_2api_8php.html#a176c448d79c211ad41c2bbe3124658f5":[5,0,0,5,5], +"include_2api_8php.html#a18cab7c6391df5c421753463f5d2a879":[5,0,0,5,18], +"include_2api_8php.html#a2c71b1226ef1283b5370bd1c200fee5f":[5,0,0,5,15], +"include_2api_8php.html#a2e94eab9d6c164bfef7a1b2ab87b339b":[5,0,0,5,0], +"include_2api_8php.html#a32f0dda848d0c11c727fe1c3e741c283":[5,0,0,5,44], +"include_2api_8php.html#a36344c80b8e9755da2f2dd3a0e28cce8":[5,0,0,5,16], +"include_2api_8php.html#a43c47de8565cc00c3369cb35c19cc75e":[5,0,0,5,49], +"include_2api_8php.html#a450d8732b7b608f7ac929aee61572b95":[5,0,0,5,38], +"include_2api_8php.html#a4c6fb9fb5203aa60f4b3afd4521db8ea":[5,0,0,5,19], +"include_2api_8php.html#a528d8070ee74ea800102936ce73cf366":[5,0,0,5,37], +"include_2api_8php.html#a53b0680b682ae6078f2e1ed18cfb3f74":[5,0,0,5,21], +"include_2api_8php.html#a58cf4c02ef435996f5c3bc4283d3968d":[5,0,0,5,13], +"include_2api_8php.html#a5990101034e7abf6404feba3cd273629":[5,0,0,5,4], +"include_2api_8php.html#a623793229a7256dd31bcfd5ab90eef08":[5,0,0,5,45], +"include_2api_8php.html#a645397787618b5c548a31e8686e8cca4":[5,0,0,5,32], "include_2api_8php.html#a6951c690d87775eb37e569c66011988e":[5,0,0,5,35], "include_2api_8php.html#a6a04b48168ba1d9dd2de3081a630611f":[5,0,0,5,31], "include_2api_8php.html#a72bfecac1970bc29b853073e816388ff":[5,0,0,5,6], @@ -44,102 +59,102 @@ var NAVTREEINDEX4 = "include_2attach_8php.html#a887d2d44a3ef18dcb6624e7fb58dc8e3":[5,0,0,6,2], "include_2attach_8php.html#ad991208ce939387e2f93a3bce7d09932":[5,0,0,6,1], "include_2attach_8php.html#aeb07968990e66a88c95483ca09a7f909":[5,0,0,6,6], -"include_2config_8php.html":[5,0,0,14], -"include_2config_8php.html#a27559f388c9b9af81c94e48d6889d1d1":[5,0,0,14,7], -"include_2config_8php.html#a549910227348003efc3c05c9105c42da":[5,0,0,14,0], -"include_2config_8php.html#a55bbed9a014c9109c767486834f3ca33":[5,0,0,14,9], -"include_2config_8php.html#a61591371cb18764138655d67dc817ab2":[5,0,0,14,11], -"include_2config_8php.html#a7ad2081c5f812ac4387fd76f3762d941":[5,0,0,14,1], -"include_2config_8php.html#a9c171def547deee16738dc58fdeb4b72":[5,0,0,14,2], -"include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e":[5,0,0,14,6], -"include_2config_8php.html#ac543813a980b3841cc5a277fcd4a24a6":[5,0,0,14,8], -"include_2config_8php.html#ad58a4913937179adb13201c2ee3261ad":[5,0,0,14,5], -"include_2config_8php.html#ad6da879e4fb5b37d1e161d4e9be5c32a":[5,0,0,14,10], -"include_2config_8php.html#af02c96e6b37335774b548914ede1d22e":[5,0,0,14,3], -"include_2config_8php.html#af08b7adb63adfb2eda7c466fba0cce74":[5,0,0,14,4], -"include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e":[5,0,0,14,12], -"include_2directory_8php.html":[5,0,0,25], -"include_2directory_8php.html#aa75d3b0697ca1456aaabdb37a74aa0f0":[5,0,0,25,0], -"include_2follow_8php.html":[5,0,0,30], -"include_2follow_8php.html#ae387d4ae097c23d69f3247e7f08140c7":[5,0,0,30,0], -"include_2group_8php.html":[5,0,0,33], -"include_2group_8php.html#a0122ef312df2c5546b1a46b3e6c7b31b":[5,0,0,33,2], -"include_2group_8php.html#a048f6892bfd28852de1b76470df411de":[5,0,0,33,10], -"include_2group_8php.html#a06ec565d2b64e79044e7c1bf91a2a4ce":[5,0,0,33,1], -"include_2group_8php.html#a1042d74055bafe54a6a30103d87a7f17":[5,0,0,33,8], -"include_2group_8php.html#a22a81875259c7d3d64d4848afea6b345":[5,0,0,33,0], -"include_2group_8php.html#a4118f498bbd1530c1d0136d016d197a5":[5,0,0,33,6], -"include_2group_8php.html#a540e3ef36f47d47532646be4241f6518":[5,0,0,33,7], -"include_2group_8php.html#a5bd191d9692e6c34d48c0ede10810f09":[5,0,0,33,4], -"include_2group_8php.html#a90e157b3e1b99c981809cb5a2abd3245":[5,0,0,33,5], -"include_2group_8php.html#ab4d9e5b59f48787cb01baae5dc6c381f":[5,0,0,33,11], -"include_2group_8php.html#abd66a5ea34a07a3422dc2dde6c7b3ecb":[5,0,0,33,3], -"include_2group_8php.html#afb802ae2ce73aae4bc36d157f7b6a92f":[5,0,0,33,9], -"include_2menu_8php.html":[5,0,0,41], -"include_2menu_8php.html#a08a800821721781a8dfffbe31481ff98":[5,0,0,41,1], -"include_2menu_8php.html#a3884bda4d85d84ec99447db9403a68d8":[5,0,0,41,3], -"include_2menu_8php.html#a47447c01ba8ea04cd74af1d4c5b68fc7":[5,0,0,41,8], -"include_2menu_8php.html#a68ebbf492470c930f652013656f9071d":[5,0,0,41,7], -"include_2menu_8php.html#a6a33c6a3db2a7510b16cc656edaec571":[5,0,0,41,5], -"include_2menu_8php.html#a890cc6237971e15f15702e6b2e88502e":[5,0,0,41,10], -"include_2menu_8php.html#a9aa8e0052dd47c1a93f53a983bd4620a":[5,0,0,41,2], -"include_2menu_8php.html#acb66f80ca895a6ccd562b3d9ae7b41aa":[5,0,0,41,6], -"include_2menu_8php.html#acef15a498d52666b1c7e5c12765c689b":[5,0,0,41,9], -"include_2menu_8php.html#ad87f51ce85172bcc3f931aa0cd96a804":[5,0,0,41,4], -"include_2menu_8php.html#add35fae5e9695031b3d46e30ac409eb8":[5,0,0,41,0], -"include_2message_8php.html":[5,0,0,42], -"include_2message_8php.html#a254a756031e4d5e94f85e2939bdb5091":[5,0,0,42,2], -"include_2message_8php.html#a5f8de9847e203329e317ac38dc646898":[5,0,0,42,1], -"include_2message_8php.html#a652973ce47a262f2d238c2fd6233d97e":[5,0,0,42,3], -"include_2message_8php.html#ac382fdcdf990dcfa8f6528ab8fd280bd":[5,0,0,42,4], -"include_2message_8php.html#aed272d77c06a309e2836ac79e75613f1":[5,0,0,42,0], -"include_2network_8php.html":[5,0,0,44], -"include_2network_8php.html#a0bdc4b0bfc54797c249dc4eca25aeda4":[5,0,0,44,0], -"include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0":[5,0,0,44,6], -"include_2network_8php.html#a2729d012410e470c527a62a3f777ded8":[5,0,0,44,10], -"include_2network_8php.html#a27a951b59d8d622c0b3e7b0673ba74c6":[5,0,0,44,15], -"include_2network_8php.html#a37ddeb88a3fd1dee9e8339723f9edf9a":[5,0,0,44,8], -"include_2network_8php.html#a4c5d50079e089168d9248427018fffd4":[5,0,0,44,13], -"include_2network_8php.html#a4cfb2c05a1c295317283d762440ce0b2":[5,0,0,44,12], -"include_2network_8php.html#a540420ff3675a72cb781ef9a7e8c2cd9":[5,0,0,44,5], -"include_2network_8php.html#a5caa264fab6d2b2344e6bd5b298b08f2":[5,0,0,44,19], -"include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7":[5,0,0,44,11], -"include_2network_8php.html#a8122356933bcd6b0a8567e8e15ae5cc5":[5,0,0,44,20], -"include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d":[5,0,0,44,9], -"include_2network_8php.html#a897e7112d86eb95526cbd0bff9375f02":[5,0,0,44,18], -"include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0":[5,0,0,44,7], -"include_2network_8php.html#a9129fd55e7fc175b4ea9a195cccc16bc":[5,0,0,44,25], -"include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff":[5,0,0,44,22], -"include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6":[5,0,0,44,23], -"include_2network_8php.html#aa44d9e33a579d930e9e79c4ebb3d6b5e":[5,0,0,44,16], -"include_2network_8php.html#aafd06c0a75402aefb06cfb9f9740fa37":[5,0,0,44,24], -"include_2network_8php.html#ab07ce9d75eae559865ed90aad2154bd7":[5,0,0,44,3], -"include_2network_8php.html#aba38458a2ff2d92d3536488dbb119694":[5,0,0,44,1], -"include_2network_8php.html#ad4056d3ce69988f5c1a997a79f503246":[5,0,0,44,4], -"include_2network_8php.html#adbc7fe45cc7fd9cd78f6b2f425ee9041":[5,0,0,44,14], -"include_2network_8php.html#adf6008b38c555e98e7ed10da9ede2335":[5,0,0,44,21], -"include_2network_8php.html#ae8d9c41a11000fb8667039fc71b4f73f":[5,0,0,44,17], -"include_2network_8php.html#aee35d9ad6b3f872bfb39ba3598936aa7":[5,0,0,44,2], -"include_2notify_8php.html":[5,0,0,46], -"include_2notify_8php.html#a0e61728e487df50c72e6434f911a57d3":[5,0,0,46,0], -"include_2oembed_8php.html":[5,0,0,48], -"include_2oembed_8php.html#a000a62b97113cf95b0e9e00412168172":[5,0,0,48,5], -"include_2oembed_8php.html#a00c4c80deffd9daf8dc97b58d4c64ed0":[5,0,0,48,7], -"include_2oembed_8php.html#a03fa3b7832c98a3d0b4630afeb73d487":[5,0,0,48,1], -"include_2oembed_8php.html#a26bb4c1e330d2f94ea7b6ce2fe970cf3":[5,0,0,48,4], -"include_2oembed_8php.html#a98549b9af8140eda3eceaeedcaabc2c2":[5,0,0,48,3], -"include_2oembed_8php.html#a9e57f3e36a0a0a47e6db79544b701d9a":[5,0,0,48,6], -"include_2oembed_8php.html#ab953a6e7c11bc6498ce01ed73e2ba319":[5,0,0,48,0], -"include_2oembed_8php.html#aba89ae64b355efcb4f706553d3edb6a2":[5,0,0,48,2], -"include_2photos_8php.html":[5,0,0,52], -"include_2photos_8php.html#a6c40ef58aefef705a5adc84a40e97109":[5,0,0,52,0], -"include_2photos_8php.html#a7e7abc69872180697c5471dc69349afe":[5,0,0,52,2], -"include_2photos_8php.html#a8e8b7be99e24c2497bc2cb3339280c35":[5,0,0,52,1], -"include_2photos_8php.html#aa27b9e435dcc34e1009f56dc02c7ca51":[5,0,0,52,7], -"include_2photos_8php.html#ab0365f25b22ccea5f085fe7c49e1f4ab":[5,0,0,52,3], -"include_2photos_8php.html#ad648c0c5544fe9263409b6f6e57c6274":[5,0,0,52,6], -"include_2photos_8php.html#aedccaf18282b26899d9549c29bd9d1b9":[5,0,0,52,5], -"include_2photos_8php.html#af24c6aeed28ecc31ec39e7d9a1804979":[5,0,0,52,4], +"include_2config_8php.html":[5,0,0,15], +"include_2config_8php.html#a27559f388c9b9af81c94e48d6889d1d1":[5,0,0,15,7], +"include_2config_8php.html#a549910227348003efc3c05c9105c42da":[5,0,0,15,0], +"include_2config_8php.html#a55bbed9a014c9109c767486834f3ca33":[5,0,0,15,9], +"include_2config_8php.html#a61591371cb18764138655d67dc817ab2":[5,0,0,15,11], +"include_2config_8php.html#a7ad2081c5f812ac4387fd76f3762d941":[5,0,0,15,1], +"include_2config_8php.html#a9c171def547deee16738dc58fdeb4b72":[5,0,0,15,2], +"include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e":[5,0,0,15,6], +"include_2config_8php.html#ac543813a980b3841cc5a277fcd4a24a6":[5,0,0,15,8], +"include_2config_8php.html#ad58a4913937179adb13201c2ee3261ad":[5,0,0,15,5], +"include_2config_8php.html#ad6da879e4fb5b37d1e161d4e9be5c32a":[5,0,0,15,10], +"include_2config_8php.html#af02c96e6b37335774b548914ede1d22e":[5,0,0,15,3], +"include_2config_8php.html#af08b7adb63adfb2eda7c466fba0cce74":[5,0,0,15,4], +"include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e":[5,0,0,15,12], +"include_2directory_8php.html":[5,0,0,26], +"include_2directory_8php.html#aa75d3b0697ca1456aaabdb37a74aa0f0":[5,0,0,26,0], +"include_2follow_8php.html":[5,0,0,31], +"include_2follow_8php.html#ae387d4ae097c23d69f3247e7f08140c7":[5,0,0,31,0], +"include_2group_8php.html":[5,0,0,34], +"include_2group_8php.html#a0122ef312df2c5546b1a46b3e6c7b31b":[5,0,0,34,2], +"include_2group_8php.html#a048f6892bfd28852de1b76470df411de":[5,0,0,34,10], +"include_2group_8php.html#a06ec565d2b64e79044e7c1bf91a2a4ce":[5,0,0,34,1], +"include_2group_8php.html#a1042d74055bafe54a6a30103d87a7f17":[5,0,0,34,8], +"include_2group_8php.html#a22a81875259c7d3d64d4848afea6b345":[5,0,0,34,0], +"include_2group_8php.html#a4118f498bbd1530c1d0136d016d197a5":[5,0,0,34,6], +"include_2group_8php.html#a540e3ef36f47d47532646be4241f6518":[5,0,0,34,7], +"include_2group_8php.html#a5bd191d9692e6c34d48c0ede10810f09":[5,0,0,34,4], +"include_2group_8php.html#a90e157b3e1b99c981809cb5a2abd3245":[5,0,0,34,5], +"include_2group_8php.html#ab4d9e5b59f48787cb01baae5dc6c381f":[5,0,0,34,11], +"include_2group_8php.html#abd66a5ea34a07a3422dc2dde6c7b3ecb":[5,0,0,34,3], +"include_2group_8php.html#afb802ae2ce73aae4bc36d157f7b6a92f":[5,0,0,34,9], +"include_2menu_8php.html":[5,0,0,42], +"include_2menu_8php.html#a08a800821721781a8dfffbe31481ff98":[5,0,0,42,1], +"include_2menu_8php.html#a3884bda4d85d84ec99447db9403a68d8":[5,0,0,42,3], +"include_2menu_8php.html#a47447c01ba8ea04cd74af1d4c5b68fc7":[5,0,0,42,8], +"include_2menu_8php.html#a68ebbf492470c930f652013656f9071d":[5,0,0,42,7], +"include_2menu_8php.html#a6a33c6a3db2a7510b16cc656edaec571":[5,0,0,42,5], +"include_2menu_8php.html#a890cc6237971e15f15702e6b2e88502e":[5,0,0,42,10], +"include_2menu_8php.html#a9aa8e0052dd47c1a93f53a983bd4620a":[5,0,0,42,2], +"include_2menu_8php.html#acb66f80ca895a6ccd562b3d9ae7b41aa":[5,0,0,42,6], +"include_2menu_8php.html#acef15a498d52666b1c7e5c12765c689b":[5,0,0,42,9], +"include_2menu_8php.html#ad87f51ce85172bcc3f931aa0cd96a804":[5,0,0,42,4], +"include_2menu_8php.html#add35fae5e9695031b3d46e30ac409eb8":[5,0,0,42,0], +"include_2message_8php.html":[5,0,0,43], +"include_2message_8php.html#a254a756031e4d5e94f85e2939bdb5091":[5,0,0,43,2], +"include_2message_8php.html#a5f8de9847e203329e317ac38dc646898":[5,0,0,43,1], +"include_2message_8php.html#a652973ce47a262f2d238c2fd6233d97e":[5,0,0,43,3], +"include_2message_8php.html#ac382fdcdf990dcfa8f6528ab8fd280bd":[5,0,0,43,4], +"include_2message_8php.html#aed272d77c06a309e2836ac79e75613f1":[5,0,0,43,0], +"include_2network_8php.html":[5,0,0,45], +"include_2network_8php.html#a0bdc4b0bfc54797c249dc4eca25aeda4":[5,0,0,45,0], +"include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0":[5,0,0,45,6], +"include_2network_8php.html#a2729d012410e470c527a62a3f777ded8":[5,0,0,45,10], +"include_2network_8php.html#a27a951b59d8d622c0b3e7b0673ba74c6":[5,0,0,45,15], +"include_2network_8php.html#a37ddeb88a3fd1dee9e8339723f9edf9a":[5,0,0,45,8], +"include_2network_8php.html#a4c5d50079e089168d9248427018fffd4":[5,0,0,45,13], +"include_2network_8php.html#a4cfb2c05a1c295317283d762440ce0b2":[5,0,0,45,12], +"include_2network_8php.html#a540420ff3675a72cb781ef9a7e8c2cd9":[5,0,0,45,5], +"include_2network_8php.html#a5caa264fab6d2b2344e6bd5b298b08f2":[5,0,0,45,19], +"include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7":[5,0,0,45,11], +"include_2network_8php.html#a8122356933bcd6b0a8567e8e15ae5cc5":[5,0,0,45,20], +"include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d":[5,0,0,45,9], +"include_2network_8php.html#a897e7112d86eb95526cbd0bff9375f02":[5,0,0,45,18], +"include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0":[5,0,0,45,7], +"include_2network_8php.html#a9129fd55e7fc175b4ea9a195cccc16bc":[5,0,0,45,25], +"include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff":[5,0,0,45,22], +"include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6":[5,0,0,45,23], +"include_2network_8php.html#aa44d9e33a579d930e9e79c4ebb3d6b5e":[5,0,0,45,16], +"include_2network_8php.html#aafd06c0a75402aefb06cfb9f9740fa37":[5,0,0,45,24], +"include_2network_8php.html#ab07ce9d75eae559865ed90aad2154bd7":[5,0,0,45,3], +"include_2network_8php.html#aba38458a2ff2d92d3536488dbb119694":[5,0,0,45,1], +"include_2network_8php.html#ad4056d3ce69988f5c1a997a79f503246":[5,0,0,45,4], +"include_2network_8php.html#adbc7fe45cc7fd9cd78f6b2f425ee9041":[5,0,0,45,14], +"include_2network_8php.html#adf6008b38c555e98e7ed10da9ede2335":[5,0,0,45,21], +"include_2network_8php.html#ae8d9c41a11000fb8667039fc71b4f73f":[5,0,0,45,17], +"include_2network_8php.html#aee35d9ad6b3f872bfb39ba3598936aa7":[5,0,0,45,2], +"include_2notify_8php.html":[5,0,0,47], +"include_2notify_8php.html#a0e61728e487df50c72e6434f911a57d3":[5,0,0,47,0], +"include_2oembed_8php.html":[5,0,0,49], +"include_2oembed_8php.html#a000a62b97113cf95b0e9e00412168172":[5,0,0,49,5], +"include_2oembed_8php.html#a00c4c80deffd9daf8dc97b58d4c64ed0":[5,0,0,49,7], +"include_2oembed_8php.html#a03fa3b7832c98a3d0b4630afeb73d487":[5,0,0,49,1], +"include_2oembed_8php.html#a26bb4c1e330d2f94ea7b6ce2fe970cf3":[5,0,0,49,4], +"include_2oembed_8php.html#a98549b9af8140eda3eceaeedcaabc2c2":[5,0,0,49,3], +"include_2oembed_8php.html#a9e57f3e36a0a0a47e6db79544b701d9a":[5,0,0,49,6], +"include_2oembed_8php.html#ab953a6e7c11bc6498ce01ed73e2ba319":[5,0,0,49,0], +"include_2oembed_8php.html#aba89ae64b355efcb4f706553d3edb6a2":[5,0,0,49,2], +"include_2photos_8php.html":[5,0,0,53], +"include_2photos_8php.html#a6c40ef58aefef705a5adc84a40e97109":[5,0,0,53,0], +"include_2photos_8php.html#a7e7abc69872180697c5471dc69349afe":[5,0,0,53,2], +"include_2photos_8php.html#a8e8b7be99e24c2497bc2cb3339280c35":[5,0,0,53,1], +"include_2photos_8php.html#aa27b9e435dcc34e1009f56dc02c7ca51":[5,0,0,53,7], +"include_2photos_8php.html#ab0365f25b22ccea5f085fe7c49e1f4ab":[5,0,0,53,3], +"include_2photos_8php.html#ad648c0c5544fe9263409b6f6e57c6274":[5,0,0,53,6], +"include_2photos_8php.html#aedccaf18282b26899d9549c29bd9d1b9":[5,0,0,53,5], +"include_2photos_8php.html#af24c6aeed28ecc31ec39e7d9a1804979":[5,0,0,53,4], "index.html":[], "interfaceITemplateEngine.html":[4,0,18], "interfaceITemplateEngine.html#aaa7381c8becc3d1c1790b53988a0f243":[4,0,18,1], @@ -157,71 +172,71 @@ var NAVTREEINDEX4 = "item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221":[5,0,1,37,3], "item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[5,0,1,37,1], "item_8php.html#abd0e603a6696051af16476eb968d52e7":[5,0,1,37,2], -"items_8php.html":[5,0,0,39], -"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[5,0,0,39,53], -"items_8php.html#a016dd86c827d08db89061ea81d15c6cb":[5,0,0,39,2], -"items_8php.html#a01e3cf44e082fa9bd06dcde5bf713d70":[5,0,0,39,5], -"items_8php.html#a04a35b610acfe54434df08adec39c0c7":[5,0,0,39,27], -"items_8php.html#a0790a4550b829e85504af548623002ca":[5,0,0,39,6], -"items_8php.html#a079e099e15d88d47aeb6ca6d60da7107":[5,0,0,39,32], -"items_8php.html#a09d425596b9f8663472cf7474ad36d96":[5,0,0,39,36], -"items_8php.html#a0cf98bb619f07dd18f602683a55a5f59":[5,0,0,39,24], -"items_8php.html#a1e75047cf175aaee8dd16aa761913ff9":[5,0,0,39,4], -"items_8php.html#a251343637ff40a50cca93452cd530c26":[5,0,0,39,31], -"items_8php.html#a2541e6861a56d145c9281877cc501615":[5,0,0,39,38], -"items_8php.html#a275108c050f7eb18bcbb5018e6b81cf6":[5,0,0,39,3], -"items_8php.html#a2b56a4c01bd22a648d52ec9af1a04259":[5,0,0,39,12], -"items_8php.html#a2d840c74ed23d1b6c7daee05cf89dda7":[5,0,0,39,20], -"items_8php.html#a36e656667193c83aa2cc03a024fc131b":[5,0,0,39,0], -"items_8php.html#a410f9c743877c125ca06312373346903":[5,0,0,39,44], -"items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b":[5,0,0,39,47], -"items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361":[5,0,0,39,29], -"items_8php.html#a566c601726697e044e75284af7fb6f17":[5,0,0,39,19], -"items_8php.html#a56b2a4abcadfac71175cd50555528cc3":[5,0,0,39,11], -"items_8php.html#a5f690fc2484abec07840b4f9dd525bd9":[5,0,0,39,17], -"items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7":[5,0,0,39,37], -"items_8php.html#a668ece2c37f05cc3abe538eb0dabfe55":[5,0,0,39,15], -"items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc":[5,0,0,39,35], -"items_8php.html#a756738301f2ed96be50232500677d58a":[5,0,0,39,40], -"items_8php.html#a77051724d1784074ff187e73a4db93fe":[5,0,0,39,33], -"items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[5,0,0,39,42], -"items_8php.html#a82955cc578f0fa600acec84475026194":[5,0,0,39,16], -"items_8php.html#a8395d189a36abfa0dfff81a2b0e70669":[5,0,0,39,13], -"items_8php.html#a8794863cdf8ce1333040933d3a3f66bd":[5,0,0,39,10], -"items_8php.html#a88c6cf7649ac836fbbed82a7a0315110":[5,0,0,39,51], -"items_8php.html#a896c1809d58f2d7a42cfe14577958ddf":[5,0,0,39,26], -"items_8php.html#a8f3c85c584ccd2b98c3ca440e45b40f8":[5,0,0,39,9], -"items_8php.html#a94ddb1d6c8fa21dd7433677e85168037":[5,0,0,39,30], -"items_8php.html#aa371905f0a211b307cb3f7188c6cba04":[5,0,0,39,52], -"items_8php.html#aa579bc4445d60098b1410961ca8e96b7":[5,0,0,39,8], -"items_8php.html#aa723c0571e314a1853a24c5854b4f54f":[5,0,0,39,21], -"items_8php.html#aa9e99613d38a97b39c8cf5449699c2ee":[5,0,0,39,7], -"items_8php.html#aab9c6bae4c40799867596bdaae9829fd":[5,0,0,39,28], -"items_8php.html#aab9e0c58247427126de0699c729c3b6c":[5,0,0,39,48], -"items_8php.html#ab1bce4261bcf75ad62753b498a144d17":[5,0,0,39,49], -"items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87":[5,0,0,39,25], -"items_8php.html#abe695dd89e1e10ed042c26b80114f0ed":[5,0,0,39,45], -"items_8php.html#abf7a1b73eb352d79acd36309b0dababd":[5,0,0,39,1], -"items_8php.html#ac1fcf621dce7370515b420a7753f4726":[5,0,0,39,43], -"items_8php.html#ac6673627d289ee4f547de0fe3b7acd0a":[5,0,0,39,18], -"items_8php.html#acf0bf7c9d21ac84f32effb754f7ad484":[5,0,0,39,39], -"items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0":[5,0,0,39,46], -"items_8php.html#ad34827ed330898456783fb14c7b46154":[5,0,0,39,50], -"items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9":[5,0,0,39,23], -"items_8php.html#ae73794179b62d39bb597ff670ab1c1e5":[5,0,0,39,34], -"items_8php.html#af94c281016c6c912d06e064113336c5c":[5,0,0,39,41], -"items_8php.html#afa1db13c2a8b73b5b17b97f17e5a19d1":[5,0,0,39,14], -"items_8php.html#afbcf26dfcf8a83fff952aa858c1b7b67":[5,0,0,39,22], -"language_8php.html":[5,0,0,40], -"language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0":[5,0,0,40,6], -"language_8php.html#a632da17c7ac0d2dc1a00a4706870194b":[5,0,0,40,0], -"language_8php.html#a78bd204955ec4cc3a9ac651285a1689d":[5,0,0,40,4], -"language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05":[5,0,0,40,3], -"language_8php.html#a980dee1d8715a98ab02e36b59facf8ed":[5,0,0,40,1], -"language_8php.html#aae0c3638fb476ae1e31f8d242f5dac04":[5,0,0,40,7], -"language_8php.html#ac9142ef1d01a235c760deb0f16643f5a":[5,0,0,40,5], -"language_8php.html#ace67d6cad57da08d030ad9dc9b8c836e":[5,0,0,40,2], -"language_8php.html#ae310fb3880484ee1cc4faefe0c63c06d":[5,0,0,40,8], +"items_8php.html":[5,0,0,40], +"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[5,0,0,40,53], +"items_8php.html#a016dd86c827d08db89061ea81d15c6cb":[5,0,0,40,2], +"items_8php.html#a01e3cf44e082fa9bd06dcde5bf713d70":[5,0,0,40,5], +"items_8php.html#a04a35b610acfe54434df08adec39c0c7":[5,0,0,40,27], +"items_8php.html#a0790a4550b829e85504af548623002ca":[5,0,0,40,6], +"items_8php.html#a079e099e15d88d47aeb6ca6d60da7107":[5,0,0,40,32], +"items_8php.html#a09d425596b9f8663472cf7474ad36d96":[5,0,0,40,36], +"items_8php.html#a0cf98bb619f07dd18f602683a55a5f59":[5,0,0,40,24], +"items_8php.html#a1e75047cf175aaee8dd16aa761913ff9":[5,0,0,40,4], +"items_8php.html#a251343637ff40a50cca93452cd530c26":[5,0,0,40,31], +"items_8php.html#a2541e6861a56d145c9281877cc501615":[5,0,0,40,38], +"items_8php.html#a275108c050f7eb18bcbb5018e6b81cf6":[5,0,0,40,3], +"items_8php.html#a2b56a4c01bd22a648d52ec9af1a04259":[5,0,0,40,12], +"items_8php.html#a2d840c74ed23d1b6c7daee05cf89dda7":[5,0,0,40,20], +"items_8php.html#a36e656667193c83aa2cc03a024fc131b":[5,0,0,40,0], +"items_8php.html#a410f9c743877c125ca06312373346903":[5,0,0,40,44], +"items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b":[5,0,0,40,47], +"items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361":[5,0,0,40,29], +"items_8php.html#a566c601726697e044e75284af7fb6f17":[5,0,0,40,19], +"items_8php.html#a56b2a4abcadfac71175cd50555528cc3":[5,0,0,40,11], +"items_8php.html#a5f690fc2484abec07840b4f9dd525bd9":[5,0,0,40,17], +"items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7":[5,0,0,40,37], +"items_8php.html#a668ece2c37f05cc3abe538eb0dabfe55":[5,0,0,40,15], +"items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc":[5,0,0,40,35], +"items_8php.html#a756738301f2ed96be50232500677d58a":[5,0,0,40,40], +"items_8php.html#a77051724d1784074ff187e73a4db93fe":[5,0,0,40,33], +"items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[5,0,0,40,42], +"items_8php.html#a82955cc578f0fa600acec84475026194":[5,0,0,40,16], +"items_8php.html#a8395d189a36abfa0dfff81a2b0e70669":[5,0,0,40,13], +"items_8php.html#a8794863cdf8ce1333040933d3a3f66bd":[5,0,0,40,10], +"items_8php.html#a88c6cf7649ac836fbbed82a7a0315110":[5,0,0,40,51], +"items_8php.html#a896c1809d58f2d7a42cfe14577958ddf":[5,0,0,40,26], +"items_8php.html#a8f3c85c584ccd2b98c3ca440e45b40f8":[5,0,0,40,9], +"items_8php.html#a94ddb1d6c8fa21dd7433677e85168037":[5,0,0,40,30], +"items_8php.html#aa371905f0a211b307cb3f7188c6cba04":[5,0,0,40,52], +"items_8php.html#aa579bc4445d60098b1410961ca8e96b7":[5,0,0,40,8], +"items_8php.html#aa723c0571e314a1853a24c5854b4f54f":[5,0,0,40,21], +"items_8php.html#aa9e99613d38a97b39c8cf5449699c2ee":[5,0,0,40,7], +"items_8php.html#aab9c6bae4c40799867596bdaae9829fd":[5,0,0,40,28], +"items_8php.html#aab9e0c58247427126de0699c729c3b6c":[5,0,0,40,48], +"items_8php.html#ab1bce4261bcf75ad62753b498a144d17":[5,0,0,40,49], +"items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87":[5,0,0,40,25], +"items_8php.html#abe695dd89e1e10ed042c26b80114f0ed":[5,0,0,40,45], +"items_8php.html#abf7a1b73eb352d79acd36309b0dababd":[5,0,0,40,1], +"items_8php.html#ac1fcf621dce7370515b420a7753f4726":[5,0,0,40,43], +"items_8php.html#ac6673627d289ee4f547de0fe3b7acd0a":[5,0,0,40,18], +"items_8php.html#acf0bf7c9d21ac84f32effb754f7ad484":[5,0,0,40,39], +"items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0":[5,0,0,40,46], +"items_8php.html#ad34827ed330898456783fb14c7b46154":[5,0,0,40,50], +"items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9":[5,0,0,40,23], +"items_8php.html#ae73794179b62d39bb597ff670ab1c1e5":[5,0,0,40,34], +"items_8php.html#af94c281016c6c912d06e064113336c5c":[5,0,0,40,41], +"items_8php.html#afa1db13c2a8b73b5b17b97f17e5a19d1":[5,0,0,40,14], +"items_8php.html#afbcf26dfcf8a83fff952aa858c1b7b67":[5,0,0,40,22], +"language_8php.html":[5,0,0,41], +"language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0":[5,0,0,41,6], +"language_8php.html#a632da17c7ac0d2dc1a00a4706870194b":[5,0,0,41,0], +"language_8php.html#a78bd204955ec4cc3a9ac651285a1689d":[5,0,0,41,4], +"language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05":[5,0,0,41,3], +"language_8php.html#a980dee1d8715a98ab02e36b59facf8ed":[5,0,0,41,1], +"language_8php.html#aae0c3638fb476ae1e31f8d242f5dac04":[5,0,0,41,7], +"language_8php.html#ac9142ef1d01a235c760deb0f16643f5a":[5,0,0,41,5], +"language_8php.html#ace67d6cad57da08d030ad9dc9b8c836e":[5,0,0,41,2], +"language_8php.html#ae310fb3880484ee1cc4faefe0c63c06d":[5,0,0,41,8], "lastpost_8php.html":[5,0,1,38], "lastpost_8php.html#a6108289ef2a767495c7c85a24f364983":[5,0,1,38,0], "lastpost_8php.html#a82f14cce5d3cfe27f40bdbd2c679d493":[5,0,1,38,1], @@ -234,20 +249,5 @@ var NAVTREEINDEX4 = "login_8php.html#a1d69ca88eb9005a7026e128b9a645904":[5,0,1,41,0], "lostpass_8php.html":[5,0,1,42], "lostpass_8php.html#a0314d94e48c789b1b3a201d740c9eab3":[5,0,1,42,0], -"lostpass_8php.html#a8ed35ba71a4404eaf4903da61d0321cc":[5,0,1,42,1], -"magic_8php.html":[5,0,1,43], -"magic_8php.html#acea2cc792849ca2d71d4b689f66518bf":[5,0,1,43,0], -"manage_8php.html":[5,0,1,44], -"manage_8php.html#a2bca247b5296827638959138367db4f5":[5,0,1,44,0], -"match_8php.html":[5,0,1,45], -"match_8php.html#a1dd853e959b9e70c1911bb2fb5f5130d":[5,0,1,45,0], -"md_README.html":[2], -"md_config.html":[0], -"md_fresh.html":[1], -"minimal_8php.html":[5,0,3,0,2], -"mitem_8php.html":[5,0,1,48], -"mitem_8php.html#a6ee694cca4b551a20d7c7a94b5243ec1":[5,0,1,48,2], -"mitem_8php.html#a7a31b702ecad18eeb6a38b243ff0037e":[5,0,1,48,0], -"mitem_8php.html#a9627cd857cafdf04e4fc0ae48c8e8518":[5,0,1,48,1], -"mod_2api_8php.html":[5,0,1,4] +"lostpass_8php.html#a8ed35ba71a4404eaf4903da61d0321cc":[5,0,1,42,1] }; diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js index deba1f96a..894f4569f 100644 --- a/doc/html/navtreeindex5.js +++ b/doc/html/navtreeindex5.js @@ -1,5 +1,20 @@ var NAVTREEINDEX5 = { +"magic_8php.html":[5,0,1,43], +"magic_8php.html#acea2cc792849ca2d71d4b689f66518bf":[5,0,1,43,0], +"manage_8php.html":[5,0,1,44], +"manage_8php.html#a2bca247b5296827638959138367db4f5":[5,0,1,44,0], +"match_8php.html":[5,0,1,45], +"match_8php.html#a1dd853e959b9e70c1911bb2fb5f5130d":[5,0,1,45,0], +"md_README.html":[2], +"md_config.html":[0], +"md_fresh.html":[1], +"minimal_8php.html":[5,0,3,0,2], +"mitem_8php.html":[5,0,1,48], +"mitem_8php.html#a6ee694cca4b551a20d7c7a94b5243ec1":[5,0,1,48,2], +"mitem_8php.html#a7a31b702ecad18eeb6a38b243ff0037e":[5,0,1,48,0], +"mitem_8php.html#a9627cd857cafdf04e4fc0ae48c8e8518":[5,0,1,48,1], +"mod_2api_8php.html":[5,0,1,4], "mod_2api_8php.html#a02ae0f60e240dc806b860edb7d582117":[5,0,1,4,2], "mod_2api_8php.html#a33315b5bbf5418f6850b2038107b526d":[5,0,1,4,0], "mod_2api_8php.html#a6fe77f05c07cb51048df0d557b4b9bd2":[5,0,1,4,1], @@ -52,8 +67,8 @@ var NAVTREEINDEX5 = "namespaceFriendica.html":[4,0,1], "namespaceacl__selectors.html":[4,0,0], "namespaceacl__selectors.html":[3,0,0], -"namespacefriendica-to-smarty-tpl.html":[3,0,2], "namespacefriendica-to-smarty-tpl.html":[4,0,2], +"namespacefriendica-to-smarty-tpl.html":[3,0,2], "namespacemembers.html":[3,1,0], "namespacemembers_func.html":[3,1,1], "namespacemembers_vars.html":[3,1,2], @@ -62,9 +77,9 @@ var NAVTREEINDEX5 = "namespaceupdatetpl.html":[3,0,3], "namespaceutil.html":[4,0,4], "namespaceutil.html":[3,0,4], -"nav_8php.html":[5,0,0,43], -"nav_8php.html#a43be0df73b90647ea70947ce004e231e":[5,0,0,43,0], -"nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a":[5,0,0,43,1], +"nav_8php.html":[5,0,0,44], +"nav_8php.html#a43be0df73b90647ea70947ce004e231e":[5,0,0,44,0], +"nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a":[5,0,0,44,1], "new__channel_8php.html":[5,0,1,52], "new__channel_8php.html#a180b0646957db8290482f02454ad7f23":[5,0,1,52,2], "new__channel_8php.html#a1ad7f99e4366a32942c6b954aba3a164":[5,0,1,52,1], @@ -75,36 +90,36 @@ var NAVTREEINDEX5 = "notifications_8php.html":[5,0,1,54], "notifications_8php.html#a5baffec7b2e625c9f9cefbc097550d33":[5,0,1,54,1], "notifications_8php.html#aadd0b5525bd8c283a5d8a37982bbfe62":[5,0,1,54,0], -"notifier_8php.html":[5,0,0,45], -"notifier_8php.html#a568c502f626cff95e344c0748938b85d":[5,0,0,45,0], -"oauth_8php.html":[5,0,0,47], -"oauth_8php.html#a7a32a5990f113ac9465b03b29175cf16":[5,0,0,47,3], -"oauth_8php.html#ad343cab37aa860d2d14dc86b7f5ca0c6":[5,0,0,47,2], +"notifier_8php.html":[5,0,0,46], +"notifier_8php.html#a568c502f626cff95e344c0748938b85d":[5,0,0,46,0], +"oauth_8php.html":[5,0,0,48], +"oauth_8php.html#a7a32a5990f113ac9465b03b29175cf16":[5,0,0,48,3], +"oauth_8php.html#ad343cab37aa860d2d14dc86b7f5ca0c6":[5,0,0,48,2], "oexchange_8php.html":[5,0,1,57], "oexchange_8php.html#a2d8b785cd7d041a4e6274f5af370cf26":[5,0,1,57,0], "oexchange_8php.html#ac8e2e469ddc3db984b0c1b44558aca59":[5,0,1,57,1], -"onepoll_8php.html":[5,0,0,49], -"onepoll_8php.html#a72753b2fdec79b37c7f432035c91fb6d":[5,0,0,49,0], +"onepoll_8php.html":[5,0,0,50], +"onepoll_8php.html#a72753b2fdec79b37c7f432035c91fb6d":[5,0,0,50,0], "opensearch_8php.html":[5,0,1,58], "opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9":[5,0,1,58,0], "page_8php.html":[5,0,1,59], "page_8php.html#a4d89800c0366a239191b1692c09635cf":[5,0,1,59,1], "page_8php.html#a91a5f649f68406149108bded1dc90b22":[5,0,1,59,0], -"page__widgets_8php.html":[5,0,0,50], -"page__widgets_8php.html#a1a1e729da27f252cab6678288a17958f":[5,0,0,50,1], -"page__widgets_8php.html#ad82011c1ed90d9de8b9f34c12af5c6f0":[5,0,0,50,0], +"page__widgets_8php.html":[5,0,0,51], +"page__widgets_8php.html#a1a1e729da27f252cab6678288a17958f":[5,0,0,51,1], +"page__widgets_8php.html#ad82011c1ed90d9de8b9f34c12af5c6f0":[5,0,0,51,0], "pages.html":[], "parse__url_8php.html":[5,0,1,60], "parse__url_8php.html#a05a9e8944380ba3cf6bbf5893dd4b74b":[5,0,1,60,2], "parse__url_8php.html#a25635549f2c22955d72465f4d2e58993":[5,0,1,60,3], "parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a":[5,0,1,60,1], "parse__url_8php.html#aa7dd8f961bea042d62726ed909e4a868":[5,0,1,60,0], -"permissions_8php.html":[5,0,0,51], -"permissions_8php.html#a040fd3d3b8517658b1668ae0cd093972":[5,0,0,51,2], -"permissions_8php.html#a0f5bd9f7f4c8fb7ba4b2c1ed048b4dc7":[5,0,0,51,0], -"permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835":[5,0,0,51,3], -"permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d":[5,0,0,51,4], -"permissions_8php.html#aeca9b280f3dc3358c89976d81d690008":[5,0,0,51,1], +"permissions_8php.html":[5,0,0,52], +"permissions_8php.html#a040fd3d3b8517658b1668ae0cd093972":[5,0,0,52,2], +"permissions_8php.html#a0f5bd9f7f4c8fb7ba4b2c1ed048b4dc7":[5,0,0,52,0], +"permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835":[5,0,0,52,3], +"permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d":[5,0,0,52,4], +"permissions_8php.html#aeca9b280f3dc3358c89976d81d690008":[5,0,0,52,1], "photo_8php.html":[5,0,1,61], "photo_8php.html#a582779d24882b0d31ee909a91d70a448":[5,0,1,61,0], "photo__driver_8php.html":[5,0,0,1,0], @@ -130,33 +145,33 @@ var NAVTREEINDEX5 = "php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[5,0,1,63,0], "ping_8php.html":[5,0,1,64], "ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[5,0,1,64,0], -"plugin_8php.html":[5,0,0,53], -"plugin_8php.html#a030cec6793b909c439c0336ba39b1571":[5,0,0,53,17], -"plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76":[5,0,0,53,20], -"plugin_8php.html#a23c4fccf1eb5fcd63b24783ba1f05f7a":[5,0,0,53,8], -"plugin_8php.html#a326365e48ef94f0b9a0a771b8d75e813":[5,0,0,53,13], -"plugin_8php.html#a425472c5f3afc137268b2ad45652b209":[5,0,0,53,15], -"plugin_8php.html#a48047edfbef770125a5508dcc2f9282f":[5,0,0,53,7], -"plugin_8php.html#a482131013272a1d5d5c1b1469c6c55d5":[5,0,0,53,12], -"plugin_8php.html#a4fc13e528367f510fcb6d8bbfc559040":[5,0,0,53,24], -"plugin_8php.html#a516591850f4fd49fd1425cfa54089db8":[5,0,0,53,9], -"plugin_8php.html#a56f71fe5adf9586ce950523d8180443e":[5,0,0,53,22], -"plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1":[5,0,0,53,11], -"plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2":[5,0,0,53,19], -"plugin_8php.html#a754d7f53b3abc557b753c057dc4e021d":[5,0,0,53,23], -"plugin_8php.html#a75f7dfed291fd7add7fc85b5c022a1f4":[5,0,0,53,4], -"plugin_8php.html#a7f05de16c0a32602853b09b99dd85e7c":[5,0,0,53,0], -"plugin_8php.html#a901657dd078e070516cf97285e0bada7":[5,0,0,53,25], -"plugin_8php.html#a9039e15aae27676af7777dcbee5a11d6":[5,0,0,53,1], -"plugin_8php.html#a90538627db68605aeb6db17a8ead6523":[5,0,0,53,21], -"plugin_8php.html#a905b54e10704b283ac64680a8abc0971":[5,0,0,53,18], -"plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d":[5,0,0,53,14], -"plugin_8php.html#acb63c27d07f6d7dffe95f98a6cef1295":[5,0,0,53,3], -"plugin_8php.html#ad48de9c0fb7f19413a2aa49250d00405":[5,0,0,53,6], -"plugin_8php.html#ad9ff8ba554576383c5911a4bce068c1f":[5,0,0,53,2], -"plugin_8php.html#af92789f559b89a380e49d303218aeeca":[5,0,0,53,10], -"plugin_8php.html#af9ac19004dca49adae1ac7a0d9f3b025":[5,0,0,53,16], -"plugin_8php.html#aff0178bd8d0b34a94d5efddc883edd35":[5,0,0,53,5], +"plugin_8php.html":[5,0,0,54], +"plugin_8php.html#a030cec6793b909c439c0336ba39b1571":[5,0,0,54,17], +"plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76":[5,0,0,54,20], +"plugin_8php.html#a23c4fccf1eb5fcd63b24783ba1f05f7a":[5,0,0,54,8], +"plugin_8php.html#a326365e48ef94f0b9a0a771b8d75e813":[5,0,0,54,13], +"plugin_8php.html#a425472c5f3afc137268b2ad45652b209":[5,0,0,54,15], +"plugin_8php.html#a48047edfbef770125a5508dcc2f9282f":[5,0,0,54,7], +"plugin_8php.html#a482131013272a1d5d5c1b1469c6c55d5":[5,0,0,54,12], +"plugin_8php.html#a4fc13e528367f510fcb6d8bbfc559040":[5,0,0,54,24], +"plugin_8php.html#a516591850f4fd49fd1425cfa54089db8":[5,0,0,54,9], +"plugin_8php.html#a56f71fe5adf9586ce950523d8180443e":[5,0,0,54,22], +"plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1":[5,0,0,54,11], +"plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2":[5,0,0,54,19], +"plugin_8php.html#a754d7f53b3abc557b753c057dc4e021d":[5,0,0,54,23], +"plugin_8php.html#a75f7dfed291fd7add7fc85b5c022a1f4":[5,0,0,54,4], +"plugin_8php.html#a7f05de16c0a32602853b09b99dd85e7c":[5,0,0,54,0], +"plugin_8php.html#a901657dd078e070516cf97285e0bada7":[5,0,0,54,25], +"plugin_8php.html#a9039e15aae27676af7777dcbee5a11d6":[5,0,0,54,1], +"plugin_8php.html#a90538627db68605aeb6db17a8ead6523":[5,0,0,54,21], +"plugin_8php.html#a905b54e10704b283ac64680a8abc0971":[5,0,0,54,18], +"plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d":[5,0,0,54,14], +"plugin_8php.html#acb63c27d07f6d7dffe95f98a6cef1295":[5,0,0,54,3], +"plugin_8php.html#ad48de9c0fb7f19413a2aa49250d00405":[5,0,0,54,6], +"plugin_8php.html#ad9ff8ba554576383c5911a4bce068c1f":[5,0,0,54,2], +"plugin_8php.html#af92789f559b89a380e49d303218aeeca":[5,0,0,54,10], +"plugin_8php.html#af9ac19004dca49adae1ac7a0d9f3b025":[5,0,0,54,16], +"plugin_8php.html#aff0178bd8d0b34a94d5efddc883edd35":[5,0,0,54,5], "po2php_8php.html":[5,0,2,6], "po2php_8php.html#a3b75e36f913198299e99559b175cd8b4":[5,0,2,6,0], "poco_8php.html":[5,0,1,65], @@ -164,8 +179,8 @@ var NAVTREEINDEX5 = "poke_8php.html":[5,0,1,66], "poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b":[5,0,1,66,1], "poke_8php.html#ac9190563a8da9c07a16f9dcd71cf6993":[5,0,1,66,0], -"poller_8php.html":[5,0,0,54], -"poller_8php.html#a5f12df3a4738124b6c039971e87e76da":[5,0,0,54,0], +"poller_8php.html":[5,0,0,55], +"poller_8php.html#a5f12df3a4738124b6c039971e87e76da":[5,0,0,55,0], "post_8php.html":[5,0,1,67], "post_8php.html#af4b48181ce773ef0cdfc972441445c34":[5,0,1,67,0], "post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[5,0,1,67,1], @@ -177,16 +192,16 @@ var NAVTREEINDEX5 = "profile_8php.html#a1a2482b775476f2f64ea5e8f4fc3fd1e":[5,0,1,70,0], "profile_8php.html#a3775cf6eef6587e5143133356a7b76c0":[5,0,1,70,1], "profile_8php.html#ab5d0246be0552e2182a585c1206d22a5":[5,0,1,70,2], -"profile__advanced_8php.html":[5,0,0,55], -"profile__advanced_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4":[5,0,0,55,0], +"profile__advanced_8php.html":[5,0,0,56], +"profile__advanced_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4":[5,0,0,56,0], "profile__photo_8php.html":[5,0,1,71], "profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02":[5,0,1,71,1], "profile__photo_8php.html#a4b80234074bd603221aa5364f330e479":[5,0,1,71,2], "profile__photo_8php.html#ac9cd968a767e2ae1b88383b6cdd6dbe3":[5,0,1,71,0], -"profile__selectors_8php.html":[5,0,0,56], -"profile__selectors_8php.html#a3b50b3ea4ea4bdbebebfffc5d1b157c7":[5,0,0,56,2], -"profile__selectors_8php.html#a7473dd095987e1cdcc79d4f0bb5e6798":[5,0,0,56,1], -"profile__selectors_8php.html#ae2b2c087e6530c61c0b256fd26d52355":[5,0,0,56,0], +"profile__selectors_8php.html":[5,0,0,57], +"profile__selectors_8php.html#a3b50b3ea4ea4bdbebebfffc5d1b157c7":[5,0,0,57,2], +"profile__selectors_8php.html#a7473dd095987e1cdcc79d4f0bb5e6798":[5,0,0,57,1], +"profile__selectors_8php.html#ae2b2c087e6530c61c0b256fd26d52355":[5,0,0,57,0], "profiles_8php.html":[5,0,1,72], "profiles_8php.html#a2a3ac90f51941ff78b85e9389304969c":[5,0,1,72,0], "profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e":[5,0,1,72,2], @@ -198,11 +213,11 @@ var NAVTREEINDEX5 = "profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023":[5,0,1,73,1], "qsearch_8php.html":[5,0,1,74], "qsearch_8php.html#a0501887b95bd8fa21018b2936a668894":[5,0,1,74,0], -"queue_8php.html":[5,0,0,58], -"queue_8php.html#af8c93de86d866c3200174c8450a0f341":[5,0,0,58,0], -"queue__fn_8php.html":[5,0,0,59], -"queue__fn_8php.html#a4c2876181f75a4a61e85b7f00dfdbba1":[5,0,0,59,1], -"queue__fn_8php.html#a8fe71e981399bbf5d000a6ca42f57b24":[5,0,0,59,0], +"queue_8php.html":[5,0,0,59], +"queue_8php.html#af8c93de86d866c3200174c8450a0f341":[5,0,0,59,0], +"queue__fn_8php.html":[5,0,0,60], +"queue__fn_8php.html#a4c2876181f75a4a61e85b7f00dfdbba1":[5,0,0,60,1], +"queue__fn_8php.html#a8fe71e981399bbf5d000a6ca42f57b24":[5,0,0,60,0], "randprof_8php.html":[5,0,1,75], "randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[5,0,1,75,0], "redbasic_2php_2style_8php.html":[5,0,3,1,0,0,1], @@ -234,20 +249,5 @@ var NAVTREEINDEX5 = "redstrap_2php_2style_8php.html#a02d39b683a42fffbb27823d3860283bd":[5,0,3,1,1,0,2,13], "redstrap_2php_2style_8php.html#a03a72942b7428fd9af1224770d20a8ba":[5,0,3,1,1,0,2,5], "redstrap_2php_2style_8php.html#a0b942d36d8862908864e2ffa4521be70":[5,0,3,1,1,0,2,12], -"redstrap_2php_2style_8php.html#a0c4684da834439885ae2285649d1aaea":[5,0,3,1,1,0,2,16], -"redstrap_2php_2style_8php.html#a232513bf4339fe34908c4c63cb93168b":[5,0,3,1,1,0,2,4], -"redstrap_2php_2style_8php.html#a4086b1a341b7c8462a47fb1b25fd49ab":[5,0,3,1,1,0,2,0], -"redstrap_2php_2style_8php.html#a4131d1765ee4deb28e83fc4527943ee0":[5,0,3,1,1,0,2,2], -"redstrap_2php_2style_8php.html#a45e6fafa363bc4586fa91dce1786be4f":[5,0,3,1,1,0,2,15], -"redstrap_2php_2style_8php.html#a6628a80911a6b37b464ef110ac8f6e42":[5,0,3,1,1,0,2,3], -"redstrap_2php_2style_8php.html#a8749837e08dfb3372662af9c33fa2a2e":[5,0,3,1,1,0,2,14], -"redstrap_2php_2style_8php.html#a938168352fd3cdaa1c10c16a34f5938a":[5,0,3,1,1,0,2,8], -"redstrap_2php_2style_8php.html#aa658152b727ea1233f6df6ded6437dad":[5,0,3,1,1,0,2,1], -"redstrap_2php_2style_8php.html#acb3046ad9c01b7d60cde20f58d77c548":[5,0,3,1,1,0,2,11], -"redstrap_2php_2style_8php.html#acc190405dda0a23a80551dee11c74c0c":[5,0,3,1,1,0,2,6], -"redstrap_2php_2style_8php.html#adcfa918e05b5a98cbddc84bc3f1c15cc":[5,0,3,1,1,0,2,10], -"redstrap_2php_2style_8php.html#addf42c3d02e53f8e4153f3bb9dabfcda":[5,0,3,1,1,0,2,9], -"redstrap_2php_2style_8php.html#aef266cfcb27c6ddb3292584c945bab33":[5,0,3,1,1,0,2,7], -"redstrap_2php_2theme_8php.html":[5,0,3,1,1,0,3], -"redstrap_2php_2theme_8php.html#a4dac61d466b4261deca2846f548e484a":[5,0,3,1,1,0,3,0] +"redstrap_2php_2style_8php.html#a0c4684da834439885ae2285649d1aaea":[5,0,3,1,1,0,2,16] }; diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index e010fec30..4a6aaa636 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -1,5 +1,20 @@ var NAVTREEINDEX6 = { +"redstrap_2php_2style_8php.html#a232513bf4339fe34908c4c63cb93168b":[5,0,3,1,1,0,2,4], +"redstrap_2php_2style_8php.html#a4086b1a341b7c8462a47fb1b25fd49ab":[5,0,3,1,1,0,2,0], +"redstrap_2php_2style_8php.html#a4131d1765ee4deb28e83fc4527943ee0":[5,0,3,1,1,0,2,2], +"redstrap_2php_2style_8php.html#a45e6fafa363bc4586fa91dce1786be4f":[5,0,3,1,1,0,2,15], +"redstrap_2php_2style_8php.html#a6628a80911a6b37b464ef110ac8f6e42":[5,0,3,1,1,0,2,3], +"redstrap_2php_2style_8php.html#a8749837e08dfb3372662af9c33fa2a2e":[5,0,3,1,1,0,2,14], +"redstrap_2php_2style_8php.html#a938168352fd3cdaa1c10c16a34f5938a":[5,0,3,1,1,0,2,8], +"redstrap_2php_2style_8php.html#aa658152b727ea1233f6df6ded6437dad":[5,0,3,1,1,0,2,1], +"redstrap_2php_2style_8php.html#acb3046ad9c01b7d60cde20f58d77c548":[5,0,3,1,1,0,2,11], +"redstrap_2php_2style_8php.html#acc190405dda0a23a80551dee11c74c0c":[5,0,3,1,1,0,2,6], +"redstrap_2php_2style_8php.html#adcfa918e05b5a98cbddc84bc3f1c15cc":[5,0,3,1,1,0,2,10], +"redstrap_2php_2style_8php.html#addf42c3d02e53f8e4153f3bb9dabfcda":[5,0,3,1,1,0,2,9], +"redstrap_2php_2style_8php.html#aef266cfcb27c6ddb3292584c945bab33":[5,0,3,1,1,0,2,7], +"redstrap_2php_2theme_8php.html":[5,0,3,1,1,0,3], +"redstrap_2php_2theme_8php.html#a4dac61d466b4261deca2846f548e484a":[5,0,3,1,1,0,3,0], "register_8php.html":[5,0,1,77], "register_8php.html#a0e91f57f111407ea8d3223a05022bb2a":[5,0,1,77,0], "register_8php.html#a51731dcc1917c58a790eb1c0f6132271":[5,0,1,77,2], @@ -22,29 +37,29 @@ var NAVTREEINDEX6 = "search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[5,0,1,82,1], "search__ac_8php.html":[5,0,1,83], "search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[5,0,1,83,0], -"security_8php.html":[5,0,0,60], -"security_8php.html#a20f8b9851f23ee8894b8925584ef6821":[5,0,0,60,2], -"security_8php.html#a444ac867dfa8c37cf0a7a226412bee28":[5,0,0,60,4], -"security_8php.html#a77ba0d1889a39cf32434c5ce96fe1433":[5,0,0,60,5], -"security_8php.html#a8d23d2597aae380a3341872fe9513380":[5,0,0,60,1], -"security_8php.html#a9355488460ab11d6058656ff919e5cf9":[5,0,0,60,7], -"security_8php.html#a9c6180e82150a5a9af91a1255d096b5c":[5,0,0,60,3], -"security_8php.html#ab3bdd30dc60d9ee72370b866aa4a2d01":[5,0,0,60,9], -"security_8php.html#acd06ef411116115c2f0a92633700db8a":[5,0,0,60,6], -"security_8php.html#adc7bf51e3b8d67bd80e9348f9ab03733":[5,0,0,60,0], -"security_8php.html#ae92c5c1a1cbbc49ddbb8b3265d2db809":[5,0,0,60,10], -"security_8php.html#afa683bc025a1d2fe9065e2f6cd71a22f":[5,0,0,60,8], -"session_8php.html":[5,0,0,61], -"session_8php.html#a26fa1042356d555023cbf15ddd4f8507":[5,0,0,61,4], -"session_8php.html#a4c0ead624f95483e386bc80abf570a8f":[5,0,0,61,0], -"session_8php.html#a5e1c616e02b863d5450317d101366bb7":[5,0,0,61,1], -"session_8php.html#a62e4a6cb26b4bb1b8ddd8277b26090eb":[5,0,0,61,8], -"session_8php.html#a7f0f50576360d9ba52d29364e0b83a8e":[5,0,0,61,5], -"session_8php.html#a96b09cc763572f45280786a7b33feb7e":[5,0,0,61,7], -"session_8php.html#ac4461c1984543d3553e73dba2771568f":[5,0,0,61,6], -"session_8php.html#ac95373f4966862a028033dd2f94d4da1":[5,0,0,61,3], -"session_8php.html#af0100a2642a5268594bbd5742a03d885":[5,0,0,61,9], -"session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052":[5,0,0,61,2], +"security_8php.html":[5,0,0,61], +"security_8php.html#a20f8b9851f23ee8894b8925584ef6821":[5,0,0,61,2], +"security_8php.html#a444ac867dfa8c37cf0a7a226412bee28":[5,0,0,61,4], +"security_8php.html#a77ba0d1889a39cf32434c5ce96fe1433":[5,0,0,61,5], +"security_8php.html#a8d23d2597aae380a3341872fe9513380":[5,0,0,61,1], +"security_8php.html#a9355488460ab11d6058656ff919e5cf9":[5,0,0,61,7], +"security_8php.html#a9c6180e82150a5a9af91a1255d096b5c":[5,0,0,61,3], +"security_8php.html#ab3bdd30dc60d9ee72370b866aa4a2d01":[5,0,0,61,9], +"security_8php.html#acd06ef411116115c2f0a92633700db8a":[5,0,0,61,6], +"security_8php.html#adc7bf51e3b8d67bd80e9348f9ab03733":[5,0,0,61,0], +"security_8php.html#ae92c5c1a1cbbc49ddbb8b3265d2db809":[5,0,0,61,10], +"security_8php.html#afa683bc025a1d2fe9065e2f6cd71a22f":[5,0,0,61,8], +"session_8php.html":[5,0,0,62], +"session_8php.html#a26fa1042356d555023cbf15ddd4f8507":[5,0,0,62,4], +"session_8php.html#a4c0ead624f95483e386bc80abf570a8f":[5,0,0,62,0], +"session_8php.html#a5e1c616e02b863d5450317d101366bb7":[5,0,0,62,1], +"session_8php.html#a62e4a6cb26b4bb1b8ddd8277b26090eb":[5,0,0,62,8], +"session_8php.html#a7f0f50576360d9ba52d29364e0b83a8e":[5,0,0,62,5], +"session_8php.html#a96b09cc763572f45280786a7b33feb7e":[5,0,0,62,7], +"session_8php.html#ac4461c1984543d3553e73dba2771568f":[5,0,0,62,6], +"session_8php.html#ac95373f4966862a028033dd2f94d4da1":[5,0,0,62,3], +"session_8php.html#af0100a2642a5268594bbd5742a03d885":[5,0,0,62,9], +"session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052":[5,0,0,62,2], "settings_8php.html":[5,0,1,84], "settings_8php.html#a39abc76ff5459c57e3b957664f273f18":[5,0,1,84,0], "settings_8php.html#a3a4cde287482fced008583f54ba2a722":[5,0,1,84,2], @@ -76,16 +91,16 @@ var NAVTREEINDEX6 = "sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1":[5,0,1,88,0], "smilies_8php.html":[5,0,1,89], "smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[5,0,1,89,0], -"socgraph_8php.html":[5,0,0,62], -"socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586":[5,0,0,62,0], -"socgraph_8php.html#a5ef8bef37161df53718a21e93d02fbd6":[5,0,0,62,6], -"socgraph_8php.html#a76e6fca3d2bc842dcd9e710bb87c8329":[5,0,0,62,7], -"socgraph_8php.html#a790690bb1a1d02483fe31632a160144d":[5,0,0,62,8], -"socgraph_8php.html#a7d34cd58025bcd9e575282f44db75918":[5,0,0,62,1], -"socgraph_8php.html#a887d576f21fd708132a06d0f72f90f84":[5,0,0,62,4], -"socgraph_8php.html#ac343a846241d36cdf046b08f3396cfe9":[5,0,0,62,2], -"socgraph_8php.html#af175807406d94407a5e11742a3287746":[5,0,0,62,5], -"socgraph_8php.html#af29d056beec10b4e38e5209c92452894":[5,0,0,62,3], +"socgraph_8php.html":[5,0,0,63], +"socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586":[5,0,0,63,0], +"socgraph_8php.html#a5ef8bef37161df53718a21e93d02fbd6":[5,0,0,63,6], +"socgraph_8php.html#a76e6fca3d2bc842dcd9e710bb87c8329":[5,0,0,63,7], +"socgraph_8php.html#a790690bb1a1d02483fe31632a160144d":[5,0,0,63,8], +"socgraph_8php.html#a7d34cd58025bcd9e575282f44db75918":[5,0,0,63,1], +"socgraph_8php.html#a887d576f21fd708132a06d0f72f90f84":[5,0,0,63,4], +"socgraph_8php.html#ac343a846241d36cdf046b08f3396cfe9":[5,0,0,63,2], +"socgraph_8php.html#af175807406d94407a5e11742a3287746":[5,0,0,63,5], +"socgraph_8php.html#af29d056beec10b4e38e5209c92452894":[5,0,0,63,3], "starred_8php.html":[5,0,1,90], "starred_8php.html#a63024fb418c678e49fd535e3752d349a":[5,0,1,90,0], "subthread_8php.html":[5,0,1,91], @@ -94,110 +109,110 @@ var NAVTREEINDEX6 = "suggest_8php.html#a4df91c84594d51ba56b5918de414230d":[5,0,1,92,0], "suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[5,0,1,92,1], "suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[5,0,1,92,2], -"system__unavailable_8php.html":[5,0,0,63], -"system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa":[5,0,0,63,0], +"system__unavailable_8php.html":[5,0,0,64], +"system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa":[5,0,0,64,0], "tagger_8php.html":[5,0,1,93], "tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[5,0,1,93,0], "tagrm_8php.html":[5,0,1,94], "tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[5,0,1,94,1], "tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[5,0,1,94,0], -"taxonomy_8php.html":[5,0,0,64], -"taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce":[5,0,0,64,6], -"taxonomy_8php.html#a061b3db9426d4b074395f5824062cad4":[5,0,0,64,8], -"taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6":[5,0,0,64,0], -"taxonomy_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1":[5,0,0,64,4], -"taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1":[5,0,0,64,2], -"taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37":[5,0,0,64,1], -"taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd":[5,0,0,64,7], -"taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c":[5,0,0,64,11], -"taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43":[5,0,0,64,10], -"taxonomy_8php.html#abdb698bc6921429df6d697f6c5dec96f":[5,0,0,64,9], -"taxonomy_8php.html#ac12a651a42ed77f8dc7072c6168811a2":[5,0,0,64,5], -"taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1":[5,0,0,64,3], -"template__processor_8php.html":[5,0,0,65], -"template__processor_8php.html#a797745996c7839a93b2ab1af456631ab":[5,0,0,65,3], -"template__processor_8php.html#ab2bcd8738f20f293636a6ae8e1099db5":[5,0,0,65,1], -"template__processor_8php.html#ac635bb19a5f6eadd6b0cddefdd537c1e":[5,0,0,65,2], -"text_8php.html":[5,0,0,66], -"text_8php.html#a0271381208acfa2d4cff36da281e3e23":[5,0,0,66,35], -"text_8php.html#a030fa5ecc64168af0c4f44897a9bce63":[5,0,0,66,40], -"text_8php.html#a05b7f26dc2df78681f57eeade53040c6":[5,0,0,66,25], -"text_8php.html#a070384ec000fd65043fce11d5392d241":[5,0,0,66,6], -"text_8php.html#a0a1f7c0e97f9ecbebf3e5834582b014c":[5,0,0,66,15], -"text_8php.html#a0c65597bb4aed3a039eb795ff540e5e3":[5,0,0,66,11], -"text_8php.html#a11255c8c4e5245b6c24f97684826aa54":[5,0,0,66,39], -"text_8php.html#a13286f8a95d2de6b102966ecc270c8d6":[5,0,0,66,5], -"text_8php.html#a1360fed7f918d859daaca1c9f384f9af":[5,0,0,66,69], -"text_8php.html#a138a3a611fa7f4f3630674145fc826bf":[5,0,0,66,29], -"text_8php.html#a1557112a774ec00fa06ed6b6f6495506":[5,0,0,66,31], -"text_8php.html#a1af49756c8c71902a66c7e329c462beb":[5,0,0,66,46], -"text_8php.html#a1e510c53624933ce9b7d6715784894db":[5,0,0,66,41], -"text_8php.html#a24d441d30df4b8e6bf6780bf62a5e2c6":[5,0,0,66,42], -"text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728":[5,0,0,66,37], -"text_8php.html#a27cd2c1b3bcb49a0cfb7249e851725ca":[5,0,0,66,4], -"text_8php.html#a29988052f3944111def3b6aaf2c7a8f6":[5,0,0,66,76], -"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[5,0,0,66,67], -"text_8php.html#a2a902f5fdba8646333e997898ac45ea3":[5,0,0,66,43], -"text_8php.html#a2e8d6c402603be3a1256a16605e09c2a":[5,0,0,66,10], -"text_8php.html#a2ffd79c60cc87cec24ef76447b905187":[5,0,0,66,78], -"text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f":[5,0,0,66,72], -"text_8php.html#a3972701c5c83624ec4e2d06242f614e7":[5,0,0,66,27], -"text_8php.html#a3d225b253bb9e0f2498c11647d927b0b":[5,0,0,66,65], -"text_8php.html#a3d2793d66db3345fd290b71e2eadf98e":[5,0,0,66,7], -"text_8php.html#a405afe814a23f3bd94d826101aa168ab":[5,0,0,66,74], -"text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a":[5,0,0,66,30], -"text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6":[5,0,0,66,64], -"text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623":[5,0,0,66,28], -"text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285":[5,0,0,66,38], -"text_8php.html#a4841df5beabdd1bdd1ed56781a915d61":[5,0,0,66,55], -"text_8php.html#a4bbb7d00c05cd20b4e043424f322388f":[5,0,0,66,44], -"text_8php.html#a4e7698aca48982512594b274543c3b9b":[5,0,0,66,54], -"text_8php.html#a543447c5ed766535221e2d9636b379ee":[5,0,0,66,71], -"text_8php.html#a55ab893be57feda59c2a7ba1e58ff2d0":[5,0,0,66,9], -"text_8php.html#a63fb21c0bed2fc72eef2c1471ac42b63":[5,0,0,66,14], -"text_8php.html#a6a3d80a6c6fb234fd0bac44203b828eb":[5,0,0,66,70], -"text_8php.html#a71f6952243d3fe1c5a8154f78027e29c":[5,0,0,66,36], -"text_8php.html#a736db13a966b8abaf8c9198faa35911a":[5,0,0,66,24], -"text_8php.html#a740ad03e00459039a2c0992246c4e727":[5,0,0,66,68], -"text_8php.html#a75c243e06341ec16bd5a44b9b1cacd85":[5,0,0,66,1], -"text_8php.html#a76d1b3435c067978d7b484c45f56472b":[5,0,0,66,23], -"text_8php.html#a85e3a4851c16674834010d8419a5d7ca":[5,0,0,66,8], -"text_8php.html#a876e94892867019935b348b573299352":[5,0,0,66,62], -"text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13":[5,0,0,66,66], -"text_8php.html#a89929fa6f70a8ba54d5273fcf622b665":[5,0,0,66,19], -"text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6":[5,0,0,66,53], -"text_8php.html#a8d8c4a11e53461caca21181ebd72daca":[5,0,0,66,18], -"text_8php.html#a95fd2f8f23a1948414a03ebc963bac57":[5,0,0,66,3], -"text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee":[5,0,0,66,48], -"text_8php.html#a9c6ce4e12a4ac883c5e3f36fed6e1e09":[5,0,0,66,59], -"text_8php.html#a9d6a5ee1290de7a8b483fe78585daade":[5,0,0,66,57], -"text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c":[5,0,0,66,61], -"text_8php.html#aa46f941155c2ac1155f2f17ffb0adb66":[5,0,0,66,26], -"text_8php.html#aa5148a0dfea2a1ca64c3d52f10aa2d64":[5,0,0,66,16], -"text_8php.html#aa5528f41533927e1bd2da3618a74a6d7":[5,0,0,66,49], -"text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e":[5,0,0,66,32], -"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[5,0,0,66,77], -"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[5,0,0,66,73], -"text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4":[5,0,0,66,75], -"text_8php.html#ac19d2b33a58372a357a43d51eed19162":[5,0,0,66,50], -"text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e":[5,0,0,66,33], -"text_8php.html#aca0f589be74fab1a460c57e88dad9779":[5,0,0,66,63], -"text_8php.html#ace3c98538c63e09b70a363210b414112":[5,0,0,66,20], -"text_8php.html#acedb584f65114a33f389efb796172a91":[5,0,0,66,2], -"text_8php.html#ad6432621d0fafcbcf3d3b9b49bef7784":[5,0,0,66,13], -"text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2":[5,0,0,66,58], -"text_8php.html#adba17ec946f4285285dc100f7860bf51":[5,0,0,66,45], -"text_8php.html#ae17b39d5e321debd3ad16dcbbde842b8":[5,0,0,66,34], -"text_8php.html#ae2126da85966da0e79c6bcbac63b0bda":[5,0,0,66,60], -"text_8php.html#ae4282a39492caa23ccbc2ce98e54f110":[5,0,0,66,17], -"text_8php.html#ae4df74296fbe55051ed3c035e55205e5":[5,0,0,66,51], -"text_8php.html#ae4f6881d7e13623f8eded6277595112a":[5,0,0,66,22], -"text_8php.html#af8a3e3a66a7b862d4510f145d2e13186":[5,0,0,66,0], -"text_8php.html#afc998d2796a6b2a08e96f7cc061e7221":[5,0,0,66,56], -"text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28":[5,0,0,66,21], -"text_8php.html#afe18627c4983ee5f7c940a0992818cd5":[5,0,0,66,12], -"text_8php.html#afe54312607d92f7ce9593f5760831f80":[5,0,0,66,52], -"text_8php.html#afe9f178d264d44a94dc1292aaf0fd585":[5,0,0,66,47], +"taxonomy_8php.html":[5,0,0,65], +"taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce":[5,0,0,65,6], +"taxonomy_8php.html#a061b3db9426d4b074395f5824062cad4":[5,0,0,65,8], +"taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6":[5,0,0,65,0], +"taxonomy_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1":[5,0,0,65,4], +"taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1":[5,0,0,65,2], +"taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37":[5,0,0,65,1], +"taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd":[5,0,0,65,7], +"taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c":[5,0,0,65,11], +"taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43":[5,0,0,65,10], +"taxonomy_8php.html#abdb698bc6921429df6d697f6c5dec96f":[5,0,0,65,9], +"taxonomy_8php.html#ac12a651a42ed77f8dc7072c6168811a2":[5,0,0,65,5], +"taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1":[5,0,0,65,3], +"template__processor_8php.html":[5,0,0,66], +"template__processor_8php.html#a797745996c7839a93b2ab1af456631ab":[5,0,0,66,3], +"template__processor_8php.html#ab2bcd8738f20f293636a6ae8e1099db5":[5,0,0,66,1], +"template__processor_8php.html#ac635bb19a5f6eadd6b0cddefdd537c1e":[5,0,0,66,2], +"text_8php.html":[5,0,0,67], +"text_8php.html#a0271381208acfa2d4cff36da281e3e23":[5,0,0,67,35], +"text_8php.html#a030fa5ecc64168af0c4f44897a9bce63":[5,0,0,67,40], +"text_8php.html#a05b7f26dc2df78681f57eeade53040c6":[5,0,0,67,25], +"text_8php.html#a070384ec000fd65043fce11d5392d241":[5,0,0,67,6], +"text_8php.html#a0a1f7c0e97f9ecbebf3e5834582b014c":[5,0,0,67,15], +"text_8php.html#a0c65597bb4aed3a039eb795ff540e5e3":[5,0,0,67,11], +"text_8php.html#a11255c8c4e5245b6c24f97684826aa54":[5,0,0,67,39], +"text_8php.html#a13286f8a95d2de6b102966ecc270c8d6":[5,0,0,67,5], +"text_8php.html#a1360fed7f918d859daaca1c9f384f9af":[5,0,0,67,69], +"text_8php.html#a138a3a611fa7f4f3630674145fc826bf":[5,0,0,67,29], +"text_8php.html#a1557112a774ec00fa06ed6b6f6495506":[5,0,0,67,31], +"text_8php.html#a1af49756c8c71902a66c7e329c462beb":[5,0,0,67,46], +"text_8php.html#a1e510c53624933ce9b7d6715784894db":[5,0,0,67,41], +"text_8php.html#a24d441d30df4b8e6bf6780bf62a5e2c6":[5,0,0,67,42], +"text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728":[5,0,0,67,37], +"text_8php.html#a27cd2c1b3bcb49a0cfb7249e851725ca":[5,0,0,67,4], +"text_8php.html#a29988052f3944111def3b6aaf2c7a8f6":[5,0,0,67,76], +"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[5,0,0,67,67], +"text_8php.html#a2a902f5fdba8646333e997898ac45ea3":[5,0,0,67,43], +"text_8php.html#a2e8d6c402603be3a1256a16605e09c2a":[5,0,0,67,10], +"text_8php.html#a2ffd79c60cc87cec24ef76447b905187":[5,0,0,67,78], +"text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f":[5,0,0,67,72], +"text_8php.html#a3972701c5c83624ec4e2d06242f614e7":[5,0,0,67,27], +"text_8php.html#a3d225b253bb9e0f2498c11647d927b0b":[5,0,0,67,65], +"text_8php.html#a3d2793d66db3345fd290b71e2eadf98e":[5,0,0,67,7], +"text_8php.html#a405afe814a23f3bd94d826101aa168ab":[5,0,0,67,74], +"text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a":[5,0,0,67,30], +"text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6":[5,0,0,67,64], +"text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623":[5,0,0,67,28], +"text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285":[5,0,0,67,38], +"text_8php.html#a4841df5beabdd1bdd1ed56781a915d61":[5,0,0,67,55], +"text_8php.html#a4bbb7d00c05cd20b4e043424f322388f":[5,0,0,67,44], +"text_8php.html#a4e7698aca48982512594b274543c3b9b":[5,0,0,67,54], +"text_8php.html#a543447c5ed766535221e2d9636b379ee":[5,0,0,67,71], +"text_8php.html#a55ab893be57feda59c2a7ba1e58ff2d0":[5,0,0,67,9], +"text_8php.html#a63fb21c0bed2fc72eef2c1471ac42b63":[5,0,0,67,14], +"text_8php.html#a6a3d80a6c6fb234fd0bac44203b828eb":[5,0,0,67,70], +"text_8php.html#a71f6952243d3fe1c5a8154f78027e29c":[5,0,0,67,36], +"text_8php.html#a736db13a966b8abaf8c9198faa35911a":[5,0,0,67,24], +"text_8php.html#a740ad03e00459039a2c0992246c4e727":[5,0,0,67,68], +"text_8php.html#a75c243e06341ec16bd5a44b9b1cacd85":[5,0,0,67,1], +"text_8php.html#a76d1b3435c067978d7b484c45f56472b":[5,0,0,67,23], +"text_8php.html#a85e3a4851c16674834010d8419a5d7ca":[5,0,0,67,8], +"text_8php.html#a876e94892867019935b348b573299352":[5,0,0,67,62], +"text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13":[5,0,0,67,66], +"text_8php.html#a89929fa6f70a8ba54d5273fcf622b665":[5,0,0,67,19], +"text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6":[5,0,0,67,53], +"text_8php.html#a8d8c4a11e53461caca21181ebd72daca":[5,0,0,67,18], +"text_8php.html#a95fd2f8f23a1948414a03ebc963bac57":[5,0,0,67,3], +"text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee":[5,0,0,67,48], +"text_8php.html#a9c6ce4e12a4ac883c5e3f36fed6e1e09":[5,0,0,67,59], +"text_8php.html#a9d6a5ee1290de7a8b483fe78585daade":[5,0,0,67,57], +"text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c":[5,0,0,67,61], +"text_8php.html#aa46f941155c2ac1155f2f17ffb0adb66":[5,0,0,67,26], +"text_8php.html#aa5148a0dfea2a1ca64c3d52f10aa2d64":[5,0,0,67,16], +"text_8php.html#aa5528f41533927e1bd2da3618a74a6d7":[5,0,0,67,49], +"text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e":[5,0,0,67,32], +"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[5,0,0,67,77], +"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[5,0,0,67,73], +"text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4":[5,0,0,67,75], +"text_8php.html#ac19d2b33a58372a357a43d51eed19162":[5,0,0,67,50], +"text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e":[5,0,0,67,33], +"text_8php.html#aca0f589be74fab1a460c57e88dad9779":[5,0,0,67,63], +"text_8php.html#ace3c98538c63e09b70a363210b414112":[5,0,0,67,20], +"text_8php.html#acedb584f65114a33f389efb796172a91":[5,0,0,67,2], +"text_8php.html#ad6432621d0fafcbcf3d3b9b49bef7784":[5,0,0,67,13], +"text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2":[5,0,0,67,58], +"text_8php.html#adba17ec946f4285285dc100f7860bf51":[5,0,0,67,45], +"text_8php.html#ae17b39d5e321debd3ad16dcbbde842b8":[5,0,0,67,34], +"text_8php.html#ae2126da85966da0e79c6bcbac63b0bda":[5,0,0,67,60], +"text_8php.html#ae4282a39492caa23ccbc2ce98e54f110":[5,0,0,67,17], +"text_8php.html#ae4df74296fbe55051ed3c035e55205e5":[5,0,0,67,51], +"text_8php.html#ae4f6881d7e13623f8eded6277595112a":[5,0,0,67,22], +"text_8php.html#af8a3e3a66a7b862d4510f145d2e13186":[5,0,0,67,0], +"text_8php.html#afc998d2796a6b2a08e96f7cc061e7221":[5,0,0,67,56], +"text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28":[5,0,0,67,21], +"text_8php.html#afe18627c4983ee5f7c940a0992818cd5":[5,0,0,67,12], +"text_8php.html#afe54312607d92f7ce9593f5760831f80":[5,0,0,67,52], +"text_8php.html#afe9f178d264d44a94dc1292aaf0fd585":[5,0,0,67,47], "theme_2redstrap_2php_2default_8php.html":[5,0,3,1,1,0,1], "theme_2redstrap_2php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762":[5,0,3,1,1,0,1,0], "theme_2redstrap_2php_2theme__init_8php.html":[5,0,3,1,1,0,4], @@ -234,20 +249,5 @@ var NAVTREEINDEX6 = "updatetpl_8py.html":[5,0,2,10], "updatetpl_8py.html#a52a85ffa6b6d63d840b185a133478c12":[5,0,2,10,5], "updatetpl_8py.html#a79c20eb62d568c999b56eb08530355d3":[5,0,2,10,2], -"updatetpl_8py.html#a988d937ed5d5c2b592b763036af5cf94":[5,0,2,10,1], -"updatetpl_8py.html#ab42dd79af65ee82201fd6f04715f62f6":[5,0,2,10,3], -"updatetpl_8py.html#ac9d11279fed403a329a719298feafc4f":[5,0,2,10,0], -"updatetpl_8py.html#ae694f5e1f25f8a92a945eb90c432dfe6":[5,0,2,10,4], -"view_2theme_2redbasic_2php_2config_8php.html":[5,0,3,1,0,0,0], -"view_2theme_2redbasic_2php_2config_8php.html#a29a6e1ef07465d1617d836b859b3b2b2":[5,0,3,1,0,0,0,0], -"view_2theme_2redbasic_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[5,0,3,1,0,0,0,1], -"view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[5,0,3,1,0,0,0,2], -"view_2theme_2redstrap_2php_2config_8php.html":[5,0,3,1,1,0,0], -"view_2theme_2redstrap_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[5,0,3,1,1,0,0,1], -"view_2theme_2redstrap_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[5,0,3,1,1,0,0,2], -"view_2theme_2redstrap_2php_2config_8php.html#af58e97b437c1e98a5e434886494cc70e":[5,0,3,1,1,0,0,0], -"view_8php.html":[5,0,1,103], -"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[5,0,1,103,0], -"viewconnections_8php.html":[5,0,1,104], -"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[5,0,1,104,2] +"updatetpl_8py.html#a988d937ed5d5c2b592b763036af5cf94":[5,0,2,10,1] }; diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js index 374967c34..0453d2f31 100644 --- a/doc/html/navtreeindex7.js +++ b/doc/html/navtreeindex7.js @@ -1,52 +1,71 @@ var NAVTREEINDEX7 = { +"updatetpl_8py.html#ab42dd79af65ee82201fd6f04715f62f6":[5,0,2,10,3], +"updatetpl_8py.html#ac9d11279fed403a329a719298feafc4f":[5,0,2,10,0], +"updatetpl_8py.html#ae694f5e1f25f8a92a945eb90c432dfe6":[5,0,2,10,4], +"view_2theme_2redbasic_2php_2config_8php.html":[5,0,3,1,0,0,0], +"view_2theme_2redbasic_2php_2config_8php.html#a29a6e1ef07465d1617d836b859b3b2b2":[5,0,3,1,0,0,0,0], +"view_2theme_2redbasic_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[5,0,3,1,0,0,0,1], +"view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[5,0,3,1,0,0,0,2], +"view_2theme_2redstrap_2php_2config_8php.html":[5,0,3,1,1,0,0], +"view_2theme_2redstrap_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[5,0,3,1,1,0,0,1], +"view_2theme_2redstrap_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[5,0,3,1,1,0,0,2], +"view_2theme_2redstrap_2php_2config_8php.html#af58e97b437c1e98a5e434886494cc70e":[5,0,3,1,1,0,0,0], +"view_8php.html":[5,0,1,103], +"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[5,0,1,103,0], +"viewconnections_8php.html":[5,0,1,104], +"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[5,0,1,104,2], "viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[5,0,1,104,1], "viewconnections_8php.html#ae330cea4cddd091559659f8b469617b6":[5,0,1,104,0], "viewsrc_8php.html":[5,0,1,105], "viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[5,0,1,105,0], -"wall__attach_8php.html":[5,0,1,106], -"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[5,0,1,106,0], -"wall__upload_8php.html":[5,0,1,107], -"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[5,0,1,107,0], -"webfinger_8php.html":[5,0,1,108], -"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[5,0,1,108,0], -"webpages_8php.html":[5,0,1,109], -"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[5,0,1,109,0], -"wfinger_8php.html":[5,0,1,110], -"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[5,0,1,110,0], -"xchan_8php.html":[5,0,1,111], -"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[5,0,1,111,0], -"xrd_8php.html":[5,0,1,112], -"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[5,0,1,112,0], -"zfinger_8php.html":[5,0,1,113], -"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[5,0,1,113,0], -"zot_8php.html":[5,0,0,67], -"zot_8php.html#a083aec6c900d244e1bfc1406f9461465":[5,0,0,67,11], -"zot_8php.html#a22e3f9b97b7969ddbe43ccf0db93a19c":[5,0,0,67,20], -"zot_8php.html#a2657e141d62d5f67ad3c87651b585299":[5,0,0,67,5], -"zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df":[5,0,0,67,13], -"zot_8php.html#a37ec13b18057634eadb071f05297f5e1":[5,0,0,67,8], -"zot_8php.html#a3862b3161b2c8557dc1a95020179bd81":[5,0,0,67,15], -"zot_8php.html#a3bf11286c2619b4ca28e49d5b5ab374a":[5,0,0,67,3], -"zot_8php.html#a3c9e0b243ba29a7b0c050bd0b86eee32":[5,0,0,67,4], -"zot_8php.html#a55056e863a7860bc0cf922e78fcce073":[5,0,0,67,19], -"zot_8php.html#a5bcdfef419b16075a0eca990956223dc":[5,0,0,67,24], -"zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea":[5,0,0,67,16], -"zot_8php.html#a666d3efcac00ec1b4a4537a60655f2ab":[5,0,0,67,14], -"zot_8php.html#a703f528ade8382cf374e4119bd6f7859":[5,0,0,67,0], -"zot_8php.html#a77720d6b59894e9b609af89c310c8a4d":[5,0,0,67,17], -"zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d":[5,0,0,67,23], -"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[5,0,0,67,22], -"zot_8php.html#a9a57b40669351c9791126b925cb7ef3b":[5,0,0,67,10], -"zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc":[5,0,0,67,9], -"zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10":[5,0,0,67,12], -"zot_8php.html#ab0227978011d8601494a7651fa26acf0":[5,0,0,67,6], -"zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7":[5,0,0,67,21], -"zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142":[5,0,0,67,25], -"zot_8php.html#ac301c67864917c35922257950ae0f95c":[5,0,0,67,7], -"zot_8php.html#ac34e479d27f32b82dd6b33542f81a6a7":[5,0,0,67,1], -"zot_8php.html#acdea9362d78a63dce948fdf0ea73ef0e":[5,0,0,67,18], -"zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72":[5,0,0,67,2], -"zotfeed_8php.html":[5,0,1,114], -"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,114,0] +"vote_8php.html":[5,0,1,106], +"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[5,0,1,106,2], +"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[5,0,1,106,0], +"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[5,0,1,106,1], +"wall__attach_8php.html":[5,0,1,107], +"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[5,0,1,107,0], +"wall__upload_8php.html":[5,0,1,108], +"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[5,0,1,108,0], +"webfinger_8php.html":[5,0,1,109], +"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[5,0,1,109,0], +"webpages_8php.html":[5,0,1,110], +"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[5,0,1,110,0], +"wfinger_8php.html":[5,0,1,111], +"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[5,0,1,111,0], +"xchan_8php.html":[5,0,1,112], +"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[5,0,1,112,0], +"xrd_8php.html":[5,0,1,113], +"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[5,0,1,113,0], +"zfinger_8php.html":[5,0,1,114], +"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[5,0,1,114,0], +"zot_8php.html":[5,0,0,68], +"zot_8php.html#a083aec6c900d244e1bfc1406f9461465":[5,0,0,68,11], +"zot_8php.html#a22e3f9b97b7969ddbe43ccf0db93a19c":[5,0,0,68,20], +"zot_8php.html#a2657e141d62d5f67ad3c87651b585299":[5,0,0,68,5], +"zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df":[5,0,0,68,13], +"zot_8php.html#a37ec13b18057634eadb071f05297f5e1":[5,0,0,68,8], +"zot_8php.html#a3862b3161b2c8557dc1a95020179bd81":[5,0,0,68,15], +"zot_8php.html#a3bf11286c2619b4ca28e49d5b5ab374a":[5,0,0,68,3], +"zot_8php.html#a3c9e0b243ba29a7b0c050bd0b86eee32":[5,0,0,68,4], +"zot_8php.html#a55056e863a7860bc0cf922e78fcce073":[5,0,0,68,19], +"zot_8php.html#a5bcdfef419b16075a0eca990956223dc":[5,0,0,68,24], +"zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea":[5,0,0,68,16], +"zot_8php.html#a666d3efcac00ec1b4a4537a60655f2ab":[5,0,0,68,14], +"zot_8php.html#a703f528ade8382cf374e4119bd6f7859":[5,0,0,68,0], +"zot_8php.html#a77720d6b59894e9b609af89c310c8a4d":[5,0,0,68,17], +"zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d":[5,0,0,68,23], +"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[5,0,0,68,22], +"zot_8php.html#a9a57b40669351c9791126b925cb7ef3b":[5,0,0,68,10], +"zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc":[5,0,0,68,9], +"zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10":[5,0,0,68,12], +"zot_8php.html#ab0227978011d8601494a7651fa26acf0":[5,0,0,68,6], +"zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7":[5,0,0,68,21], +"zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142":[5,0,0,68,25], +"zot_8php.html#ac301c67864917c35922257950ae0f95c":[5,0,0,68,7], +"zot_8php.html#ac34e479d27f32b82dd6b33542f81a6a7":[5,0,0,68,1], +"zot_8php.html#acdea9362d78a63dce948fdf0ea73ef0e":[5,0,0,68,18], +"zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72":[5,0,0,68,2], +"zotfeed_8php.html":[5,0,1,115], +"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,115,0] }; diff --git a/doc/html/php2po_8php.html b/doc/html/php2po_8php.html index e0c1ec29e..6a74a7d04 100644 --- a/doc/html/php2po_8php.html +++ b/doc/html/php2po_8php.html @@ -168,7 +168,7 @@ Variables
    -

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

    +

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

    diff --git a/doc/html/plugin_8php.html b/doc/html/plugin_8php.html index a02505013..13e7cf6f9 100644 --- a/doc/html/plugin_8php.html +++ b/doc/html/plugin_8php.html @@ -190,7 +190,7 @@ Functions
    -

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

    +

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

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

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

    +

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

    diff --git a/doc/html/redbasic_2php_2style_8php.html b/doc/html/redbasic_2php_2style_8php.html index a636a96f7..652450bfe 100644 --- a/doc/html/redbasic_2php_2style_8php.html +++ b/doc/html/redbasic_2php_2style_8php.html @@ -386,7 +386,7 @@ Variables
    -

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

    +

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

    diff --git a/doc/html/search/all_24.js b/doc/html/search/all_24.js index 023be319b..9a60a349f 100644 --- a/doc/html/search/all_24.js +++ b/doc/html/search/all_24.js @@ -59,6 +59,7 @@ var searchData= ['_24k',['$k',['../php2po_8php.html#ad6726cfaa85d4b8299d2b0f034cbf178',1,'php2po.php']]], ['_24lang',['$lang',['../classTemplate.html#ace26b8a4252fbc1c385d2b5e1e93e5c8',1,'Template']]], ['_24language',['$language',['../classApp.html#a1a297e70b3667b83f4460aa7ed9f5d6f',1,'App']]], + ['_24layout',['$layout',['../classApp.html#a58ac598544892ff7c32890291b72635e',1,'App']]], ['_24ldelim',['$ldelim',['../classApp.html#a59dd4b665c70e7dbd80682c014ff7145',1,'App']]], ['_24line_5fheight',['$line_height',['../redbasic_2php_2style_8php.html#a4131d1765ee4deb28e83fc4527943ee0',1,'$line_height(): style.php'],['../redstrap_2php_2style_8php.html#a4131d1765ee4deb28e83fc4527943ee0',1,'$line_height(): style.php']]], ['_24linkcolour',['$linkcolour',['../redbasic_2php_2style_8php.html#a6628a80911a6b37b464ef110ac8f6e42',1,'$linkcolour(): style.php'],['../redstrap_2php_2style_8php.html#a6628a80911a6b37b464ef110ac8f6e42',1,'$linkcolour(): style.php']]], diff --git a/doc/html/search/all_63.js b/doc/html/search/all_63.js index ec3323a11..ea4623c67 100644 --- a/doc/html/search/all_63.js +++ b/doc/html/search/all_63.js @@ -56,6 +56,12 @@ var searchData= ['collect_5fprivate',['collect_private',['../classProtoDriver.html#af66171aa7dab9b62cee915cb4f1abe1b',1,'ProtoDriver\collect_private()'],['../classZotDriver.html#a2e15ff09772f0608203dad1c98299394',1,'ZotDriver\collect_private()']]], ['collect_5frecipients',['collect_recipients',['../items_8php.html#a01e3cf44e082fa9bd06dcde5bf713d70',1,'items.php']]], ['collecturls',['collecturls',['../html2plain_8php.html#ae1c203d0f089d5678d73a6c64a395201',1,'html2plain.php']]], + ['comanche_2ephp',['comanche.php',['../comanche_8php.html',1,'']]], + ['comanche_5fmenu',['comanche_menu',['../comanche_8php.html#a1fe339e1454803aa502ac89379c17f5b',1,'comanche.php']]], + ['comanche_5fparser',['comanche_parser',['../comanche_8php.html#a1a208fdb40dd83d6298caec4290ee922',1,'comanche.php']]], + ['comanche_5fregion',['comanche_region',['../comanche_8php.html#a5718daeda40bf835345fe061e8808cdf',1,'comanche.php']]], + ['comanche_5freplace_5fregion',['comanche_replace_region',['../comanche_8php.html#a028f004d5b8c23d6367816d899e17cfe',1,'comanche.php']]], + ['comanche_5fwidget',['comanche_widget',['../comanche_8php.html#a45900dd1d6101b53e3d063db40eafa5e',1,'comanche.php']]], ['common_2ephp',['common.php',['../common_8php.html',1,'']]], ['common_5faside',['common_aside',['../common_8php.html#a3b12ec67b3d3edcf595c8d195da5d14a',1,'common.php']]], ['common_5fcontent',['common_content',['../common_8php.html#ab63408f39abef7a6915186e8dabc5a96',1,'common.php']]], @@ -69,9 +75,9 @@ var searchData= ['compare_5fpermissions',['compare_permissions',['../items_8php.html#a0790a4550b829e85504af548623002ca',1,'items.php']]], ['completeurl',['completeurl',['../parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a',1,'parse_url.php']]], ['config_2emd',['config.md',['../config_8md.html',1,'']]], + ['config_2ephp',['config.php',['../view_2theme_2redbasic_2php_2config_8php.html',1,'']]], ['config_2ephp',['config.php',['../view_2theme_2redstrap_2php_2config_8php.html',1,'']]], ['config_2ephp',['config.php',['../include_2config_8php.html',1,'']]], - ['config_2ephp',['config.php',['../view_2theme_2redbasic_2php_2config_8php.html',1,'']]], ['connect',['connect',['../classdba__driver.html#ae533e62a240a793f17aef5ab4ef10edc',1,'dba_driver\connect()'],['../classdba__mysql.html#a1887338627ce0e28786839363014bd0b',1,'dba_mysql\connect()'],['../classdba__mysqli.html#add062bd93961e5f0194d94820e9a51b1',1,'dba_mysqli\connect()']]], ['connect_2ephp',['connect.php',['../connect_8php.html',1,'']]], ['connect_5fcontent',['connect_content',['../connect_8php.html#a489f0a66c660de6ec4d6917b27674f07',1,'connect.php']]], diff --git a/doc/html/search/all_67.js b/doc/html/search/all_67.js index dbb8d68b7..b57640f77 100644 --- a/doc/html/search/all_67.js +++ b/doc/html/search/all_67.js @@ -26,6 +26,7 @@ var searchData= ['get_5fconversation',['get_conversation',['../classItem.html#a0c301aaed2b7d682728d18db3a22afa3',1,'Item']]], ['get_5fcurl_5fcode',['get_curl_code',['../classApp.html#ab410451f132910773d0a02e35d0dced9',1,'App']]], ['get_5fcurl_5fheaders',['get_curl_headers',['../classApp.html#abaf2173711e861ae4aebf43a7f70157e',1,'App']]], + ['get_5fcustom_5fnav',['get_custom_nav',['../boot_8php.html#a899d24fd074594ceebbf72e1feff335f',1,'boot.php']]], ['get_5fdata',['get_data',['../classItem.html#ad3638f93065693c1f69eb349feb1b7aa',1,'Item']]], ['get_5fdata_5fvalue',['get_data_value',['../classItem.html#ac6f1c96cc82a0dfb7e881fc70309ea3c',1,'Item']]], ['get_5fdb_5ferrno',['get_db_errno',['../setup_8php.html#a8652788e8589778c5f81634a9d5b9429',1,'setup.php']]], @@ -93,8 +94,8 @@ var searchData= ['gravity_5fcomment',['GRAVITY_COMMENT',['../boot_8php.html#a4a12ce5de39789b0361e308d89925a20',1,'boot.php']]], ['gravity_5flike',['GRAVITY_LIKE',['../boot_8php.html#a1f5906598e90b5ea2b4245f682be4348',1,'boot.php']]], ['gravity_5fparent',['GRAVITY_PARENT',['../boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3',1,'boot.php']]], - ['group_2ephp',['group.php',['../mod_2group_8php.html',1,'']]], ['group_2ephp',['group.php',['../include_2group_8php.html',1,'']]], + ['group_2ephp',['group.php',['../mod_2group_8php.html',1,'']]], ['group_5fadd',['group_add',['../include_2group_8php.html#a06ec565d2b64e79044e7c1bf91a2a4ce',1,'group.php']]], ['group_5fadd_5fmember',['group_add_member',['../include_2group_8php.html#a0122ef312df2c5546b1a46b3e6c7b31b',1,'group.php']]], ['group_5faside',['group_aside',['../mod_2group_8php.html#aeb0784dd928e53e6d8693513bec8928c',1,'group.php']]], diff --git a/doc/html/search/all_69.js b/doc/html/search/all_69.js index f548d83db..d3d619b18 100644 --- a/doc/html/search/all_69.js +++ b/doc/html/search/all_69.js @@ -58,6 +58,7 @@ var searchData= ['item_5fnsfw',['ITEM_NSFW',['../boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08',1,'boot.php']]], ['item_5fobscured',['ITEM_OBSCURED',['../boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d',1,'boot.php']]], ['item_5forigin',['ITEM_ORIGIN',['../boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7',1,'boot.php']]], + ['item_5fpdl',['ITEM_PDL',['../boot_8php.html#a6e57d913634d033b4d5ad72d99fd3e9d',1,'boot.php']]], ['item_5fpermissions_5fsql',['item_permissions_sql',['../security_8php.html#a9355488460ab11d6058656ff919e5cf9',1,'security.php']]], ['item_5fphoto_5fmenu',['item_photo_menu',['../conversation_8php.html#aacbb12d372d5e9c3ab0735b4aea48fb3',1,'conversation.php']]], ['item_5fpost',['item_post',['../item_8php.html#a693cd09805755ab85bbb5ecae69a48c3',1,'item.php']]], diff --git a/doc/html/search/all_70.js b/doc/html/search/all_70.js index d4b358207..6be6519c8 100644 --- a/doc/html/search/all_70.js +++ b/doc/html/search/all_70.js @@ -20,6 +20,7 @@ var searchData= ['parsed',['parsed',['../classFriendicaSmarty.html#a6a4d4281d6fa9be1d37a97b188ffe8c9',1,'FriendicaSmarty']]], ['parseurl_5fgetsiteinfo',['parseurl_getsiteinfo',['../parse__url_8php.html#a25635549f2c22955d72465f4d2e58993',1,'parse_url.php']]], ['path',['path',['../namespacefriendica-to-smarty-tpl.html#a68d15934660cd1f4301ce251b1646f09',1,'friendica-to-smarty-tpl.path()'],['../namespaceupdatetpl.html#ae694f5e1f25f8a92a945eb90c432dfe6',1,'updatetpl.path()']]], + ['pdl_5fselector',['pdl_selector',['../comanche_8php.html#af7150df735e5ff9d467994cd6f769c6e',1,'comanche.php']]], ['perm_5fis_5fallowed',['perm_is_allowed',['../permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835',1,'permissions.php']]], ['permissions_2ephp',['permissions.php',['../permissions_8php.html',1,'']]], ['permissions_5fsql',['permissions_sql',['../security_8php.html#afa683bc025a1d2fe9065e2f6cd71a22f',1,'security.php']]], @@ -90,6 +91,10 @@ var searchData= ['poke_2ephp',['poke.php',['../poke_8php.html',1,'']]], ['poke_5fcontent',['poke_content',['../poke_8php.html#ac9190563a8da9c07a16f9dcd71cf6993',1,'poke.php']]], ['poke_5finit',['poke_init',['../poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b',1,'poke.php']]], + ['poll_5fmultiple_5fchoice',['POLL_MULTIPLE_CHOICE',['../boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86',1,'boot.php']]], + ['poll_5foverwrite',['POLL_OVERWRITE',['../boot_8php.html#a2b525996e4426bdddbcec277778bde08',1,'boot.php']]], + ['poll_5fsimple_5frating',['POLL_SIMPLE_RATING',['../boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5',1,'boot.php']]], + ['poll_5ftenscale',['POLL_TENSCALE',['../boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc',1,'boot.php']]], ['poller_2ephp',['poller.php',['../poller_8php.html',1,'']]], ['poller_5frun',['poller_run',['../poller_8php.html#a5f12df3a4738124b6c039971e87e76da',1,'poller.php']]], ['pop_5flang',['pop_lang',['../language_8php.html#a78bd204955ec4cc3a9ac651285a1689d',1,'language.php']]], diff --git a/doc/html/search/all_76.js b/doc/html/search/all_76.js index 1bf8df053..a91749bcf 100644 --- a/doc/html/search/all_76.js +++ b/doc/html/search/all_76.js @@ -14,5 +14,9 @@ var searchData= ['viewconnections_5finit',['viewconnections_init',['../viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330',1,'viewconnections.php']]], ['viewsrc_2ephp',['viewsrc.php',['../viewsrc_8php.html',1,'']]], ['viewsrc_5fcontent',['viewsrc_content',['../viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4',1,'viewsrc.php']]], - ['visible_5factivity',['visible_activity',['../conversation_8php.html#a7eeaaf44506815576f3bd80053ef52c3',1,'conversation.php']]] + ['visible_5factivity',['visible_activity',['../conversation_8php.html#a7eeaaf44506815576f3bd80053ef52c3',1,'conversation.php']]], + ['vote_2ephp',['vote.php',['../vote_8php.html',1,'']]], + ['vote_5fcontent',['vote_content',['../vote_8php.html#a6aa67489bf458ca5e3206e46dac68596',1,'vote.php']]], + ['vote_5finit',['vote_init',['../vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2',1,'vote.php']]], + ['vote_5fpost',['vote_post',['../vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2',1,'vote.php']]] ]; diff --git a/doc/html/search/all_77.js b/doc/html/search/all_77.js index cdf98bbd7..7e76e44f1 100644 --- a/doc/html/search/all_77.js +++ b/doc/html/search/all_77.js @@ -14,5 +14,6 @@ var searchData= ['wfinger_5finit',['wfinger_init',['../wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3',1,'wfinger.php']]], ['what_5fnext',['what_next',['../setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58',1,'setup.php']]], ['while',['while',['../docblox__errorchecker_8php.html#af4ca738a05beffe9c8c23e1f7aea3c2d',1,'docblox_errorchecker.php']]], + ['widget_5fprofile',['widget_profile',['../comanche_8php.html#abd2e508a2a0b911c4a838e3cb7599923',1,'comanche.php']]], ['writepages_5fwidget',['writepages_widget',['../page__widgets_8php.html#a1a1e729da27f252cab6678288a17958f',1,'page_widgets.php']]] ]; diff --git a/doc/html/search/files_63.js b/doc/html/search/files_63.js index 45806b907..7589aec25 100644 --- a/doc/html/search/files_63.js +++ b/doc/html/search/files_63.js @@ -5,6 +5,7 @@ var searchData= ['chanview_2ephp',['chanview.php',['../chanview_8php.html',1,'']]], ['cli_5fstartup_2ephp',['cli_startup.php',['../cli__startup_8php.html',1,'']]], ['cli_5fsuggest_2ephp',['cli_suggest.php',['../cli__suggest_8php.html',1,'']]], + ['comanche_2ephp',['comanche.php',['../comanche_8php.html',1,'']]], ['common_2ephp',['common.php',['../common_8php.html',1,'']]], ['community_2ephp',['community.php',['../community_8php.html',1,'']]], ['config_2emd',['config.md',['../config_8md.html',1,'']]], diff --git a/doc/html/search/files_76.js b/doc/html/search/files_76.js index 2f5aac4b4..c3a52655e 100644 --- a/doc/html/search/files_76.js +++ b/doc/html/search/files_76.js @@ -2,5 +2,6 @@ var searchData= [ ['view_2ephp',['view.php',['../view_8php.html',1,'']]], ['viewconnections_2ephp',['viewconnections.php',['../viewconnections_8php.html',1,'']]], - ['viewsrc_2ephp',['viewsrc.php',['../viewsrc_8php.html',1,'']]] + ['viewsrc_2ephp',['viewsrc.php',['../viewsrc_8php.html',1,'']]], + ['vote_2ephp',['vote.php',['../vote_8php.html',1,'']]] ]; diff --git a/doc/html/search/functions_63.js b/doc/html/search/functions_63.js index 5d56e9a5f..a1b79545e 100644 --- a/doc/html/search/functions_63.js +++ b/doc/html/search/functions_63.js @@ -47,6 +47,11 @@ var searchData= ['collect_5fprivate',['collect_private',['../classProtoDriver.html#af66171aa7dab9b62cee915cb4f1abe1b',1,'ProtoDriver\collect_private()'],['../classZotDriver.html#a2e15ff09772f0608203dad1c98299394',1,'ZotDriver\collect_private()']]], ['collect_5frecipients',['collect_recipients',['../items_8php.html#a01e3cf44e082fa9bd06dcde5bf713d70',1,'items.php']]], ['collecturls',['collecturls',['../html2plain_8php.html#ae1c203d0f089d5678d73a6c64a395201',1,'html2plain.php']]], + ['comanche_5fmenu',['comanche_menu',['../comanche_8php.html#a1fe339e1454803aa502ac89379c17f5b',1,'comanche.php']]], + ['comanche_5fparser',['comanche_parser',['../comanche_8php.html#a1a208fdb40dd83d6298caec4290ee922',1,'comanche.php']]], + ['comanche_5fregion',['comanche_region',['../comanche_8php.html#a5718daeda40bf835345fe061e8808cdf',1,'comanche.php']]], + ['comanche_5freplace_5fregion',['comanche_replace_region',['../comanche_8php.html#a028f004d5b8c23d6367816d899e17cfe',1,'comanche.php']]], + ['comanche_5fwidget',['comanche_widget',['../comanche_8php.html#a45900dd1d6101b53e3d063db40eafa5e',1,'comanche.php']]], ['common_5faside',['common_aside',['../common_8php.html#a3b12ec67b3d3edcf595c8d195da5d14a',1,'common.php']]], ['common_5fcontent',['common_content',['../common_8php.html#ab63408f39abef7a6915186e8dabc5a96',1,'common.php']]], ['common_5ffriends',['common_friends',['../socgraph_8php.html#a7d34cd58025bcd9e575282f44db75918',1,'socgraph.php']]], diff --git a/doc/html/search/functions_67.js b/doc/html/search/functions_67.js index 789e7eac2..3f7009f9e 100644 --- a/doc/html/search/functions_67.js +++ b/doc/html/search/functions_67.js @@ -26,6 +26,7 @@ var searchData= ['get_5fconversation',['get_conversation',['../classItem.html#a0c301aaed2b7d682728d18db3a22afa3',1,'Item']]], ['get_5fcurl_5fcode',['get_curl_code',['../classApp.html#ab410451f132910773d0a02e35d0dced9',1,'App']]], ['get_5fcurl_5fheaders',['get_curl_headers',['../classApp.html#abaf2173711e861ae4aebf43a7f70157e',1,'App']]], + ['get_5fcustom_5fnav',['get_custom_nav',['../boot_8php.html#a899d24fd074594ceebbf72e1feff335f',1,'boot.php']]], ['get_5fdata',['get_data',['../classItem.html#ad3638f93065693c1f69eb349feb1b7aa',1,'Item']]], ['get_5fdata_5fvalue',['get_data_value',['../classItem.html#ac6f1c96cc82a0dfb7e881fc70309ea3c',1,'Item']]], ['get_5fdb_5ferrno',['get_db_errno',['../setup_8php.html#a8652788e8589778c5f81634a9d5b9429',1,'setup.php']]], diff --git a/doc/html/search/functions_70.js b/doc/html/search/functions_70.js index 82636bdb5..f63d7379c 100644 --- a/doc/html/search/functions_70.js +++ b/doc/html/search/functions_70.js @@ -8,6 +8,7 @@ var searchData= ['parse_5fxml_5fstring',['parse_xml_string',['../include_2network_8php.html#a27a951b59d8d622c0b3e7b0673ba74c6',1,'network.php']]], ['parsed',['parsed',['../classFriendicaSmarty.html#a6a4d4281d6fa9be1d37a97b188ffe8c9',1,'FriendicaSmarty']]], ['parseurl_5fgetsiteinfo',['parseurl_getsiteinfo',['../parse__url_8php.html#a25635549f2c22955d72465f4d2e58993',1,'parse_url.php']]], + ['pdl_5fselector',['pdl_selector',['../comanche_8php.html#af7150df735e5ff9d467994cd6f769c6e',1,'comanche.php']]], ['perm_5fis_5fallowed',['perm_is_allowed',['../permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835',1,'permissions.php']]], ['permissions_5fsql',['permissions_sql',['../security_8php.html#afa683bc025a1d2fe9065e2f6cd71a22f',1,'security.php']]], ['perms2str',['perms2str',['../text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee',1,'text.php']]], diff --git a/doc/html/search/functions_76.js b/doc/html/search/functions_76.js index 87ecfe8d8..1a8b0574f 100644 --- a/doc/html/search/functions_76.js +++ b/doc/html/search/functions_76.js @@ -11,5 +11,8 @@ var searchData= ['viewconnections_5fcontent',['viewconnections_content',['../viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776',1,'viewconnections.php']]], ['viewconnections_5finit',['viewconnections_init',['../viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330',1,'viewconnections.php']]], ['viewsrc_5fcontent',['viewsrc_content',['../viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4',1,'viewsrc.php']]], - ['visible_5factivity',['visible_activity',['../conversation_8php.html#a7eeaaf44506815576f3bd80053ef52c3',1,'conversation.php']]] + ['visible_5factivity',['visible_activity',['../conversation_8php.html#a7eeaaf44506815576f3bd80053ef52c3',1,'conversation.php']]], + ['vote_5fcontent',['vote_content',['../vote_8php.html#a6aa67489bf458ca5e3206e46dac68596',1,'vote.php']]], + ['vote_5finit',['vote_init',['../vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2',1,'vote.php']]], + ['vote_5fpost',['vote_post',['../vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2',1,'vote.php']]] ]; diff --git a/doc/html/search/functions_77.js b/doc/html/search/functions_77.js index 58fdbc3ed..c2752ebb3 100644 --- a/doc/html/search/functions_77.js +++ b/doc/html/search/functions_77.js @@ -8,5 +8,6 @@ var searchData= ['webpages_5fcontent',['webpages_content',['../webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d',1,'webpages.php']]], ['wfinger_5finit',['wfinger_init',['../wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3',1,'wfinger.php']]], ['what_5fnext',['what_next',['../setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58',1,'setup.php']]], + ['widget_5fprofile',['widget_profile',['../comanche_8php.html#abd2e508a2a0b911c4a838e3cb7599923',1,'comanche.php']]], ['writepages_5fwidget',['writepages_widget',['../page__widgets_8php.html#a1a1e729da27f252cab6678288a17958f',1,'page_widgets.php']]] ]; diff --git a/doc/html/search/variables_24.js b/doc/html/search/variables_24.js index 023be319b..9a60a349f 100644 --- a/doc/html/search/variables_24.js +++ b/doc/html/search/variables_24.js @@ -59,6 +59,7 @@ var searchData= ['_24k',['$k',['../php2po_8php.html#ad6726cfaa85d4b8299d2b0f034cbf178',1,'php2po.php']]], ['_24lang',['$lang',['../classTemplate.html#ace26b8a4252fbc1c385d2b5e1e93e5c8',1,'Template']]], ['_24language',['$language',['../classApp.html#a1a297e70b3667b83f4460aa7ed9f5d6f',1,'App']]], + ['_24layout',['$layout',['../classApp.html#a58ac598544892ff7c32890291b72635e',1,'App']]], ['_24ldelim',['$ldelim',['../classApp.html#a59dd4b665c70e7dbd80682c014ff7145',1,'App']]], ['_24line_5fheight',['$line_height',['../redbasic_2php_2style_8php.html#a4131d1765ee4deb28e83fc4527943ee0',1,'$line_height(): style.php'],['../redstrap_2php_2style_8php.html#a4131d1765ee4deb28e83fc4527943ee0',1,'$line_height(): style.php']]], ['_24linkcolour',['$linkcolour',['../redbasic_2php_2style_8php.html#a6628a80911a6b37b464ef110ac8f6e42',1,'$linkcolour(): style.php'],['../redstrap_2php_2style_8php.html#a6628a80911a6b37b464ef110ac8f6e42',1,'$linkcolour(): style.php']]], diff --git a/doc/html/search/variables_69.js b/doc/html/search/variables_69.js index 60b01ebbf..bef7f3578 100644 --- a/doc/html/search/variables_69.js +++ b/doc/html/search/variables_69.js @@ -13,6 +13,7 @@ var searchData= ['item_5fnsfw',['ITEM_NSFW',['../boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08',1,'boot.php']]], ['item_5fobscured',['ITEM_OBSCURED',['../boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d',1,'boot.php']]], ['item_5forigin',['ITEM_ORIGIN',['../boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7',1,'boot.php']]], + ['item_5fpdl',['ITEM_PDL',['../boot_8php.html#a6e57d913634d033b4d5ad72d99fd3e9d',1,'boot.php']]], ['item_5frelay',['ITEM_RELAY',['../boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221',1,'boot.php']]], ['item_5fspam',['ITEM_SPAM',['../boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb',1,'boot.php']]], ['item_5fstarred',['ITEM_STARRED',['../boot_8php.html#a7af107fab8d62b9a73801713b774ed30',1,'boot.php']]], diff --git a/doc/html/search/variables_70.js b/doc/html/search/variables_70.js index e26b79358..8656256c5 100644 --- a/doc/html/search/variables_70.js +++ b/doc/html/search/variables_70.js @@ -35,5 +35,9 @@ var searchData= ['photo_5fthing',['PHOTO_THING',['../boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383',1,'boot.php']]], ['photo_5fxchan',['PHOTO_XCHAN',['../boot_8php.html#ac43182e0d8bae7576a30b603774974f8',1,'boot.php']]], ['php_5ftpl',['php_tpl',['../namespacefriendica-to-smarty-tpl.html#a5dfc21ab8282dda8e3a7dff43cd0e283',1,'friendica-to-smarty-tpl']]], - ['png_5fquality',['PNG_QUALITY',['../boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce',1,'boot.php']]] + ['png_5fquality',['PNG_QUALITY',['../boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce',1,'boot.php']]], + ['poll_5fmultiple_5fchoice',['POLL_MULTIPLE_CHOICE',['../boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86',1,'boot.php']]], + ['poll_5foverwrite',['POLL_OVERWRITE',['../boot_8php.html#a2b525996e4426bdddbcec277778bde08',1,'boot.php']]], + ['poll_5fsimple_5frating',['POLL_SIMPLE_RATING',['../boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5',1,'boot.php']]], + ['poll_5ftenscale',['POLL_TENSCALE',['../boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc',1,'boot.php']]] ]; diff --git a/doc/html/security_8php.html b/doc/html/security_8php.html index 267d175c2..fba933b97 100644 --- a/doc/html/security_8php.html +++ b/doc/html/security_8php.html @@ -359,7 +359,7 @@ Functions

    Profile owner - everything is visible

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

    -

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

    +

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

    diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index 00695b9e3..26822ca21 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -1112,7 +1112,7 @@ Variables

    Function: linkify

    Replace naked text hyperlink with HTML formatted hyperlink

    -

    Referenced by advanced_profile().

    +

    Referenced by advanced_profile(), and profile_activity().

    @@ -1140,7 +1140,7 @@ Variables
    -

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

    +

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

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

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

    +

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

    diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html index 836bff6a1..19c251680 100644 --- a/doc/html/typo_8php.html +++ b/doc/html/typo_8php.html @@ -134,7 +134,7 @@ Variables
    -

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

    +

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

    diff --git a/include/conversation.php b/include/conversation.php index 82010b153..2157f8291 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -92,8 +92,14 @@ function item_redir_and_replace_images($body, $images, $cid) { function localize_item(&$item){ if (activity_match($item['verb'],ACTIVITY_LIKE) || activity_match($item['verb'],ACTIVITY_DISLIKE)){ - + + if(! $item['object']) + return; + $obj = json_decode_plus($item['object']); + if((! $obj) && ($item['object'])) { + logger('localize_item: failed to decode object: ' . print_r($item['object'],true)); + } if($obj['author'] && $obj['author']['link']) $author_link = get_rel_link($obj['author']['link'],'alternate'); diff --git a/util/messages.po b/util/messages.po index 2a36c8757..d416296dd 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2013-08-23.414\n" +"Project-Id-Version: 2013-08-30.421\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-23 00:01-0700\n" +"POT-Creation-Date: 2013-08-30 00:01-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -38,17 +38,17 @@ msgstr "" msgid "public profile" msgstr "" -#: ../../include/activities.php:48 +#: ../../include/activities.php:50 #, php-format msgid "%1$s changed %2$s to “%3$s”" msgstr "" -#: ../../include/activities.php:49 +#: ../../include/activities.php:51 #, php-format msgid "Visit %1$s's %2$s" msgstr "" -#: ../../include/activities.php:52 +#: ../../include/activities.php:54 #, php-format msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" @@ -242,9 +242,13 @@ msgstr "" msgid "Please visit %s to approve or reject the suggestion." msgstr "" +#: ../../include/comanche.php:39 +msgid "Default" +msgstr "" + #: ../../include/Contact.php:87 ../../include/contact_widgets.php:9 #: ../../mod/directory.php:163 ../../mod/match.php:58 ../../mod/suggest.php:56 -#: ../../boot.php:1631 +#: ../../boot.php:1686 msgid "Connect" msgstr "" @@ -256,33 +260,33 @@ msgstr "" msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/Contact.php:462 ../../include/conversation.php:904 +#: ../../include/Contact.php:462 ../../include/conversation.php:914 msgid "Poke" msgstr "" -#: ../../include/Contact.php:463 ../../include/conversation.php:898 +#: ../../include/Contact.php:463 ../../include/conversation.php:908 msgid "View Status" msgstr "" #: ../../include/Contact.php:464 ../../include/nav.php:75 -#: ../../include/conversation.php:899 ../../mod/connections.php:295 -#: ../../mod/connections.php:402 +#: ../../include/conversation.php:909 ../../mod/connections.php:304 +#: ../../mod/connections.php:411 msgid "View Profile" msgstr "" -#: ../../include/Contact.php:465 ../../include/conversation.php:900 +#: ../../include/Contact.php:465 ../../include/conversation.php:910 msgid "View Photos" msgstr "" -#: ../../include/Contact.php:466 ../../include/conversation.php:901 +#: ../../include/Contact.php:466 ../../include/conversation.php:911 msgid "Network Posts" msgstr "" -#: ../../include/Contact.php:467 ../../include/conversation.php:902 +#: ../../include/Contact.php:467 ../../include/conversation.php:912 msgid "Edit Contact" msgstr "" -#: ../../include/Contact.php:468 ../../include/conversation.php:903 +#: ../../include/Contact.php:468 ../../include/conversation.php:913 msgid "Send PM" msgstr "" @@ -347,7 +351,7 @@ msgid "RSS/Atom" msgstr "" #: ../../include/contact_selectors.php:77 ../../mod/admin.php:636 -#: ../../mod/admin.php:645 ../../boot.php:1366 +#: ../../mod/admin.php:645 ../../boot.php:1421 msgid "Email" msgstr "" @@ -411,7 +415,7 @@ msgid "Examples: Robert Morgenstein, Fishing" msgstr "" #: ../../include/contact_widgets.php:33 ../../mod/directory.php:182 -#: ../../mod/directory.php:187 ../../mod/connections.php:657 +#: ../../mod/directory.php:187 ../../mod/connections.php:666 msgid "Find" msgstr "" @@ -546,7 +550,7 @@ msgid "Finishes:" msgstr "" #: ../../include/event.php:40 ../../include/bb2diaspora.php:455 -#: ../../mod/events.php:450 ../../mod/directory.php:138 ../../boot.php:1681 +#: ../../mod/events.php:450 ../../mod/directory.php:138 ../../boot.php:1736 msgid "Location:" msgstr "" @@ -785,8 +789,7 @@ msgid "Delete this item?" msgstr "" #: ../../include/js_strings.php:6 ../../include/ItemObject.php:504 -#: ../../mod/photos.php:1069 ../../mod/photos.php:1107 -#: ../../mod/photos.php:1134 +#: ../../mod/photos.php:1073 ../../mod/photos.php:1157 msgid "Comment" msgstr "" @@ -896,7 +899,7 @@ msgid "view full size" msgstr "" #: ../../include/photo/photo_driver.php:609 ../../include/photos.php:51 -#: ../../mod/photos.php:97 ../../mod/photos.php:754 ../../mod/photos.php:776 +#: ../../mod/photos.php:97 ../../mod/photos.php:755 ../../mod/photos.php:777 #: ../../mod/profile_photo.php:88 ../../mod/profile_photo.php:235 #: ../../mod/profile_photo.php:346 msgid "Profile Photos" @@ -912,7 +915,7 @@ msgid "Full Name:" msgstr "" #: ../../include/profile_advanced.php:17 ../../mod/directory.php:140 -#: ../../boot.php:1683 +#: ../../boot.php:1738 msgid "Gender:" msgstr "" @@ -933,7 +936,7 @@ msgid "Age:" msgstr "" #: ../../include/profile_advanced.php:37 ../../mod/directory.php:142 -#: ../../boot.php:1684 +#: ../../boot.php:1739 msgid "Status:" msgstr "" @@ -947,7 +950,7 @@ msgid "Sexual Preference:" msgstr "" #: ../../include/profile_advanced.php:48 ../../mod/directory.php:144 -#: ../../boot.php:1685 +#: ../../boot.php:1740 msgid "Homepage:" msgstr "" @@ -1015,7 +1018,7 @@ msgstr "" msgid "School/education:" msgstr "" -#: ../../include/nav.php:71 ../../include/nav.php:86 ../../boot.php:1363 +#: ../../include/nav.php:71 ../../include/nav.php:86 ../../boot.php:1418 msgid "Logout" msgstr "" @@ -1044,7 +1047,7 @@ msgstr "" msgid "Manage/Edit Profiles" msgstr "" -#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2119 +#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2176 msgid "Photos" msgstr "" @@ -1052,7 +1055,7 @@ msgstr "" msgid "Your photos" msgstr "" -#: ../../include/nav.php:84 ../../boot.php:1364 +#: ../../include/nav.php:84 ../../boot.php:1419 msgid "Login" msgstr "" @@ -1073,7 +1076,7 @@ msgstr "" msgid "Home Page" msgstr "" -#: ../../include/nav.php:120 ../../mod/register.php:181 ../../boot.php:1339 +#: ../../include/nav.php:120 ../../mod/register.php:181 ../../boot.php:1394 msgid "Register" msgstr "" @@ -1142,7 +1145,7 @@ msgstr "" msgid "Intros" msgstr "" -#: ../../include/nav.php:153 ../../mod/connections.php:545 +#: ../../include/nav.php:153 ../../mod/connections.php:554 msgid "New Connections" msgstr "" @@ -1194,7 +1197,7 @@ msgstr "" msgid "New Message" msgstr "" -#: ../../include/nav.php:169 ../../mod/events.php:348 ../../boot.php:2130 +#: ../../include/nav.php:169 ../../mod/events.php:348 ../../boot.php:2187 msgid "Events" msgstr "" @@ -1227,7 +1230,7 @@ msgstr "" msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:177 ../../mod/connections.php:651 +#: ../../include/nav.php:177 ../../mod/connections.php:660 msgid "Connections" msgstr "" @@ -1276,13 +1279,13 @@ msgstr "" #: ../../mod/common.php:43 ../../mod/events.php:134 ../../mod/invite.php:13 #: ../../mod/invite.php:102 ../../mod/allfriends.php:10 #: ../../mod/webpages.php:40 ../../mod/api.php:26 ../../mod/api.php:31 -#: ../../mod/lastpost.php:93 ../../mod/page.php:33 ../../mod/setup.php:181 +#: ../../mod/lastpost.php:93 ../../mod/page.php:30 ../../mod/setup.php:181 #: ../../mod/settings.php:598 ../../mod/viewconnections.php:33 #: ../../mod/viewconnections.php:38 ../../mod/delegate.php:6 #: ../../mod/mitem.php:92 ../../mod/group.php:15 ../../mod/photos.php:74 -#: ../../mod/photos.php:644 ../../mod/viewsrc.php:12 ../../mod/menu.php:40 +#: ../../mod/photos.php:645 ../../mod/viewsrc.php:12 ../../mod/menu.php:40 #: ../../mod/message.php:204 ../../mod/item.php:152 ../../mod/network.php:7 -#: ../../mod/intro.php:50 ../../mod/connections.php:165 +#: ../../mod/intro.php:50 ../../mod/connections.php:174 #: ../../mod/profiles.php:163 ../../mod/profiles.php:476 #: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97 #: ../../mod/manage.php:6 ../../mod/crepair.php:115 ../../mod/nogroup.php:25 @@ -1312,12 +1315,12 @@ msgstr "" msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:287 ../../boot.php:2122 +#: ../../include/photos.php:287 ../../boot.php:2179 msgid "Photo Albums" msgstr "" -#: ../../include/photos.php:291 ../../mod/photos.php:792 -#: ../../mod/photos.php:1287 +#: ../../include/photos.php:291 ../../mod/photos.php:793 +#: ../../mod/photos.php:1267 msgid "Upload New Photos" msgstr "" @@ -1466,7 +1469,7 @@ msgid "Sex Addict" msgstr "" #: ../../include/profile_selectors.php:42 ../../include/identity.php:236 -#: ../../mod/network.php:364 ../../mod/connections.php:368 +#: ../../mod/network.php:364 ../../mod/connections.php:377 msgid "Friends" msgstr "" @@ -1603,7 +1606,7 @@ msgstr "" msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:569 +#: ../../include/zot.php:572 #, php-format msgid "Unable to verify site signature for %s" msgstr "" @@ -1642,7 +1645,7 @@ msgid "Registration request at %s" msgstr "" #: ../../include/account.php:274 ../../include/account.php:301 -#: ../../include/account.php:358 ../../boot.php:1204 +#: ../../include/account.php:358 ../../boot.php:1240 msgid "Administrator" msgstr "" @@ -1664,6 +1667,28 @@ msgstr "" msgid "Registration revoked for %s" msgstr "" +#: ../../include/bbcode.php:94 ../../include/bbcode.php:443 +#: ../../include/bbcode.php:446 +msgid "Image/photo" +msgstr "" + +#: ../../include/bbcode.php:161 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" +msgstr "" + +#: ../../include/bbcode.php:163 +msgid "post" +msgstr "" + +#: ../../include/bbcode.php:403 ../../include/bbcode.php:423 +msgid "$1 wrote:" +msgstr "" + +#: ../../include/bbcode.php:450 ../../include/bbcode.php:451 +msgid "Encrypted content" +msgstr "" + #: ../../include/text.php:281 msgid "prev" msgstr "" @@ -1920,7 +1945,7 @@ msgid "bytes" msgstr "" #: ../../include/text.php:1066 ../../include/text.php:1081 -#: ../../include/conversation.php:804 +#: ../../include/conversation.php:814 msgid "remove" msgstr "" @@ -1928,11 +1953,11 @@ msgstr "" msgid "[remove]" msgstr "" -#: ../../include/text.php:1069 ../../include/conversation.php:652 +#: ../../include/text.php:1069 ../../include/conversation.php:661 msgid "Categories:" msgstr "" -#: ../../include/text.php:1084 ../../include/conversation.php:653 +#: ../../include/text.php:1084 ../../include/conversation.php:662 msgid "Filed under:" msgstr "" @@ -2165,7 +2190,7 @@ msgstr "" msgid "Path not available." msgstr "" -#: ../../include/ItemObject.php:87 ../../mod/photos.php:942 +#: ../../include/ItemObject.php:87 ../../mod/photos.php:943 msgid "Private Message" msgstr "" @@ -2175,14 +2200,14 @@ msgstr "" msgid "Edit" msgstr "" -#: ../../include/ItemObject.php:104 ../../include/conversation.php:616 +#: ../../include/ItemObject.php:104 ../../include/conversation.php:625 #: ../../mod/settings.php:684 ../../mod/group.php:182 -#: ../../mod/photos.php:1162 ../../mod/connections.php:335 +#: ../../mod/photos.php:1123 ../../mod/connections.php:344 #: ../../mod/admin.php:640 msgid "Delete" msgstr "" -#: ../../include/ItemObject.php:110 ../../include/conversation.php:615 +#: ../../include/ItemObject.php:110 ../../include/conversation.php:624 msgid "Select" msgstr "" @@ -2210,11 +2235,11 @@ msgstr "" msgid "add tag" msgstr "" -#: ../../include/ItemObject.php:165 ../../mod/photos.php:1049 +#: ../../include/ItemObject.php:165 ../../mod/photos.php:1053 msgid "I like this (toggle)" msgstr "" -#: ../../include/ItemObject.php:166 ../../mod/photos.php:1050 +#: ../../include/ItemObject.php:166 ../../mod/photos.php:1054 msgid "I don't like this (toggle)" msgstr "" @@ -2243,13 +2268,13 @@ msgstr "" msgid "via Wall-To-Wall:" msgstr "" -#: ../../include/ItemObject.php:206 ../../include/conversation.php:662 +#: ../../include/ItemObject.php:206 ../../include/conversation.php:671 #, php-format msgid " from %s" msgstr "" -#: ../../include/ItemObject.php:233 ../../include/conversation.php:681 -#: ../../include/conversation.php:1051 ../../mod/photos.php:1052 +#: ../../include/ItemObject.php:233 ../../include/conversation.php:690 +#: ../../include/conversation.php:1061 ../../mod/photos.php:1056 #: ../../mod/message.php:298 ../../mod/message.php:461 #: ../../mod/editwebpage.php:110 ../../mod/editpost.php:85 msgid "Please wait" @@ -2262,8 +2287,8 @@ msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../include/ItemObject.php:502 ../../mod/photos.php:1067 -#: ../../mod/photos.php:1105 ../../mod/photos.php:1132 +#: ../../include/ItemObject.php:502 ../../mod/photos.php:1071 +#: ../../mod/photos.php:1155 msgid "This is you" msgstr "" @@ -2273,15 +2298,14 @@ msgstr "" #: ../../mod/settings.php:733 ../../mod/settings.php:761 #: ../../mod/settings.php:785 ../../mod/settings.php:856 #: ../../mod/settings.php:1023 ../../mod/connect.php:96 ../../mod/group.php:87 -#: ../../mod/photos.php:675 ../../mod/photos.php:769 ../../mod/photos.php:1031 -#: ../../mod/photos.php:1070 ../../mod/photos.php:1108 -#: ../../mod/photos.php:1135 ../../mod/message.php:299 -#: ../../mod/message.php:460 ../../mod/connections.php:412 -#: ../../mod/profiles.php:529 ../../mod/admin.php:409 ../../mod/admin.php:633 -#: ../../mod/admin.php:769 ../../mod/admin.php:968 ../../mod/admin.php:1055 -#: ../../mod/import.php:381 ../../mod/crepair.php:166 ../../mod/poke.php:166 -#: ../../mod/fsuggest.php:108 ../../mod/mood.php:135 -#: ../../view/theme/redbasic/php/config.php:136 +#: ../../mod/photos.php:676 ../../mod/photos.php:770 ../../mod/photos.php:1035 +#: ../../mod/photos.php:1074 ../../mod/photos.php:1158 +#: ../../mod/message.php:299 ../../mod/message.php:460 +#: ../../mod/connections.php:421 ../../mod/profiles.php:529 +#: ../../mod/admin.php:409 ../../mod/admin.php:633 ../../mod/admin.php:769 +#: ../../mod/admin.php:968 ../../mod/admin.php:1055 ../../mod/import.php:381 +#: ../../mod/crepair.php:166 ../../mod/poke.php:166 ../../mod/fsuggest.php:108 +#: ../../mod/mood.php:135 ../../view/theme/redbasic/php/config.php:136 #: ../../view/theme/redbasic/php/config.php:154 #: ../../view/theme/redstrap/php/config.php:131 msgid "Submit" @@ -2319,8 +2343,8 @@ msgstr "" msgid "Video" msgstr "" -#: ../../include/ItemObject.php:514 ../../include/conversation.php:1069 -#: ../../mod/photos.php:1071 ../../mod/editwebpage.php:130 +#: ../../include/ItemObject.php:514 ../../include/conversation.php:1079 +#: ../../mod/photos.php:1075 ../../mod/editwebpage.php:130 #: ../../mod/editpost.php:105 msgid "Preview" msgstr "" @@ -2354,192 +2378,192 @@ msgstr "" msgid "%1$s is currently %2$s" msgstr "" -#: ../../include/conversation.php:640 +#: ../../include/conversation.php:649 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:679 +#: ../../include/conversation.php:688 msgid "View in context" msgstr "" -#: ../../include/conversation.php:808 +#: ../../include/conversation.php:818 msgid "Loading..." msgstr "" -#: ../../include/conversation.php:809 +#: ../../include/conversation.php:819 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:897 +#: ../../include/conversation.php:907 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:966 +#: ../../include/conversation.php:976 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:966 +#: ../../include/conversation.php:976 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:970 +#: ../../include/conversation.php:980 #, php-format msgid "%2$d people like this." msgstr "" -#: ../../include/conversation.php:972 +#: ../../include/conversation.php:982 #, php-format msgid "%2$d people don't like this." msgstr "" -#: ../../include/conversation.php:978 +#: ../../include/conversation.php:988 msgid "and" msgstr "" -#: ../../include/conversation.php:981 +#: ../../include/conversation.php:991 #, php-format msgid ", and %d other people" msgstr "" -#: ../../include/conversation.php:982 +#: ../../include/conversation.php:992 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:982 +#: ../../include/conversation.php:992 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1007 +#: ../../include/conversation.php:1017 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:1008 ../../mod/message.php:253 +#: ../../include/conversation.php:1018 ../../mod/message.php:253 #: ../../mod/message.php:365 msgid "Please enter a link URL:" msgstr "" -#: ../../include/conversation.php:1009 +#: ../../include/conversation.php:1019 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:1010 +#: ../../include/conversation.php:1020 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:1011 +#: ../../include/conversation.php:1021 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1012 ../../mod/filer.php:35 +#: ../../include/conversation.php:1022 ../../mod/filer.php:35 msgid "Save to Folder:" msgstr "" -#: ../../include/conversation.php:1013 +#: ../../include/conversation.php:1023 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1028 ../../mod/photos.php:1051 +#: ../../include/conversation.php:1038 ../../mod/photos.php:1055 msgid "Share" msgstr "" -#: ../../include/conversation.php:1030 +#: ../../include/conversation.php:1040 msgid "Page link title" msgstr "" -#: ../../include/conversation.php:1032 ../../mod/message.php:295 +#: ../../include/conversation.php:1042 ../../mod/message.php:295 #: ../../mod/message.php:457 ../../mod/editwebpage.php:102 #: ../../mod/editpost.php:77 msgid "Upload photo" msgstr "" -#: ../../include/conversation.php:1033 +#: ../../include/conversation.php:1043 msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1034 ../../mod/message.php:296 +#: ../../include/conversation.php:1044 ../../mod/message.php:296 #: ../../mod/message.php:458 ../../mod/editwebpage.php:103 #: ../../mod/editpost.php:78 msgid "Attach file" msgstr "" -#: ../../include/conversation.php:1035 +#: ../../include/conversation.php:1045 msgid "attach file" msgstr "" -#: ../../include/conversation.php:1036 ../../mod/message.php:297 +#: ../../include/conversation.php:1046 ../../mod/message.php:297 #: ../../mod/message.php:459 ../../mod/editwebpage.php:104 #: ../../mod/editpost.php:79 msgid "Insert web link" msgstr "" -#: ../../include/conversation.php:1037 +#: ../../include/conversation.php:1047 msgid "web link" msgstr "" -#: ../../include/conversation.php:1038 +#: ../../include/conversation.php:1048 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:1039 +#: ../../include/conversation.php:1049 msgid "video link" msgstr "" -#: ../../include/conversation.php:1040 +#: ../../include/conversation.php:1050 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:1041 +#: ../../include/conversation.php:1051 msgid "audio link" msgstr "" -#: ../../include/conversation.php:1042 ../../mod/editwebpage.php:108 +#: ../../include/conversation.php:1052 ../../mod/editwebpage.php:108 #: ../../mod/editpost.php:83 msgid "Set your location" msgstr "" -#: ../../include/conversation.php:1043 +#: ../../include/conversation.php:1053 msgid "set location" msgstr "" -#: ../../include/conversation.php:1044 ../../mod/editwebpage.php:109 +#: ../../include/conversation.php:1054 ../../mod/editwebpage.php:109 #: ../../mod/editpost.php:84 msgid "Clear browser location" msgstr "" -#: ../../include/conversation.php:1045 +#: ../../include/conversation.php:1055 msgid "clear location" msgstr "" -#: ../../include/conversation.php:1047 ../../mod/editwebpage.php:122 +#: ../../include/conversation.php:1057 ../../mod/editwebpage.php:122 #: ../../mod/editpost.php:97 msgid "Set title" msgstr "" -#: ../../include/conversation.php:1050 ../../mod/editwebpage.php:124 +#: ../../include/conversation.php:1060 ../../mod/editwebpage.php:124 #: ../../mod/editpost.php:99 msgid "Categories (comma-separated list)" msgstr "" -#: ../../include/conversation.php:1052 ../../mod/editwebpage.php:111 +#: ../../include/conversation.php:1062 ../../mod/editwebpage.php:111 #: ../../mod/editpost.php:86 msgid "Permission settings" msgstr "" -#: ../../include/conversation.php:1053 +#: ../../include/conversation.php:1063 msgid "permissions" msgstr "" -#: ../../include/conversation.php:1061 ../../mod/editwebpage.php:119 +#: ../../include/conversation.php:1071 ../../mod/editwebpage.php:119 #: ../../mod/editpost.php:94 msgid "Public post" msgstr "" -#: ../../include/conversation.php:1063 ../../mod/editwebpage.php:125 +#: ../../include/conversation.php:1073 ../../mod/editwebpage.php:125 #: ../../mod/editpost.php:100 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -2549,7 +2573,7 @@ msgstr "" msgid "Permission denied" msgstr "" -#: ../../include/items.php:3265 ../../mod/page.php:63 ../../mod/viewsrc.php:18 +#: ../../include/items.php:3265 ../../mod/page.php:60 ../../mod/viewsrc.php:18 #: ../../mod/home.php:64 ../../mod/admin.php:142 ../../mod/admin.php:677 #: ../../mod/admin.php:876 ../../mod/display.php:33 msgid "Item not found." @@ -2571,28 +2595,6 @@ msgstr "" msgid "Connection not found." msgstr "" -#: ../../include/bbcode.php:94 ../../include/bbcode.php:442 -#: ../../include/bbcode.php:445 -msgid "Image/photo" -msgstr "" - -#: ../../include/bbcode.php:161 -#, php-format -msgid "%1$s wrote the following %2$s %3$s" -msgstr "" - -#: ../../include/bbcode.php:163 -msgid "post" -msgstr "" - -#: ../../include/bbcode.php:402 ../../include/bbcode.php:422 -msgid "$1 wrote:" -msgstr "" - -#: ../../include/bbcode.php:449 ../../include/bbcode.php:450 -msgid "Encrypted content" -msgstr "" - #: ../../include/security.php:49 msgid "Welcome " msgstr "" @@ -2815,7 +2817,7 @@ msgid "No friends to display." msgstr "" #: ../../mod/webpages.php:8 ../../mod/connect.php:13 ../../mod/profile.php:8 -#: ../../boot.php:1537 +#: ../../boot.php:1592 msgid "Requested profile is not available." msgstr "" @@ -2867,11 +2869,11 @@ msgstr "" msgid "Applications" msgstr "" -#: ../../mod/page.php:38 +#: ../../mod/page.php:35 msgid "Invalid item." msgstr "" -#: ../../mod/page.php:50 ../../mod/chanview.php:78 ../../mod/home.php:51 +#: ../../mod/page.php:47 ../../mod/chanview.php:78 ../../mod/home.php:51 #: ../../mod/magic.php:63 ../../mod/wall_upload.php:35 msgid "Channel not found." msgstr "" @@ -3659,7 +3661,7 @@ msgid "Change the behaviour of this account for special situations" msgstr "" #: ../../mod/viewconnections.php:28 ../../mod/directory.php:23 -#: ../../mod/photos.php:558 ../../mod/display.php:9 ../../mod/search.php:80 +#: ../../mod/photos.php:559 ../../mod/display.php:9 ../../mod/search.php:80 #: ../../mod/community.php:18 msgid "Public access denied." msgstr "" @@ -3971,131 +3973,131 @@ msgstr "" msgid "Album not found." msgstr "" -#: ../../mod/photos.php:125 ../../mod/photos.php:770 +#: ../../mod/photos.php:125 ../../mod/photos.php:771 msgid "Delete Album" msgstr "" -#: ../../mod/photos.php:165 ../../mod/photos.php:1032 +#: ../../mod/photos.php:165 ../../mod/photos.php:1036 msgid "Delete Photo" msgstr "" -#: ../../mod/photos.php:494 +#: ../../mod/photos.php:495 #, php-format msgid "%1$s was tagged in %2$s by %3$s" msgstr "" -#: ../../mod/photos.php:494 +#: ../../mod/photos.php:495 msgid "a photo" msgstr "" -#: ../../mod/photos.php:568 +#: ../../mod/photos.php:569 msgid "No photos selected" msgstr "" -#: ../../mod/photos.php:622 +#: ../../mod/photos.php:623 msgid "Access to this item is restricted." msgstr "" -#: ../../mod/photos.php:686 +#: ../../mod/photos.php:687 #, php-format msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "" -#: ../../mod/photos.php:689 +#: ../../mod/photos.php:690 #, php-format msgid "You have used %1$.2f Mbytes of photo storage." msgstr "" -#: ../../mod/photos.php:697 +#: ../../mod/photos.php:698 msgid "Upload Photos" msgstr "" -#: ../../mod/photos.php:701 ../../mod/photos.php:765 +#: ../../mod/photos.php:702 ../../mod/photos.php:766 msgid "New album name: " msgstr "" -#: ../../mod/photos.php:702 +#: ../../mod/photos.php:703 msgid "or existing album name: " msgstr "" -#: ../../mod/photos.php:703 +#: ../../mod/photos.php:704 msgid "Do not show a status post for this upload" msgstr "" -#: ../../mod/photos.php:705 ../../mod/photos.php:1027 +#: ../../mod/photos.php:706 ../../mod/photos.php:1031 msgid "Permissions" msgstr "" -#: ../../mod/photos.php:754 ../../mod/photos.php:776 ../../mod/photos.php:1223 -#: ../../mod/photos.php:1238 +#: ../../mod/photos.php:755 ../../mod/photos.php:777 ../../mod/photos.php:1203 +#: ../../mod/photos.php:1218 msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:780 +#: ../../mod/photos.php:781 msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:786 +#: ../../mod/photos.php:787 msgid "Show Newest First" msgstr "" -#: ../../mod/photos.php:788 +#: ../../mod/photos.php:789 msgid "Show Oldest First" msgstr "" -#: ../../mod/photos.php:832 ../../mod/photos.php:1270 +#: ../../mod/photos.php:833 ../../mod/photos.php:1250 msgid "View Photo" msgstr "" -#: ../../mod/photos.php:876 +#: ../../mod/photos.php:877 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:878 +#: ../../mod/photos.php:879 msgid "Photo not available" msgstr "" -#: ../../mod/photos.php:936 +#: ../../mod/photos.php:937 msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:964 +#: ../../mod/photos.php:965 msgid "View Full Size" msgstr "" -#: ../../mod/photos.php:1015 +#: ../../mod/photos.php:1019 msgid "Edit photo" msgstr "" -#: ../../mod/photos.php:1017 +#: ../../mod/photos.php:1021 msgid "Rotate CW (right)" msgstr "" -#: ../../mod/photos.php:1018 +#: ../../mod/photos.php:1022 msgid "Rotate CCW (left)" msgstr "" -#: ../../mod/photos.php:1020 +#: ../../mod/photos.php:1024 msgid "New album name" msgstr "" -#: ../../mod/photos.php:1023 +#: ../../mod/photos.php:1027 msgid "Caption" msgstr "" -#: ../../mod/photos.php:1025 +#: ../../mod/photos.php:1029 msgid "Add a Tag" msgstr "" -#: ../../mod/photos.php:1029 +#: ../../mod/photos.php:1033 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/photos.php:1276 +#: ../../mod/photos.php:1256 msgid "View Album" msgstr "" -#: ../../mod/photos.php:1285 +#: ../../mod/photos.php:1265 msgid "Recent Photos" msgstr "" @@ -4107,11 +4109,11 @@ msgstr "" msgid "added your channel" msgstr "" -#: ../../mod/ping.php:230 ../../boot.php:1743 ../../boot.php:1823 +#: ../../mod/ping.php:230 ../../boot.php:1798 ../../boot.php:1878 msgid "g A l F d" msgstr "" -#: ../../mod/ping.php:252 ../../boot.php:1789 ../../boot.php:1864 +#: ../../mod/ping.php:252 ../../boot.php:1844 ../../boot.php:1919 msgid "[today]" msgstr "" @@ -4148,7 +4150,7 @@ msgid "Drop" msgstr "" #: ../../mod/menu.php:54 ../../mod/network.php:298 -#: ../../mod/connections.php:512 +#: ../../mod/connections.php:521 msgid "New" msgstr "" @@ -4379,11 +4381,11 @@ msgstr "" msgid "Refresh" msgstr "" -#: ../../mod/network.php:362 ../../mod/connections.php:365 +#: ../../mod/network.php:362 ../../mod/connections.php:374 msgid "Me" msgstr "" -#: ../../mod/network.php:363 ../../mod/connections.php:367 +#: ../../mod/network.php:363 ../../mod/connections.php:376 msgid "Best Friends" msgstr "" @@ -4391,11 +4393,11 @@ msgstr "" msgid "Co-workers" msgstr "" -#: ../../mod/network.php:366 ../../mod/connections.php:369 +#: ../../mod/network.php:366 ../../mod/connections.php:378 msgid "Former Friends" msgstr "" -#: ../../mod/network.php:367 ../../mod/connections.php:370 +#: ../../mod/network.php:367 ../../mod/connections.php:379 msgid "Acquaintances" msgstr "" @@ -4428,19 +4430,19 @@ msgstr "" msgid "Approve" msgstr "" -#: ../../mod/intro.php:14 ../../mod/intro.php:99 ../../mod/connections.php:309 -#: ../../mod/connections.php:450 ../../mod/admin.php:641 +#: ../../mod/intro.php:14 ../../mod/intro.php:99 ../../mod/connections.php:318 +#: ../../mod/connections.php:459 ../../mod/admin.php:641 msgid "Block" msgstr "" #: ../../mod/intro.php:17 ../../mod/intro.php:100 -#: ../../mod/connections.php:316 ../../mod/connections.php:451 +#: ../../mod/connections.php:325 ../../mod/connections.php:460 #: ../../mod/notifications.php:51 ../../mod/notifications.php:162 #: ../../mod/notifications.php:208 msgid "Ignore" msgstr "" -#: ../../mod/intro.php:29 ../../mod/connections.php:117 +#: ../../mod/intro.php:29 ../../mod/connections.php:119 msgid "Connection updated." msgstr "" @@ -4460,7 +4462,7 @@ msgstr "" msgid "System error. Please try again later." msgstr "" -#: ../../mod/intro.php:95 ../../mod/connections.php:456 +#: ../../mod/intro.php:95 ../../mod/connections.php:465 #: ../../mod/notifications.php:155 ../../mod/notifications.php:202 msgid "Hide this contact from others" msgstr "" @@ -4488,370 +4490,370 @@ msgstr "" msgid "Could not locate selected profile." msgstr "" -#: ../../mod/connections.php:119 +#: ../../mod/connections.php:121 msgid "Failed to update connection record." msgstr "" -#: ../../mod/connections.php:187 +#: ../../mod/connections.php:196 msgid "Could not access address book record." msgstr "" -#: ../../mod/connections.php:201 +#: ../../mod/connections.php:210 msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../mod/connections.php:208 +#: ../../mod/connections.php:217 msgid "Channel has been unblocked" msgstr "" -#: ../../mod/connections.php:209 +#: ../../mod/connections.php:218 msgid "Channel has been blocked" msgstr "" -#: ../../mod/connections.php:213 ../../mod/connections.php:225 -#: ../../mod/connections.php:237 ../../mod/connections.php:249 -#: ../../mod/connections.php:264 +#: ../../mod/connections.php:222 ../../mod/connections.php:234 +#: ../../mod/connections.php:246 ../../mod/connections.php:258 +#: ../../mod/connections.php:273 msgid "Unable to set address book parameters." msgstr "" -#: ../../mod/connections.php:220 +#: ../../mod/connections.php:229 msgid "Channel has been unignored" msgstr "" -#: ../../mod/connections.php:221 +#: ../../mod/connections.php:230 msgid "Channel has been ignored" msgstr "" -#: ../../mod/connections.php:232 +#: ../../mod/connections.php:241 msgid "Channel has been unarchived" msgstr "" -#: ../../mod/connections.php:233 +#: ../../mod/connections.php:242 msgid "Channel has been archived" msgstr "" -#: ../../mod/connections.php:244 +#: ../../mod/connections.php:253 msgid "Channel has been unhidden" msgstr "" -#: ../../mod/connections.php:245 +#: ../../mod/connections.php:254 msgid "Channel has been hidden" msgstr "" -#: ../../mod/connections.php:259 +#: ../../mod/connections.php:268 msgid "Channel has been approved" msgstr "" -#: ../../mod/connections.php:260 +#: ../../mod/connections.php:269 msgid "Channel has been unapproved" msgstr "" -#: ../../mod/connections.php:278 +#: ../../mod/connections.php:287 msgid "Contact has been removed." msgstr "" -#: ../../mod/connections.php:298 +#: ../../mod/connections.php:307 #, php-format msgid "View %s's profile" msgstr "" -#: ../../mod/connections.php:302 +#: ../../mod/connections.php:311 msgid "Refresh Permissions" msgstr "" -#: ../../mod/connections.php:305 +#: ../../mod/connections.php:314 msgid "Fetch updated permissions" msgstr "" -#: ../../mod/connections.php:309 ../../mod/connections.php:450 +#: ../../mod/connections.php:318 ../../mod/connections.php:459 #: ../../mod/admin.php:642 msgid "Unblock" msgstr "" -#: ../../mod/connections.php:312 +#: ../../mod/connections.php:321 msgid "Block or Unblock this connection" msgstr "" -#: ../../mod/connections.php:316 ../../mod/connections.php:451 +#: ../../mod/connections.php:325 ../../mod/connections.php:460 msgid "Unignore" msgstr "" -#: ../../mod/connections.php:319 +#: ../../mod/connections.php:328 msgid "Ignore or Unignore this connection" msgstr "" -#: ../../mod/connections.php:322 +#: ../../mod/connections.php:331 msgid "Unarchive" msgstr "" -#: ../../mod/connections.php:322 +#: ../../mod/connections.php:331 msgid "Archive" msgstr "" -#: ../../mod/connections.php:325 +#: ../../mod/connections.php:334 msgid "Archive or Unarchive this connection" msgstr "" -#: ../../mod/connections.php:328 +#: ../../mod/connections.php:337 msgid "Unhide" msgstr "" -#: ../../mod/connections.php:328 +#: ../../mod/connections.php:337 msgid "Hide" msgstr "" -#: ../../mod/connections.php:331 +#: ../../mod/connections.php:340 msgid "Hide or Unhide this connection" msgstr "" -#: ../../mod/connections.php:338 +#: ../../mod/connections.php:347 msgid "Delete this connection" msgstr "" -#: ../../mod/connections.php:371 +#: ../../mod/connections.php:380 msgid "Unknown" msgstr "" -#: ../../mod/connections.php:381 ../../mod/connections.php:409 +#: ../../mod/connections.php:390 ../../mod/connections.php:418 msgid "Approve this connection" msgstr "" -#: ../../mod/connections.php:381 +#: ../../mod/connections.php:390 msgid "Accept connection to allow communication" msgstr "" -#: ../../mod/connections.php:397 +#: ../../mod/connections.php:406 msgid "Automatic Permissions Settings" msgstr "" -#: ../../mod/connections.php:397 +#: ../../mod/connections.php:406 #, php-format msgid "Connections: settings for %s" msgstr "" -#: ../../mod/connections.php:401 +#: ../../mod/connections.php:410 msgid "" "When receiving a channel introduction, any permissions provided here will be " "applied to the new connection automatically and the introduction approved. " "Leave this page if you do not wish to use this feature." msgstr "" -#: ../../mod/connections.php:403 +#: ../../mod/connections.php:412 msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../mod/connections.php:410 +#: ../../mod/connections.php:419 msgid "Connection has no individual permissions!" msgstr "" -#: ../../mod/connections.php:411 +#: ../../mod/connections.php:420 msgid "" "This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"." msgstr "" -#: ../../mod/connections.php:413 +#: ../../mod/connections.php:422 msgid "Profile Visibility" msgstr "" -#: ../../mod/connections.php:414 +#: ../../mod/connections.php:423 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../mod/connections.php:415 +#: ../../mod/connections.php:424 msgid "Contact Information / Notes" msgstr "" -#: ../../mod/connections.php:416 +#: ../../mod/connections.php:425 msgid "Edit contact notes" msgstr "" -#: ../../mod/connections.php:418 +#: ../../mod/connections.php:427 msgid "Their Settings" msgstr "" -#: ../../mod/connections.php:419 +#: ../../mod/connections.php:428 msgid "My Settings" msgstr "" -#: ../../mod/connections.php:421 +#: ../../mod/connections.php:430 msgid "Forum Members" msgstr "" -#: ../../mod/connections.php:422 +#: ../../mod/connections.php:431 msgid "Soapbox" msgstr "" -#: ../../mod/connections.php:423 +#: ../../mod/connections.php:432 msgid "Full Sharing" msgstr "" -#: ../../mod/connections.php:424 +#: ../../mod/connections.php:433 msgid "Cautious Sharing" msgstr "" -#: ../../mod/connections.php:425 +#: ../../mod/connections.php:434 msgid "Follow Only" msgstr "" -#: ../../mod/connections.php:426 +#: ../../mod/connections.php:435 msgid "Individual Permissions" msgstr "" -#: ../../mod/connections.php:427 +#: ../../mod/connections.php:436 msgid "" "Individual permissions are only enabled for privacy " "settings which are set to \"Only those you specifically allow\". " "Otherwise they are controlled by your privacy settings." msgstr "" -#: ../../mod/connections.php:428 +#: ../../mod/connections.php:437 msgid "Advanced Permissions" msgstr "" -#: ../../mod/connections.php:429 +#: ../../mod/connections.php:438 msgid "Quick Links" msgstr "" -#: ../../mod/connections.php:433 +#: ../../mod/connections.php:442 #, php-format msgid "Visit %s's profile - %s" msgstr "" -#: ../../mod/connections.php:434 +#: ../../mod/connections.php:443 msgid "Block/Unblock contact" msgstr "" -#: ../../mod/connections.php:435 +#: ../../mod/connections.php:444 msgid "Ignore contact" msgstr "" -#: ../../mod/connections.php:436 +#: ../../mod/connections.php:445 msgid "Repair URL settings" msgstr "" -#: ../../mod/connections.php:437 +#: ../../mod/connections.php:446 msgid "View conversations" msgstr "" -#: ../../mod/connections.php:439 +#: ../../mod/connections.php:448 msgid "Delete contact" msgstr "" -#: ../../mod/connections.php:442 +#: ../../mod/connections.php:451 msgid "Last update:" msgstr "" -#: ../../mod/connections.php:444 +#: ../../mod/connections.php:453 msgid "Update public posts" msgstr "" -#: ../../mod/connections.php:446 +#: ../../mod/connections.php:455 msgid "Update now" msgstr "" -#: ../../mod/connections.php:452 +#: ../../mod/connections.php:461 msgid "Currently blocked" msgstr "" -#: ../../mod/connections.php:453 +#: ../../mod/connections.php:462 msgid "Currently ignored" msgstr "" -#: ../../mod/connections.php:454 +#: ../../mod/connections.php:463 msgid "Currently archived" msgstr "" -#: ../../mod/connections.php:455 +#: ../../mod/connections.php:464 msgid "Currently pending" msgstr "" -#: ../../mod/connections.php:456 +#: ../../mod/connections.php:465 msgid "" "Replies/likes to your public posts may still be visible" msgstr "" -#: ../../mod/connections.php:492 ../../mod/connections.php:564 +#: ../../mod/connections.php:501 ../../mod/connections.php:573 msgid "Blocked" msgstr "" -#: ../../mod/connections.php:497 ../../mod/connections.php:571 +#: ../../mod/connections.php:506 ../../mod/connections.php:580 msgid "Ignored" msgstr "" -#: ../../mod/connections.php:502 ../../mod/connections.php:585 +#: ../../mod/connections.php:511 ../../mod/connections.php:594 msgid "Hidden" msgstr "" -#: ../../mod/connections.php:507 ../../mod/connections.php:578 +#: ../../mod/connections.php:516 ../../mod/connections.php:587 msgid "Archived" msgstr "" -#: ../../mod/connections.php:518 +#: ../../mod/connections.php:527 msgid "All" msgstr "" -#: ../../mod/connections.php:539 +#: ../../mod/connections.php:548 msgid "Suggestions" msgstr "" -#: ../../mod/connections.php:542 +#: ../../mod/connections.php:551 msgid "Suggest new connections" msgstr "" -#: ../../mod/connections.php:548 +#: ../../mod/connections.php:557 msgid "Show pending (new) connections" msgstr "" -#: ../../mod/connections.php:551 +#: ../../mod/connections.php:560 msgid "All Connections" msgstr "" -#: ../../mod/connections.php:554 +#: ../../mod/connections.php:563 msgid "Show all connections" msgstr "" -#: ../../mod/connections.php:557 +#: ../../mod/connections.php:566 msgid "Unblocked" msgstr "" -#: ../../mod/connections.php:560 +#: ../../mod/connections.php:569 msgid "Only show unblocked connections" msgstr "" -#: ../../mod/connections.php:567 +#: ../../mod/connections.php:576 msgid "Only show blocked connections" msgstr "" -#: ../../mod/connections.php:574 +#: ../../mod/connections.php:583 msgid "Only show ignored connections" msgstr "" -#: ../../mod/connections.php:581 +#: ../../mod/connections.php:590 msgid "Only show archived connections" msgstr "" -#: ../../mod/connections.php:588 +#: ../../mod/connections.php:597 msgid "Only show hidden connections" msgstr "" -#: ../../mod/connections.php:630 +#: ../../mod/connections.php:639 #, php-format msgid "%1$s [%2$s]" msgstr "" -#: ../../mod/connections.php:631 ../../mod/nogroup.php:41 +#: ../../mod/connections.php:640 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "" -#: ../../mod/connections.php:655 +#: ../../mod/connections.php:664 msgid "Search your connections" msgstr "" -#: ../../mod/connections.php:656 +#: ../../mod/connections.php:665 msgid "Finding: " msgstr "" @@ -5118,23 +5120,23 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:624 ../../boot.php:1645 +#: ../../mod/profiles.php:624 ../../boot.php:1700 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:625 ../../boot.php:1652 +#: ../../mod/profiles.php:625 ../../boot.php:1707 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:636 ../../boot.php:1666 +#: ../../mod/profiles.php:636 ../../boot.php:1721 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:639 ../../boot.php:1669 +#: ../../mod/profiles.php:639 ../../boot.php:1724 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:640 ../../boot.php:1670 +#: ../../mod/profiles.php:640 ../../boot.php:1725 msgid "Edit visibility" msgstr "" @@ -5273,14 +5275,6 @@ msgstr "" msgid "Free Access" msgstr "" -#: ../../mod/admin.php:401 -msgid "No SSL policy, links will track page SSL state" -msgstr "" - -#: ../../mod/admin.php:402 -msgid "Force all links to use SSL" -msgstr "" - #: ../../mod/admin.php:410 ../../mod/register.php:166 msgid "Registration" msgstr "" @@ -5343,14 +5337,6 @@ msgstr "" msgid "Site Channel" msgstr "" -#: ../../mod/admin.php:424 -msgid "SSL link policy" -msgstr "" - -#: ../../mod/admin.php:424 -msgid "Determines whether generated links should be forced to use SSL" -msgstr "" - #: ../../mod/admin.php:425 msgid "Maximum image size" msgstr "" @@ -5702,7 +5688,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1374 +#: ../../mod/lostpass.php:85 ../../boot.php:1429 msgid "Password Reset" msgstr "" @@ -5852,6 +5838,14 @@ msgstr "" msgid "Make Default" msgstr "" +#: ../../mod/vote.php:97 +msgid "Total votes" +msgstr "" + +#: ../../mod/vote.php:98 +msgid "Average Rating" +msgstr "" + #: ../../mod/match.php:12 msgid "Profile Match" msgstr "" @@ -6455,104 +6449,104 @@ msgstr "" msgid "0-99 default: 5" msgstr "" -#: ../../boot.php:1198 +#: ../../boot.php:1234 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1201 +#: ../../boot.php:1237 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1338 +#: ../../boot.php:1393 msgid "Create a New Account" msgstr "" -#: ../../boot.php:1367 +#: ../../boot.php:1422 msgid "Password" msgstr "" -#: ../../boot.php:1368 +#: ../../boot.php:1423 msgid "Remember me" msgstr "" -#: ../../boot.php:1373 +#: ../../boot.php:1428 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1492 +#: ../../boot.php:1547 msgid "Requested channel is not available." msgstr "" -#: ../../boot.php:1504 +#: ../../boot.php:1559 msgid " Sorry, you don't have the permission to view this profile. " msgstr "" -#: ../../boot.php:1651 +#: ../../boot.php:1706 msgid "Profiles" msgstr "" -#: ../../boot.php:1651 +#: ../../boot.php:1706 msgid "Manage/edit profiles" msgstr "" -#: ../../boot.php:1655 +#: ../../boot.php:1710 msgid "Edit Profile" msgstr "" -#: ../../boot.php:1744 ../../boot.php:1824 +#: ../../boot.php:1799 ../../boot.php:1879 msgid "F d" msgstr "" -#: ../../boot.php:1801 +#: ../../boot.php:1856 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1802 +#: ../../boot.php:1857 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1857 +#: ../../boot.php:1912 msgid "[No description]" msgstr "" -#: ../../boot.php:1875 +#: ../../boot.php:1930 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1876 +#: ../../boot.php:1931 msgid "Events this week:" msgstr "" -#: ../../boot.php:2105 +#: ../../boot.php:2162 msgid "Channel" msgstr "" -#: ../../boot.php:2108 +#: ../../boot.php:2165 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:2112 +#: ../../boot.php:2169 msgid "About" msgstr "" -#: ../../boot.php:2115 +#: ../../boot.php:2172 msgid "Profile Details" msgstr "" -#: ../../boot.php:2133 +#: ../../boot.php:2190 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:2138 +#: ../../boot.php:2195 msgid "Webpages" msgstr "" -#: ../../boot.php:2141 +#: ../../boot.php:2198 msgid "Manage Webpages" msgstr "" -#: ../../boot.php:2368 +#: ../../boot.php:2469 msgid "toggle mobile" msgstr "" diff --git a/version.inc b/version.inc index 06ed318a0..56cd6a2d2 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-08-29.420 +2013-08-31.422 From 625dcb911a01983f4767a55567a0374d6045093e Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 31 Aug 2013 04:22:40 -0700 Subject: [PATCH 054/330] doc updates --- doc/html/comanche_8php.html | 291 ++++++++++++++++++++++++++++++++++++ doc/html/comanche_8php.js | 10 ++ doc/html/vote_8php.html | 173 +++++++++++++++++++++ doc/html/vote_8php.js | 6 + 4 files changed, 480 insertions(+) create mode 100644 doc/html/comanche_8php.html create mode 100644 doc/html/comanche_8php.js create mode 100644 doc/html/vote_8php.html create mode 100644 doc/html/vote_8php.js diff --git a/doc/html/comanche_8php.html b/doc/html/comanche_8php.html new file mode 100644 index 000000000..58d792ecd --- /dev/null +++ b/doc/html/comanche_8php.html @@ -0,0 +1,291 @@ + + + + + + +The Red Matrix: include/comanche.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    + +
    +
    comanche.php File Reference
    +
    +
    + + + + + + + + + + + + + + + + +

    +Functions

     pdl_selector ($uid, $current="")
     
     comanche_parser (&$a, $s)
     
     comanche_menu ($name)
     
     comanche_replace_region ($match)
     
     comanche_widget ($name, $args=null)
     
     comanche_region (&$a, $s)
     
     widget_profile ($args)
     
    +

    Function Documentation

    + +
    +
    + + + + + + + + +
    comanche_menu ( $name)
    +
    + +

    Referenced by comanche_region().

    + +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + +
    comanche_parser ($a,
     $s 
    )
    +
    + +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + +
    comanche_region ($a,
     $s 
    )
    +
    + +

    Referenced by comanche_parser().

    + +
    +
    + +
    +
    + + + + + + + + +
    comanche_replace_region ( $match)
    +
    + +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + +
    comanche_widget ( $name,
     $args = null 
    )
    +
    + +

    Referenced by comanche_region().

    + +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + +
    pdl_selector ( $uid,
     $current = "" 
    )
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    widget_profile ( $args)
    +
    + +
    +
    +
    +
    + diff --git a/doc/html/comanche_8php.js b/doc/html/comanche_8php.js new file mode 100644 index 000000000..afb696fda --- /dev/null +++ b/doc/html/comanche_8php.js @@ -0,0 +1,10 @@ +var comanche_8php = +[ + [ "comanche_menu", "comanche_8php.html#a1fe339e1454803aa502ac89379c17f5b", null ], + [ "comanche_parser", "comanche_8php.html#a1a208fdb40dd83d6298caec4290ee922", null ], + [ "comanche_region", "comanche_8php.html#a5718daeda40bf835345fe061e8808cdf", null ], + [ "comanche_replace_region", "comanche_8php.html#a028f004d5b8c23d6367816d899e17cfe", null ], + [ "comanche_widget", "comanche_8php.html#a45900dd1d6101b53e3d063db40eafa5e", null ], + [ "pdl_selector", "comanche_8php.html#af7150df735e5ff9d467994cd6f769c6e", null ], + [ "widget_profile", "comanche_8php.html#abd2e508a2a0b911c4a838e3cb7599923", null ] +]; \ No newline at end of file diff --git a/doc/html/vote_8php.html b/doc/html/vote_8php.html new file mode 100644 index 000000000..dd610e85d --- /dev/null +++ b/doc/html/vote_8php.html @@ -0,0 +1,173 @@ + + + + + + +The Red Matrix: mod/vote.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    + +
    +
    vote.php File Reference
    +
    +
    + + + + + + + + +

    +Functions

     vote_init (&$a)
     
     vote_post (&$a)
     
     vote_content (&$a)
     
    +

    Function Documentation

    + +
    +
    + + + + + + + + +
    vote_content ($a)
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    vote_init ($a)
    +
    + +
    +
    + +
    +
    + + + + + + + + +
    vote_post ($a)
    +
    + +
    +
    +
    +
    + diff --git a/doc/html/vote_8php.js b/doc/html/vote_8php.js new file mode 100644 index 000000000..6f0639cd8 --- /dev/null +++ b/doc/html/vote_8php.js @@ -0,0 +1,6 @@ +var vote_8php = +[ + [ "vote_content", "vote_8php.html#a6aa67489bf458ca5e3206e46dac68596", null ], + [ "vote_init", "vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2", null ], + [ "vote_post", "vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2", null ] +]; \ No newline at end of file From 00622779f3fd68bf9ae4860d776c65c82ae1c0c0 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 31 Aug 2013 04:30:01 -0700 Subject: [PATCH 055/330] add a guid to directory update table to avoid recursion --- boot.php | 2 +- install/database.sql | 2 ++ install/update.php | 11 ++++++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index 5e8b52d0d..ae27d65ab 100755 --- a/boot.php +++ b/boot.php @@ -43,7 +43,7 @@ require_once('include/taxonomy.php'); define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1064 ); +define ( 'DB_UPDATE_VERSION', 1065 ); define ( 'EOL', '
    ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/install/database.sql b/install/database.sql index dbffbf59b..2f92167c8 100644 --- a/install/database.sql +++ b/install/database.sql @@ -882,8 +882,10 @@ CREATE TABLE IF NOT EXISTS `tokens` ( CREATE TABLE IF NOT EXISTS `updates` ( `ud_hash` char(128) NOT NULL, + `ud_guid` char(255) NOT NULL DEFAULT '', `ud_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`ud_hash`), + KEY `ud_guid` (`ud_guid`), KEY `ud_date` (`ud_date`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/install/update.php b/install/update.php index 9beb25254..13dded6fe 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Sat, 31 Aug 2013 18:20:34 +0200 Subject: [PATCH 056/330] More mobile theme fixes If user is logged in personal settings are used else use admin settings. Only show toggle link if there is something to switch between. --- boot.php | 28 +++++++++++++++++----------- include/auth.php | 1 + 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/boot.php b/boot.php index ae27d65ab..d3412069a 100755 --- a/boot.php +++ b/boot.php @@ -2025,25 +2025,28 @@ function current_theme(){ $is_mobile = $a->is_mobile || $a->is_tablet; + $standard_system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : ''); + $standard_theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $standard_system_theme); + if($is_mobile) { if(isset($_SESSION['show_mobile']) && !$_SESSION['show_mobile']) { - $system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : ''); - $theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme); + $system_theme = $standard_system_theme; + $theme_name = $standard_theme_name; } else { $system_theme = ((isset($a->config['system']['mobile_theme'])) ? $a->config['system']['mobile_theme'] : ''); $theme_name = ((isset($_SESSION) && x($_SESSION,'mobile_theme')) ? $_SESSION['mobile_theme'] : $system_theme); - if($theme_name === '---') { + if($theme_name === '' || $theme_name === '---' ) { // user has selected to have the mobile theme be the same as the normal one - $system_theme = ''; - $theme_name = ''; + $system_theme = $standard_system_theme; + $theme_name = $standard_theme_name; } } } else { - $system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : ''); - $theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme); + $system_theme = $standard_system_theme; + $theme_name = $standard_theme_name; if($page_theme) $theme_name = $page_theme; @@ -2464,10 +2467,13 @@ function construct_page(&$a) { else { $link = $a->get_baseurl() . '/toggle_mobile?f=&off=1&address=' . curPageURL(); } - $a->page['footer'] .= replace_macros(get_markup_template("toggle_mobile_footer.tpl"), array( - '$toggle_link' => $link, - '$toggle_text' => t('toggle mobile') - )); + if ((isset($_SESSION) && $_SESSION['mobile_theme'] !='' && $_SESSION['mobile_theme'] !='---' ) || + (isset($a->config['system']['mobile_theme']) && !isset($_SESSION['mobile_theme']))) { + $a->page['footer'] .= replace_macros(get_markup_template("toggle_mobile_footer.tpl"), array( + '$toggle_link' => $link, + '$toggle_text' => t('toggle mobile') + )); + } } $page = $a->page; diff --git a/include/auth.php b/include/auth.php index 143a16de8..d04ebbe43 100644 --- a/include/auth.php +++ b/include/auth.php @@ -15,6 +15,7 @@ function nuke_session() { unset($_SESSION['cid']); unset($_SESSION['theme']); unset($_SESSION['mobile_theme']); + unset($_SESSION['show_mobile']); unset($_SESSION['page_flags']); unset($_SESSION['submanage']); unset($_SESSION['my_url']); From de3345f5f39f080e00c2572b48a53d85c7f65b5c Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 1 Sep 2013 17:07:55 -0700 Subject: [PATCH 057/330] This isn't optimal, but on the short term we'll clone the page editor to use as a block editor, and probably a layout editor as well. Eventually, these should all probably just be switches onto a single editor instance. Decided to put the layout_mid into the item table directory rather than re-use resource_id, so that we can still have pages attached to different resources like photos and events and stuff. The block editor is far from finished, at this point I've only cloned it and changed the name and type of item it looks for. --- boot.php | 2 +- install/database.sql | 4 +- install/update.php | 9 ++- mod/blocks.php | 82 +++++++++++++++++++++++++ mod/editblock.php | 139 +++++++++++++++++++++++++++++++++++++++++++ mod/item.php | 17 +++++- version.inc | 2 +- 7 files changed, 248 insertions(+), 7 deletions(-) create mode 100644 mod/blocks.php create mode 100644 mod/editblock.php diff --git a/boot.php b/boot.php index ae27d65ab..e1c2503ff 100755 --- a/boot.php +++ b/boot.php @@ -43,7 +43,7 @@ require_once('include/taxonomy.php'); define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1065 ); +define ( 'DB_UPDATE_VERSION', 1066 ); define ( 'EOL', '
    ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/install/database.sql b/install/database.sql index 2f92167c8..176b3610f 100644 --- a/install/database.sql +++ b/install/database.sql @@ -408,7 +408,6 @@ CREATE TABLE IF NOT EXISTS `item` ( `mid` char(255) CHARACTER SET ascii NOT NULL DEFAULT '', `aid` int(10) unsigned NOT NULL DEFAULT '0', `uid` int(10) unsigned NOT NULL DEFAULT '0', - `wall` tinyint(1) NOT NULL DEFAULT '0', `parent` int(10) unsigned NOT NULL DEFAULT '0', `parent_mid` char(255) CHARACTER SET ascii NOT NULL DEFAULT '', `thr_parent` char(255) NOT NULL DEFAULT '', @@ -431,6 +430,7 @@ CREATE TABLE IF NOT EXISTS `item` ( `object` text NOT NULL, `tgt_type` char(255) NOT NULL DEFAULT '', `target` text NOT NULL, + `layout_mid` char(255) NOT NULL DEFAULT '', `postopts` text NOT NULL, `llink` char(255) NOT NULL DEFAULT '', `plink` char(255) NOT NULL DEFAULT '', @@ -454,7 +454,6 @@ CREATE TABLE IF NOT EXISTS `item` ( KEY `created` (`created`), KEY `edited` (`edited`), KEY `received` (`received`), - KEY `wall` (`wall`), KEY `uid_commented` (`uid`,`commented`), KEY `uid_created` (`uid`,`created`), KEY `aid` (`aid`), @@ -474,6 +473,7 @@ CREATE TABLE IF NOT EXISTS `item` ( KEY `parent_mid` (`parent_mid`), KEY `uid_mid` (`mid`,`uid`), KEY `comment_policy` (`comment_policy`), + KEY `layout_mid` (`layout_mid`), FULLTEXT KEY `title` (`title`), FULLTEXT KEY `body` (`body`), FULLTEXT KEY `allow_cid` (`allow_cid`), diff --git a/install/update.php b/install/update.php index 13dded6fe..4f004e651 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ 1) + $which = argv(1); + else { + notice( t('Requested profile is not available.') . EOL ); + $a->error = 404; + return; + } + + profile_load($a,$which,0); + + + // Figure out who the page owner is. + $r = q("select channel_id from channel where channel_address = '%s'", + dbesc($which) + ); + if($r) { + $owner = intval($r[0]['channel_id']); + } + +// Get the observer, check their permissions + + $observer = $a->get_observer(); + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + + $perms = get_all_perms($owner,$ob_hash); + + if(! $perms['write_pages']) { + notice( t('Permission denied.') . EOL); + return; + } + +// Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages +// Nickname is set to the observers xchan, and profile_uid to the owners. This lets you post pages at other people's channels. +require_once ('include/conversation.php'); + $x = array( + 'webpage' => 1, + 'is_owner' => true, + 'nickname' => $a->profile['channel_address'], + 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), + 'bang' => (($group || $cid) ? '!' : ''), + 'visitor' => 'block', + 'profile_uid' => intval($owner), + ); + + $o .= status_editor($a,$x); + + //Get a list of blocks. We can't display all them because endless scroll makes that unusable, so just list titles and an edit link. +//TODO - this should be replaced with pagelist_widget + +$r = q("select * from item_id where uid = %d and service = 'BUILDBLOCK' order by sid asc", + intval($owner) +); + + $pages = null; + + if($r) { + $pages = array(); + foreach($r as $rr) { + $pages[$rr['iid']][] = array('url' => $rr['iid'],'title' => $rr['sid']); + } + } + + +//Build the base URL for edit links + $url = z_root() . "/editblock/" . $which; +// This isn't pretty, but it works. Until I figure out what to do with the UI, it's Good Enough(TM). + return $o . replace_macros(get_markup_template("webpagelist.tpl"), array( + '$baseurl' => $url, + '$edit' => t('Edit'), + '$pages' => $pages, + '$channel' => $which, + '$view' => t('View'), + '$preview' => '1', + + )); + + +} diff --git a/mod/editblock.php b/mod/editblock.php new file mode 100644 index 000000000..25ae8d8b6 --- /dev/null +++ b/mod/editblock.php @@ -0,0 +1,139 @@ + +get_channel() and stuff don't work here, so we've got to find the owner for ourselves. + $r = q("select channel_id from channel where channel_address = '%s'", + dbesc($which) + ); + if($r) { + $owner = intval($r[0]['channel_id']); + //logger('owner: ' . print_r($owner,true)); + } + + + + + if((local_user()) && (argc() > 2) && (argv(2) === 'view')) { + $which = $channel['channel_address']; + } + + + $o = ''; + + +// Figure out which post we're editing + $post_id = ((argc() > 2) ? intval(argv(2)) : 0); + + + if(! $post_id) { + notice( t('Item not found') . EOL); + return; + } + +// Now we've got a post and an owner, let's find out if we're allowed to edit it + + $observer = $a->get_observer(); + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + + $perms = get_all_perms($owner,$ob_hash); + + if(! $perms['write_pages']) { + notice( t('Permission denied.') . EOL); + return; + } + + + +// We've already figured out which item we want and whose copy we need, so we don't need anything fancy here + $itm = q("SELECT * FROM `item` WHERE `id` = %d and uid = %s LIMIT 1", + intval($post_id), + intval($owner) + ); + + + + $plaintext = true; +// You may or may not be a local user. This won't work, + if(feature_enabled(local_user(),'richtext')) + $plaintext = false; + + $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( + '$title' => t('Edit block') + )); + + + $a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array( + '$baseurl' => $a->get_baseurl(), + '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), + '$ispublic' => ' ', // t('Visible to everybody'), + '$geotag' => $geotag, + '$nickname' => $a->user['nickname'] + )); + + + $tpl = get_markup_template("jot.tpl"); + + $jotplugins = ''; + $jotnets = ''; + + call_hooks('jot_tool', $jotplugins); + call_hooks('jot_networks', $jotnets); + + $channel = $a->get_channel(); + + //$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); + +//FIXME A return path with $_SESSION doesn't always work for observer - it may WSoD instead of loading a sensible page. So, send folk to the webpage list. + + $rp = '/blocks/' . $which; + + $o .= replace_macros($tpl,array( + '$return_path' => $rp, + '$action' => 'item', + '$share' => t('Edit'), + '$upload' => t('Upload photo'), + '$attach' => t('Attach file'), + '$weblink' => t('Insert web link'), + '$youtube' => t('Insert YouTube video'), + '$video' => t('Insert Vorbis [.ogg] video'), + '$audio' => t('Insert Vorbis [.ogg] audio'), + '$setloc' => t('Set your location'), + '$noloc' => t('Clear browser location'), + '$wait' => t('Please wait'), + '$permset' => t('Permission settings'), + '$ptyp' => $itm[0]['type'], + '$content' => undo_post_tagging($itm[0]['body']), + '$post_id' => $post_id, + '$baseurl' => $a->get_baseurl(), + '$defloc' => $channel['channel_location'], + '$visitor' => 'none', + '$pvisit' => 'none', + '$public' => t('Public post'), + '$jotnets' => $jotnets, + '$title' => htmlspecialchars($itm[0]['title']), + '$placeholdertitle' => t('Set title'), + '$category' => '', + '$placeholdercategory' => t('Categories (comma-separated list)'), + '$emtitle' => t('Example: bob@example.com, mary@example.com'), + '$lockstate' => $lockstate, + '$acl' => '', + '$bang' => '', + '$profile_uid' => (intval($owner)), + '$preview' => ((feature_enabled(local_user(),'preview')) ? t('Preview') : ''), + '$jotplugins' => $jotplugins, + '$sourceapp' => t($a->sourcename), + )); + + return $o; + +} + + diff --git a/mod/item.php b/mod/item.php index 1893a6ef4..504df9d29 100644 --- a/mod/item.php +++ b/mod/item.php @@ -495,6 +495,9 @@ function item_post(&$a) { if($buildblock) $item_restrict = $item_restrict | ITEM_BUILDBLOCK; + + if($pdl) + $item_restrict = $item_restrict | ITEM_PDL; if(! strlen($verb)) @@ -764,7 +767,16 @@ function item_post(&$a) { intval($parent) ); - if($webpage) { + $page_type = ''; + + if($webpage) + $page_type = 'WEBPAGE'; + elseif($buildblock) + $page_type = 'BUILDBLOCK'; + elseif($ptemplate) + $page_type = 'PDL'; + + if($page_type) { // store page info as an alternate message_id so we can access it via // https://sitename/page/$channelname/$pagetitle @@ -773,11 +785,12 @@ function item_post(&$a) { // as the entire mid. If it were the post_id the link would be less portable. // We should have the ability to edit this and arrange pages into menus via the pages module + q("insert into item_id ( iid, uid, sid, service ) values ( %d, %d, '%s','%s' )", intval($post_id), intval($channel['channel_id']), dbesc(($pagetitle) ? $pagetitle : substr($mid,0,16)), - dbesc('WEBPAGE') + dbesc($page_type) ); } diff --git a/version.inc b/version.inc index 56cd6a2d2..6119cf100 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-08-31.422 +2013-09-01.423 From cbab62c95efdd3ab306736a430698313b6b2a320 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 1 Sep 2013 18:22:31 -0700 Subject: [PATCH 058/330] add layouts and editlayout and rework the page logic in mod/item --- mod/blocks.php | 2 +- mod/editlayout.php | 139 +++++++++++++++++++++++++++++++++++++++++++++ mod/item.php | 17 ++---- mod/layouts.php | 82 ++++++++++++++++++++++++++ mod/webpages.php | 2 +- 5 files changed, 227 insertions(+), 15 deletions(-) create mode 100644 mod/editlayout.php create mode 100644 mod/layouts.php diff --git a/mod/blocks.php b/mod/blocks.php index f3010f60f..bb1b68e8b 100644 --- a/mod/blocks.php +++ b/mod/blocks.php @@ -37,7 +37,7 @@ function webpages_content(&$a) { // Nickname is set to the observers xchan, and profile_uid to the owners. This lets you post pages at other people's channels. require_once ('include/conversation.php'); $x = array( - 'webpage' => 1, + 'webpage' => ITEM_BUILDBLOCK, 'is_owner' => true, 'nickname' => $a->profile['channel_address'], 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), diff --git a/mod/editlayout.php b/mod/editlayout.php new file mode 100644 index 000000000..1cebdc845 --- /dev/null +++ b/mod/editlayout.php @@ -0,0 +1,139 @@ + +get_channel() and stuff don't work here, so we've got to find the owner for ourselves. + $r = q("select channel_id from channel where channel_address = '%s'", + dbesc($which) + ); + if($r) { + $owner = intval($r[0]['channel_id']); + //logger('owner: ' . print_r($owner,true)); + } + + + + + if((local_user()) && (argc() > 2) && (argv(2) === 'view')) { + $which = $channel['channel_address']; + } + + + $o = ''; + + +// Figure out which post we're editing + $post_id = ((argc() > 2) ? intval(argv(2)) : 0); + + + if(! $post_id) { + notice( t('Item not found') . EOL); + return; + } + +// Now we've got a post and an owner, let's find out if we're allowed to edit it + + $observer = $a->get_observer(); + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + + $perms = get_all_perms($owner,$ob_hash); + + if(! $perms['write_pages']) { + notice( t('Permission denied.') . EOL); + return; + } + + + +// We've already figured out which item we want and whose copy we need, so we don't need anything fancy here + $itm = q("SELECT * FROM `item` WHERE `id` = %d and uid = %s LIMIT 1", + intval($post_id), + intval($owner) + ); + + + + $plaintext = true; +// You may or may not be a local user. This won't work, + if(feature_enabled(local_user(),'richtext')) + $plaintext = false; + + $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( + '$title' => t('Edit block') + )); + + + $a->page['htmlhead'] .= replace_macros(get_markup_template('jot-header.tpl'), array( + '$baseurl' => $a->get_baseurl(), + '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), + '$ispublic' => ' ', // t('Visible to everybody'), + '$geotag' => $geotag, + '$nickname' => $a->user['nickname'] + )); + + + $tpl = get_markup_template("jot.tpl"); + + $jotplugins = ''; + $jotnets = ''; + + call_hooks('jot_tool', $jotplugins); + call_hooks('jot_networks', $jotnets); + + $channel = $a->get_channel(); + + //$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); + +//FIXME A return path with $_SESSION doesn't always work for observer - it may WSoD instead of loading a sensible page. So, send folk to the webpage list. + + $rp = '/layouts/' . $which; + + $o .= replace_macros($tpl,array( + '$return_path' => $rp, + '$action' => 'item', + '$share' => t('Edit'), + '$upload' => t('Upload photo'), + '$attach' => t('Attach file'), + '$weblink' => t('Insert web link'), + '$youtube' => t('Insert YouTube video'), + '$video' => t('Insert Vorbis [.ogg] video'), + '$audio' => t('Insert Vorbis [.ogg] audio'), + '$setloc' => t('Set your location'), + '$noloc' => t('Clear browser location'), + '$wait' => t('Please wait'), + '$permset' => t('Permission settings'), + '$ptyp' => $itm[0]['type'], + '$content' => undo_post_tagging($itm[0]['body']), + '$post_id' => $post_id, + '$baseurl' => $a->get_baseurl(), + '$defloc' => $channel['channel_location'], + '$visitor' => 'none', + '$pvisit' => 'none', + '$public' => t('Public post'), + '$jotnets' => $jotnets, + '$title' => htmlspecialchars($itm[0]['title']), + '$placeholdertitle' => t('Set title'), + '$category' => '', + '$placeholdercategory' => t('Categories (comma-separated list)'), + '$emtitle' => t('Example: bob@example.com, mary@example.com'), + '$lockstate' => $lockstate, + '$acl' => '', + '$bang' => '', + '$profile_uid' => (intval($owner)), + '$preview' => ((feature_enabled(local_user(),'preview')) ? t('Preview') : ''), + '$jotplugins' => $jotplugins, + '$sourceapp' => t($a->sourcename), + )); + + return $o; + +} + + diff --git a/mod/item.php b/mod/item.php index 504df9d29..e22ecd197 100644 --- a/mod/item.php +++ b/mod/item.php @@ -70,7 +70,6 @@ function item_post(&$a) { $categories = ((x($_REQUEST,'category')) ? escape_tags($_REQUEST['category']) : ''); $webpage = ((x($_REQUEST,'webpage')) ? intval($_REQUEST['webpage']) : 0); $pagetitle = ((x($_REQUEST,'pagetitle')) ? escape_tags($_REQUEST['pagetitle']): ''); - $buildblock = ((x($_REQUEST,'buildblock')) ? intval($_REQUEST['buildblock']) : 0); if($pagetitle) { require_once('library/urlify/URLify.php'); @@ -491,13 +490,7 @@ function item_post(&$a) { $item_restrict = $item_restrict | ITEM_MODERATED; if($webpage) - $item_restrict = $item_restrict | ITEM_WEBPAGE; - - if($buildblock) - $item_restrict = $item_restrict | ITEM_BUILDBLOCK; - - if($pdl) - $item_restrict = $item_restrict | ITEM_PDL; + $item_restrict = $item_restrict | $webpage; if(! strlen($verb)) @@ -769,11 +762,11 @@ function item_post(&$a) { $page_type = ''; - if($webpage) + if($webpage & ITEM_WEBPAGE) $page_type = 'WEBPAGE'; - elseif($buildblock) + elseif($webpage & ITEM_BUILDBLOCK) $page_type = 'BUILDBLOCK'; - elseif($ptemplate) + elseif($webpage & ITEM_PDL) $page_type = 'PDL'; if($page_type) { @@ -783,8 +776,6 @@ function item_post(&$a) { // if no pagetitle was given or it couldn't be transliterated into a url, use the first // sixteen bytes of the mid - which makes the link portable and not quite as daunting // as the entire mid. If it were the post_id the link would be less portable. - // We should have the ability to edit this and arrange pages into menus via the pages module - q("insert into item_id ( iid, uid, sid, service ) values ( %d, %d, '%s','%s' )", intval($post_id), diff --git a/mod/layouts.php b/mod/layouts.php new file mode 100644 index 000000000..78d142c47 --- /dev/null +++ b/mod/layouts.php @@ -0,0 +1,82 @@ + 1) + $which = argv(1); + else { + notice( t('Requested profile is not available.') . EOL ); + $a->error = 404; + return; + } + + profile_load($a,$which,0); + + + // Figure out who the page owner is. + $r = q("select channel_id from channel where channel_address = '%s'", + dbesc($which) + ); + if($r) { + $owner = intval($r[0]['channel_id']); + } + +// Get the observer, check their permissions + + $observer = $a->get_observer(); + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + + $perms = get_all_perms($owner,$ob_hash); + + if(! $perms['write_pages']) { + notice( t('Permission denied.') . EOL); + return; + } + +// Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages +// Nickname is set to the observers xchan, and profile_uid to the owners. This lets you post pages at other people's channels. +require_once ('include/conversation.php'); + $x = array( + 'webpage' => ITEM_PDL, + 'is_owner' => true, + 'nickname' => $a->profile['channel_address'], + 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), + 'bang' => (($group || $cid) ? '!' : ''), + 'visitor' => 'block', + 'profile_uid' => intval($owner), + ); + + $o .= status_editor($a,$x); + + //Get a list of blocks. We can't display all them because endless scroll makes that unusable, so just list titles and an edit link. +//TODO - this should be replaced with pagelist_widget + +$r = q("select * from item_id where uid = %d and service = 'PDL' order by sid asc", + intval($owner) +); + + $pages = null; + + if($r) { + $pages = array(); + foreach($r as $rr) { + $pages[$rr['iid']][] = array('url' => $rr['iid'],'title' => $rr['sid']); + } + } + + +//Build the base URL for edit links + $url = z_root() . "/editlayout/" . $which; +// This isn't pretty, but it works. Until I figure out what to do with the UI, it's Good Enough(TM). + return $o . replace_macros(get_markup_template("webpagelist.tpl"), array( + '$baseurl' => $url, + '$edit' => t('Edit'), + '$pages' => $pages, + '$channel' => $which, + '$view' => t('View'), + '$preview' => '1', + + )); + + +} diff --git a/mod/webpages.php b/mod/webpages.php index fb133eccf..f3e1cd2f7 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -45,7 +45,7 @@ function webpages_content(&$a) { // Nickname is set to the observers xchan, and profile_uid to the owners. This lets you post pages at other people's channels. require_once ('include/conversation.php'); $x = array( - 'webpage' => 1, + 'webpage' => ITEM_WEBPAGE, 'is_owner' => true, 'nickname' => $a->profile['channel_address'], 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), From a1906482dc3323f747744a1447aace78b494ddbd Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 1 Sep 2013 18:36:14 -0700 Subject: [PATCH 059/330] rework the pdl_selector a bit since we've slightly changed the way layouts are stored. --- include/comanche.php | 12 +++--------- mod/page.php | 13 +++++++++++++ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/include/comanche.php b/include/comanche.php index cf7ecd7c5..bdce0c5e2 100644 --- a/include/comanche.php +++ b/include/comanche.php @@ -17,16 +17,10 @@ function pdl_selector($uid,$current="") { $o = ''; - // You can use anybody's Comanche layouts on this site that haven't been protected in some way - $sql_extra = item_permissions_sql($uid); - // By default order by title (therefore at this time pdl's need a unique title across this system), - // though future work may allow categorisation - // based on taxonomy terms - - $r = q("select title, mid from item where (item_restrict & %d) $sql_extra order by title", - intval(ITEM_PDL) + $r = q("select item_id.*, mid from item_id left join item on iid = item.id where item_id.uid = %d and item_id.uid = item.uid and service = 'PDL' order by sid asc", + intval($owner) ); $arr = array('channel_id' => $uid, 'current' => $current, 'entries' => $r); @@ -39,7 +33,7 @@ function pdl_selector($uid,$current="") { $entries[] = array('title' => t('Default'), 'mid' => ''); foreach($entries as $selection) { $selected = (($selection == $current) ? ' selected="selected" ' : ''); - $o .= ""; + $o .= ""; } $o .= ''; diff --git a/mod/page.php b/mod/page.php index c63932b5e..b227227bb 100644 --- a/mod/page.php +++ b/mod/page.php @@ -61,6 +61,19 @@ function page_content(&$a) { return; } + if($r[0]['layout_mid']) { + $l = q("select body from item where mid = '%s' and uid = %d limit 1", + dbesc($r[0]['layout_mid']), + intval($u[0]['channel_id']) + ); + + if($l) { + require_once('include/comanche.php'); + comanche_parser(get_app(),$l[0]['body']); + } + } + + // Use of widgets should be determined by Comanche, but we don't have it yet, so... if ($perms['write_pages']) { From caa148c1e3736b6d51327883b04405b00a4cda0b Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 1 Sep 2013 19:15:08 -0700 Subject: [PATCH 060/330] Sheesh. Three lines of Javascript. All you have to do is find which of the three lines is doing something wrong. Or FILE A BUG. Or use a different browser (not *try* a different browser, *use* a different browser), or turn off freaking tinymce. But no - let's argue about browsers instead. --- include/items.php | 11 ++++++ js/fk.autocomplete.js | 6 ++++ mod/item.php | 79 ++++++++++++++++++++++--------------------- 3 files changed, 57 insertions(+), 39 deletions(-) diff --git a/include/items.php b/include/items.php index c695a9b72..712c416de 100755 --- a/include/items.php +++ b/include/items.php @@ -1361,6 +1361,17 @@ function item_store($arr,$allow_exec = false) { return 0; } + // If a page layout is provided, ensure it exists and belongs to us. + + if(array_key_exists('layout_mid',$arr) && $arr['layout_mid']) { + $l = q("select item_restrict from item where mid = '%s' and uid = %d limit 1", + dbesc($arr['layout_mid']), + intval($arr['uid']) + ); + if((! $l) || (! ($l[0]['item_restrict'] & ITEM_PDL))) + unset($arr['layout_mid']); + } + // Don't let anybody set these, either intentionally or accidentally if(array_key_exists('id',$arr)) diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js index cd0a1c044..8bac41936 100644 --- a/js/fk.autocomplete.js +++ b/js/fk.autocomplete.js @@ -32,6 +32,12 @@ function ACPopup(elm,backend_url){ } } + if(! w) + w = 530; + + if(! h) + h = 130; + style.top=style.top+h; style.width = w; style.position = 'absolute'; diff --git a/mod/item.php b/mod/item.php index e22ecd197..060f36fdd 100644 --- a/mod/item.php +++ b/mod/item.php @@ -62,14 +62,15 @@ function item_post(&$a) { $message_id = ((x($_REQUEST,'message_id') && $api_source) ? strip_tags($_REQUEST['message_id']) : ''); - $profile_uid = ((x($_REQUEST,'profile_uid')) ? intval($_REQUEST['profile_uid']) : 0); - $post_id = ((x($_REQUEST,'post_id')) ? intval($_REQUEST['post_id']) : 0); - $app = ((x($_REQUEST,'source')) ? strip_tags($_REQUEST['source']) : ''); - $return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : ''); - $preview = ((x($_REQUEST,'preview')) ? intval($_REQUEST['preview']) : 0); - $categories = ((x($_REQUEST,'category')) ? escape_tags($_REQUEST['category']) : ''); - $webpage = ((x($_REQUEST,'webpage')) ? intval($_REQUEST['webpage']) : 0); - $pagetitle = ((x($_REQUEST,'pagetitle')) ? escape_tags($_REQUEST['pagetitle']): ''); + $profile_uid = ((x($_REQUEST,'profile_uid')) ? intval($_REQUEST['profile_uid']) : 0); + $post_id = ((x($_REQUEST,'post_id')) ? intval($_REQUEST['post_id']) : 0); + $app = ((x($_REQUEST,'source')) ? strip_tags($_REQUEST['source']) : ''); + $return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : ''); + $preview = ((x($_REQUEST,'preview')) ? intval($_REQUEST['preview']) : 0); + $categories = ((x($_REQUEST,'category')) ? escape_tags($_REQUEST['category']) : ''); + $webpage = ((x($_REQUEST,'webpage')) ? intval($_REQUEST['webpage']) : 0); + $pagetitle = ((x($_REQUEST,'pagetitle')) ? escape_tags($_REQUEST['pagetitle']) : ''); + $layout_mid = ((x($_REQUEST,'layout_mid')) ? escape_tags($_REQUEST['layout_mid']): ''); if($pagetitle) { require_once('library/urlify/URLify.php'); @@ -516,38 +517,38 @@ function item_post(&$a) { $item_flags = $item_flags | ITEM_THREAD_TOP; } - $datarray['aid'] = $channel['channel_account_id']; - $datarray['uid'] = $profile_uid; - - $datarray['owner_xchan'] = (($owner_hash) ? $owner_hash : $owner_xchan['xchan_hash']); - $datarray['author_xchan'] = $observer['xchan_hash']; - $datarray['created'] = datetime_convert(); - $datarray['edited'] = datetime_convert(); - $datarray['expires'] = $expires; - $datarray['commented'] = datetime_convert(); - $datarray['received'] = datetime_convert(); - $datarray['changed'] = datetime_convert(); - $datarray['mid'] = $mid; - $datarray['parent_mid'] = $parent_mid; - $datarray['mimetype'] = $content_type; - $datarray['title'] = $title; - $datarray['body'] = $body; - $datarray['app'] = $app; - $datarray['location'] = $location; - $datarray['coord'] = $coord; - $datarray['inform'] = $inform; - $datarray['verb'] = $verb; - $datarray['allow_cid'] = $str_contact_allow; - $datarray['allow_gid'] = $str_group_allow; - $datarray['deny_cid'] = $str_contact_deny; - $datarray['deny_gid'] = $str_group_deny; - $datarray['item_private'] = $private; - $datarray['attach'] = $attachments; - $datarray['thr_parent'] = $thr_parent; - $datarray['postopts'] = ''; - $datarray['item_restrict'] = $item_restrict; - $datarray['item_flags'] = $item_flags; + $datarray['aid'] = $channel['channel_account_id']; + $datarray['uid'] = $profile_uid; + $datarray['owner_xchan'] = (($owner_hash) ? $owner_hash : $owner_xchan['xchan_hash']); + $datarray['author_xchan'] = $observer['xchan_hash']; + $datarray['created'] = datetime_convert(); + $datarray['edited'] = datetime_convert(); + $datarray['expires'] = $expires; + $datarray['commented'] = datetime_convert(); + $datarray['received'] = datetime_convert(); + $datarray['changed'] = datetime_convert(); + $datarray['mid'] = $mid; + $datarray['parent_mid'] = $parent_mid; + $datarray['mimetype'] = $content_type; + $datarray['title'] = $title; + $datarray['body'] = $body; + $datarray['app'] = $app; + $datarray['location'] = $location; + $datarray['coord'] = $coord; + $datarray['inform'] = $inform; + $datarray['verb'] = $verb; + $datarray['allow_cid'] = $str_contact_allow; + $datarray['allow_gid'] = $str_group_allow; + $datarray['deny_cid'] = $str_contact_deny; + $datarray['deny_gid'] = $str_group_deny; + $datarray['item_private'] = $private; + $datarray['attach'] = $attachments; + $datarray['thr_parent'] = $thr_parent; + $datarray['postopts'] = ''; + $datarray['item_restrict'] = $item_restrict; + $datarray['item_flags'] = $item_flags; + $datarray['layout_mid'] = $layout_mid; $datarray['comment_policy'] = map_scope($channel['channel_w_comment']); // preview mode - prepare the body for display and send it via json From a35d440ff1fee806a8aa17a0297e1163db6a3ba5 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 1 Sep 2013 20:11:04 -0700 Subject: [PATCH 061/330] Add Comanche layouts to the things that don't go offsite. --- include/notifier.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/notifier.php b/include/notifier.php index 2a0301357..5dcd7b58c 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -257,6 +257,10 @@ function notifier_run($argv, $argc){ return; } + if($target_item['item_restrict'] & ITEM_PDL) { + logger('notifier: target item ITEM_PDL', LOGGER_DEBUG); + return; + } $s = q("select * from channel where channel_id = %d limit 1", intval($target_item['uid']) From 8b7757e033c4483da24700722c186057bb431164 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 2 Sep 2013 01:38:17 -0700 Subject: [PATCH 062/330] webpage content-type -- needs cleaning up and a security check once all the important bits are in place. --- include/conversation.php | 8 ++ include/items.php | 10 +- include/text.php | 60 ++++++++++ mod/blocks.php | 2 +- mod/item.php | 244 ++++++++++++++++++++------------------- mod/webpages.php | 3 + version.inc | 2 +- view/tpl/jot.tpl | 3 + 8 files changed, 206 insertions(+), 126 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 2157f8291..a357e1480 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1009,9 +1009,16 @@ function status_editor($a,$x,$popup=false) { $geotag = (($x['allow_location']) ? replace_macros(get_markup_template('jot_geotag.tpl'), array()) : ''); $plaintext = true; + if(feature_enabled(local_user(),'richtext')) $plaintext = false; + if(intval($x['plaintext'])) + $plaintext = true; + + if(intval($x['mimeselect'])) + $mimeselect = mimetype_select($x['profile_uid']); + $tpl = get_markup_template('jot-header.tpl'); $a->page['htmlhead'] .= replace_macros($tpl, array( @@ -1079,6 +1086,7 @@ function status_editor($a,$x,$popup=false) { '$emtitle' => t('Example: bob@example.com, mary@example.com'), '$lockstate' => $x['lockstate'], '$acl' => $x['acl'], + '$mimeselect' => $mimeselect, '$showacl' => ((array_key_exists('showacl',$x)) ? $x['showacl'] : 'yes'), '$bang' => $x['bang'], '$profile_uid' => $x['profile_uid'], diff --git a/include/items.php b/include/items.php index 712c416de..66172ade3 100755 --- a/include/items.php +++ b/include/items.php @@ -1397,14 +1397,10 @@ function item_store($arr,$allow_exec = false) { $arr['item_private'] = ((x($arr,'item_private')) ? intval($arr['item_private']) : 0 ); $arr['item_flags'] = ((x($arr,'item_flags')) ? intval($arr['item_flags']) : 0 ); - // this is a bit messy - we really need an input filter chain that temporarily undoes obscuring - if($arr['mimetype'] != 'text/html' && $arr['mimetype'] != 'application/x-php') { - if((strpos($arr['body'],'<') !== false) || (strpos($arr['body'],'>') !== false)) - $arr['body'] = escape_tags($arr['body']); - if((strpos($arr['title'],'<') !== false) || (strpos($arr['title'],'>') !== false)) - $arr['title'] = escape_tags($arr['title']); - } + $arr['body'] = z_input_filter($arr['uid'],$arr['body'],$arr['mimetype']); + $arr['title'] = escape_tags($arr['title']); + // only detect language if we have text content, and if the post is private but not yet // obscured, make it so. diff --git a/include/text.php b/include/text.php index 99d5c9d78..606ef421c 100755 --- a/include/text.php +++ b/include/text.php @@ -81,6 +81,34 @@ function escape_tags($string) { } +function z_input_filter($channel_id,$s,$type = 'text/bbcode') { + + if($type === 'text/bbcode') + return escape_tags($s); + if($type === 'text/markdown') + return escape_tags($s); + if($type == 'text/plain') + return escape_tags($s); + $r = q("select account_id, account_roles from account left join channel on channel_account_id = account_id where channel_id = %d limit 1", + intval($channel_id) + ); + if($r && ($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWEXEC)) { + if(local_user() && (get_account_id() == $r[0]['account_id'])) { + return $s; + } + } + + if($type === 'text/html') + return purify_html($s); + + return escape_tags($s); + +} + + + + + function purify_html($s) { require_once('library/HTMLPurifier.auto.php'); require_once('include/html2bbcode.php'); @@ -1127,6 +1155,7 @@ function prepare_body(&$item,$attach = false) { function prepare_text($text,$content_type = 'text/bbcode') { + switch($content_type) { case 'text/plain': @@ -1291,6 +1320,37 @@ function unamp($s) { } +function mimetype_select($channel_id, $current = 'text/bbcode') { + + $x = array( + 'text/bbcode', + 'text/html', + 'text/markdown', + 'text/plain' + ); + + $r = q("select account_flags from account left join channel on account_id = channel_account_id where + channel_id = %d limit 1", + intval($channel_id) + ); + + if($r) { + if($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) { + $x[] = 'application/x-php'; + } + } + + $o = t('Page content type: '); + $o .= ''; + + return $o; + +} diff --git a/mod/blocks.php b/mod/blocks.php index bb1b68e8b..29117eae8 100644 --- a/mod/blocks.php +++ b/mod/blocks.php @@ -1,6 +1,6 @@ 1) $which = argv(1); diff --git a/mod/item.php b/mod/item.php index 060f36fdd..50644607d 100644 --- a/mod/item.php +++ b/mod/item.php @@ -44,7 +44,7 @@ function item_post(&$a) { call_hooks('post_local_start', $_REQUEST); -// logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA); + logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA); $api_source = ((x($_REQUEST,'api_source') && $_REQUEST['api_source']) ? true : false); @@ -221,7 +221,7 @@ function item_post(&$a) { $verb = $orig_post['verb']; $app = $orig_post['app']; $title = escape_tags(trim($_REQUEST['title'])); - $body = escape_tags(trim($_REQUEST['body'])); + $body = $_REQUEST['body']; $private = $orig_post['item_private']; } @@ -255,7 +255,7 @@ function item_post(&$a) { $coord = notags(trim($_REQUEST['coord'])); $verb = notags(trim($_REQUEST['verb'])); $title = escape_tags(trim($_REQUEST['title'])); - $body = escape_tags(trim($_REQUEST['body'])); + $body = $_REQUEST['body']; $private = ( ( strlen($str_group_allow) @@ -310,154 +310,164 @@ function item_post(&$a) { $post_type = notags(trim($_REQUEST['type'])); - $content_type = notags(trim($_REQUEST['content_type'])); - if(! $content_type) - $content_type = 'text/bbcode'; + $mimetype = notags(trim($_REQUEST['mimetype'])); + if(! $mimetype) + $mimetype = 'text/bbcode'; + // Verify ability to use html or php!!! -// BBCODE alert: the following functions assume bbcode input -// and will require alternatives for alternative content-types (text/html, text/markdown, text/plain, etc.) -// we may need virtual or template classes to implement the possible alternatives - - // Work around doubled linefeeds in Tinymce 3.5b2 - // First figure out if it's a status post that would've been - // created using tinymce. Otherwise leave it alone. - - $plaintext = ((feature_enabled($profile_uid,'richtext')) ? false : true); - if((! $parent) && (! $api_source) && (! $plaintext)) { - $body = fix_mce_lf($body); + if($preview) { + $body = z_input_filter($profile_uid,$body,$mimetype); } - // If we're sending a private top-level message with a single @-taggable channel as a recipient, @-tag it. +logger('body: ' . $body); - if((! $parent) && (substr_count($str_contact_allow,'<') == 1) && ($str_group_allow == '') && ($str_contact_deny == '') && ($str_group_deny == '')) { - $x = q("select abook_id, abook_their_perms from abook where abook_xchan = '%s' and abook_channel = %d limit 1", - dbesc(str_replace(array('<','>'),array('',''),$str_contact_allow)), - intval($profile_uid) - ); - if($x && ($x[0]['abook_their_perms'] & PERMS_W_TAGWALL)) - $body .= "\n\n@group+" . $x[0]['abook_id'] . "\n"; - } + if($mimetype === 'text/bbcode') { - /** - * fix naked links by passing through a callback to see if this is a red site - * (already known to us) which will get a zrl, otherwise link with url - */ + // BBCODE alert: the following functions assume bbcode input + // and will require alternatives for alternative content-types (text/html, text/markdown, text/plain, etc.) + // we may need virtual or template classes to implement the possible alternatives - $body = preg_replace_callback("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ism", 'red_zrl_callback', $body); + // Work around doubled linefeeds in Tinymce 3.5b2 + // First figure out if it's a status post that would've been + // created using tinymce. Otherwise leave it alone. - /** - * - * When a photo was uploaded into the message using the (profile wall) ajax - * uploader, The permissions are initially set to disallow anybody but the - * owner from seeing it. This is because the permissions may not yet have been - * set for the post. If it's private, the photo permissions should be set - * appropriately. But we didn't know the final permissions on the post until - * now. So now we'll look for links of uploaded messages that are in the - * post and set them to the same permissions as the post itself. - * - */ + $plaintext = ((feature_enabled($profile_uid,'richtext')) ? false : true); + if((! $parent) && (! $api_source) && (! $plaintext)) { + $body = fix_mce_lf($body); + } - if(! $preview) { - fix_attached_photo_permissions($profile_uid,$owner_xchan['xchan_hash'],$body, - $str_contact_allow,$str_group_allow,$str_contact_deny,$str_group_deny); + // If we're sending a private top-level message with a single @-taggable channel as a recipient, @-tag it. - fix_attached_file_permissions($channel,$observer['xchan_hash'],$body, - $str_contact_allow,$str_group_allow,$str_contact_deny,$str_group_deny); + if((! $parent) && (substr_count($str_contact_allow,'<') == 1) && ($str_group_allow == '') && ($str_contact_deny == '') && ($str_group_deny == '')) { + $x = q("select abook_id, abook_their_perms from abook where abook_xchan = '%s' and abook_channel = %d limit 1", + dbesc(str_replace(array('<','>'),array('',''),$str_contact_allow)), + intval($profile_uid) + ); + if($x && ($x[0]['abook_their_perms'] & PERMS_W_TAGWALL)) + $body .= "\n\n@group+" . $x[0]['abook_id'] . "\n"; + } - } + /** + * fix naked links by passing through a callback to see if this is a red site + * (already known to us) which will get a zrl, otherwise link with url + */ + + $body = preg_replace_callback("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\@\_\~\#\%\$\!\+\,]+)/ism", 'red_zrl_callback', $body); + + /** + * + * When a photo was uploaded into the message using the (profile wall) ajax + * uploader, The permissions are initially set to disallow anybody but the + * owner from seeing it. This is because the permissions may not yet have been + * set for the post. If it's private, the photo permissions should be set + * appropriately. But we didn't know the final permissions on the post until + * now. So now we'll look for links of uploaded messages that are in the + * post and set them to the same permissions as the post itself. + * + */ + + if(! $preview) { + fix_attached_photo_permissions($profile_uid,$owner_xchan['xchan_hash'],$body, + $str_contact_allow,$str_group_allow,$str_contact_deny,$str_group_deny); + + fix_attached_file_permissions($channel,$observer['xchan_hash'],$body, + $str_contact_allow,$str_group_allow,$str_contact_deny,$str_group_deny); + + } - $body = bb_translate_video($body); + $body = bb_translate_video($body); - /** - * Fold multi-line [code] sequences - */ + /** + * Fold multi-line [code] sequences + */ - $body = preg_replace('/\[\/code\]\s*\[code\]/ism',"\n",$body); + $body = preg_replace('/\[\/code\]\s*\[code\]/ism',"\n",$body); - $body = scale_external_images($body,false); + $body = scale_external_images($body,false); - /** - * Look for any tags and linkify them - */ + /** + * Look for any tags and linkify them + */ - $str_tags = ''; - $inform = ''; - $post_tags = array(); + $str_tags = ''; + $inform = ''; + $post_tags = array(); - $tags = get_tags($body); + $tags = get_tags($body); - $tagged = array(); + $tagged = array(); - $private_forum = false; + $private_forum = false; - if(count($tags)) { - foreach($tags as $tag) { + if(count($tags)) { + foreach($tags as $tag) { - // If we already tagged 'Robert Johnson', don't try and tag 'Robert'. - // Robert Johnson should be first in the $tags array + // If we already tagged 'Robert Johnson', don't try and tag 'Robert'. + // Robert Johnson should be first in the $tags array - $fullnametagged = false; - for($x = 0; $x < count($tagged); $x ++) { - if(stristr($tagged[$x],$tag . ' ')) { - $fullnametagged = true; - break; + $fullnametagged = false; + for($x = 0; $x < count($tagged); $x ++) { + if(stristr($tagged[$x],$tag . ' ')) { + $fullnametagged = true; + break; + } + } + if($fullnametagged) + continue; + + $success = handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag); + logger('handle_tag: ' . print_r($success,tue)); + + if($success['replaced']) { + $tagged[] = $tag; + $post_tags[] = array( + 'uid' => $profile_uid, + 'type' => $success['termtype'], + 'otype' => TERM_OBJ_POST, + 'term' => $success['term'], + 'url' => $success['url'] + ); + } + if(is_array($success['contact']) && intval($success['contact']['prv'])) { + $private_forum = true; + $private_id = $success['contact']['id']; } } - if($fullnametagged) - continue; - - $success = handle_tag($a, $body, $inform, $str_tags, (local_user()) ? local_user() : $profile_uid , $tag); - logger('handle_tag: ' . print_r($success,tue)); - - if($success['replaced']) { - $tagged[] = $tag; - $post_tags[] = array( - 'uid' => $profile_uid, - 'type' => $success['termtype'], - 'otype' => TERM_OBJ_POST, - 'term' => $success['term'], - 'url' => $success['url'] - ); - } - if(is_array($success['contact']) && intval($success['contact']['prv'])) { - $private_forum = true; - $private_id = $success['contact']['id']; - } } - } // logger('post_tags: ' . print_r($post_tags,true)); - if(($private_forum) && (! $parent) && (! $private)) { - // we tagged a private forum in a top level post and the message was public. - // Restrict it. - $private = 1; - $str_contact_allow = '<' . $private_id . '>'; - } + if(($private_forum) && (! $parent) && (! $private)) { + // we tagged a private forum in a top level post and the message was public. + // Restrict it. + $private = 1; + $str_contact_allow = '<' . $private_id . '>'; + } - $attachments = ''; - $match = false; + $attachments = ''; + $match = false; - if(preg_match_all('/(\[attachment\](.*?)\[\/attachment\])/',$body,$match)) { - $attachments = array(); - foreach($match[2] as $mtch) { - $hash = substr($mtch,0,strpos($mtch,',')); - $rev = intval(substr($mtch,strpos($mtch,','))); - $r = attach_by_hash_nodata($hash,$rev); - if($r['success']) { - $attachments[] = array( - 'href' => $a->get_baseurl() . '/attach/' . $r['data']['hash'], - 'length' => $r['data']['filesize'], - 'type' => $r['data']['filetype'], - 'title' => urlencode($r['data']['filename']), - 'revision' => $r['data']['revision'] - ); + if(preg_match_all('/(\[attachment\](.*?)\[\/attachment\])/',$body,$match)) { + $attachments = array(); + foreach($match[2] as $mtch) { + $hash = substr($mtch,0,strpos($mtch,',')); + $rev = intval(substr($mtch,strpos($mtch,','))); + $r = attach_by_hash_nodata($hash,$rev); + if($r['success']) { + $attachments[] = array( + 'href' => $a->get_baseurl() . '/attach/' . $r['data']['hash'], + 'length' => $r['data']['filesize'], + 'type' => $r['data']['filetype'], + 'title' => urlencode($r['data']['filename']), + 'revision' => $r['data']['revision'] + ); + } + $body = str_replace($match[1],'',$body); } - $body = str_replace($match[1],'',$body); } } @@ -530,7 +540,7 @@ function item_post(&$a) { $datarray['changed'] = datetime_convert(); $datarray['mid'] = $mid; $datarray['parent_mid'] = $parent_mid; - $datarray['mimetype'] = $content_type; + $datarray['mimetype'] = $mimetype; $datarray['title'] = $title; $datarray['body'] = $body; $datarray['app'] = $app; diff --git a/mod/webpages.php b/mod/webpages.php index f3e1cd2f7..081297eb9 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -52,10 +52,13 @@ require_once ('include/conversation.php'); 'bang' => (($group || $cid) ? '!' : ''), 'visitor' => 'block', 'profile_uid' => intval($owner), + 'plaintext' => 1, + 'mimeselect' => 1, ); $o .= status_editor($a,$x); + //Get a list of webpages. We can't display all them because endless scroll makes that unusable, so just list titles and an edit link. //TODO - this should be replaced with pagelist_widget diff --git a/version.inc b/version.inc index 6119cf100..5a1e9d9a7 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-09-01.423 +2013-09-02.424 diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 8092a7047..e67caf3d2 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -9,6 +9,9 @@ + + {{$mimeselect}} +
    {{if $catsenabled}}
    From f44274bfca6137795ee878a076d5aeed0b330f64 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 2 Sep 2013 13:31:59 -0700 Subject: [PATCH 063/330] allow a channel owner to define a default mimetype on webpages (otherwise default to "choose") - also fix the selector w/r/t php code. There is no ui for setting either at the moment, but for instance with wiki pages we probably don't want to have multiple choice of the mimetype. Keep it simple. --- include/conversation.php | 10 ++++++++-- include/text.php | 5 +++-- mod/webpages.php | 7 +++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index a357e1480..31bfdbef9 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1016,8 +1016,14 @@ function status_editor($a,$x,$popup=false) { if(intval($x['plaintext'])) $plaintext = true; - if(intval($x['mimeselect'])) - $mimeselect = mimetype_select($x['profile_uid']); + $mimeselct = ''; + if(array_key_exists('mimetype',$x) && $x['mimetype']) { + if($x['mimetype'] === 'choose') + $mimeselect = mimetype_select($x['profile_uid']); + else + $mimeselect = ''; + } + $tpl = get_markup_template('jot-header.tpl'); diff --git a/include/text.php b/include/text.php index 606ef421c..71374f1f9 100755 --- a/include/text.php +++ b/include/text.php @@ -1329,14 +1329,15 @@ function mimetype_select($channel_id, $current = 'text/bbcode') { 'text/plain' ); - $r = q("select account_flags from account left join channel on account_id = channel_account_id where + $r = q("select account_id, account_roles from account left join channel on account_id = channel_account_id where channel_id = %d limit 1", intval($channel_id) ); if($r) { if($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE) { - $x[] = 'application/x-php'; + if(local_user() && get_account_id() == $r[0]['account_id']) + $x[] = 'application/x-php'; } } diff --git a/mod/webpages.php b/mod/webpages.php index 081297eb9..559b176fc 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -41,6 +41,10 @@ function webpages_content(&$a) { return; } + $mimetype = get_config('system','page_mimetype'); + if(! $mimetype) + $mimetype = 'choose'; + // Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages // Nickname is set to the observers xchan, and profile_uid to the owners. This lets you post pages at other people's channels. require_once ('include/conversation.php'); @@ -52,8 +56,7 @@ require_once ('include/conversation.php'); 'bang' => (($group || $cid) ? '!' : ''), 'visitor' => 'block', 'profile_uid' => intval($owner), - 'plaintext' => 1, - 'mimeselect' => 1, + 'mimetype' => $mimetype, ); $o .= status_editor($a,$x); From 5f2a7573d5423e82b3a73ca91a4e72a56dab1a14 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 2 Sep 2013 13:39:13 -0700 Subject: [PATCH 064/330] only allow richtext editor on pages if bbcode is the default mimetype, otherwise use plaintext editor. This will eventually need work to support a visual editor for html or other types. --- include/conversation.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 31bfdbef9..c40691bba 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1013,17 +1013,17 @@ function status_editor($a,$x,$popup=false) { if(feature_enabled(local_user(),'richtext')) $plaintext = false; - if(intval($x['plaintext'])) - $plaintext = true; - $mimeselct = ''; if(array_key_exists('mimetype',$x) && $x['mimetype']) { - if($x['mimetype'] === 'choose') + if($x['mimetype'] != 'text/bbcode') + $plaintext = true; + if($x['mimetype'] === 'choose') { $mimeselect = mimetype_select($x['profile_uid']); + } else - $mimeselect = ''; + $mimeselect = ''; } - + $tpl = get_markup_template('jot-header.tpl'); From 7c775db9d6b9dc68bc05cded7ab93357aeeb9c3f Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 2 Sep 2013 16:01:29 -0700 Subject: [PATCH 065/330] fix webpage storage --- include/conversation.php | 2 +- include/text.php | 2 +- mod/item.php | 10 +++------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index c40691bba..8cee4f34f 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1055,7 +1055,7 @@ function status_editor($a,$x,$popup=false) { '$return_path' => $a->query_string, '$action' => $a->get_baseurl(true) . '/item', '$share' => (x($x,'button') ? $x['button'] : t('Share')), - '$webpage' => (x($x,'webpage') ? '1' : ''), + '$webpage' => (x($x,'webpage') ? $x['webpage'] : ''), '$placeholdpagetitle' => t('Page link title'), '$pagetitle' => (x($x,'pagetitle') ? $x['pagetitle'] : ''), '$upload' => t('Upload photo'), diff --git a/include/text.php b/include/text.php index 71374f1f9..b0b519851 100755 --- a/include/text.php +++ b/include/text.php @@ -92,7 +92,7 @@ function z_input_filter($channel_id,$s,$type = 'text/bbcode') { $r = q("select account_id, account_roles from account left join channel on channel_account_id = account_id where channel_id = %d limit 1", intval($channel_id) ); - if($r && ($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWEXEC)) { + if($r && ($r[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE)) { if(local_user() && (get_account_id() == $r[0]['account_id'])) { return $s; } diff --git a/mod/item.php b/mod/item.php index 50644607d..ce484999b 100644 --- a/mod/item.php +++ b/mod/item.php @@ -44,7 +44,7 @@ function item_post(&$a) { call_hooks('post_local_start', $_REQUEST); - logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA); +// logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA); $api_source = ((x($_REQUEST,'api_source') && $_REQUEST['api_source']) ? true : false); @@ -320,7 +320,6 @@ function item_post(&$a) { $body = z_input_filter($profile_uid,$body,$mimetype); } -logger('body: ' . $body); if($mimetype === 'text/bbcode') { @@ -368,11 +367,9 @@ logger('body: ' . $body); */ if(! $preview) { - fix_attached_photo_permissions($profile_uid,$owner_xchan['xchan_hash'],$body, - $str_contact_allow,$str_group_allow,$str_contact_deny,$str_group_deny); + fix_attached_photo_permissions($profile_uid,$owner_xchan['xchan_hash'],$body,$str_contact_allow,$str_group_allow,$str_contact_deny,$str_group_deny); - fix_attached_file_permissions($channel,$observer['xchan_hash'],$body, - $str_contact_allow,$str_group_allow,$str_contact_deny,$str_group_deny); + fix_attached_file_permissions($channel,$observer['xchan_hash'],$body,$str_contact_allow,$str_group_allow,$str_contact_deny,$str_group_deny); } @@ -487,7 +484,6 @@ logger('body: ' . $body); } } - $item_flags = ITEM_UNSEEN; $item_restrict = ITEM_VISIBLE; From 56e408f4679862a0d7d9d8fa46a1875f2cbf3574 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 2 Sep 2013 16:29:52 -0700 Subject: [PATCH 066/330] pass execflag - Working for preview but not yet executing on page render --- include/text.php | 1 + mod/item.php | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/include/text.php b/include/text.php index b0b519851..53471f460 100755 --- a/include/text.php +++ b/include/text.php @@ -1199,6 +1199,7 @@ function prepare_text($text,$content_type = 'text/bbcode') { $s = zidify_links($s); break; } +//logger('prepare: ' . $s); return $s; } diff --git a/mod/item.php b/mod/item.php index ce484999b..56fdda887 100644 --- a/mod/item.php +++ b/mod/item.php @@ -320,6 +320,24 @@ function item_post(&$a) { $body = z_input_filter($profile_uid,$body,$mimetype); } + $execflag = false; + + if($mimetype === 'application/x-php') { + $z = q("select account_id, account_roles from account left join channel on channel_account_id = account_id where channel_id = %d limit 1", + intval($profile_uid) + ); + if($z && ($z[0]['account_roles'] & ACCOUNT_ROLE_ALLOWCODE)) { + if(local_user() && (get_account_id() == $z[0]['account_id'])) { + $execflag = true; + } + else { + notice( t('Executable content type not permitted to this channel.') . EOL); + if(x($_REQUEST,'return')) + goaway($a->get_baseurl() . "/" . $return_path ); + killme(); + } + } + } if($mimetype === 'text/bbcode') { @@ -655,7 +673,7 @@ function item_post(&$a) { $post_id = 0; - $post_id = item_store($datarray); + $post_id = item_store($datarray,$execflag); if($post_id) { logger('mod_item: saved item ' . $post_id); From dfa2efcecf976783c4fa06f4301a851eca8e97c6 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 2 Sep 2013 16:37:54 -0700 Subject: [PATCH 067/330] oh that's why --- include/conversation.php | 3 ++- include/text.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 8cee4f34f..299cc1431 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1248,12 +1248,13 @@ function render_location_default($item) { function prepare_page($item) { + return replace_macros(get_markup_template('page_display.tpl'),array( '$author' => $item['author']['xchan_name'], '$auth_url' => $item['author']['xchan_url'], '$date' => datetime_convert('UTC',date_default_timezone_get(),$item['created'],'Y-m-d H:i'), '$title' => smilies(bbcode($item['title'])), - '$body' => smilies(bbcode($item['body'])) + '$body' => prepare_text($item['body'],$item['mimetype']) )); } diff --git a/include/text.php b/include/text.php index 53471f460..bbd538f15 100755 --- a/include/text.php +++ b/include/text.php @@ -1199,7 +1199,8 @@ function prepare_text($text,$content_type = 'text/bbcode') { $s = zidify_links($s); break; } -//logger('prepare: ' . $s); + +//logger('prepare_text: ' . $s); return $s; } From a32d86f0a07e244faeb3fde36c002d9657b3552d Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 2 Sep 2013 17:48:48 -0700 Subject: [PATCH 068/330] preserve mimetype on page edits --- include/conversation.php | 9 +++++---- mod/editwebpage.php | 14 +++++++++++++- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 299cc1431..43de9fc8d 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1013,7 +1013,7 @@ function status_editor($a,$x,$popup=false) { if(feature_enabled(local_user(),'richtext')) $plaintext = false; - $mimeselct = ''; + $mimeselect = ''; if(array_key_exists('mimetype',$x) && $x['mimetype']) { if($x['mimetype'] != 'text/bbcode') $plaintext = true; @@ -1021,9 +1021,10 @@ function status_editor($a,$x,$popup=false) { $mimeselect = mimetype_select($x['profile_uid']); } else - $mimeselect = ''; + $mimeselect = ''; } + $webpage = ((x($x,'webpage')) ? $x['webpage'] : ''); $tpl = get_markup_template('jot-header.tpl'); @@ -1055,7 +1056,7 @@ function status_editor($a,$x,$popup=false) { '$return_path' => $a->query_string, '$action' => $a->get_baseurl(true) . '/item', '$share' => (x($x,'button') ? $x['button'] : t('Share')), - '$webpage' => (x($x,'webpage') ? $x['webpage'] : ''), + '$webpage' => $webpage, '$placeholdpagetitle' => t('Page link title'), '$pagetitle' => (x($x,'pagetitle') ? $x['pagetitle'] : ''), '$upload' => t('Upload photo'), @@ -1074,7 +1075,7 @@ function status_editor($a,$x,$popup=false) { '$shortnoloc' => t('clear location'), '$title' => "", '$placeholdertitle' => t('Set title'), - '$catsenabled' => ((feature_enabled($x['profile_uid'],'categories')) ? 'categories' : ''), + '$catsenabled' => ((feature_enabled($x['profile_uid'],'categories') && (! $webpage)) ? 'categories' : ''), '$category' => "", '$placeholdercategory' => t('Categories (comma-separated list)'), '$wait' => t('Please wait'), diff --git a/mod/editwebpage.php b/mod/editwebpage.php index f89be67c4..cd901e7e3 100644 --- a/mod/editwebpage.php +++ b/mod/editwebpage.php @@ -65,6 +65,17 @@ function editwebpage_content(&$a) { if(feature_enabled(local_user(),'richtext')) $plaintext = false; + + + $mimetype = $itm[0]['mimetype']; + + $mimeselect = ''; + + if($mimetype != 'text/bbcode') + $plaintext = true; + $mimeselect = ''; + + $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( '$title' => t('Edit post') )); @@ -78,7 +89,7 @@ function editwebpage_content(&$a) { '$nickname' => $a->user['nickname'] )); - + $tpl = get_markup_template("jot.tpl"); $jotplugins = ''; @@ -118,6 +129,7 @@ function editwebpage_content(&$a) { '$pvisit' => 'none', '$public' => t('Public post'), '$jotnets' => $jotnets, + '$mimeselect' => $mimeselect, '$title' => htmlspecialchars($itm[0]['title']), '$placeholdertitle' => t('Set title'), '$category' => '', From 1a7bb1fb75084fbcd4d81c8c24820631e3df4d64 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 2 Sep 2013 19:40:21 -0700 Subject: [PATCH 069/330] The triple linebreaks in notification emails finally bothered me enough to do something about it. --- include/enotify.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/enotify.php b/include/enotify.php index a15e42b73..b2a4f5856 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -379,11 +379,9 @@ function notification($params) { logger('notification: sending notification email'); - $textversion = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n"), "\n", - $body))),ENT_QUOTES,'UTF-8')); + $textversion = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r", "\\n"), array( "", "\n"), $body))),ENT_QUOTES,'UTF-8')); - $htmlversion = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), - "
    \n",$body))), ENT_QUOTES,'UTF-8'); + $htmlversion = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r","\\n"), array("","
    \n"),$body))), ENT_QUOTES,'UTF-8'); // use $_SESSION['zid_override'] to force zid() to use From 615bf237330519f0d21fccfe6a8f69b5bb4c0f69 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 2 Sep 2013 20:25:33 -0700 Subject: [PATCH 070/330] add a layout selector --- include/conversation.php | 12 ++++++++++++ include/text.php | 23 +++++++++++++++++++++++ mod/webpages.php | 6 ++++++ view/tpl/jot.tpl | 1 + 4 files changed, 42 insertions(+) diff --git a/include/conversation.php b/include/conversation.php index 43de9fc8d..45a744dd8 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1023,7 +1023,18 @@ function status_editor($a,$x,$popup=false) { else $mimeselect = ''; } + + $layoutselect = ''; + if(array_key_exists('layout',$x) && $x['layout']) { + if($x['layout'] === 'choose') { + $layoutselect = layout_select($x['profile_uid']); + } + else + $layoutselect = ''; + } + + $webpage = ((x($x,'webpage')) ? $x['webpage'] : ''); $tpl = get_markup_template('jot-header.tpl'); @@ -1094,6 +1105,7 @@ function status_editor($a,$x,$popup=false) { '$lockstate' => $x['lockstate'], '$acl' => $x['acl'], '$mimeselect' => $mimeselect, + '$layoutselect' => $layoutselect, '$showacl' => ((array_key_exists('showacl',$x)) ? $x['showacl'] : 'yes'), '$bang' => $x['bang'], '$profile_uid' => $x['profile_uid'], diff --git a/include/text.php b/include/text.php index bbd538f15..004efc08d 100755 --- a/include/text.php +++ b/include/text.php @@ -1321,6 +1321,29 @@ function unamp($s) { return str_replace('&', '&', $s); } +function layout_select($channel_id, $current = '') { + $r = q("select mid,sid from item left join item_id on iid = item.id where service = 'PDL' and item.uid = item_id.uid and item_id.uid = %d and (item_restrict & %d)", + intval($channel_id), + intval(ITEM_PDL) + ); + if($r) { + $o = t('Select a page layout: '); + $o .= ''; + } + + return $o; +} + + + + function mimetype_select($channel_id, $current = 'text/bbcode') { diff --git a/mod/webpages.php b/mod/webpages.php index 559b176fc..d87bd4a86 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -45,6 +45,11 @@ function webpages_content(&$a) { if(! $mimetype) $mimetype = 'choose'; + $layout = get_config('system','page_layout'); + if(! $layout) + $layout = 'choose'; + + // Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages // Nickname is set to the observers xchan, and profile_uid to the owners. This lets you post pages at other people's channels. require_once ('include/conversation.php'); @@ -57,6 +62,7 @@ require_once ('include/conversation.php'); 'visitor' => 'block', 'profile_uid' => intval($owner), 'mimetype' => $mimetype, + 'layout' => $layout, ); $o .= status_editor($a,$x); diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index e67caf3d2..9a93e5291 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -11,6 +11,7 @@ {{$mimeselect}} + {{$layoutselect}}
    {{if $catsenabled}} From c646388cd974e8f5128ec6d191301029a13db5e2 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 2 Sep 2013 20:51:04 -0700 Subject: [PATCH 071/330] fix mod/search_ac (sort of) --- mod/search_ac.php | 15 ++++++++------- view/theme/redbasic/css/style.css | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/mod/search_ac.php b/mod/search_ac.php index 5bc3c1c0b..308f42f76 100644 --- a/mod/search_ac.php +++ b/mod/search_ac.php @@ -27,18 +27,19 @@ function search_ac_init(&$a){ // Priority to people searches if ($search) { - $people_sql_extra = protect_sprintf(" AND `name` LIKE '%". dbesc($search) . "%' "); + $people_sql_extra = protect_sprintf(" AND `xchan_name` LIKE '%". dbesc($search) . "%' "); $tag_sql_extra = protect_sprintf(" AND term LIKE '%". dbesc($search) . "%' "); } - $r = q("SELECT `id`, `name`, `micro`, `url` FROM `contact` - WHERE `uid` = %d AND `pending` = 0 - $people_sql_extra - ORDER BY `name` ASC ", - intval(local_user()) + + $r = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms + FROM abook left join xchan on abook_xchan = xchan_hash + WHERE abook_channel = %d AND not ( abook_flags & %d ) $people_sql_extra order by xchan_name asc" , + intval(local_user()), + intval(ABOOK_FLAG_SELF|ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED) ); - if(count($r)) { + if($r) { foreach($r as $g) { $x['photos'][] = $g['micro']; $x['links'][] = $g['url']; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 4d0f6bbcf..325658775 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2098,7 +2098,7 @@ aside input[type='text'] { display: block; color: #FFFFFF; margin-top: 15px; - background-color: #FF6666; + background-color: #F80000; -webkit-border-radius: $radiuspx ; -moz-border-radius: $radiuspx; border-radius: $radiuspx; From 9d262a186f4d7532d74f2eced4959372a9b7f392 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 2 Sep 2013 20:53:52 -0700 Subject: [PATCH 072/330] the rest of the fix --- mod/search_ac.php | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/mod/search_ac.php b/mod/search_ac.php index 308f42f76..21ff1c9f3 100644 --- a/mod/search_ac.php +++ b/mod/search_ac.php @@ -27,19 +27,18 @@ function search_ac_init(&$a){ // Priority to people searches if ($search) { - $people_sql_extra = protect_sprintf(" AND `xchan_name` LIKE '%". dbesc($search) . "%' "); + $people_sql_extra = protect_sprintf(" AND `name` LIKE '%". dbesc($search) . "%' "); $tag_sql_extra = protect_sprintf(" AND term LIKE '%". dbesc($search) . "%' "); } - - $r = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms - FROM abook left join xchan on abook_xchan = xchan_hash - WHERE abook_channel = %d AND not ( abook_flags & %d ) $people_sql_extra order by xchan_name asc" , - intval(local_user()), - intval(ABOOK_FLAG_SELF|ABOOK_FLAG_BLOCKED|ABOOK_FLAG_PENDING|ABOOK_FLAG_ARCHIVED) + $r = q("SELECT `id`, `name`, `micro`, `url` FROM `contact` + WHERE `uid` = %d AND `pending` = 0 + $people_sql_extra + ORDER BY `name` ASC ", + intval(local_user()) ); - if($r) { + if(count($r)) { foreach($r as $g) { $x['photos'][] = $g['micro']; $x['links'][] = $g['url']; @@ -47,22 +46,23 @@ function search_ac_init(&$a){ $x['data'][] = intval($g['id']); } } - else { +// FIXME - extend search to non-connnections if you couldn't find any connections with that name, use poco or directory +// else { +// +// $r = q("SELECT `id`, `name`, `photo`, `url` FROM `gcontact` where 1 +// $people_sql_extra +// ORDER BY `name` ASC " +// ); - $r = q("SELECT `id`, `name`, `photo`, `url` FROM `gcontact` where 1 - $people_sql_extra - ORDER BY `name` ASC " - ); - - if(count($r)) { - foreach($r as $g) { - $x['photos'][] = $g['photo']; - $x['links'][] = $g['url']; - $x['suggestions'][] = '@' . $g['name']; - $x['data'][] = intval($g['id']); - } - } - } +// if(count($r)) { +// foreach($r as $g) { +// $x['photos'][] = $g['photo']; +// $x['links'][] = $g['url']; +// $x['suggestions'][] = '@' . $g['name']; +// $x['data'][] = intval($g['id']); +// } +// } +// } $r = q("select tid, term, url from term where type = %d $tag_sql_extra order by term asc", intval(TERM_HASHTAG) From 0be8e4061c42372a60e0274e7947edcb81625eaa Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 3 Sep 2013 01:57:11 -0700 Subject: [PATCH 073/330] testing Comanche --- boot.php | 5 ++--- include/comanche.php | 13 +++++++------ mod/page.php | 5 ++++- version.inc | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/boot.php b/boot.php index 3c340da90..8ab617a97 100755 --- a/boot.php +++ b/boot.php @@ -2452,10 +2452,9 @@ function construct_page(&$a) { foreach($a->layout as $k => $v) { if((strpos($k,'region_') === 0) && strlen($v)) { if(strpos($v,'$region_') !== false) { - $v = preg_replace_callback('/\$region_([a-zA-Z0-9]*?)/ism','comanche_replace_region',$v); - + $v = preg_replace_callback('/\$region_([a-zA-Z0-9]+)/ism','comanche_replace_region',$v); } - $a->data[substr($k,0,7)] = $v; + $a->page[substr($k,7)] = $v; } } } diff --git a/include/comanche.php b/include/comanche.php index bdce0c5e2..3b50a5d85 100644 --- a/include/comanche.php +++ b/include/comanche.php @@ -45,15 +45,15 @@ function pdl_selector($uid,$current="") { function comanche_parser(&$a,$s) { - $cnt = preg_match("/\[layout\](.*?)\[\/layout\]/ism", $matches, $s); + $cnt = preg_match("/\[layout\](.*?)\[\/layout\]/ism", $s, $matches); if($cnt) $a->page['template'] = trim($matches[1]); - $cnt = preg_match("/\[theme\](.*?)\[\/theme\]/ism", $matches, $s); + $cnt = preg_match("/\[theme\](.*?)\[\/theme\]/ism", $s, $matches); if($cnt) $a->layout['theme'] = trim($matches[1]); - $cnt = preg_match_all("/\[region=(.*?)\](.*?)\[\/region\]/ism", $matches, $s, PREG_SET_ORDER); + $cnt = preg_match_all("/\[region=(.*?)\](.*?)\[\/region\]/ism", $s, $matches, PREG_SET_ORDER); if($cnt) { foreach($matches as $mtch) { $a->layout['region_' . $mtch[1]] = comanche_region($a,$mtch[2]); @@ -71,8 +71,9 @@ function comanche_menu($name) { function comanche_replace_region($match) { $a = get_app(); - if(array_key_exists($match[1],$a->page)) + if(array_key_exists($match[1],$a->page)) { return $a->page[$match[1]]; + } } // Widgets will have to get any operational arguments from the session, @@ -90,7 +91,7 @@ function comanche_widget($name,$args = null) { function comanche_region(&$a,$s) { - $cnt = preg_match_all("/\[menu\](.*?)\[\/menu\]/ism", $matches, $s, PREG_SET_ORDER); + $cnt = preg_match_all("/\[menu\](.*?)\[\/menu\]/ism", $s, $matches, PREG_SET_ORDER); if($cnt) { foreach($matches as $mtch) { $s = str_replace($mtch[0],comanche_menu(trim($mtch[1])),$s); @@ -99,7 +100,7 @@ function comanche_region(&$a,$s) { // need to modify this to accept parameters - $cnt = preg_match_all("/\[widget\](.*?)\[\/widget\]/ism", $matches, $s, PREG_SET_ORDER); + $cnt = preg_match_all("/\[widget\](.*?)\[\/widget\]/ism", $s, $matches, PREG_SET_ORDER); if($cnt) { foreach($matches as $mtch) { $s = str_replace($mtch[0],comanche_widget(trim($mtch[1])),$s); diff --git a/mod/page.php b/mod/page.php index b227227bb..d91f8d866 100644 --- a/mod/page.php +++ b/mod/page.php @@ -60,7 +60,7 @@ function page_content(&$a) { notice( t('Item not found.') . EOL); return; } - +dbg(1); if($r[0]['layout_mid']) { $l = q("select body from item where mid = '%s' and uid = %d limit 1", dbesc($r[0]['layout_mid']), @@ -72,6 +72,9 @@ function page_content(&$a) { comanche_parser(get_app(),$l[0]['body']); } } +dbg(0); + +logger('layout: ' . print_r($a->layout,true)); // Use of widgets should be determined by Comanche, but we don't have it yet, so... diff --git a/version.inc b/version.inc index 5a1e9d9a7..a0e566714 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-09-02.424 +2013-09-03.425 From 7b84b8480fe825927ca646c427da5eb78c8b8dba Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 3 Sep 2013 16:31:59 -0700 Subject: [PATCH 074/330] security fix and ability to change layout on webpage edit form --- boot.php | 16 +++++++-- mod/editwebpage.php | 84 ++++++++++++++++++++++++--------------------- mod/item.php | 3 +- 3 files changed, 60 insertions(+), 43 deletions(-) diff --git a/boot.php b/boot.php index 8ab617a97..de54ea986 100755 --- a/boot.php +++ b/boot.php @@ -2439,9 +2439,9 @@ function construct_page(&$a) { } } - // Let's say we have a comanche declaration '[region_nav][/region_nav][region_content]$region_nav $region_section[/region_content]'. - // The text 'region_' identifies a section of the layout by that name (without the 'region_' text). - // So what we want to do here is leave $a->page['nav'] empty and put the default content from $a->page['nav'] and $a->page['section'] + // Let's say we have a comanche declaration '[region=nav][/region][region=content]$nav $content[/region]'. + // The text 'region=' identifies a section of the layout by that name. So what we want to do here is leave + // $a->page['nav'] empty and put the default content from $a->page['nav'] and $a->page['section'] // into a new region called $a->data['content']. It is presumed that the chosen layout file for this comanche page // has a '' element instead of a '
    '. @@ -2454,6 +2454,16 @@ function construct_page(&$a) { if(strpos($v,'$region_') !== false) { $v = preg_replace_callback('/\$region_([a-zA-Z0-9]+)/ism','comanche_replace_region',$v); } + + // And a couple of convenience macros + + if(strpos($v,'$nav') !== false) { + $v = str_replace('$nav',$a->page['nav'],$v); + } + if(strpos($v,'$content') !== false) { + $v = str_replace('$content',$a->page['section'],$v); + } + $a->page[substr($k,7)] = $v; } } diff --git a/mod/editwebpage.php b/mod/editwebpage.php index cd901e7e3..d49a006c9 100644 --- a/mod/editwebpage.php +++ b/mod/editwebpage.php @@ -1,35 +1,29 @@ get_channel() and stuff don't work here, so we've got to find the owner for ourselves. + $which = argv(1); + + // $a->get_channel() and stuff don't work here, so we've got to find the owner for ourselves. + $r = q("select channel_id from channel where channel_address = '%s'", dbesc($which) - ); - if($r) { - $owner = intval($r[0]['channel_id']); - //logger('owner: ' . print_r($owner,true)); - } - - - - - if((local_user()) && (argc() > 2) && (argv(2) === 'view')) { - $which = $channel['channel_address']; - } - - + ); + if($r) { + $owner = intval($r[0]['channel_id']); + //logger('owner: ' . print_r($owner,true)); + } + $o = ''; - -// Figure out which post we're editing + // Figure out which post we're editing $post_id = ((argc() > 2) ? intval(argv(2)) : 0); @@ -38,37 +32,41 @@ function editwebpage_content(&$a) { return; } -// Now we've got a post and an owner, let's find out if we're allowed to edit it + // Now we've got a post and an owner, let's find out if we're allowed to edit it - $observer = $a->get_observer(); - $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); + $observer = $a->get_observer(); + $ob_hash = (($observer) ? $observer['xchan_hash'] : ''); - $perms = get_all_perms($owner,$ob_hash); + $perms = get_all_perms($owner,$ob_hash); - if(! $perms['write_pages']) { - notice( t('Permission denied.') . EOL); - return; - } + if(! $perms['write_pages']) { + notice( t('Permission denied.') . EOL); + return; + } -// We've already figured out which item we want and whose copy we need, so we don't need anything fancy here - $itm = q("SELECT * FROM `item` WHERE `id` = %d and uid = %s LIMIT 1", - intval($post_id), - intval($owner) - ); - + // We've already figured out which item we want and whose copy we need, so we don't need anything fancy here + $itm = q("SELECT * FROM `item` WHERE `id` = %d and uid = %s LIMIT 1", + intval($post_id), + intval($owner) + ); $plaintext = true; -// You may or may not be a local user. This won't work, - if(feature_enabled(local_user(),'richtext')) + + if(feature_enabled($itm[0]['uid'],'richtext')) $plaintext = false; - - $mimetype = $itm[0]['mimetype']; + if($mimetype === 'application/x-php') { + if((! local_user()) || (local_user() != $itm[0]['uid'])) { + notice( t('Permission denied.') . EOL); + return; + } + } + $mimeselect = ''; if($mimetype != 'text/bbcode') @@ -76,6 +74,13 @@ function editwebpage_content(&$a) { $mimeselect = ''; + $layout = get_config('system','page_layout'); + if($layout) + $layoutselect = ''; + else + $layoutselect = layout_select($x['profile_uid']); + + $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( '$title' => t('Edit post') )); @@ -130,6 +135,7 @@ function editwebpage_content(&$a) { '$public' => t('Public post'), '$jotnets' => $jotnets, '$mimeselect' => $mimeselect, + '$layoutselect' => $layoutselect, '$title' => htmlspecialchars($itm[0]['title']), '$placeholdertitle' => t('Set title'), '$category' => '', diff --git a/mod/item.php b/mod/item.php index 56fdda887..da703e916 100644 --- a/mod/item.php +++ b/mod/item.php @@ -624,11 +624,12 @@ function item_post(&$a) { if($orig_post) { - $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `attach` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1", + $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `attach` = '%s', `edited` = '%s', layout_mid = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1", dbesc($datarray['title']), dbesc($datarray['body']), dbesc($datarray['attach']), dbesc(datetime_convert()), + dbesc($layout_mid), intval($post_id), intval($profile_uid) ); From c360bf3252d3a6ec330a80ba70c19af9848a44e1 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 3 Sep 2013 17:49:47 -0700 Subject: [PATCH 075/330] personal config to just show the page content without author info - probably this needs to be a page option --- include/conversation.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 45a744dd8..5888d3679 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1262,10 +1262,12 @@ function render_location_default($item) { function prepare_page($item) { + $naked = ((pconfig($item['uid'],'system','nakedpage')) ? 1 : 0); + return replace_macros(get_markup_template('page_display.tpl'),array( - '$author' => $item['author']['xchan_name'], - '$auth_url' => $item['author']['xchan_url'], - '$date' => datetime_convert('UTC',date_default_timezone_get(),$item['created'],'Y-m-d H:i'), + '$author' => (($naked) ? '' : $item['author']['xchan_name']), + '$auth_url' => (($naked) ? '' : $item['author']['xchan_url'], + '$date' => (($naked) ? '' : datetime_convert('UTC',date_default_timezone_get(),$item['created'],'Y-m-d H:i')), '$title' => smilies(bbcode($item['title'])), '$body' => prepare_text($item['body'],$item['mimetype']) )); From bac2dcd46a6c5ebc7ba63fc60e0a90bfe48b8d87 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 3 Sep 2013 17:55:25 -0700 Subject: [PATCH 076/330] typo --- include/conversation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/conversation.php b/include/conversation.php index 5888d3679..176dc33d4 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1266,7 +1266,7 @@ function prepare_page($item) { return replace_macros(get_markup_template('page_display.tpl'),array( '$author' => (($naked) ? '' : $item['author']['xchan_name']), - '$auth_url' => (($naked) ? '' : $item['author']['xchan_url'], + '$auth_url' => (($naked) ? '' : $item['author']['xchan_url']), '$date' => (($naked) ? '' : datetime_convert('UTC',date_default_timezone_get(),$item['created'],'Y-m-d H:i')), '$title' => smilies(bbcode($item['title'])), '$body' => prepare_text($item['body'],$item['mimetype']) From 879ac359523623d779f3097e5aa02937d6518950 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 3 Sep 2013 18:00:09 -0700 Subject: [PATCH 077/330] my bad --- include/conversation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/conversation.php b/include/conversation.php index 176dc33d4..2b568c35e 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1262,7 +1262,7 @@ function render_location_default($item) { function prepare_page($item) { - $naked = ((pconfig($item['uid'],'system','nakedpage')) ? 1 : 0); + $naked = ((get_pconfig($item['uid'],'system','nakedpage')) ? 1 : 0); return replace_macros(get_markup_template('page_display.tpl'),array( '$author' => (($naked) ? '' : $item['author']['xchan_name']), From e9ffc46bd1a7d176ae19e8da2ceed015cb4268c9 Mon Sep 17 00:00:00 2001 From: Michael Johnston Date: Sun, 1 Sep 2013 13:13:52 -0400 Subject: [PATCH 078/330] allow categories to be edited when editing a post --- mod/editpost.php | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/mod/editpost.php b/mod/editpost.php index 583bae9eb..8d510ce05 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -2,6 +2,8 @@ require_once('acl_selectors.php'); require_once('include/crypto.php'); +require_once('include/items.php'); +require_once('include/taxonomy.php'); function editpost_content(&$a) { @@ -70,6 +72,22 @@ function editpost_content(&$a) { //$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); + $category = ''; + $catsenabled = ((feature_enabled(local_user(),'categories')) ? 'categories' : ''); + + if ($catsenabled){ + $itm = fetch_post_tags($itm); + + $cats = get_terms_oftype($itm[0]['term'], TERM_CATEGORY); + + foreach ($cats as $cat) { + if (strlen($category)) + $category .= ', '; + $category .= $cat['term']; + } + + } + $o .= replace_macros($tpl,array( '$return_path' => $_SESSION['return_url'], '$action' => 'item', @@ -95,7 +113,7 @@ function editpost_content(&$a) { '$jotnets' => $jotnets, '$title' => htmlspecialchars($itm[0]['title']), '$placeholdertitle' => t('Set title'), - '$category' => '', // FIXME + '$category' => $category, '$placeholdercategory' => t('Categories (comma-separated list)'), '$emtitle' => t('Example: bob@example.com, mary@example.com'), '$lockstate' => $lockstate, @@ -105,6 +123,7 @@ function editpost_content(&$a) { '$preview' => ((feature_enabled(local_user(),'preview')) ? t('Preview') : ''), '$jotplugins' => $jotplugins, '$sourceapp' => t($a->sourcename), + '$catsenabled' => $catsenabled, )); return $o; From c6df954fc00e4fdc7e2888e7dc3fe3a7c8f930e4 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 3 Sep 2013 18:48:01 -0700 Subject: [PATCH 079/330] make displaying the language selector configurable --- include/nav.php | 2 +- view/tpl/nav.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/nav.php b/include/nav.php index 626caf981..dd11f10d5 100644 --- a/include/nav.php +++ b/include/nav.php @@ -200,7 +200,7 @@ EOT; $a->page['nav'] .= replace_macros($tpl, array( '$baseurl' => $a->get_baseurl(), - '$langselector' => lang_selector(), + '$langselector' => ((get_config('system','select_language')) ? lang_selector() : ''), '$sitelocation' => $sitelocation, '$nav' => $nav, '$banner' => $banner, diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 7c26609c3..713280808 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -148,5 +148,5 @@
  • {2} {3}
  • -
    {{$langselector}}
    +{{if $langselector}}
    {{$langselector}}
    {{/if}} From ab1c9dc9c9ecc1f382b6c7512b014c11f08b6e5e Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 3 Sep 2013 19:55:26 -0700 Subject: [PATCH 080/330] add design tool menu to appropriate pages --- include/text.php | 18 +++++++++++++++++- mod/blocks.php | 19 +++++++++++++++++++ mod/editwebpage.php | 2 +- mod/layouts.php | 16 ++++++++++++++++ mod/menu.php | 3 +++ mod/mitem.php | 2 ++ mod/webpages.php | 5 +++++ 7 files changed, 63 insertions(+), 2 deletions(-) diff --git a/include/text.php b/include/text.php index 004efc08d..ac82e4429 100755 --- a/include/text.php +++ b/include/text.php @@ -1826,4 +1826,20 @@ function json_decode_plus($s) { $x = json_decode(str_replace(array('\\"','\\\\'),array('"','\\'),$s),true); return $x; -} \ No newline at end of file +} + + +function design_tools() { +// FIXME - this should be a template + + $o = '
    '; + $o .= '

    ' . t('Design') . '

    '; + $o .= '' . t('Blocks') . '' . EOL; + $o .= '' . t('Menus') . '' . EOL; + $o .= '' . t('Layouts') . '' . EOL; + $o .= '' . t('Pages') . '' . EOL; + $o .= '
    '; + return $o; + +} + diff --git a/mod/blocks.php b/mod/blocks.php index 29117eae8..170d37256 100644 --- a/mod/blocks.php +++ b/mod/blocks.php @@ -2,6 +2,8 @@ function blocks_content(&$a) { + + if(argc() > 1) $which = argv(1); else { @@ -21,6 +23,16 @@ function blocks_content(&$a) { $owner = intval($r[0]['channel_id']); } + // Block design features from visitors + + if((! local_user()) || (local_user() != $owner)) { + notice( t('Permission denied.') . EOL); + return; + } + + + + // Get the observer, check their permissions $observer = $a->get_observer(); @@ -33,6 +45,12 @@ function blocks_content(&$a) { return; } + if(local_user() && local_user() == $owner) { + $a->set_widget('design',design_tools()); + } + + + // Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages // Nickname is set to the observers xchan, and profile_uid to the owners. This lets you post pages at other people's channels. require_once ('include/conversation.php'); @@ -43,6 +61,7 @@ require_once ('include/conversation.php'); 'lockstate' => (($group || $cid || $channel['channel_allow_cid'] || $channel['channel_allow_gid'] || $channel['channel_deny_cid'] || $channel['channel_deny_gid']) ? 'lock' : 'unlock'), 'bang' => (($group || $cid) ? '!' : ''), 'visitor' => 'block', + 'mimetype' => 'choose', 'profile_uid' => intval($owner), ); diff --git a/mod/editwebpage.php b/mod/editwebpage.php index d49a006c9..6ce5a9493 100644 --- a/mod/editwebpage.php +++ b/mod/editwebpage.php @@ -78,7 +78,7 @@ function editwebpage_content(&$a) { if($layout) $layoutselect = ''; else - $layoutselect = layout_select($x['profile_uid']); + $layoutselect = layout_select($itm[0]['uid']); $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( diff --git a/mod/layouts.php b/mod/layouts.php index 78d142c47..cd6e61f88 100644 --- a/mod/layouts.php +++ b/mod/layouts.php @@ -21,6 +21,16 @@ function layouts_content(&$a) { $owner = intval($r[0]['channel_id']); } + // Block design features from visitors + + if((! local_user()) || (local_user() != $owner)) { + notice( t('Permission denied.') . EOL); + return; + } + + + + // Get the observer, check their permissions $observer = $a->get_observer(); @@ -33,6 +43,12 @@ function layouts_content(&$a) { return; } + if(local_user() && local_user() == $owner) { + $a->set_widget('design',design_tools()); + } + + + // Create a status editor (for now - we'll need a WYSIWYG eventually) to create pages // Nickname is set to the observers xchan, and profile_uid to the owners. This lets you post pages at other people's channels. require_once ('include/conversation.php'); diff --git a/mod/menu.php b/mod/menu.php index c3302544e..1ec3c7996 100644 --- a/mod/menu.php +++ b/mod/menu.php @@ -42,6 +42,9 @@ function menu_content(&$a) { } + $a->set_widget('design',design_tools()); + + if(argc() == 1) { // list menus $x = menu_list(local_user()); diff --git a/mod/mitem.php b/mod/mitem.php index 2b890d5a1..ee690907e 100644 --- a/mod/mitem.php +++ b/mod/mitem.php @@ -98,6 +98,8 @@ function mitem_content(&$a) { return ''; } + $a->set_widget('design',design_tools()); + $m = menu_fetch($a->data['menu']['menu_name'],local_user(), get_observer_hash()); $a->set_widget('menu_preview',menu_render($m)); diff --git a/mod/webpages.php b/mod/webpages.php index d87bd4a86..04c2e07c5 100644 --- a/mod/webpages.php +++ b/mod/webpages.php @@ -41,6 +41,11 @@ function webpages_content(&$a) { return; } + if(local_user() && local_user() == $owner) { + $a->set_widget('design',design_tools()); + } + + $mimetype = get_config('system','page_mimetype'); if(! $mimetype) $mimetype = 'choose'; From a0668c8bbba43cb8b3b28d5a75d7d48f321e30f5 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 3 Sep 2013 22:48:08 -0700 Subject: [PATCH 081/330] fix private message encryption since the input_filter mangled it --- include/items.php | 4 ++-- mod/item.php | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/items.php b/include/items.php index 66172ade3..c15bf8205 100755 --- a/include/items.php +++ b/include/items.php @@ -1398,15 +1398,15 @@ function item_store($arr,$allow_exec = false) { $arr['item_flags'] = ((x($arr,'item_flags')) ? intval($arr['item_flags']) : 0 ); - $arr['body'] = z_input_filter($arr['uid'],$arr['body'],$arr['mimetype']); $arr['title'] = escape_tags($arr['title']); - // only detect language if we have text content, and if the post is private but not yet // obscured, make it so. if(! ($arr['item_flags'] & ITEM_OBSCURED)) { $arr['lang'] = detect_language($arr['body']); + // apply the input filter here - if it is obscured it has been filtered already + $arr['body'] = z_input_filter($arr['uid'],$arr['body'],$arr['mimetype']); $allowed_languages = get_pconfig($arr['uid'],'system','allowed_languages'); diff --git a/mod/item.php b/mod/item.php index da703e916..dc00efd35 100644 --- a/mod/item.php +++ b/mod/item.php @@ -611,6 +611,9 @@ function item_post(&$a) { $datarray['title'] = mb_substr($datarray['title'],0,255); if(array_key_exists('item_private',$datarray) && $datarray['item_private']) { + + $datarray['body'] = z_input_filter($datarray['uid'],$datarray['body'],$datarray['mimetype']); + logger('Encrypting local storage'); $key = get_config('system','pubkey'); $datarray['item_flags'] = $datarray['item_flags'] | ITEM_OBSCURED; From a8f99df7770e6154ac4e0bc405974fde22357af6 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 4 Sep 2013 00:50:47 -0700 Subject: [PATCH 082/330] render blocks - yes these should be templates, but I've got too much to do at the moment and just want everything to fall into place quickly. The clerical work will have to wait. --- include/comanche.php | 23 +++++++++++++++++++++++ version.inc | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/include/comanche.php b/include/comanche.php index 3b50a5d85..c3a513332 100644 --- a/include/comanche.php +++ b/include/comanche.php @@ -76,6 +76,23 @@ function comanche_replace_region($match) { } } +function comanche_block($name) { + $o = ''; + $r = q("select * from item left join item_id on iid = item_id and item_id.uid = item.uid and service = 'BUILDBLOCK' and sid = '%s' limit 1", + dbesc($name) + ); + if($r) { + $o = '
    '; + if($r[0]['title']) + $o .= '

    ' . $r[0]['title'] . '

    '; + $o .= prepare_text($r[0]['body'],$r[0]['mimetype']); + $o .= '
    '; + + } + return $o; +} + + // Widgets will have to get any operational arguments from the session, // the global app environment, or config storage until we implement argument passing @@ -97,6 +114,12 @@ function comanche_region(&$a,$s) { $s = str_replace($mtch[0],comanche_menu(trim($mtch[1])),$s); } } + $cnt = preg_match_all("/\[block\](.*?)\[\/block\]/ism", $s, $matches, PREG_SET_ORDER); + if($cnt) { + foreach($matches as $mtch) { + $s = str_replace($mtch[0],comanche_block(trim($mtch[1])),$s); + } + } // need to modify this to accept parameters diff --git a/version.inc b/version.inc index a0e566714..5c930aad3 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-09-03.425 +2013-09-04.426 From ba283028118c6ad7af9d9ba3586f2f55a10e5cb8 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 4 Sep 2013 17:52:24 -0700 Subject: [PATCH 083/330] test module for dead site discovery --- mod/zping.php | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 mod/zping.php diff --git a/mod/zping.php b/mod/zping.php new file mode 100644 index 000000000..76f4470c1 --- /dev/null +++ b/mod/zping.php @@ -0,0 +1,28 @@ +get_channel(),'ping'); + $r = zot_zot($url,$m); + return print_r($r,true); + +} \ No newline at end of file From 99ea251b12f9bf361daf8abd96f6b3fab7023aa7 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 4 Sep 2013 21:24:57 -0700 Subject: [PATCH 084/330] provide templating options in comanche for the underlying webpage element - in this case the way the author is displayed. Leave this open for other forms templating options. --- include/comanche.php | 27 +++++++++++++++++++++++++++ include/conversation.php | 6 ++++++ 2 files changed, 33 insertions(+) diff --git a/include/comanche.php b/include/comanche.php index c3a513332..56a16fd3b 100644 --- a/include/comanche.php +++ b/include/comanche.php @@ -60,6 +60,14 @@ function comanche_parser(&$a,$s) { } } + $cnt = preg_match_all("/\[webpage\](.*?)\[\/webpage\]/ism", $s, $matches, PREG_SET_ORDER); + if($cnt) { + // only the last webpage definition is used if there is more than one + foreach($matches as $mtch) { + $a->layout['webpage'] = comanche_webpage($a,$mtch[1]); + } + } + } @@ -92,6 +100,25 @@ function comanche_block($name) { return $o; } +// This doesn't really belong in Comanche, but it could also be argued that it is the perfect place. +// We need to be able to select what kind of template and decoration to use for the webpage at the heart of our content. +// For now we'll allow an '[authored]' element which defaults to name and date, or 'none' to remove these, and perhaps +// 'full' to provide a social network style profile photo. +// But leave it open to have richer templating options and perhaps ultimately discard this one, once we have a better idea +// of what template and webpage options we might desire. + +function comanche_webpage(&$a,$s) { + + $ret = array(); + $cnt = preg_match_all("/\[authored\](.*?)\[\/authored\]/ism", $s, $matches, PREG_SET_ORDER); + if($cnt) { + foreach($matches as $mtch) { + $ret['authored'] = $mtch[1]; + } + } + return $ret; +} + // Widgets will have to get any operational arguments from the session, // the global app environment, or config storage until we implement argument passing diff --git a/include/conversation.php b/include/conversation.php index 2b568c35e..0c1479356 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1262,7 +1262,13 @@ function render_location_default($item) { function prepare_page($item) { + $a = get_app(); $naked = ((get_pconfig($item['uid'],'system','nakedpage')) ? 1 : 0); + if(array_key_exists('webpage',$a->layout) && array_key_exists('authored',$a->layout['webpage'])) { + if($a->layout['webpage']['authored'] === 'none') + $naked = 1; + // ... other possible options + } return replace_macros(get_markup_template('page_display.tpl'),array( '$author' => (($naked) ? '' : $item['author']['xchan_name']), From a88437a1ef75c688e36788c70e53c02e873e9740 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 4 Sep 2013 22:23:53 -0700 Subject: [PATCH 085/330] issue #107 --- mod/register.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mod/register.php b/mod/register.php index 3ba714c74..bc1603f25 100644 --- a/mod/register.php +++ b/mod/register.php @@ -64,6 +64,12 @@ function register_post(&$a) { break; } + + if((! $_POST['password']) || ($_POST['password'] !== $_POST['password2'])) { + notice( t('Passwords do not match.') . EOL); + return; + } + $arr = $_POST; $arr['account_flags'] = $flags; From f1d875c3e181ce02020830ed9e40b0ffb38ccc85 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 4 Sep 2013 23:15:53 -0700 Subject: [PATCH 086/330] issue #59 - this is a real bugger. Might seem fixed but read the code. This could potentially create a security/permissions issue --- include/items.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/include/items.php b/include/items.php index c15bf8205..a2300c2e0 100755 --- a/include/items.php +++ b/include/items.php @@ -2010,8 +2010,13 @@ function tag_deliver($uid,$item_id) { intval($item['parent']), intval($uid) ); - if(($x) && ($x[0]['item_flags'] & ITEM_UPLINK) && ($x[0]['author_xchan'] == $item['author_xchan'])) { - logger('tag_deliver: creating second delivery chain for owner comment.'); + +// issue #59 +// FIXME - check security on post and allowed senders, right now we just allow it. The author *may* be foreign and the original owner is lost on our copy of the post. So this could be very hard to verify. For instance what happens if the top-level post was a wall-to-wall? +// if(($x) && ($x[0]['item_flags'] & ITEM_UPLINK) && ($x[0]['author_xchan'] == $item['author_xchan'])) { + if(($x) && ($x[0]['item_flags'] & ITEM_UPLINK)) { +// logger('tag_deliver: creating second delivery chain for owner comment.'); + logger('tag_deliver: creating second delivery chain for comment to tagged post.'); // now change this copy of the post to a forum head message and deliver to all the tgroup members // also reset all the privacy bits to the forum default permissions From fd5e2c6d6c2c66c37fdba7cf26d50dfe1b83e566 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 5 Sep 2013 01:18:05 -0700 Subject: [PATCH 087/330] fix network search - except it can't search private posts. That may be a problem. --- mod/network.php | 3 ++- version.inc | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mod/network.php b/mod/network.php index b2ff671c7..9b108aef8 100644 --- a/mod/network.php +++ b/mod/network.php @@ -379,7 +379,7 @@ function network_content(&$a, $update = 0, $load = false) { // --- end item filter tabs - + $search = (($_GET['search']) ? $_GET['search'] : ''); // search terms header if($search) $o .= '

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

    '; @@ -484,6 +484,7 @@ function network_content(&$a, $update = 0, $load = false) { . "'; var profile_page = " . $a->pager['page'] . ";"; +logger('Search: ' . $search); $a->page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array( '$baseurl' => z_root(), diff --git a/version.inc b/version.inc index 5c930aad3..a99b76c17 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-09-04.426 +2013-09-05.427 From 7ecf1626371f9eb55d05c160f5748ecb0b1ba091 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 5 Sep 2013 04:48:14 -0700 Subject: [PATCH 088/330] fix location of language variable in help module --- mod/help.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/help.php b/mod/help.php index af05bd47c..770a0a8af 100644 --- a/mod/help.php +++ b/mod/help.php @@ -2,7 +2,7 @@ if(! function_exists('load_doc_file')) { function load_doc_file($s) { - global $lang; + $lang = get_app()->language; if(! isset($lang)) $lang = 'en'; $b = basename($s); From 3b697957af902cbe28aecf70dcf0dfad328a6db1 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 5 Sep 2013 16:26:40 -0700 Subject: [PATCH 089/330] update photo timestamp on site rename --- boot.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot.php b/boot.php index de54ea986..9bf586caf 100755 --- a/boot.php +++ b/boot.php @@ -1343,7 +1343,7 @@ function fix_system_urls($oldurl,$newurl) { // paths aren't going to work. You have to be at the (sub)domain root // . (($parsed['path']) ? $parsed['path'] : ''); - $x = q("update xchan set xchan_addr = '%s', xchan_url = '%s', xchan_connurl = '%s', xchan_follow = '%s', xchan_connpage = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s' where xchan_hash = '%s' limit 1", + $x = q("update xchan set xchan_addr = '%s', xchan_url = '%s', xchan_connurl = '%s', xchan_follow = '%s', xchan_connpage = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_date = '%s' where xchan_hash = '%s' limit 1", dbesc($channel . '@' . $rhs), dbesc(str_replace($oldurl,$newurl,$rr['xchan_url'])), dbesc(str_replace($oldurl,$newurl,$rr['xchan_connurl'])), @@ -1352,6 +1352,7 @@ function fix_system_urls($oldurl,$newurl) { dbesc(str_replace($oldurl,$newurl,$rr['xchan_photo_l'])), dbesc(str_replace($oldurl,$newurl,$rr['xchan_photo_m'])), dbesc(str_replace($oldurl,$newurl,$rr['xchan_photo_s'])), + dbesc(datetime_convert()), dbesc($rr['xchan_hash']) ); From 37c96861078aab8a6c1741ecdd606f807999dc50 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Fri, 6 Sep 2013 01:29:18 +0100 Subject: [PATCH 090/330] Redbasic - clean up nav. --- view/css/default.css | 5 ++- view/theme/redbasic/css/style.css | 64 +------------------------------ 2 files changed, 5 insertions(+), 64 deletions(-) diff --git a/view/css/default.css b/view/css/default.css index f3b34a86d..d39bcd394 100644 --- a/view/css/default.css +++ b/view/css/default.css @@ -1,7 +1,10 @@ nav { - height: 94px; + height: 24px; display: block; + position: fixed; + width: 100%; + z-index: 100; } aside { diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 325658775..ca1630ed5 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -167,13 +167,6 @@ blockquote { -/* nav */ - -nav { - display: block; - -} - #langselector { position: fixed; top: 3px; @@ -3058,61 +3051,6 @@ div.jGrowl div.info { width: 90%; } -/* nav */ -nav { - width: 100%; - height: 24px; - position: fixed; -// opacity: 0.6; -// filter:alpha(opacity=60); - - left: 0px; - top: 0px; - padding: 0px; - background-color: #d00; - color: #eec; - z-index: 100; -/* -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); - box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); */ - -/* TODO find a better way to do this without different code for every single browser. */ - - background-image: linear-gradient(bottom, #f88 26%, #b00 82%); - background-image: -o-linear-gradient(bottom, #f88 26%, #b00 82%); - background-image: -moz-linear-gradient(bottom, #f88 26%, #b00 82%); - background-image: -webkit-linear-gradient(bottom, #f88 26%, #b00 82%); - background-image: -ms-linear-gradient(bottom, #f88 26%, #b00 82%); - - background-image: -webkit-gradient( -linear, -left bottom, -left top, -color-stop(0.26, #f88), -color-stop(0.82, #b00) -); -} - -/* - -nav:hover { - - background-image: linear-gradient(bottom, #f00 26%, #b00 82%); - background-image: -o-linear-gradient(bottom, #f00 26%, #b00 82%); - background-image: -moz-linear-gradient(bottom, #f00 26%, #b00 82%); - background-image: -webkit-linear-gradient(bottom, #f00 26%, #b00 82%); - background-image: -ms-linear-gradient(bottom, #f00 26%, #b00 82%); - - background-image: -webkit-gradient( -linear, -left bottom, -left top, -color-stop(0.26, #f00), -color-stop(0.82, #b00) -); -} - -*/ nav a, nav a:active, @@ -3608,4 +3546,4 @@ margin: 20px; .pmenu li { margin-left: -20px; -} \ No newline at end of file +} From 1ff6f4a43c3888ee653926d33975e179799138b3 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Fri, 6 Sep 2013 02:14:17 +0100 Subject: [PATCH 091/330] Redbasic - some more CSS we don't use. --- view/theme/redbasic/css/style.css | 184 +----------------------------- 1 file changed, 3 insertions(+), 181 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index ca1630ed5..50d98bc14 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -22,11 +22,6 @@ abbr { border-bottom: none; } -aside { -border: none; -color: #444444; -} - /* icons */ .icon { background-color: transparent ; @@ -39,67 +34,6 @@ color: #444444; .icon.text { text-indent: 0px; } -.icon.notify { - background-image: url("../img/notify_on.png"); - min-width: 22px; - height: 22px; - margin-top: -4px; - background-position: left center; - padding: 1px; -} -.icon.gear { - background-image: url("../img/settings.png"); - min-width: 22px; - height: 22px; - margin-top: -2px; - background-position: left center; - padding: 1px; -} - -.icon.home { - background-image: url("../img/home.png"); - min-width: 22px; - height: 22px; - margin-top: -4px; - background-position: left center; - padding: 1px; -} - -.icon.network { - background-image: url("../img/network.png"); - min-width: 22px; - height: 22px; - margin-top: -3px; - background-position: left center; - padding: 1px; -} - -.icon.introductions { - background-image: url("../img/introductions.png"); - min-width: 22px; - height: 22px; - margin-top: -4px; - background-position: left center; - padding: 1px; -} - -.icon.mail { - background-image: url("../img/message.png"); - min-width: 22px; - height: 22px; - margin-top: -2px; - background-position: left center; - padding: 1px; -} - -.icon.events { - background-image: url("../img/events.png"); - min-width: 22px; - height: 22px; - margin-top: -4px; - background-position: left center; - padding: 1px; -} a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { font-weight: bold; @@ -120,8 +54,6 @@ input { padding: 3px; } -img { border :0px; } - code { font-family: Courier, monospace; @@ -297,19 +229,16 @@ nav #nav-link-wrapper .nav-link { border-bottom: 1px solid #aaaaaa; padding:0px; width: 90%; -/* margin-right: 5px; */ } .tabs li { margin: 0px; list-style: none; } .tab { display:block; float:left; -/* padding: 0.4em; */ margin-right: 15px ; } .tab.active { -/* font-weight: bold; */ color: #444444; } @@ -331,15 +260,6 @@ footer { padding-right: 3em; } -#powered-by { - position: fixed; - bottom: 1px; - left: 15px; - opacity: 0.3; - filter:alpha(opacity=30); - -} - .birthday-today, .event-today { font-weight: bold; } @@ -506,7 +426,6 @@ footer { margin-left: 100px; margin-top: 10px; -/* margin-left: 200px; */ } @@ -877,40 +796,16 @@ footer { margin-bottom: 15px; } -#network-star-link{ - margin-top: 10px; -} -.network-star { - float: left; - margin-right: 5px; -} -#network-bmark-link { - margin-top: 10px; -} -.thread-wrapper .wall-item-comment-wrapper { +.thread-wrapper .wall-item-comment-wrapper, .wall-item-content-wrapper.comment { margin-left: 50px; } -/* Give the top level post bigger shadows than the comments. This makes them appear "higher" and the comments "lower", which separates posts from each other reasonably without literally drawing a line under it */ - .wall-item-content-wrapper { margin-top: 10px; position: relative; border-radius: $radiuspx; border: 1px solid #eec; - -/* background: #fff; */ -/* border-radius: 5px; */ -/* box-shadow: 12px 12px 12px #111; */ -/* border-left: 1px solid #eec; */ - -} -.wall-item-content-wrapper.comment { -/* background: #fff; */ -/* border-left: 1px solid #e0e0e0; */ - margin-left: 50px; -/* box-shadow: 5px 5px 5px #222; */ } .thread-end-wrapper { @@ -918,12 +813,6 @@ footer { } -.wall-item-content-wrapper.comment { -/* background: #ffffff; - border-left: 1px solid #e0e0e0; -*/ -} - .wall-item-like.comment, .wall-item-dislike.comment { margin-left: 50px; } @@ -999,14 +888,9 @@ footer { z-index: 99; } .wall-item-wrapper { - /*float: left; - margin-right: 5px; - width: 250px;*/ margin-left:10px; } .wall-item-lock { - /*height: 20px;*/ - /*margin-top: 10px;*/ left: 105px; position: absolute; top: 1px; @@ -1058,11 +942,7 @@ footer { .wall-item-wrapper-end { clear: both; } -.wall-item-name-link { - font-weight: bold; - text-decoration: none; - color: #3172BD; -} + .wall-item-photo { border: none; } @@ -1077,16 +957,11 @@ footer { .wall-item-content img { max-width: 95% !important; -/* box-shadow: 8px 8px 8px #666; can't really have this because of smileys */ } -.wall-item-content img.smiley { - box-shadow: none; -} .wall-item-title { float: left; font-weight: bold; - /*width: 450px;*/ } .wall-item-title-end { @@ -1094,13 +969,10 @@ footer { } .thread-wrapper.toplevel_item { - width: 92%; } .wall-item-body { -/* float: left; */ - /*width: 450px;*/ margin-top: 10px; } @@ -1114,23 +986,13 @@ footer { } .wall-item-like, .wall-item-dislike { - margin-left: 0px; - margin-top: 3px; + margin-top: 5px; } .wall-item-author { margin-top: 10px; } -.comment-edit-wrapper { - margin-top: 15px; - margin-left: 50px; -} - -.comment-wwedit-wrapper { - margin-top: 2px; -} - .comment-edit-photo { margin-top: 10px; margin-left: 10px; @@ -1152,7 +1014,6 @@ footer { border: 1px solid #ccc; padding: 8px; border-radius: $radiuspx; -/* box-shadow: 5px 5px 5px #666 inset; */ } .comment-edit-text-empty { @@ -1193,9 +1054,6 @@ footer { width:90%; } -#profile-jot-submit { - float: left; -} #profile-upload-wrapper { float: left; margin-left: 15px; @@ -1264,7 +1122,6 @@ footer { } #profile-jot-perms-end { - /*clear: left;*/ height: 30px; } @@ -1283,7 +1140,6 @@ footer { } #profile-jot-end { - /*clear: both;*/ margin-bottom: 30px; } #about-jot-submit-wrapper { @@ -1490,17 +1346,8 @@ footer { DIV#profile-jot-text_toolbargroup{ background: #FFF; border: 1px #111; -/*box-shadow: 5px 5px 5px #000 inset;*/ } -/* -#profile-jot-text_parent, .mceLayout { - border-radius: $radiuspx; - -moz-border-radius: $radiuspx; - box-shadow: 4px 4px 3px 0 #444444; -} -*/ - iframe#profile-jot-text_ifr { width: 100% !important; @@ -1521,7 +1368,6 @@ tr.mceLast { width: 90%; -moz-border-radius: $radiuspx; border-radius: $radiuspx; -/* box-shadow: 4px 4px 3px 0 #666 inset; */ } #profile-jot-text:hover { color: #000000; @@ -1694,14 +1540,10 @@ tr.mceLast { margin-top: 15px; margin-right: 15px; margin-left: 15px; -/* width: 200px; height: 200px; - overflow: hidden; - position: relative; */ } .photo-album-image-wrapper .caption { display: none; width: 100%; -/* position: absolute; */ bottom: 0px; padding: 0.5em 0.5em 0px 0.5em; background-color: rgba(245, 245, 255, 0.8); @@ -1718,19 +1560,15 @@ tr.mceLast { } .photo-top-image-wrapper { -/* position: relative; */ float: left; margin-top: 15px; margin-right: 15px; margin-left: 15px; margin-bottom: 15px; -/* width: 200px; height: 200px; - overflow: hidden; */ } .photo-top-album-name { width: 100%; min-height: 2em; -/* position: absolute; */ bottom: 0px; padding: 0px 3px; padding-top: 0.5em; @@ -1911,13 +1749,6 @@ a.mail-list-link { -/* -*a.mail-list-link:hover { -* background-color: #15607B; -* color: #F5F6FB; -*} -*/ - .mail-list-outside-wrapper-end { clear: both; } @@ -2100,21 +1931,12 @@ aside input[type='text'] { } -#dfrn-request-networks { - margin-bottom: 30px; -} - #pause { position: fixed; bottom: 5px; right: 5px; } -.sparkle { - cursor: url('../img/lock.cur'), pointer; -/* cursor: pointer !important; */ -} - #vcard-end { clear: both; } From fc2ede307ff12b4f2fe8633789e408a117be6238 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Fri, 6 Sep 2013 02:43:00 +0100 Subject: [PATCH 092/330] Redbasic - optimise mail list. --- view/theme/redbasic/css/style.css | 31 +++++++------------------------ view/tpl/mail_list.tpl | 8 ++++---- 2 files changed, 11 insertions(+), 28 deletions(-) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 50d98bc14..c1e5b76d1 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3261,38 +3261,21 @@ border-bottom: 1px solid #ccc; padding: 20px; } +span.mail-list { +float: left; +width: 20%; +} + span.mail-delete { float: left; width: 30px; } -a.mail-list-sender-url { -float: left; -width: 35px; -} - img.mail-list-sender-photo { -height: 16px; -width: 16px; +height: 24px; +width: 24px; } - -span.mail-from { -float: left; -width: 200px; -} - -span.mail-subject.unseen{ -float: left; -width: 200px; -} - -span.mail-date { -float:left; -width: 200px; -} - - .tag1 { font-size : 1.0em !important; } diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index a01396ae5..4d8a744ac 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -1,7 +1,7 @@
    - {{$from_name}} - {{$from_name}} - {{$subject}} - {{$date}} + {{$from_name}} + {{$from_name}} + {{$subject}} + {{$date}}
    From 4df0aad6ab84c177fe2f9b7e5746fd20dbe9eb2b Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 5 Sep 2013 19:31:26 -0700 Subject: [PATCH 093/330] pages feed --- include/items.php | 44 +++++++++++++++++++++++++++++--------------- mod/feed.php | 7 ++++--- 2 files changed, 33 insertions(+), 18 deletions(-) diff --git a/include/items.php b/include/items.php index a2300c2e0..cd3ef7f68 100755 --- a/include/items.php +++ b/include/items.php @@ -220,16 +220,18 @@ function get_public_feed($channel,$params) { $start = 0; $records = 40; $direction = 'desc'; + $pages = 0; if(! $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['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); - $params['direction'] = ((x($params,'direction')) ? $params['direction'] : 'desc'); + $params['type'] = ((x($params,'type')) ? $params['type'] : 'xml'); + $params['begin'] = ((x($params,'begin')) ? $params['begin'] : '0000-00-00 00:00:00'); + $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); + $params['direction'] = ((x($params,'direction')) ? $params['direction'] : 'desc'); + $params['pages'] = ((x($params,'pages')) ? intval($params['pages']) : 0); switch($params['type']) { case 'json': @@ -250,9 +252,15 @@ function get_feed_for($channel, $observer_hash, $params) { if(! channel) http_status_exit(401); - if(! perm_is_allowed($channel['channel_id'],$observer_hash,'view_stream')) - http_status_exit(403); + if($params['pages']) { + if(! perm_is_allowed($channel['channel_id'],$observer_hash,'view_pages')) + http_status_exit(403); + } + else { + if(! perm_is_allowed($channel['channel_id'],$observer_hash,'view_stream')) + http_status_exit(403); + } $items = items_fetch(array( 'wall' => '1', 'datequery' => $params['begin'], @@ -260,6 +268,7 @@ function get_feed_for($channel, $observer_hash, $params) { 'start' => $params['start'], // FIXME 'records' => $params['records'], // FIXME 'direction' => $params['direction'], // FIXME + 'pages' => $params['pages'], 'order' => 'post' ), $channel, $observer_hash, CLIENT_MODE_NORMAL, get_app()->module); @@ -2938,9 +2947,8 @@ function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) { $o .= '' . xmlify($item['title']) . '' . "\r\n"; $o .= '' . xmlify(datetime_convert('UTC','UTC',$item['created'] . '+00:00',ATOM_TIME)) . '' . "\r\n"; $o .= '' . xmlify(datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME)) . '' . "\r\n"; - $o .= '' . base64url_encode($body, true) . '' . "\r\n"; - // FIXME for other content types - $o .= '' . xmlify((($type === 'html') ? bbcode($body) : $body)) . '' . "\r\n"; + + $o .= '' . xmlify(prepare_text($body,$item['mimetype'])) . '' . "\r\n"; $o .= '' . "\r\n"; if($item['location']) { @@ -3710,11 +3718,17 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C require_once('include/security.php'); $sql_extra .= item_permissions_sql($channel['channel_id']); + if($arr['pages']) + $item_restrict = " AND (item_restrict & " . ITEM_WEBPAGE . ") "; + else + $item_restrict = " AND item_restrict = 0 "; + + if($arr['nouveau'] && ($client_mode & CLIENT_MODELOAD) && $channel) { // "New Item View" - show all items unthreaded in reverse created date order $items = q("SELECT item.*, item.id AS item_id FROM item - WHERE $item_uids AND item_restrict = 0 + WHERE $item_uids $item_restrict $simple_update $sql_extra $sql_nets ORDER BY item.received DESC $pager_sql " @@ -3741,7 +3755,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C $r = q("SELECT distinct item.id AS item_id FROM item left join abook on item.author_xchan = abook.abook_xchan - WHERE $item_uids AND item.item_restrict = 0 + WHERE $item_uids $item_restrict AND item.parent = item.id and ((abook.abook_flags & %d) = 0 or abook.abook_flags is null) $sql_extra3 $sql_extra $sql_nets @@ -3754,7 +3768,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C // update $r = q("SELECT item.parent AS item_id FROM item left join abook on item.author_xchan = abook.abook_xchan - WHERE $item_uids AND item.item_restrict = 0 $simple_update + WHERE $item_uids $item_restrict $simple_update and ((abook.abook_flags & %d) = 0 or abook.abook_flags is null) $sql_extra3 $sql_extra $sql_nets ", intval(ABOOK_FLAG_BLOCKED) @@ -3770,7 +3784,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C $parents_str = ids_to_querystr($r,'item_id'); $items = q("SELECT item.*, item.id AS item_id FROM item - WHERE $item_uids AND item.item_restrict = 0 + WHERE $item_uids $item_restrict AND item.parent IN ( %s ) $sql_extra ", dbesc($parents_str) diff --git a/mod/feed.php b/mod/feed.php index 104208875..0f8296ed1 100644 --- a/mod/feed.php +++ b/mod/feed.php @@ -7,9 +7,10 @@ function feed_init(&$a) { $params = array(); - $params['begin'] = ((x($_REQUEST,'date_begin')) ? $_REQUEST['date_begin'] : '0000-00-00 00:00:00'); - $params['end'] = ((x($_REQUEST,'date_end')) ? $_REQUEST['date_end'] : ''); - $params['type'] = ((stristr(argv(0),'json')) ? 'json' : 'xml'); + $params['begin'] = ((x($_REQUEST,'date_begin')) ? $_REQUEST['date_begin'] : '0000-00-00 00:00:00'); + $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); $channel = ''; if(argc() > 1) { From 789536f5a72d950cc6a0e641e733a8443286750b Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Fri, 6 Sep 2013 05:05:31 +0100 Subject: [PATCH 094/330] Fix new menu link. --- view/tpl/menulist.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl index 4ee382a27..19428aca2 100644 --- a/view/tpl/menulist.tpl +++ b/view/tpl/menulist.tpl @@ -7,7 +7,7 @@ {{if $menus }} {{/if}} From c65ea0b97b2dc6fcefa0d2da489f32bdd7d05b65 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 5 Sep 2013 22:00:06 -0700 Subject: [PATCH 095/330] public site list (will take a few days to populate, assuming folks have updated their site access policy which old sites do not have) --- boot.php | 2 +- include/zot.php | 19 ++++++++++++++++--- install/database.sql | 2 ++ install/update.php | 11 ++++++++++- mod/dirsearch.php | 36 ++++++++++++++++++++++++++++++++++++ mod/pubsites.php | 37 +++++++++++++++++++++++++++++++++++++ 6 files changed, 102 insertions(+), 5 deletions(-) create mode 100644 mod/pubsites.php diff --git a/boot.php b/boot.php index 9bf586caf..483e98bba 100755 --- a/boot.php +++ b/boot.php @@ -43,7 +43,7 @@ require_once('include/taxonomy.php'); define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1066 ); +define ( 'DB_UPDATE_VERSION', 1067 ); define ( 'EOL', '
    ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/include/zot.php b/include/zot.php index 49f58c3bd..33522b485 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1523,10 +1523,22 @@ function import_site($arr,$pubkey) { if($arr['register_policy'] == 'approve') $register_policy = REGISTER_APPROVE; + $access_policy = 0; + if(array_key_exists('access_policy',$arr)) { + if($arr['access_policy'] === 'private') + $access_policy = ACCESS_PRIVATE; + if($arr['access_policy'] === 'paid') + $access_policy = ACCESS_PAID; + if($arr['access_policy'] === 'free') + $access_policy = ACCESS_FREE; + } + + if($update) { - $r = q("update site set site_flags = %d, site_directory = '%s', site_register = %d, site_update = '%s' + $r = q("update site set site_flags = %d, site_access = %d, site_directory = '%s', site_register = %d, site_update = '%s' where site_url = '%s' limit 1", intval($site_directory), + intval($access_policy), dbesc(htmlentities($arr['directory_url'],ENT_COMPAT,'UTF-8',false)), intval($register_policy), dbesc(datetime_convert()), @@ -1537,10 +1549,11 @@ function import_site($arr,$pubkey) { } } else { - $r = q("insert into site ( site_url, site_flags, site_update, site_directory, site_register ) - values ( '%s', %d, '%s', '%s', %d )", + $r = q("insert into site ( site_url, site_acccess, site_flags, site_update, site_directory, site_register ) + values ( '%s', %d, %d, '%s', '%s', %d )", dbesc(htmlentities($arr['url'],ENT_COMPAT,'UTF-8',false)), intval($site_directory), + intval($access_policy), dbesc(datetime_convert()), dbesc(htmlentities($arr['directory_url'],ENT_COMPAT,'UTF-8',false)), intval($register_policy) diff --git a/install/database.sql b/install/database.sql index 176b3610f..ce46149c4 100644 --- a/install/database.sql +++ b/install/database.sql @@ -818,11 +818,13 @@ CREATE TABLE IF NOT EXISTS `shares` ( CREATE TABLE IF NOT EXISTS `site` ( `site_url` char(255) NOT NULL, + `site_access` int(11) NOT NULL DEFAULT '0', `site_flags` int(11) NOT NULL DEFAULT '0', `site_update` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `site_directory` char(255) NOT NULL DEFAULT '', `site_register` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`site_url`), + KEY `site_access` (`site_access`), KEY `site_flags` (`site_flags`), KEY `site_update` (`site_update`), KEY `site_directory` (`site_directory`), diff --git a/install/update.php b/install/update.php index 4f004e651..36a85afec 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ 1 && argv(1) === 'sites') { + $ret = list_public_sites(); + json_return_and_die($ret); + } + + $name = ((x($_REQUEST,'name')) ? $_REQUEST['name'] : ''); $hub = ((x($_REQUEST,'hub')) ? $_REQUEST['hub'] : ''); $address = ((x($_REQUEST,'address')) ? $_REQUEST['address'] : ''); @@ -163,3 +169,33 @@ function dirsearch_content(&$a) { json_return_and_die($ret); } + + +function list_public_sites() { + $r = q("select * from site where site_access != 0 order by rand()"); + $ret = array('success' => false); + + if($r) { + $ret['success'] = true; + $ret['sites'] = array(); + foreach($r as $rr) { + + if($rr['site_access'] == ACCESS_FREE) + $access = 'free'; + elseif($rr['site_access'] == ACCESS_PAID) + $access = 'paid'; + else + $access = 'private'; + + if($rr['site_register'] == REGISTER_OPEN) + $register = 'open'; + elseif($rr['site_register'] == REGISTER_APPROVE) + $register = 'approve'; + else + $register = 'closed'; + + $ret['sites'][] = array('url' => $rr['site_url'], 'access' => $access, 'register' => $register); + } + } + return $ret; +} \ No newline at end of file diff --git a/mod/pubsites.php b/mod/pubsites.php new file mode 100644 index 000000000..3e8833a9d --- /dev/null +++ b/mod/pubsites.php @@ -0,0 +1,37 @@ +' . t('Public Sites') . ''; + + $ret = z_fetch_url($url); + if($ret['success']) { + $j = json_decode($ret['body'],true); + if($j) { + $o .= ''; + foreach($j as $jj) { + $o .= ''; + } + + $o .= '
    ' . t('Site URL') . '' . t('Access Type') . '' . t('Registration Policy') . '
    ' . $jj['url'] . '' . $jj['access'] . '' . $jj['register'] . '
    '; + } + } + return $o; +} From 2c53017fb5fc250f3b8a9fa9fa33ff6ef0dd341f Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 5 Sep 2013 22:23:57 -0700 Subject: [PATCH 096/330] function name --- mod/dirsearch.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/dirsearch.php b/mod/dirsearch.php index 7bf430bec..064c3f287 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -22,7 +22,7 @@ function dirsearch_content(&$a) { json_return_and_die($ret); } - if(argc > 1 && argv(1) === 'sites') { + if(argc() > 1 && argv(1) === 'sites') { $ret = list_public_sites(); json_return_and_die($ret); } From ae624e9bce6fc3bb14ab6b6f8dcb88f2a082f086 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 5 Sep 2013 22:26:19 -0700 Subject: [PATCH 097/330] more fixes to public site list while waiting for a public site or two to show up --- mod/pubsites.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/pubsites.php b/mod/pubsites.php index 3e8833a9d..694541b7a 100644 --- a/mod/pubsites.php +++ b/mod/pubsites.php @@ -26,7 +26,7 @@ function pubsites_content(&$a) { $j = json_decode($ret['body'],true); if($j) { $o .= ''; - foreach($j as $jj) { + foreach($j['sites'] as $jj) { $o .= ''; } From 63c60b224c70ee9d09b8eb73bd11c44ca4a259fd Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 6 Sep 2013 03:10:25 -0700 Subject: [PATCH 098/330] provide mimetype selector on edit (pages and blocks) --- doc/html/bbcode_8php.html | 2 +- doc/html/boot_8php.html | 48 +- doc/html/comanche_8php.html | 52 ++ doc/html/comanche_8php.js | 2 + doc/html/conversation_8php.html | 2 +- doc/html/datetime_8php.html | 2 +- doc/html/dba__driver_8php.html | 6 +- doc/html/dir__fns_8php.html | 2 +- .../dir_d41ce877eb409a4791b288730010abe2.html | 12 + .../dir_d41ce877eb409a4791b288730010abe2.js | 8 +- doc/html/dirsearch_8php.html | 19 + doc/html/dirsearch_8php.js | 3 +- doc/html/extract_8php.html | 2 +- doc/html/features_8php.html | 2 +- doc/html/files.html | 224 +++--- doc/html/globals_0x62.html | 3 + doc/html/globals_0x63.html | 6 + doc/html/globals_0x64.html | 3 + doc/html/globals_0x65.html | 10 +- doc/html/globals_0x6c.html | 9 + doc/html/globals_0x6d.html | 3 + doc/html/globals_0x70.html | 3 + doc/html/globals_0x7a.html | 6 + doc/html/globals_func_0x62.html | 3 + doc/html/globals_func_0x63.html | 6 + doc/html/globals_func_0x64.html | 3 + doc/html/globals_func_0x65.html | 6 + doc/html/globals_func_0x6c.html | 9 + doc/html/globals_func_0x6d.html | 3 + doc/html/globals_func_0x70.html | 3 + doc/html/globals_func_0x7a.html | 6 + doc/html/include_2config_8php.html | 2 +- doc/html/include_2network_8php.html | 2 +- doc/html/items_8php.html | 2 +- doc/html/language_8php.html | 2 +- doc/html/navtree.js | 14 +- doc/html/navtreeindex0.js | 6 +- doc/html/navtreeindex1.js | 18 +- doc/html/navtreeindex2.js | 70 +- doc/html/navtreeindex3.js | 94 +-- doc/html/navtreeindex4.js | 52 +- doc/html/navtreeindex5.js | 248 +++---- doc/html/navtreeindex6.js | 306 ++++---- doc/html/navtreeindex7.js | 79 +- doc/html/permissions_8php.html | 2 +- doc/html/plugin_8php.html | 4 +- doc/html/redbasic_2php_2style_8php.html | 2 +- doc/html/search/all_62.js | 2 + doc/html/search/all_63.js | 2 + doc/html/search/all_64.js | 1 + doc/html/search/all_65.js | 4 + doc/html/search/all_6c.js | 4 + doc/html/search/all_6d.js | 1 + doc/html/search/all_70.js | 2 + doc/html/search/all_7a.js | 5 +- doc/html/search/files_62.js | 1 + doc/html/search/files_65.js | 2 + doc/html/search/files_6c.js | 1 + doc/html/search/files_70.js | 3 +- doc/html/search/files_7a.js | 3 +- doc/html/search/functions_62.js | 1 + doc/html/search/functions_63.js | 2 + doc/html/search/functions_64.js | 1 + doc/html/search/functions_65.js | 2 + doc/html/search/functions_6c.js | 3 + doc/html/search/functions_6d.js | 1 + doc/html/search/functions_70.js | 1 + doc/html/search/functions_7a.js | 4 +- doc/html/taxonomy_8php.html | 2 +- doc/html/text_8php.html | 127 +++- doc/html/text_8php.js | 4 + doc/html/typo_8php.html | 2 +- doc/html/zot_8php.html | 4 +- mod/editblock.php | 15 + mod/editwebpage.php | 7 +- mod/item.php | 3 +- util/messages.po | 697 ++++++++++-------- version.inc | 2 +- 78 files changed, 1364 insertions(+), 916 deletions(-) diff --git a/doc/html/bbcode_8php.html b/doc/html/bbcode_8php.html index 5948b387c..0ad017f65 100644 --- a/doc/html/bbcode_8php.html +++ b/doc/html/bbcode_8php.html @@ -221,7 +221,7 @@ Functions
    ' . t('Site URL') . '' . t('Access Type') . '' . t('Registration Policy') . '
    ' . $jj['url'] . '' . $jj['access'] . '' . $jj['register'] . '
    diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index fbc70bf6f..08eb2a98f 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -224,7 +224,7 @@ Variables   const ZOT_REVISION 1   -const DB_UPDATE_VERSION 1064 +const DB_UPDATE_VERSION 1067   const EOL '<br />' . "\r\n"   @@ -690,7 +690,7 @@ Variables
    -

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

    +

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

    @@ -708,7 +708,7 @@ Variables
    -

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

    +

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

    @@ -913,7 +913,7 @@ Variables @@ -930,7 +930,7 @@ Variables
    -

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

    +

    Referenced by FriendicaSmarty\__construct(), FriendicaSmartyEngine\__construct(), abook_toggle_flag(), allowed_public_recips(), api_apply_template(), api_format_items(), api_get_user(), api_statuses_home_timeline(), api_statuses_repeat(), api_user(), argc(), argv(), atom_entry(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), 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_menu(), comanche_replace_region(), comanche_widget(), common_friends_visitor_widget(), connections_content(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), dfrn_deliver(), drop_item(), event_store(), fetch_url(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), format_event_diaspora(), get_account_id(), get_best_language(), get_birthdays(), get_events(), get_feed_for(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_observer_hash(), get_plink(), get_theme_config_file(), get_theme_screenshot(), gprobe_run(), group_select(), guess_image_type(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), import_channel_photo(), import_post(), import_profile_photo(), info(), is_site_admin(), item_message_id(), item_photo_menu(), item_redir_and_replace_images(), items_fetch(), load_contact_links(), load_hooks(), login(), FKOAuth1\loginUser(), lrdd(), manage_content(), map_scope(), nav_set_selected(), new_contact(), notice(), notification(), notifier_run(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), onepoll_run(), page_content(), ping_init(), poco_load(), poller_run(), post_activity_item(), post_url(), preg_heart(), prepare_body(), proc_run(), process_delivery(), profile_activity(), profile_sidebar(), public_permissions_sql(), replace_macros(), rmagic_init(), saved_searches(), scale_external_images(), search(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), smilies(), tag_deliver(), terminate_friendship(), tgroup_check(), theme_include(), tt(), update_suggestions(), user_allow(), vcard_from_xchan(), what_next(), widget_profile(), z_fetch_url(), and zot_finger().

    @@ -1226,7 +1226,7 @@ Variables
    -

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

    +

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

    @@ -1278,7 +1278,7 @@ Variables
    -

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

    +

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

    @@ -1367,7 +1367,7 @@ Variables

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

    load/reload current theme info

    -

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

    +

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

    @@ -1585,7 +1585,7 @@ Variables
    -

    Referenced by allowed_public_recips(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), chanview_content(), check_config(), connect_post(), connections_content(), conversation(), create_identity(), deliver_run(), directory_content(), display_content(), event_store(), follow_init(), format_css_if_exists(), format_js_if_exists(), group_post(), App\head_get_icon(), head_get_icon(), hostxrd_init(), import_post(), import_xchan(), intro_post(), invite_content(), item_photo_menu(), item_store(), lastpost_content(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), manage_content(), menu_content(), menu_post(), mitem_content(), mitem_post(), mood_init(), navbar_complete(), network_content(), new_channel_post(), notification(), notifications_post(), notifier_run(), photo_upload(), photos_album_widget(), photos_create_item(), post_init(), post_post(), profile_activity(), profile_sidebar(), public_recips(), redir_init(), register_post(), removeme_content(), rmagic_init(), rmagic_post(), search_content(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), sync_directories(), tagger_content(), thing_init(), update_suggestions(), user_allow(), vcard_from_xchan(), webpages_content(), wfinger_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().

    +

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

    @@ -1740,7 +1740,7 @@ Variables @@ -1754,7 +1754,7 @@ Variables @@ -1769,7 +1769,7 @@ Variables

    site access policy

    -

    Referenced by admin_page_site(), and zfinger_init().

    +

    Referenced by admin_page_site(), import_site(), and zfinger_init().

    @@ -1867,6 +1867,8 @@ Variables @@ -2364,7 +2366,7 @@ Variables
    - +
    const DB_UPDATE_VERSION 1064const DB_UPDATE_VERSION 1067
    @@ -2396,7 +2398,7 @@ Variables
    @@ -2424,7 +2426,7 @@ Variables @@ -2452,7 +2454,7 @@ Variables @@ -2478,7 +2480,7 @@ Variables
    -

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

    +

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

    @@ -2571,7 +2573,7 @@ Variables @@ -2726,7 +2728,7 @@ Variables @@ -2873,7 +2875,7 @@ Variables @@ -4216,7 +4218,7 @@ Variables @@ -4245,7 +4247,7 @@ Variables @@ -4300,7 +4302,7 @@ Variables diff --git a/doc/html/comanche_8php.html b/doc/html/comanche_8php.html index 58d792ecd..58419e3df 100644 --- a/doc/html/comanche_8php.html +++ b/doc/html/comanche_8php.html @@ -120,6 +120,10 @@ Functions    comanche_replace_region ($match)   + comanche_block ($name) +  + comanche_webpage (&$a, $s) +   comanche_widget ($name, $args=null)    comanche_region (&$a, $s) @@ -128,6 +132,24 @@ Functions  

    Function Documentation

    + +
    +
    + + + + + + + + +
    comanche_block ( $name)
    +
    + +

    Referenced by comanche_region().

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

    Referenced by page_content().

    +
    @@ -214,6 +238,34 @@ Functions
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + +
    comanche_webpage ($a,
     $s 
    )
    +
    + +

    Referenced by comanche_parser().

    +
    diff --git a/doc/html/comanche_8php.js b/doc/html/comanche_8php.js index afb696fda..d4273e596 100644 --- a/doc/html/comanche_8php.js +++ b/doc/html/comanche_8php.js @@ -1,9 +1,11 @@ var comanche_8php = [ + [ "comanche_block", "comanche_8php.html#a5a7ab801717d38e91ac910b933973887", null ], [ "comanche_menu", "comanche_8php.html#a1fe339e1454803aa502ac89379c17f5b", null ], [ "comanche_parser", "comanche_8php.html#a1a208fdb40dd83d6298caec4290ee922", null ], [ "comanche_region", "comanche_8php.html#a5718daeda40bf835345fe061e8808cdf", null ], [ "comanche_replace_region", "comanche_8php.html#a028f004d5b8c23d6367816d899e17cfe", null ], + [ "comanche_webpage", "comanche_8php.html#ae9fe1ce574db3dd0931eada80234f82a", null ], [ "comanche_widget", "comanche_8php.html#a45900dd1d6101b53e3d063db40eafa5e", null ], [ "pdl_selector", "comanche_8php.html#af7150df735e5ff9d467994cd6f769c6e", null ], [ "widget_profile", "comanche_8php.html#abd2e508a2a0b911c4a838e3cb7599923", null ] diff --git a/doc/html/conversation_8php.html b/doc/html/conversation_8php.html index 77e3a6a5e..d8ae2be0c 100644 --- a/doc/html/conversation_8php.html +++ b/doc/html/conversation_8php.html @@ -691,7 +691,7 @@ Functions diff --git a/doc/html/datetime_8php.html b/doc/html/datetime_8php.html index e334d6286..bb2ebb4ec 100644 --- a/doc/html/datetime_8php.html +++ b/doc/html/datetime_8php.html @@ -332,7 +332,7 @@ Functions
    -

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

    +

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

    diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html index 7a209c87a..1dd06e1a4 100644 --- a/doc/html/dba__driver_8php.html +++ b/doc/html/dba__driver_8php.html @@ -202,7 +202,7 @@ Functions
    -

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

    +

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

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

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

    -

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

    +

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

    diff --git a/doc/html/dir__fns_8php.html b/doc/html/dir__fns_8php.html index 2b9136a0e..72bc242a9 100644 --- a/doc/html/dir__fns_8php.html +++ b/doc/html/dir__fns_8php.html @@ -134,7 +134,7 @@ Functions diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html index 6fb9858af..60a238cee 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html @@ -118,6 +118,8 @@ Files   file  attach.php   +file  blocks.php +  file  channel.php   file  chanview.php @@ -144,6 +146,10 @@ Files   file  display.php   +file  editblock.php +  +file  editlayout.php +  file  editpost.php   file  editwebpage.php @@ -182,6 +188,8 @@ Files   file  lastpost.php   +file  layouts.php +  file  like.php   file  lockview.php @@ -252,6 +260,8 @@ Files   file  profperm.php   +file  pubsites.php +  file  qsearch.php   file  randprof.php @@ -336,6 +346,8 @@ Files   file  zotfeed.php   +file  zping.php diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js index 3f2fc9551..a5c045f90 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js @@ -7,6 +7,7 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "api.php", "mod_2api_8php.html", "mod_2api_8php" ], [ "apps.php", "apps_8php.html", "apps_8php" ], [ "attach.php", "mod_2attach_8php.html", "mod_2attach_8php" ], + [ "blocks.php", "blocks_8php.html", "blocks_8php" ], [ "channel.php", "channel_8php.html", "channel_8php" ], [ "chanview.php", "chanview_8php.html", "chanview_8php" ], [ "common.php", "common_8php.html", "common_8php" ], @@ -20,6 +21,8 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "dirfind.php", "dirfind_8php.html", "dirfind_8php" ], [ "dirsearch.php", "dirsearch_8php.html", "dirsearch_8php" ], [ "display.php", "display_8php.html", "display_8php" ], + [ "editblock.php", "editblock_8php.html", "editblock_8php" ], + [ "editlayout.php", "editlayout_8php.html", "editlayout_8php" ], [ "editpost.php", "editpost_8php.html", "editpost_8php" ], [ "editwebpage.php", "editwebpage_8php.html", "editwebpage_8php" ], [ "events.php", "events_8php.html", "events_8php" ], @@ -39,6 +42,7 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "invite.php", "invite_8php.html", "invite_8php" ], [ "item.php", "item_8php.html", "item_8php" ], [ "lastpost.php", "lastpost_8php.html", "lastpost_8php" ], + [ "layouts.php", "layouts_8php.html", "layouts_8php" ], [ "like.php", "like_8php.html", "like_8php" ], [ "lockview.php", "lockview_8php.html", "lockview_8php" ], [ "login.php", "login_8php.html", "login_8php" ], @@ -74,6 +78,7 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "profile_photo.php", "profile__photo_8php.html", "profile__photo_8php" ], [ "profiles.php", "profiles_8php.html", "profiles_8php" ], [ "profperm.php", "profperm_8php.html", "profperm_8php" ], + [ "pubsites.php", "pubsites_8php.html", "pubsites_8php" ], [ "qsearch.php", "qsearch_8php.html", "qsearch_8php" ], [ "randprof.php", "randprof_8php.html", "randprof_8php" ], [ "redir.php", "redir_8php.html", "redir_8php" ], @@ -115,5 +120,6 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "xchan.php", "xchan_8php.html", "xchan_8php" ], [ "xrd.php", "xrd_8php.html", "xrd_8php" ], [ "zfinger.php", "zfinger_8php.html", "zfinger_8php" ], - [ "zotfeed.php", "zotfeed_8php.html", "zotfeed_8php" ] + [ "zotfeed.php", "zotfeed_8php.html", "zotfeed_8php" ], + [ "zping.php", "zping_8php.html", "zping_8php" ] ]; \ No newline at end of file diff --git a/doc/html/dirsearch_8php.html b/doc/html/dirsearch_8php.html index 4a6aae150..37bdcb100 100644 --- a/doc/html/dirsearch_8php.html +++ b/doc/html/dirsearch_8php.html @@ -116,6 +116,8 @@ Functions    dirsearch_content (&$a)   + list_public_sites () + 

    Function Documentation

    @@ -148,6 +150,23 @@ Functions
    +
    + + +
    +
    + + + + + + + +
    list_public_sites ()
    +
    + +

    Referenced by dirsearch_content().

    +
    diff --git a/doc/html/dirsearch_8php.js b/doc/html/dirsearch_8php.js index 0cb81668f..45753b123 100644 --- a/doc/html/dirsearch_8php.js +++ b/doc/html/dirsearch_8php.js @@ -1,5 +1,6 @@ var dirsearch_8php = [ [ "dirsearch_content", "dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c", null ], - [ "dirsearch_init", "dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752", null ] + [ "dirsearch_init", "dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752", null ], + [ "list_public_sites", "dirsearch_8php.html#a985d410a170549429857af6ff2673149", null ] ]; \ No newline at end of file diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html index 0a77759ef..8c8acbf0c 100644 --- a/doc/html/extract_8php.html +++ b/doc/html/extract_8php.html @@ -160,7 +160,7 @@ Variables
    -

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

    +

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

    diff --git a/doc/html/features_8php.html b/doc/html/features_8php.html index 6d9159820..86105f41b 100644 --- a/doc/html/features_8php.html +++ b/doc/html/features_8php.html @@ -142,7 +142,7 @@ Functions diff --git a/doc/html/files.html b/doc/html/files.html index 4df59bda8..703404553 100644 --- a/doc/html/files.html +++ b/doc/html/files.html @@ -193,115 +193,121 @@ $(document).ready(function(){initNavTree('files.html','');}); |o*api.php |o*apps.php |o*attach.php -|o*channel.php -|o*chanview.php -|o*common.php -|o*community.php -|o*connect.php -|o*connections.php -|o*contactgroup.php -|o*crepair.php -|o*delegate.php -|o*directory.php -|o*dirfind.php -|o*dirsearch.php -|o*display.php -|o*editpost.php -|o*editwebpage.php -|o*events.php -|o*fbrowser.php -|o*feed.php -|o*filer.php -|o*filerm.php -|o*follow.php -|o*fsuggest.php -|o*group.php -|o*hcard.php -|o*help.php -|o*home.php -|o*hostxrd.php -|o*import.php -|o*intro.php -|o*invite.php -|o*item.php -|o*lastpost.php -|o*like.php -|o*lockview.php -|o*login.php -|o*lostpass.php -|o*magic.php -|o*manage.php -|o*match.php -|o*menu.php -|o*message.php -|o*mitem.php -|o*mood.php -|o*msearch.php -|o*network.php -|o*new_channel.php -|o*nogroup.php -|o*notifications.php -|o*notify.php -|o*oembed.php -|o*oexchange.php -|o*opensearch.php -|o*page.php -|o*parse_url.php -|o*photo.php -|o*photos.php -|o*php.php -|o*ping.php -|o*poco.php -|o*poke.php -|o*post.php -|o*pretheme.php -|o*probe.php -|o*profile.php -|o*profile_photo.php -|o*profiles.php -|o*profperm.php -|o*qsearch.php -|o*randprof.php -|o*redir.php -|o*register.php -|o*regmod.php -|o*removeme.php -|o*rmagic.php -|o*rsd_xml.php -|o*search.php -|o*search_ac.php -|o*settings.php -|o*setup.php -|o*share.php -|o*siteinfo.php -|o*sitelist.php -|o*smilies.php -|o*starred.php -|o*subthread.php -|o*suggest.php -|o*tagger.php -|o*tagrm.php -|o*thing.php -|o*toggle_mobile.php -|o*uexport.php -|o*update_channel.php -|o*update_community.php -|o*update_display.php -|o*update_network.php -|o*update_search.php -|o*view.php -|o*viewconnections.php -|o*viewsrc.php -|o*vote.php -|o*wall_attach.php -|o*wall_upload.php -|o*webfinger.php -|o*webpages.php -|o*wfinger.php -|o*xchan.php -|o*xrd.php -|o*zfinger.php -|\*zotfeed.php +|o*blocks.php +|o*channel.php +|o*chanview.php +|o*common.php +|o*community.php +|o*connect.php +|o*connections.php +|o*contactgroup.php +|o*crepair.php +|o*delegate.php +|o*directory.php +|o*dirfind.php +|o*dirsearch.php +|o*display.php +|o*editblock.php +|o*editlayout.php +|o*editpost.php +|o*editwebpage.php +|o*events.php +|o*fbrowser.php +|o*feed.php +|o*filer.php +|o*filerm.php +|o*follow.php +|o*fsuggest.php +|o*group.php +|o*hcard.php +|o*help.php +|o*home.php +|o*hostxrd.php +|o*import.php +|o*intro.php +|o*invite.php +|o*item.php +|o*lastpost.php +|o*layouts.php +|o*like.php +|o*lockview.php +|o*login.php +|o*lostpass.php +|o*magic.php +|o*manage.php +|o*match.php +|o*menu.php +|o*message.php +|o*mitem.php +|o*mood.php +|o*msearch.php +|o*network.php +|o*new_channel.php +|o*nogroup.php +|o*notifications.php +|o*notify.php +|o*oembed.php +|o*oexchange.php +|o*opensearch.php +|o*page.php +|o*parse_url.php +|o*photo.php +|o*photos.php +|o*php.php +|o*ping.php +|o*poco.php +|o*poke.php +|o*post.php +|o*pretheme.php +|o*probe.php +|o*profile.php +|o*profile_photo.php +|o*profiles.php +|o*profperm.php +|o*pubsites.php +|o*qsearch.php +|o*randprof.php +|o*redir.php +|o*register.php +|o*regmod.php +|o*removeme.php +|o*rmagic.php +|o*rsd_xml.php +|o*search.php +|o*search_ac.php +|o*settings.php +|o*setup.php +|o*share.php +|o*siteinfo.php +|o*sitelist.php +|o*smilies.php +|o*starred.php +|o*subthread.php +|o*suggest.php +|o*tagger.php +|o*tagrm.php +|o*thing.php +|o*toggle_mobile.php +|o*uexport.php +|o*update_channel.php +|o*update_community.php +|o*update_display.php +|o*update_network.php +|o*update_search.php +|o*view.php +|o*viewconnections.php +|o*viewsrc.php +|o*vote.php +|o*wall_attach.php +|o*wall_upload.php +|o*webfinger.php +|o*webpages.php +|o*wfinger.php +|o*xchan.php +|o*xrd.php +|o*zfinger.php +|o*zotfeed.php +|\*zping.php o+util |o+fpostit ||\*fpostit.php diff --git a/doc/html/globals_0x62.html b/doc/html/globals_0x62.html index d185d3fa9..a28bb4987 100644 --- a/doc/html/globals_0x62.html +++ b/doc/html/globals_0x62.html @@ -183,6 +183,9 @@ $(document).ready(function(){initNavTree('globals_0x62.html','');});
  • best_link_url() : conversation.php
  • +
  • blocks_content() +: blocks.php +
  • breaklines() : html2plain.php
  • diff --git a/doc/html/globals_0x63.html b/doc/html/globals_0x63.html index ee4ef91b2..3527881d2 100644 --- a/doc/html/globals_0x63.html +++ b/doc/html/globals_0x63.html @@ -276,6 +276,9 @@ $(document).ready(function(){initNavTree('globals_0x63.html','');});
  • collecturls() : html2plain.php
  • +
  • comanche_block() +: comanche.php +
  • comanche_menu() : comanche.php
  • @@ -288,6 +291,9 @@ $(document).ready(function(){initNavTree('globals_0x63.html','');});
  • comanche_replace_region() : comanche.php
  • +
  • comanche_webpage() +: comanche.php +
  • comanche_widget() : comanche.php
  • diff --git a/doc/html/globals_0x64.html b/doc/html/globals_0x64.html index 6f8a0a98b..c9573a753 100644 --- a/doc/html/globals_0x64.html +++ b/doc/html/globals_0x64.html @@ -210,6 +210,9 @@ $(document).ready(function(){initNavTree('globals_0x64.html','');});
  • deliver_run() : deliver.php
  • +
  • design_tools() +: text.php +
  • detect_language() : language.php
  • diff --git a/doc/html/globals_0x65.html b/doc/html/globals_0x65.html index e3042d8f2..45d38cb53 100644 --- a/doc/html/globals_0x65.html +++ b/doc/html/globals_0x65.html @@ -144,6 +144,12 @@ $(document).ready(function(){initNavTree('globals_0x65.html','');});
    Here is a list of all file members with links to the files they belong to:

    - e -

      +
    • editblock_content() +: editblock.php +
    • +
    • editlayout_content() +: editlayout.php +
    • editpost_content() : editpost.php
    • @@ -151,9 +157,9 @@ $(document).ready(function(){initNavTree('globals_0x65.html','');}); : editwebpage.php
    • else -: fpostit.php +: auth.php +, fpostit.php , tpldebug.php -, auth.php
    • email_header_encode() : network.php diff --git a/doc/html/globals_0x6c.html b/doc/html/globals_0x6c.html index 24fecb71e..e10884157 100644 --- a/doc/html/globals_0x6c.html +++ b/doc/html/globals_0x6c.html @@ -162,6 +162,12 @@ $(document).ready(function(){initNavTree('globals_0x6c.html','');});
    • lastpost_init() : lastpost.php
    • +
    • layout_select() +: text.php +
    • +
    • layouts_content() +: layouts.php +
    • legal_webbie() : text.php
    • @@ -180,6 +186,9 @@ $(document).ready(function(){initNavTree('globals_0x6c.html','');});
    • linkify() : text.php
    • +
    • list_public_sites() +: dirsearch.php +
    • load_config() : config.php
    • diff --git a/doc/html/globals_0x6d.html b/doc/html/globals_0x6d.html index fb2c10254..83a755fa0 100644 --- a/doc/html/globals_0x6d.html +++ b/doc/html/globals_0x6d.html @@ -255,6 +255,9 @@ $(document).ready(function(){initNavTree('globals_0x6d.html','');});
    • micropro() : text.php
    • +
    • mimetype_select() +: text.php +
    • mini_group_select() : group.php
    • diff --git a/doc/html/globals_0x70.html b/doc/html/globals_0x70.html index f6a10e3e4..c96cd5508 100644 --- a/doc/html/globals_0x70.html +++ b/doc/html/globals_0x70.html @@ -506,6 +506,9 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
    • public_recips() : zot.php
    • +
    • pubsites_content() +: pubsites.php +
    • purify_html() : text.php
    • diff --git a/doc/html/globals_0x7a.html b/doc/html/globals_0x7a.html index 03c86723b..fc4a9bb32 100644 --- a/doc/html/globals_0x7a.html +++ b/doc/html/globals_0x7a.html @@ -150,6 +150,9 @@ $(document).ready(function(){initNavTree('globals_0x7a.html','');});
    • z_fetch_url() : network.php
    • +
    • z_input_filter() +: text.php +
    • z_mime_content_type() : attach.php
    • @@ -228,6 +231,9 @@ $(document).ready(function(){initNavTree('globals_0x7a.html','');});
    • zotfeed_init() : zotfeed.php
    • +
    • zping_content() +: zping.php +
    diff --git a/doc/html/globals_func_0x62.html b/doc/html/globals_func_0x62.html index 12e9a65e7..84a41e9bc 100644 --- a/doc/html/globals_func_0x62.html +++ b/doc/html/globals_func_0x62.html @@ -182,6 +182,9 @@ $(document).ready(function(){initNavTree('globals_func_0x62.html','');});
  • best_link_url() : conversation.php
  • +
  • blocks_content() +: blocks.php +
  • breaklines() : html2plain.php
  • diff --git a/doc/html/globals_func_0x63.html b/doc/html/globals_func_0x63.html index 818ce4c6d..0c8414fb6 100644 --- a/doc/html/globals_func_0x63.html +++ b/doc/html/globals_func_0x63.html @@ -266,6 +266,9 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');});
  • collecturls() : html2plain.php
  • +
  • comanche_block() +: comanche.php +
  • comanche_menu() : comanche.php
  • @@ -278,6 +281,9 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');});
  • comanche_replace_region() : comanche.php
  • +
  • comanche_webpage() +: comanche.php +
  • comanche_widget() : comanche.php
  • diff --git a/doc/html/globals_func_0x64.html b/doc/html/globals_func_0x64.html index cd1fca1c7..96de8abd4 100644 --- a/doc/html/globals_func_0x64.html +++ b/doc/html/globals_func_0x64.html @@ -203,6 +203,9 @@ $(document).ready(function(){initNavTree('globals_func_0x64.html','');});
  • deliver_run() : deliver.php
  • +
  • design_tools() +: text.php +
  • detect_language() : language.php
  • diff --git a/doc/html/globals_func_0x65.html b/doc/html/globals_func_0x65.html index b479b761c..3069c0d0f 100644 --- a/doc/html/globals_func_0x65.html +++ b/doc/html/globals_func_0x65.html @@ -143,6 +143,12 @@ $(document).ready(function(){initNavTree('globals_func_0x65.html','');});  

    - e -

      +
    • editblock_content() +: editblock.php +
    • +
    • editlayout_content() +: editlayout.php +
    • editpost_content() : editpost.php
    • diff --git a/doc/html/globals_func_0x6c.html b/doc/html/globals_func_0x6c.html index e3447131c..37e7a3b17 100644 --- a/doc/html/globals_func_0x6c.html +++ b/doc/html/globals_func_0x6c.html @@ -155,6 +155,12 @@ $(document).ready(function(){initNavTree('globals_func_0x6c.html','');});
    • lastpost_init() : lastpost.php
    • +
    • layout_select() +: text.php +
    • +
    • layouts_content() +: layouts.php +
    • legal_webbie() : text.php
    • @@ -173,6 +179,9 @@ $(document).ready(function(){initNavTree('globals_func_0x6c.html','');});
    • linkify() : text.php
    • +
    • list_public_sites() +: dirsearch.php +
    • load_config() : config.php
    • diff --git a/doc/html/globals_func_0x6d.html b/doc/html/globals_func_0x6d.html index 36d012213..25e39fcab 100644 --- a/doc/html/globals_func_0x6d.html +++ b/doc/html/globals_func_0x6d.html @@ -224,6 +224,9 @@ $(document).ready(function(){initNavTree('globals_func_0x6d.html','');});
    • micropro() : text.php
    • +
    • mimetype_select() +: text.php +
    • mini_group_select() : group.php
    • diff --git a/doc/html/globals_func_0x70.html b/doc/html/globals_func_0x70.html index 29f8c1ee5..4b81db067 100644 --- a/doc/html/globals_func_0x70.html +++ b/doc/html/globals_func_0x70.html @@ -389,6 +389,9 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');});
    • public_recips() : zot.php
    • +
    • pubsites_content() +: pubsites.php +
    • purify_html() : text.php
    • diff --git a/doc/html/globals_func_0x7a.html b/doc/html/globals_func_0x7a.html index ff834a587..9a28fb1b3 100644 --- a/doc/html/globals_func_0x7a.html +++ b/doc/html/globals_func_0x7a.html @@ -149,6 +149,9 @@ $(document).ready(function(){initNavTree('globals_func_0x7a.html','');});
    • z_fetch_url() : network.php
    • +
    • z_input_filter() +: text.php +
    • z_mime_content_type() : attach.php
    • @@ -221,6 +224,9 @@ $(document).ready(function(){initNavTree('globals_func_0x7a.html','');});
    • zotfeed_init() : zotfeed.php
    • +
    • zping_content() +: zping.php +
    diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html index 8565c7df3..207e268e9 100644 --- a/doc/html/include_2config_8php.html +++ b/doc/html/include_2config_8php.html @@ -256,7 +256,7 @@ Functions
    -

    Referenced by admin_page_dbsync(), admin_page_logs(), admin_page_site(), admin_page_summary(), admin_page_themes(), allowed_email(), allowed_url(), api_statuses_mentions(), api_statusnet_config(), attach_store(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), community_content(), create_account(), create_identity(), detect_language(), dfrn_deliver(), directory_content(), directory_run(), dirfind_content(), dirsearch_content(), display_content(), dlogger(), dob(), editpost_content(), encode_item(), encode_mail(), events_content(), expire_run(), feed_init(), fetch_url(), fetch_xrd_links(), findpeople_widget(), Item\get_comment_box(), get_item_elements(), get_mail_elements(), group_content(), hcard_init(), hostxrd_init(), photo_gd\imageString(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), item_store(), lastpost_content(), photo_imagick\load(), logger(), login(), lostpass_content(), lostpass_post(), match_content(), nav(), navbar_complete(), FKOAuthDataStore\new_access_token(), new_channel_post(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), parse_url_content(), photo_upload(), photos_content(), photos_init(), poco_init(), poller_run(), post_post(), post_url(), prepare_body(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), proc_run(), profile_content(), profile_create_sidebar(), profile_photo_post(), profiles_content(), profperm_content(), qsearch_init(), register_content(), register_post(), reload_plugins(), 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(), update_suggestions(), upgrade_link(), user_allow(), valid_email(), validate_email(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), widget_profile(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_import(), and zotfeed_init().

    +

    Referenced by admin_page_dbsync(), admin_page_logs(), admin_page_site(), admin_page_summary(), admin_page_themes(), allowed_email(), allowed_url(), api_statuses_mentions(), api_statusnet_config(), attach_store(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), community_content(), create_account(), create_identity(), detect_language(), dfrn_deliver(), directory_content(), directory_run(), dirfind_content(), dirsearch_content(), display_content(), dlogger(), dob(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), events_content(), expire_run(), feed_init(), fetch_url(), fetch_xrd_links(), findpeople_widget(), Item\get_comment_box(), get_item_elements(), get_mail_elements(), group_content(), hcard_init(), hostxrd_init(), photo_gd\imageString(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), item_store(), lastpost_content(), photo_imagick\load(), logger(), login(), lostpass_content(), lostpass_post(), match_content(), nav(), navbar_complete(), FKOAuthDataStore\new_access_token(), new_channel_post(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), parse_url_content(), photo_upload(), photos_content(), photos_init(), poco_init(), poller_run(), post_post(), post_url(), prepare_body(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), proc_run(), profile_content(), profile_create_sidebar(), profile_photo_post(), profiles_content(), profperm_content(), pubsites_content(), qsearch_init(), register_content(), register_post(), reload_plugins(), 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(), update_suggestions(), upgrade_link(), user_allow(), valid_email(), validate_email(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), webpages_content(), widget_profile(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_import(), and zotfeed_init().

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

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

    +

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

    diff --git a/doc/html/items_8php.html b/doc/html/items_8php.html index 45632a5d3..09d2998ea 100644 --- a/doc/html/items_8php.html +++ b/doc/html/items_8php.html @@ -832,7 +832,7 @@ Functions diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html index 618626445..a9f2ba05b 100644 --- a/doc/html/language_8php.html +++ b/doc/html/language_8php.html @@ -280,7 +280,7 @@ Functions
    -

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

    +

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

    diff --git a/doc/html/navtree.js b/doc/html/navtree.js index d2fb0acef..0a845a8c2 100644 --- a/doc/html/navtree.js +++ b/doc/html/navtree.js @@ -36,13 +36,13 @@ var NAVTREE = var NAVTREEINDEX = [ "BaseObject_8php.html", -"boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42", -"classItem.html#a3ee7667c2ec6cd7657328e27848c0bdf", -"db__update_8php.html", -"include_2api_8php.html#a176c448d79c211ad41c2bbe3124658f5", -"magic_8php.html", -"redstrap_2php_2style_8php.html#a232513bf4339fe34908c4c63cb93168b", -"updatetpl_8py.html#ab42dd79af65ee82201fd6f04715f62f6" +"boot_8php.html#a9eeb8989272d5ff804a616898bb13659", +"classItem.html#a248f45871ecfe82a08d1d4c0769b2eb2", +"datetime_8php.html#abc1652f96799cec6fce8797ba2ebc2df", +"identity_8php.html#a78151baf4407a8482d2681a91a9c486b", +"layouts_8php.html", +"redbasic_2php_2style_8php.html#adcfa918e05b5a98cbddc84bc3f1c15cc", +"typohelper_8php.html#ab6fd357fb5b2a3ba8aab9e8b98c6a805" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js index 981c68690..e5e6ff123 100644 --- a/doc/html/navtreeindex0.js +++ b/doc/html/navtreeindex0.js @@ -87,6 +87,8 @@ var NAVTREEINDEX0 = "bbcode_8php.html#a52c45273fbb7ce5ec27094f7936856e1":[5,0,0,10,0], "bbcode_8php.html#a55b0cb6973f1ec731de0e726bcc0efa7":[5,0,0,10,5], "bbcode_8php.html#a8911e027907820df3db03b4f76724b50":[5,0,0,10,2], +"blocks_8php.html":[5,0,1,7], +"blocks_8php.html#a2531a8fd51db3cecb2eb20c002c66e12":[5,0,1,7,0], "boot_8php.html":[5,0,4], "boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[5,0,4,133], "boot_8php.html#a01353c9abebc3544ea080ac161729632":[5,0,4,43], @@ -247,7 +249,5 @@ var NAVTREEINDEX0 = "boot_8php.html#a9c80420e5a063a4a87ce4831f086134d":[5,0,4,56], "boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e":[5,0,4,5], "boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[5,0,4,214], -"boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[5,0,4,191], -"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[5,0,4,248], -"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[5,0,4,213] +"boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[5,0,4,191] }; diff --git a/doc/html/navtreeindex1.js b/doc/html/navtreeindex1.js index 3fa6238e9..b2d7695dc 100644 --- a/doc/html/navtreeindex1.js +++ b/doc/html/navtreeindex1.js @@ -1,5 +1,7 @@ var NAVTREEINDEX1 = { +"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[5,0,4,248], +"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[5,0,4,213], "boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[5,0,4,179], "boot_8php.html#aa1e828bbbcba170265eb2668d8daf42e":[5,0,4,29], "boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[5,0,4,197], @@ -99,12 +101,12 @@ var NAVTREEINDEX1 = "boot_8php.html#afe88b920aa285982edb817a0dd44eb37":[5,0,4,14], "boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[5,0,4,206], "cache_8php.html":[5,0,0,11], -"channel_8php.html":[5,0,1,7], -"channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1":[5,0,1,7,1], -"channel_8php.html#ac7c8c7845741baadf87fae6bc279f3dc":[5,0,1,7,2], -"channel_8php.html#aea8e189f2fbabfda779349dd94082e8e":[5,0,1,7,0], -"chanview_8php.html":[5,0,1,8], -"chanview_8php.html#a4192c6da888c8c1165851acf9ad4cb8b":[5,0,1,8,0], +"channel_8php.html":[5,0,1,8], +"channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1":[5,0,1,8,1], +"channel_8php.html#ac7c8c7845741baadf87fae6bc279f3dc":[5,0,1,8,2], +"channel_8php.html#aea8e189f2fbabfda779349dd94082e8e":[5,0,1,8,0], +"chanview_8php.html":[5,0,1,9], +"chanview_8php.html#a4192c6da888c8c1165851acf9ad4cb8b":[5,0,1,9,0], "classApp.html":[4,0,5], "classApp.html#a037049cba88dfc6ff94f4b5b779e3fd3":[4,0,5,60], "classApp.html#a050b0696118da47e8b30859ad1a2c149":[4,0,5,44], @@ -247,7 +249,5 @@ var NAVTREEINDEX1 = "classItem.html#a078f95b4134ce3a1df344cf8d386f986":[4,0,17,33], "classItem.html#a0c301aaed2b7d682728d18db3a22afa3":[4,0,17,8], "classItem.html#a1a1e42877e6ac7af50286142ceb483d2":[4,0,17,35], -"classItem.html#a1cb6aa8abdf7ea7daca647e40c8ea3a2":[4,0,17,38], -"classItem.html#a248f45871ecfe82a08d1d4c0769b2eb2":[4,0,17,0], -"classItem.html#a2ce70ef63f9f4d86a09c351678806925":[4,0,17,23] +"classItem.html#a1cb6aa8abdf7ea7daca647e40c8ea3a2":[4,0,17,38] }; diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js index ebd0cdfae..1b0c20c07 100644 --- a/doc/html/navtreeindex2.js +++ b/doc/html/navtreeindex2.js @@ -1,5 +1,7 @@ var NAVTREEINDEX2 = { +"classItem.html#a248f45871ecfe82a08d1d4c0769b2eb2":[4,0,17,0], +"classItem.html#a2ce70ef63f9f4d86a09c351678806925":[4,0,17,23], "classItem.html#a3ee7667c2ec6cd7657328e27848c0bdf":[4,0,17,6], "classItem.html#a428f448f89a8629055ea3294eb942aea":[4,0,17,16], "classItem.html#a4a123ae98987c1e30ecb15c4edf5a3b8":[4,0,17,40], @@ -160,30 +162,32 @@ var NAVTREEINDEX2 = "cli__suggest_8php.html":[5,0,0,13], "cli__suggest_8php.html#a8f3a60fc96f4bec7d3837c4efc7725f2":[5,0,0,13,0], "comanche_8php.html":[5,0,0,14], -"comanche_8php.html#a028f004d5b8c23d6367816d899e17cfe":[5,0,0,14,3], -"comanche_8php.html#a1a208fdb40dd83d6298caec4290ee922":[5,0,0,14,1], -"comanche_8php.html#a1fe339e1454803aa502ac89379c17f5b":[5,0,0,14,0], -"comanche_8php.html#a45900dd1d6101b53e3d063db40eafa5e":[5,0,0,14,4], -"comanche_8php.html#a5718daeda40bf835345fe061e8808cdf":[5,0,0,14,2], -"comanche_8php.html#abd2e508a2a0b911c4a838e3cb7599923":[5,0,0,14,6], -"comanche_8php.html#af7150df735e5ff9d467994cd6f769c6e":[5,0,0,14,5], -"common_8php.html":[5,0,1,9], -"common_8php.html#a3b12ec67b3d3edcf595c8d195da5d14a":[5,0,1,9,0], -"common_8php.html#ab63408f39abef7a6915186e8dabc5a96":[5,0,1,9,1], -"common_8php.html#aca62f113655809f41f49042ce9b123c2":[5,0,1,9,2], -"community_8php.html":[5,0,1,10], -"community_8php.html#a1197aafd6a6b540dbb4a0c04ade3a25a":[5,0,1,10,0], -"community_8php.html#a56c94ec978a38633c5628fa6f8e386d9":[5,0,1,10,1], -"connect_8php.html":[5,0,1,11], -"connect_8php.html#a417ec27afe33f21a929667a665e32ee2":[5,0,1,11,2], -"connect_8php.html#a489f0a66c660de6ec4d6917b27674f07":[5,0,1,11,0], -"connect_8php.html#ad46a38f32fd7a3d324b1fa26373efa36":[5,0,1,11,1], -"connections_8php.html":[5,0,1,12], -"connections_8php.html#a1224058db8e3fb56463eb312f98e561d":[5,0,1,12,4], -"connections_8php.html#a15af118efee9c948b6f8294e54a73bb2":[5,0,1,12,1], -"connections_8php.html#a1f23623f802af7bd35e95b0e94e5d558":[5,0,1,12,3], -"connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c":[5,0,1,12,2], -"connections_8php.html#af48f7ad20914760ba9874c090384e35a":[5,0,1,12,0], +"comanche_8php.html#a028f004d5b8c23d6367816d899e17cfe":[5,0,0,14,4], +"comanche_8php.html#a1a208fdb40dd83d6298caec4290ee922":[5,0,0,14,2], +"comanche_8php.html#a1fe339e1454803aa502ac89379c17f5b":[5,0,0,14,1], +"comanche_8php.html#a45900dd1d6101b53e3d063db40eafa5e":[5,0,0,14,6], +"comanche_8php.html#a5718daeda40bf835345fe061e8808cdf":[5,0,0,14,3], +"comanche_8php.html#a5a7ab801717d38e91ac910b933973887":[5,0,0,14,0], +"comanche_8php.html#abd2e508a2a0b911c4a838e3cb7599923":[5,0,0,14,8], +"comanche_8php.html#ae9fe1ce574db3dd0931eada80234f82a":[5,0,0,14,5], +"comanche_8php.html#af7150df735e5ff9d467994cd6f769c6e":[5,0,0,14,7], +"common_8php.html":[5,0,1,10], +"common_8php.html#a3b12ec67b3d3edcf595c8d195da5d14a":[5,0,1,10,0], +"common_8php.html#ab63408f39abef7a6915186e8dabc5a96":[5,0,1,10,1], +"common_8php.html#aca62f113655809f41f49042ce9b123c2":[5,0,1,10,2], +"community_8php.html":[5,0,1,11], +"community_8php.html#a1197aafd6a6b540dbb4a0c04ade3a25a":[5,0,1,11,0], +"community_8php.html#a56c94ec978a38633c5628fa6f8e386d9":[5,0,1,11,1], +"connect_8php.html":[5,0,1,12], +"connect_8php.html#a417ec27afe33f21a929667a665e32ee2":[5,0,1,12,2], +"connect_8php.html#a489f0a66c660de6ec4d6917b27674f07":[5,0,1,12,0], +"connect_8php.html#ad46a38f32fd7a3d324b1fa26373efa36":[5,0,1,12,1], +"connections_8php.html":[5,0,1,13], +"connections_8php.html#a1224058db8e3fb56463eb312f98e561d":[5,0,1,13,4], +"connections_8php.html#a15af118efee9c948b6f8294e54a73bb2":[5,0,1,13,1], +"connections_8php.html#a1f23623f802af7bd35e95b0e94e5d558":[5,0,1,13,3], +"connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c":[5,0,1,13,2], +"connections_8php.html#af48f7ad20914760ba9874c090384e35a":[5,0,1,13,0], "contact__selectors_8php.html":[5,0,0,17], "contact__selectors_8php.html#a2c743d2eb526eb758d943a1490162d75":[5,0,0,17,1], "contact__selectors_8php.html#a9839e8fdaac7ffb37bf1420493f5c28f":[5,0,0,17,0], @@ -195,8 +199,8 @@ var NAVTREEINDEX2 = "contact__widgets_8php.html#a552f8544528cec0c995cea7287ea9d65":[5,0,0,18,1], "contact__widgets_8php.html#a57e73ebcfd62bb5d8c7a7b9e663726d6":[5,0,0,18,3], "contact__widgets_8php.html#af24e693532a045954caab515942cfc6f":[5,0,0,18,4], -"contactgroup_8php.html":[5,0,1,13], -"contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3":[5,0,1,13,0], +"contactgroup_8php.html":[5,0,1,14], +"contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3":[5,0,1,14,0], "conversation_8php.html":[5,0,0,19], "conversation_8php.html#a0891aaa4492cba2b51eda12fe01957f3":[5,0,0,19,7], "conversation_8php.html#a0ee05f15255fb1cc3d89f30bc378a654":[5,0,0,19,9], @@ -220,10 +224,10 @@ var NAVTREEINDEX2 = "conversation_8php.html#ae59703b07ce2ddf627b4172ff26058b6":[5,0,0,19,5], "conversation_8php.html#ae996eb116d397a2c6396c312d7b98664":[5,0,0,19,16], "conversation_8php.html#afe5b2f38d8b803edb0d7ec5fa2868db0":[5,0,0,19,12], -"crepair_8php.html":[5,0,1,14], -"crepair_8php.html#a29464c01838e209c8059cfcd2d195caa":[5,0,1,14,0], -"crepair_8php.html#ab089978e50df156bbfabf9f8f5ccd198":[5,0,1,14,1], -"crepair_8php.html#acc4493e1ffd1462a605dd9b870034513":[5,0,1,14,2], +"crepair_8php.html":[5,0,1,15], +"crepair_8php.html#a29464c01838e209c8059cfcd2d195caa":[5,0,1,15,0], +"crepair_8php.html#ab089978e50df156bbfabf9f8f5ccd198":[5,0,1,15,1], +"crepair_8php.html#acc4493e1ffd1462a605dd9b870034513":[5,0,1,15,2], "cronhooks_8php.html":[5,0,0,21], "cronhooks_8php.html#a4c4c1bbec4ecc9a0efa00dd6afd2c0ca":[5,0,0,21,0], "crypto_8php.html":[5,0,0,22], @@ -245,9 +249,5 @@ var NAVTREEINDEX2 = "datetime_8php.html#a7df24d72ea05922d3127363e2295174c":[5,0,0,23,7], "datetime_8php.html#a8ae8dc95ace7ac27fa5a1ecf42b78c82":[5,0,0,23,9], "datetime_8php.html#aa51b5a7ea4f931b23acbdfcea46e9865":[5,0,0,23,12], -"datetime_8php.html#aba971b67f17fecf050813f1eba72367f":[5,0,0,23,8], -"datetime_8php.html#abc1652f96799cec6fce8797ba2ebc2df":[5,0,0,23,0], -"datetime_8php.html#ac265b86f384ee094ed5479aae02aa5c8":[5,0,0,23,2], -"datetime_8php.html#ad6301e74b0f9267d52f8d432b5beb226":[5,0,0,23,4], -"datetime_8php.html#aea356409ba69f9de412298c998595dd2":[5,0,0,23,1] +"datetime_8php.html#aba971b67f17fecf050813f1eba72367f":[5,0,0,23,8] }; diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js index 2ef8ffdb0..d7efeb160 100644 --- a/doc/html/navtreeindex3.js +++ b/doc/html/navtreeindex3.js @@ -1,5 +1,9 @@ var NAVTREEINDEX3 = { +"datetime_8php.html#abc1652f96799cec6fce8797ba2ebc2df":[5,0,0,23,0], +"datetime_8php.html#ac265b86f384ee094ed5479aae02aa5c8":[5,0,0,23,2], +"datetime_8php.html#ad6301e74b0f9267d52f8d432b5beb226":[5,0,0,23,4], +"datetime_8php.html#aea356409ba69f9de412298c998595dd2":[5,0,0,23,1], "db__update_8php.html":[5,0,2,1], "dba__driver_8php.html":[5,0,0,0,0], "dba__driver_8php.html#a2c09a731d3b4fef41fed0e83db01be1f":[5,0,0,0,0,8], @@ -12,8 +16,8 @@ var NAVTREEINDEX3 = "dba__driver_8php.html#af531546fac5f0836a8557a4f6dfee930":[5,0,0,0,0,4], "dba__mysql_8php.html":[5,0,0,0,1], "dba__mysqli_8php.html":[5,0,0,0,2], -"delegate_8php.html":[5,0,1,15], -"delegate_8php.html#a943eea8996ef348eb845c498f9f354dd":[5,0,1,15,0], +"delegate_8php.html":[5,0,1,16], +"delegate_8php.html#a943eea8996ef348eb845c498f9f354dd":[5,0,1,16,0], "deliver_8php.html":[5,0,0,24], "deliver_8php.html#a397afcb9afecf0c1816b0951189dd346":[5,0,0,24,0], "dir_032dd9e2cfe278a2cfa5eb9547448eb9.html":[5,0,3,1,0,0], @@ -33,14 +37,15 @@ var NAVTREEINDEX3 = "dir_d41ce877eb409a4791b288730010abe2.html":[5,0,1], "dir_d44c64559bbebec7f509842c48db8b23.html":[5,0,0], "dir_d795dfe8933002397556cc7aa16eca15.html":[5,0,3,1,1], -"dirfind_8php.html":[5,0,1,17], -"dirfind_8php.html#ac689a812c84f161b3a0d42349f83981c":[5,0,1,17,1], -"dirfind_8php.html#af22b0283f928c4c32e62248a5ae67cee":[5,0,1,17,0], -"dirsearch_8php.html":[5,0,1,18], -"dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752":[5,0,1,18,1], -"dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c":[5,0,1,18,0], -"display_8php.html":[5,0,1,19], -"display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0":[5,0,1,19,0], +"dirfind_8php.html":[5,0,1,18], +"dirfind_8php.html#ac689a812c84f161b3a0d42349f83981c":[5,0,1,18,1], +"dirfind_8php.html#af22b0283f928c4c32e62248a5ae67cee":[5,0,1,18,0], +"dirsearch_8php.html":[5,0,1,19], +"dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752":[5,0,1,19,1], +"dirsearch_8php.html#a985d410a170549429857af6ff2673149":[5,0,1,19,2], +"dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c":[5,0,1,19,0], +"display_8php.html":[5,0,1,20], +"display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0":[5,0,1,20,0], "docblox__errorchecker_8php.html":[5,0,2,2], "docblox__errorchecker_8php.html#a1659f0a629d408e0f849dbe4ee061e62":[5,0,2,2,3], "docblox__errorchecker_8php.html#a21b4bbe5aae2d85db33affc7126a67ec":[5,0,2,2,2], @@ -53,10 +58,14 @@ var NAVTREEINDEX3 = "docblox__errorchecker_8php.html#ab66bc0493d25f39bf8b4dcbb429f04e6":[5,0,2,2,4], "docblox__errorchecker_8php.html#ae9562cf60aa693114603d27b55d2185f":[5,0,2,2,1], "docblox__errorchecker_8php.html#af4ca738a05beffe9c8c23e1f7aea3c2d":[5,0,2,2,10], -"editpost_8php.html":[5,0,1,20], -"editpost_8php.html#a34011690864d122680c802e9e748ccfb":[5,0,1,20,0], -"editwebpage_8php.html":[5,0,1,21], -"editwebpage_8php.html#a375e945255fad79a71036528f7480650":[5,0,1,21,0], +"editblock_8php.html":[5,0,1,21], +"editblock_8php.html#abbe8f55de06967bc8d79d620509a49e6":[5,0,1,21,0], +"editlayout_8php.html":[5,0,1,22], +"editlayout_8php.html#aa877e4157a26b099de904164181dd386":[5,0,1,22,0], +"editpost_8php.html":[5,0,1,23], +"editpost_8php.html#a34011690864d122680c802e9e748ccfb":[5,0,1,23,0], +"editwebpage_8php.html":[5,0,1,24], +"editwebpage_8php.html#a375e945255fad79a71036528f7480650":[5,0,1,24,0], "enotify_8php.html":[5,0,0,27], "enotify_8php.html#a3e9a9355b243777c488d2a9883908dfc":[5,0,0,27,1], "event_8php.html":[5,0,0,28], @@ -67,9 +76,9 @@ var NAVTREEINDEX3 = "event_8php.html#a32ba1b9ddf7a744a9a1512b052e5f850":[5,0,0,28,2], "event_8php.html#a89ef533faf345db8d64a58d4856bde3a":[5,0,0,28,3], "event_8php.html#abb74206cf42d694307c3d7abb7af9869":[5,0,0,28,4], -"events_8php.html":[5,0,1,22], -"events_8php.html#a1d293fb217ae6bc9e3858c4b32e363ec":[5,0,1,22,0], -"events_8php.html#ab3e8a8f901175f8e40a8089eea45c075":[5,0,1,22,1], +"events_8php.html":[5,0,1,25], +"events_8php.html#a1d293fb217ae6bc9e3858c4b32e363ec":[5,0,1,25,0], +"events_8php.html#ab3e8a8f901175f8e40a8089eea45c075":[5,0,1,25,1], "expire_8php.html":[5,0,0,29], "expire_8php.html#a444e45c9b67727b27db4c779fd51a298":[5,0,0,29,0], "extract_8php.html":[5,0,2,3], @@ -77,17 +86,17 @@ var NAVTREEINDEX3 = "extract_8php.html#a50b05cf2e02ef0b67fcad97106dd7634":[5,0,2,3,2], "extract_8php.html#a63bb4c41bc532baacf6a4976cfaa0feb":[5,0,2,3,0], "extract_8php.html#a9590b15215a21e9b42eb546aeef79704":[5,0,2,3,1], -"fbrowser_8php.html":[5,0,1,23], -"fbrowser_8php.html#aee476addcf7a3e0fe9454f7dfd5a56c4":[5,0,1,23,0], +"fbrowser_8php.html":[5,0,1,26], +"fbrowser_8php.html#aee476addcf7a3e0fe9454f7dfd5a56c4":[5,0,1,26,0], "features_8php.html":[5,0,0,30], "features_8php.html#a52b5bdfb61b256713efecf7a7b20b0c0":[5,0,0,30,0], "features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c":[5,0,0,30,1], -"feed_8php.html":[5,0,1,24], -"feed_8php.html#af86137700b56f33d1d5f25c8dec22c04":[5,0,1,24,0], -"filer_8php.html":[5,0,1,25], -"filer_8php.html#a5fd5d7e61b2f9c43cb5f110c89dc4274":[5,0,1,25,0], -"filerm_8php.html":[5,0,1,26], -"filerm_8php.html#ae2eb28d2054fa2c37e38689882172208":[5,0,1,26,0], +"feed_8php.html":[5,0,1,27], +"feed_8php.html#af86137700b56f33d1d5f25c8dec22c04":[5,0,1,27,0], +"filer_8php.html":[5,0,1,28], +"filer_8php.html#a5fd5d7e61b2f9c43cb5f110c89dc4274":[5,0,1,28,0], +"filerm_8php.html":[5,0,1,29], +"filerm_8php.html#ae2eb28d2054fa2c37e38689882172208":[5,0,1,29,0], "files.html":[5,0], "fpostit_8php.html":[5,0,2,0,0], "fpostit_8php.html#a3f3ae3ae61578b5671673914fd894443":[5,0,2,0,0,0], @@ -109,9 +118,9 @@ var NAVTREEINDEX3 = "friendica-to-smarty-tpl_8py.html#aecf730e0884bb4ddc6c0deb1ef85f8eb":[5,0,2,4,4], "friendica-to-smarty-tpl_8py.html#af6b2c793958aae2aadc294577431f749":[5,0,2,4,3], "friendica__smarty_8php.html":[5,0,0,32], -"fsuggest_8php.html":[5,0,1,28], -"fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d":[5,0,1,28,1], -"fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998":[5,0,1,28,0], +"fsuggest_8php.html":[5,0,1,31], +"fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d":[5,0,1,31,1], +"fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998":[5,0,1,31,0], "full_8php.html":[5,0,3,0,1], "full_8php.html#a6fac1b4b8cdfde06ea1b7713479e92db":[5,0,3,0,1,0], "functions.html":[4,3,0], @@ -192,8 +201,8 @@ var NAVTREEINDEX3 = "globals_func_0x77.html":[5,1,1,23], "globals_func_0x78.html":[5,1,1,24], "globals_func_0x7a.html":[5,1,1,25], -"globals_vars.html":[5,1,2], "globals_vars.html":[5,1,2,0], +"globals_vars.html":[5,1,2], "globals_vars_0x61.html":[5,1,2,1], "globals_vars_0x63.html":[5,1,2,2], "globals_vars_0x64.html":[5,1,2,3], @@ -217,15 +226,15 @@ var NAVTREEINDEX3 = "globals_vars_0x7a.html":[5,1,2,21], "gprobe_8php.html":[5,0,0,33], "gprobe_8php.html#adf72cb0a70b5b9d99fdec1cc60e18ed1":[5,0,0,33,0], -"hcard_8php.html":[5,0,1,30], -"hcard_8php.html#a956c7cae2009652a37900306e5b7b73d":[5,0,1,30,0], -"hcard_8php.html#ac34f26b0e6a37eef44fa49bea135136d":[5,0,1,30,1], -"help_8php.html":[5,0,1,31], -"help_8php.html#af055e15f600ffa6fbca9386fdf715224":[5,0,1,31,0], +"hcard_8php.html":[5,0,1,33], +"hcard_8php.html#a956c7cae2009652a37900306e5b7b73d":[5,0,1,33,0], +"hcard_8php.html#ac34f26b0e6a37eef44fa49bea135136d":[5,0,1,33,1], +"help_8php.html":[5,0,1,34], +"help_8php.html#af055e15f600ffa6fbca9386fdf715224":[5,0,1,34,0], "hierarchy.html":[4,2], -"home_8php.html":[5,0,1,32], -"hostxrd_8php.html":[5,0,1,33], -"hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92":[5,0,1,33,0], +"home_8php.html":[5,0,1,35], +"hostxrd_8php.html":[5,0,1,36], +"hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92":[5,0,1,36,0], "html2bbcode_8php.html":[5,0,0,35], "html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7":[5,0,0,35,3], "html2bbcode_8php.html#a5ad726995ac4070213abdb3bd09f4837":[5,0,0,35,1], @@ -240,14 +249,5 @@ var NAVTREEINDEX3 = "identity_8php.html#a345f4c943d84de502ec6e72d2c813945":[5,0,0,37,2], "identity_8php.html#a3570a4eb77332b292d394c4132cb8f03":[5,0,0,37,3], "identity_8php.html#a77d2237f1846964634b1c99089c27c7d":[5,0,0,37,0], -"identity_8php.html#a77ee7d66eb0758f7e7882f70ad0f9485":[5,0,0,37,4], -"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[5,0,0,37,6], -"identity_8php.html#abf6a9c6ed92d594f1d4513c4e22a7abd":[5,0,0,37,1], -"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[5,0,0,37,5], -"identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[5,0,0,37,7], -"import_8php.html":[5,0,1,34], -"import_8php.html#af17fef0410518f7eac205d0ea416eaa2":[5,0,1,34,1], -"import_8php.html#afdf25ed70096d5dbf4f6d0ca79fea184":[5,0,1,34,0], -"include_2api_8php.html":[5,0,0,5], -"include_2api_8php.html#a0991f72554f821255397d615e76f3203":[5,0,0,5,12] +"identity_8php.html#a77ee7d66eb0758f7e7882f70ad0f9485":[5,0,0,37,4] }; diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js index f3fa13f8d..e4653ef21 100644 --- a/doc/html/navtreeindex4.js +++ b/doc/html/navtreeindex4.js @@ -1,5 +1,14 @@ var NAVTREEINDEX4 = { +"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[5,0,0,37,6], +"identity_8php.html#abf6a9c6ed92d594f1d4513c4e22a7abd":[5,0,0,37,1], +"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[5,0,0,37,5], +"identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[5,0,0,37,7], +"import_8php.html":[5,0,1,37], +"import_8php.html#af17fef0410518f7eac205d0ea416eaa2":[5,0,1,37,1], +"import_8php.html#afdf25ed70096d5dbf4f6d0ca79fea184":[5,0,1,37,0], +"include_2api_8php.html":[5,0,0,5], +"include_2api_8php.html#a0991f72554f821255397d615e76f3203":[5,0,0,5,12], "include_2api_8php.html#a176c448d79c211ad41c2bbe3124658f5":[5,0,0,5,5], "include_2api_8php.html#a18cab7c6391df5c421753463f5d2a879":[5,0,0,5,18], "include_2api_8php.html#a2c71b1226ef1283b5370bd1c200fee5f":[5,0,0,5,15], @@ -159,19 +168,19 @@ var NAVTREEINDEX4 = "interfaceITemplateEngine.html":[4,0,18], "interfaceITemplateEngine.html#aaa7381c8becc3d1c1790b53988a0f243":[4,0,18,1], "interfaceITemplateEngine.html#aaf2698adbf46c073c24b162fe1b1c442":[4,0,18,0], -"intro_8php.html":[5,0,1,35], -"intro_8php.html#a3e2a523697633ddb4517b9266a515f5b":[5,0,1,35,1], -"intro_8php.html#abc3abf25da64f98f215126eb08c7936b":[5,0,1,35,0], -"intro_8php.html#af3681062183ccbdf065ae2647b07d6f1":[5,0,1,35,2], -"invite_8php.html":[5,0,1,36], -"invite_8php.html#a244385b28cfd021d308715f01158bfd9":[5,0,1,36,0], -"invite_8php.html#aeb0881c0f93c8e8552e5ed756ce6e5a5":[5,0,1,36,1], -"item_8php.html":[5,0,1,37], -"item_8php.html#a3daae7944f737bd30412a0d042207c0f":[5,0,1,37,0], -"item_8php.html#a693cd09805755ab85bbb5ecae69a48c3":[5,0,1,37,4], -"item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221":[5,0,1,37,3], -"item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[5,0,1,37,1], -"item_8php.html#abd0e603a6696051af16476eb968d52e7":[5,0,1,37,2], +"intro_8php.html":[5,0,1,38], +"intro_8php.html#a3e2a523697633ddb4517b9266a515f5b":[5,0,1,38,1], +"intro_8php.html#abc3abf25da64f98f215126eb08c7936b":[5,0,1,38,0], +"intro_8php.html#af3681062183ccbdf065ae2647b07d6f1":[5,0,1,38,2], +"invite_8php.html":[5,0,1,39], +"invite_8php.html#a244385b28cfd021d308715f01158bfd9":[5,0,1,39,0], +"invite_8php.html#aeb0881c0f93c8e8552e5ed756ce6e5a5":[5,0,1,39,1], +"item_8php.html":[5,0,1,40], +"item_8php.html#a3daae7944f737bd30412a0d042207c0f":[5,0,1,40,0], +"item_8php.html#a693cd09805755ab85bbb5ecae69a48c3":[5,0,1,40,4], +"item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221":[5,0,1,40,3], +"item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[5,0,1,40,1], +"item_8php.html#abd0e603a6696051af16476eb968d52e7":[5,0,1,40,2], "items_8php.html":[5,0,0,40], "items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[5,0,0,40,53], "items_8php.html#a016dd86c827d08db89061ea81d15c6cb":[5,0,0,40,2], @@ -237,17 +246,8 @@ var NAVTREEINDEX4 = "language_8php.html#ac9142ef1d01a235c760deb0f16643f5a":[5,0,0,41,5], "language_8php.html#ace67d6cad57da08d030ad9dc9b8c836e":[5,0,0,41,2], "language_8php.html#ae310fb3880484ee1cc4faefe0c63c06d":[5,0,0,41,8], -"lastpost_8php.html":[5,0,1,38], -"lastpost_8php.html#a6108289ef2a767495c7c85a24f364983":[5,0,1,38,0], -"lastpost_8php.html#a82f14cce5d3cfe27f40bdbd2c679d493":[5,0,1,38,1], -"lastpost_8php.html#ab4c6ebd25736af678e64d55ce508ce8c":[5,0,1,38,2], -"like_8php.html":[5,0,1,39], -"like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538":[5,0,1,39,0], -"lockview_8php.html":[5,0,1,40], -"lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44":[5,0,1,40,0], -"login_8php.html":[5,0,1,41], -"login_8php.html#a1d69ca88eb9005a7026e128b9a645904":[5,0,1,41,0], -"lostpass_8php.html":[5,0,1,42], -"lostpass_8php.html#a0314d94e48c789b1b3a201d740c9eab3":[5,0,1,42,0], -"lostpass_8php.html#a8ed35ba71a4404eaf4903da61d0321cc":[5,0,1,42,1] +"lastpost_8php.html":[5,0,1,41], +"lastpost_8php.html#a6108289ef2a767495c7c85a24f364983":[5,0,1,41,0], +"lastpost_8php.html#a82f14cce5d3cfe27f40bdbd2c679d493":[5,0,1,41,1], +"lastpost_8php.html#ab4c6ebd25736af678e64d55ce508ce8c":[5,0,1,41,2] }; diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js index 894f4569f..c67976b55 100644 --- a/doc/html/navtreeindex5.js +++ b/doc/html/navtreeindex5.js @@ -1,70 +1,81 @@ var NAVTREEINDEX5 = { -"magic_8php.html":[5,0,1,43], -"magic_8php.html#acea2cc792849ca2d71d4b689f66518bf":[5,0,1,43,0], -"manage_8php.html":[5,0,1,44], -"manage_8php.html#a2bca247b5296827638959138367db4f5":[5,0,1,44,0], -"match_8php.html":[5,0,1,45], -"match_8php.html#a1dd853e959b9e70c1911bb2fb5f5130d":[5,0,1,45,0], +"layouts_8php.html":[5,0,1,42], +"layouts_8php.html#a6e0193759ad9eef76d3df2db24237b50":[5,0,1,42,0], +"like_8php.html":[5,0,1,43], +"like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538":[5,0,1,43,0], +"lockview_8php.html":[5,0,1,44], +"lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44":[5,0,1,44,0], +"login_8php.html":[5,0,1,45], +"login_8php.html#a1d69ca88eb9005a7026e128b9a645904":[5,0,1,45,0], +"lostpass_8php.html":[5,0,1,46], +"lostpass_8php.html#a0314d94e48c789b1b3a201d740c9eab3":[5,0,1,46,0], +"lostpass_8php.html#a8ed35ba71a4404eaf4903da61d0321cc":[5,0,1,46,1], +"magic_8php.html":[5,0,1,47], +"magic_8php.html#acea2cc792849ca2d71d4b689f66518bf":[5,0,1,47,0], +"manage_8php.html":[5,0,1,48], +"manage_8php.html#a2bca247b5296827638959138367db4f5":[5,0,1,48,0], +"match_8php.html":[5,0,1,49], +"match_8php.html#a1dd853e959b9e70c1911bb2fb5f5130d":[5,0,1,49,0], "md_README.html":[2], "md_config.html":[0], "md_fresh.html":[1], "minimal_8php.html":[5,0,3,0,2], -"mitem_8php.html":[5,0,1,48], -"mitem_8php.html#a6ee694cca4b551a20d7c7a94b5243ec1":[5,0,1,48,2], -"mitem_8php.html#a7a31b702ecad18eeb6a38b243ff0037e":[5,0,1,48,0], -"mitem_8php.html#a9627cd857cafdf04e4fc0ae48c8e8518":[5,0,1,48,1], +"mitem_8php.html":[5,0,1,52], +"mitem_8php.html#a6ee694cca4b551a20d7c7a94b5243ec1":[5,0,1,52,2], +"mitem_8php.html#a7a31b702ecad18eeb6a38b243ff0037e":[5,0,1,52,0], +"mitem_8php.html#a9627cd857cafdf04e4fc0ae48c8e8518":[5,0,1,52,1], "mod_2api_8php.html":[5,0,1,4], "mod_2api_8php.html#a02ae0f60e240dc806b860edb7d582117":[5,0,1,4,2], "mod_2api_8php.html#a33315b5bbf5418f6850b2038107b526d":[5,0,1,4,0], "mod_2api_8php.html#a6fe77f05c07cb51048df0d557b4b9bd2":[5,0,1,4,1], "mod_2attach_8php.html":[5,0,1,6], "mod_2attach_8php.html#aa88eb5ad87aa1036a30e70339cc6c1b1":[5,0,1,6,0], -"mod_2directory_8php.html":[5,0,1,16], -"mod_2directory_8php.html#a5ee59c213508b6b9787612a8219cb5bf":[5,0,1,16,2], -"mod_2directory_8php.html#aa1d928543212871491706216742dd73c":[5,0,1,16,0], -"mod_2directory_8php.html#aac79396570d759da2efac24fcedf5b44":[5,0,1,16,1], -"mod_2follow_8php.html":[5,0,1,27], -"mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a":[5,0,1,27,1], -"mod_2follow_8php.html#a4c540ea4e9f5c581c1a53516ac585592":[5,0,1,27,0], -"mod_2group_8php.html":[5,0,1,29], -"mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83":[5,0,1,29,1], -"mod_2group_8php.html#aeb0784dd928e53e6d8693513bec8928c":[5,0,1,29,0], -"mod_2group_8php.html#aed1f009b1221348021bb34761160ef35":[5,0,1,29,2], -"mod_2menu_8php.html":[5,0,1,46], -"mod_2menu_8php.html#a6fed23af14d71a78a4153c8363a685cf":[5,0,1,46,0], -"mod_2menu_8php.html#aaa491ef173868fe002aece4632bcf393":[5,0,1,46,1], -"mod_2message_8php.html":[5,0,1,47], -"mod_2message_8php.html#a0db7030362a7e9ed9549b341d7b35718":[5,0,1,47,2], -"mod_2message_8php.html#a3547ed86d09a4bb8fa64ec374a40ee79":[5,0,1,47,1], -"mod_2message_8php.html#af4ba72486117cc24335fd8e92a2112a7":[5,0,1,47,0], -"mod_2network_8php.html":[5,0,1,51], -"mod_2network_8php.html#a180fce90ad11d7e0e45be094da7149ec":[5,0,1,51,1], -"mod_2network_8php.html#a36e03af6f2efe62ecaa247509365bfad":[5,0,1,51,3], -"mod_2network_8php.html#a43f2f29b90c5e29072c561934bc8f8b4":[5,0,1,51,0], -"mod_2network_8php.html#aeaa518c1a317516a3da337b88d358666":[5,0,1,51,2], -"mod_2notify_8php.html":[5,0,1,55], -"mod_2notify_8php.html#a94f9a6a9d4b5fd704baafff0c34f41ae":[5,0,1,55,1], -"mod_2notify_8php.html#acdf3851688ebd6d6a575eb84ef9febe3":[5,0,1,55,0], -"mod_2oembed_8php.html":[5,0,1,56], -"mod_2oembed_8php.html#a9145025aaf057fb5d3f9f7011e5e1014":[5,0,1,56,0], -"mod_2photos_8php.html":[5,0,1,62], -"mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080":[5,0,1,62,2], -"mod_2photos_8php.html#aa87382611a66ec5effdb2d78f13f5812":[5,0,1,62,0], -"mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014":[5,0,1,62,1], +"mod_2directory_8php.html":[5,0,1,17], +"mod_2directory_8php.html#a5ee59c213508b6b9787612a8219cb5bf":[5,0,1,17,2], +"mod_2directory_8php.html#aa1d928543212871491706216742dd73c":[5,0,1,17,0], +"mod_2directory_8php.html#aac79396570d759da2efac24fcedf5b44":[5,0,1,17,1], +"mod_2follow_8php.html":[5,0,1,30], +"mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a":[5,0,1,30,1], +"mod_2follow_8php.html#a4c540ea4e9f5c581c1a53516ac585592":[5,0,1,30,0], +"mod_2group_8php.html":[5,0,1,32], +"mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83":[5,0,1,32,1], +"mod_2group_8php.html#aeb0784dd928e53e6d8693513bec8928c":[5,0,1,32,0], +"mod_2group_8php.html#aed1f009b1221348021bb34761160ef35":[5,0,1,32,2], +"mod_2menu_8php.html":[5,0,1,50], +"mod_2menu_8php.html#a6fed23af14d71a78a4153c8363a685cf":[5,0,1,50,0], +"mod_2menu_8php.html#aaa491ef173868fe002aece4632bcf393":[5,0,1,50,1], +"mod_2message_8php.html":[5,0,1,51], +"mod_2message_8php.html#a0db7030362a7e9ed9549b341d7b35718":[5,0,1,51,2], +"mod_2message_8php.html#a3547ed86d09a4bb8fa64ec374a40ee79":[5,0,1,51,1], +"mod_2message_8php.html#af4ba72486117cc24335fd8e92a2112a7":[5,0,1,51,0], +"mod_2network_8php.html":[5,0,1,55], +"mod_2network_8php.html#a180fce90ad11d7e0e45be094da7149ec":[5,0,1,55,1], +"mod_2network_8php.html#a36e03af6f2efe62ecaa247509365bfad":[5,0,1,55,3], +"mod_2network_8php.html#a43f2f29b90c5e29072c561934bc8f8b4":[5,0,1,55,0], +"mod_2network_8php.html#aeaa518c1a317516a3da337b88d358666":[5,0,1,55,2], +"mod_2notify_8php.html":[5,0,1,59], +"mod_2notify_8php.html#a94f9a6a9d4b5fd704baafff0c34f41ae":[5,0,1,59,1], +"mod_2notify_8php.html#acdf3851688ebd6d6a575eb84ef9febe3":[5,0,1,59,0], +"mod_2oembed_8php.html":[5,0,1,60], +"mod_2oembed_8php.html#a9145025aaf057fb5d3f9f7011e5e1014":[5,0,1,60,0], +"mod_2photos_8php.html":[5,0,1,66], +"mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080":[5,0,1,66,2], +"mod_2photos_8php.html#aa87382611a66ec5effdb2d78f13f5812":[5,0,1,66,0], +"mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014":[5,0,1,66,1], "mod__import_8php.html":[5,0,3,0,3], "mod__import_8php.html#a8db1899eeeb44dabd0904065b63627bb":[5,0,3,0,3,0], "mod__new__channel_8php.html":[5,0,3,0,4], "mod__new__channel_8php.html#a8db1899eeeb44dabd0904065b63627bb":[5,0,3,0,4,0], "mod__register_8php.html":[5,0,3,0,5], "mod__register_8php.html#a8db1899eeeb44dabd0904065b63627bb":[5,0,3,0,5,0], -"mood_8php.html":[5,0,1,49], -"mood_8php.html#a721b9b6703b3234a005641c92d409b8f":[5,0,1,49,0], -"mood_8php.html#a7ae136dd7476865b4828136175db5022":[5,0,1,49,1], -"msearch_8php.html":[5,0,1,50], -"msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[5,0,1,50,0], -"namespaceFriendica.html":[3,0,1], +"mood_8php.html":[5,0,1,53], +"mood_8php.html#a721b9b6703b3234a005641c92d409b8f":[5,0,1,53,0], +"mood_8php.html#a7ae136dd7476865b4828136175db5022":[5,0,1,53,1], +"msearch_8php.html":[5,0,1,54], +"msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[5,0,1,54,0], "namespaceFriendica.html":[4,0,1], +"namespaceFriendica.html":[3,0,1], "namespaceacl__selectors.html":[4,0,0], "namespaceacl__selectors.html":[3,0,0], "namespacefriendica-to-smarty-tpl.html":[4,0,2], @@ -80,48 +91,48 @@ var NAVTREEINDEX5 = "nav_8php.html":[5,0,0,44], "nav_8php.html#a43be0df73b90647ea70947ce004e231e":[5,0,0,44,0], "nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a":[5,0,0,44,1], -"new__channel_8php.html":[5,0,1,52], -"new__channel_8php.html#a180b0646957db8290482f02454ad7f23":[5,0,1,52,2], -"new__channel_8php.html#a1ad7f99e4366a32942c6b954aba3a164":[5,0,1,52,1], -"new__channel_8php.html#ae585191610f79da129492482ce8e2fee":[5,0,1,52,0], -"nogroup_8php.html":[5,0,1,53], -"nogroup_8php.html#a099cb353bf62e8453069ce107b763212":[5,0,1,53,1], -"nogroup_8php.html#a52085b183f97c552f1db5c4926e8ec30":[5,0,1,53,0], -"notifications_8php.html":[5,0,1,54], -"notifications_8php.html#a5baffec7b2e625c9f9cefbc097550d33":[5,0,1,54,1], -"notifications_8php.html#aadd0b5525bd8c283a5d8a37982bbfe62":[5,0,1,54,0], +"new__channel_8php.html":[5,0,1,56], +"new__channel_8php.html#a180b0646957db8290482f02454ad7f23":[5,0,1,56,2], +"new__channel_8php.html#a1ad7f99e4366a32942c6b954aba3a164":[5,0,1,56,1], +"new__channel_8php.html#ae585191610f79da129492482ce8e2fee":[5,0,1,56,0], +"nogroup_8php.html":[5,0,1,57], +"nogroup_8php.html#a099cb353bf62e8453069ce107b763212":[5,0,1,57,1], +"nogroup_8php.html#a52085b183f97c552f1db5c4926e8ec30":[5,0,1,57,0], +"notifications_8php.html":[5,0,1,58], +"notifications_8php.html#a5baffec7b2e625c9f9cefbc097550d33":[5,0,1,58,1], +"notifications_8php.html#aadd0b5525bd8c283a5d8a37982bbfe62":[5,0,1,58,0], "notifier_8php.html":[5,0,0,46], "notifier_8php.html#a568c502f626cff95e344c0748938b85d":[5,0,0,46,0], "oauth_8php.html":[5,0,0,48], "oauth_8php.html#a7a32a5990f113ac9465b03b29175cf16":[5,0,0,48,3], "oauth_8php.html#ad343cab37aa860d2d14dc86b7f5ca0c6":[5,0,0,48,2], -"oexchange_8php.html":[5,0,1,57], -"oexchange_8php.html#a2d8b785cd7d041a4e6274f5af370cf26":[5,0,1,57,0], -"oexchange_8php.html#ac8e2e469ddc3db984b0c1b44558aca59":[5,0,1,57,1], +"oexchange_8php.html":[5,0,1,61], +"oexchange_8php.html#a2d8b785cd7d041a4e6274f5af370cf26":[5,0,1,61,0], +"oexchange_8php.html#ac8e2e469ddc3db984b0c1b44558aca59":[5,0,1,61,1], "onepoll_8php.html":[5,0,0,50], "onepoll_8php.html#a72753b2fdec79b37c7f432035c91fb6d":[5,0,0,50,0], -"opensearch_8php.html":[5,0,1,58], -"opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9":[5,0,1,58,0], -"page_8php.html":[5,0,1,59], -"page_8php.html#a4d89800c0366a239191b1692c09635cf":[5,0,1,59,1], -"page_8php.html#a91a5f649f68406149108bded1dc90b22":[5,0,1,59,0], +"opensearch_8php.html":[5,0,1,62], +"opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9":[5,0,1,62,0], +"page_8php.html":[5,0,1,63], +"page_8php.html#a4d89800c0366a239191b1692c09635cf":[5,0,1,63,1], +"page_8php.html#a91a5f649f68406149108bded1dc90b22":[5,0,1,63,0], "page__widgets_8php.html":[5,0,0,51], "page__widgets_8php.html#a1a1e729da27f252cab6678288a17958f":[5,0,0,51,1], "page__widgets_8php.html#ad82011c1ed90d9de8b9f34c12af5c6f0":[5,0,0,51,0], "pages.html":[], -"parse__url_8php.html":[5,0,1,60], -"parse__url_8php.html#a05a9e8944380ba3cf6bbf5893dd4b74b":[5,0,1,60,2], -"parse__url_8php.html#a25635549f2c22955d72465f4d2e58993":[5,0,1,60,3], -"parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a":[5,0,1,60,1], -"parse__url_8php.html#aa7dd8f961bea042d62726ed909e4a868":[5,0,1,60,0], +"parse__url_8php.html":[5,0,1,64], +"parse__url_8php.html#a05a9e8944380ba3cf6bbf5893dd4b74b":[5,0,1,64,2], +"parse__url_8php.html#a25635549f2c22955d72465f4d2e58993":[5,0,1,64,3], +"parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a":[5,0,1,64,1], +"parse__url_8php.html#aa7dd8f961bea042d62726ed909e4a868":[5,0,1,64,0], "permissions_8php.html":[5,0,0,52], "permissions_8php.html#a040fd3d3b8517658b1668ae0cd093972":[5,0,0,52,2], "permissions_8php.html#a0f5bd9f7f4c8fb7ba4b2c1ed048b4dc7":[5,0,0,52,0], "permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835":[5,0,0,52,3], "permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d":[5,0,0,52,4], "permissions_8php.html#aeca9b280f3dc3358c89976d81d690008":[5,0,0,52,1], -"photo_8php.html":[5,0,1,61], -"photo_8php.html#a582779d24882b0d31ee909a91d70a448":[5,0,1,61,0], +"photo_8php.html":[5,0,1,65], +"photo_8php.html#a582779d24882b0d31ee909a91d70a448":[5,0,1,65,0], "photo__driver_8php.html":[5,0,0,1,0], "photo__driver_8php.html#a102f3f26f67e0e38f4322a771951c1ca":[5,0,0,1,0,3], "photo__driver_8php.html#a1d0bc7161dec0d177b7d3bbe4421af9a":[5,0,0,1,0,2], @@ -141,10 +152,10 @@ var NAVTREEINDEX5 = "php_2default_8php.html":[5,0,3,0,0], "php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762":[5,0,3,0,0,0], "php_2theme__init_8php.html":[5,0,3,0,6], -"php_8php.html":[5,0,1,63], -"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[5,0,1,63,0], -"ping_8php.html":[5,0,1,64], -"ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[5,0,1,64,0], +"php_8php.html":[5,0,1,67], +"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[5,0,1,67,0], +"ping_8php.html":[5,0,1,68], +"ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[5,0,1,68,0], "plugin_8php.html":[5,0,0,54], "plugin_8php.html#a030cec6793b909c439c0336ba39b1571":[5,0,0,54,17], "plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76":[5,0,0,54,20], @@ -174,52 +185,54 @@ var NAVTREEINDEX5 = "plugin_8php.html#aff0178bd8d0b34a94d5efddc883edd35":[5,0,0,54,5], "po2php_8php.html":[5,0,2,6], "po2php_8php.html#a3b75e36f913198299e99559b175cd8b4":[5,0,2,6,0], -"poco_8php.html":[5,0,1,65], -"poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498":[5,0,1,65,0], -"poke_8php.html":[5,0,1,66], -"poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b":[5,0,1,66,1], -"poke_8php.html#ac9190563a8da9c07a16f9dcd71cf6993":[5,0,1,66,0], +"poco_8php.html":[5,0,1,69], +"poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498":[5,0,1,69,0], +"poke_8php.html":[5,0,1,70], +"poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b":[5,0,1,70,1], +"poke_8php.html#ac9190563a8da9c07a16f9dcd71cf6993":[5,0,1,70,0], "poller_8php.html":[5,0,0,55], "poller_8php.html#a5f12df3a4738124b6c039971e87e76da":[5,0,0,55,0], -"post_8php.html":[5,0,1,67], -"post_8php.html#af4b48181ce773ef0cdfc972441445c34":[5,0,1,67,0], -"post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[5,0,1,67,1], -"pretheme_8php.html":[5,0,1,68], -"pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[5,0,1,68,0], -"probe_8php.html":[5,0,1,69], -"probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[5,0,1,69,0], -"profile_8php.html":[5,0,1,70], -"profile_8php.html#a1a2482b775476f2f64ea5e8f4fc3fd1e":[5,0,1,70,0], -"profile_8php.html#a3775cf6eef6587e5143133356a7b76c0":[5,0,1,70,1], -"profile_8php.html#ab5d0246be0552e2182a585c1206d22a5":[5,0,1,70,2], +"post_8php.html":[5,0,1,71], +"post_8php.html#af4b48181ce773ef0cdfc972441445c34":[5,0,1,71,0], +"post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[5,0,1,71,1], +"pretheme_8php.html":[5,0,1,72], +"pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[5,0,1,72,0], +"probe_8php.html":[5,0,1,73], +"probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[5,0,1,73,0], +"profile_8php.html":[5,0,1,74], +"profile_8php.html#a1a2482b775476f2f64ea5e8f4fc3fd1e":[5,0,1,74,0], +"profile_8php.html#a3775cf6eef6587e5143133356a7b76c0":[5,0,1,74,1], +"profile_8php.html#ab5d0246be0552e2182a585c1206d22a5":[5,0,1,74,2], "profile__advanced_8php.html":[5,0,0,56], "profile__advanced_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4":[5,0,0,56,0], -"profile__photo_8php.html":[5,0,1,71], -"profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02":[5,0,1,71,1], -"profile__photo_8php.html#a4b80234074bd603221aa5364f330e479":[5,0,1,71,2], -"profile__photo_8php.html#ac9cd968a767e2ae1b88383b6cdd6dbe3":[5,0,1,71,0], +"profile__photo_8php.html":[5,0,1,75], +"profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02":[5,0,1,75,1], +"profile__photo_8php.html#a4b80234074bd603221aa5364f330e479":[5,0,1,75,2], +"profile__photo_8php.html#ac9cd968a767e2ae1b88383b6cdd6dbe3":[5,0,1,75,0], "profile__selectors_8php.html":[5,0,0,57], "profile__selectors_8php.html#a3b50b3ea4ea4bdbebebfffc5d1b157c7":[5,0,0,57,2], "profile__selectors_8php.html#a7473dd095987e1cdcc79d4f0bb5e6798":[5,0,0,57,1], "profile__selectors_8php.html#ae2b2c087e6530c61c0b256fd26d52355":[5,0,0,57,0], -"profiles_8php.html":[5,0,1,72], -"profiles_8php.html#a2a3ac90f51941ff78b85e9389304969c":[5,0,1,72,0], -"profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e":[5,0,1,72,2], -"profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00":[5,0,1,72,1], -"profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04":[5,0,1,72,3], -"profperm_8php.html":[5,0,1,73], -"profperm_8php.html#a17fb64ec05edee1dc94d95438807d6c6":[5,0,1,73,2], -"profperm_8php.html#a77fd398ae7c25142e1d9ad724ec347cc":[5,0,1,73,0], -"profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023":[5,0,1,73,1], -"qsearch_8php.html":[5,0,1,74], -"qsearch_8php.html#a0501887b95bd8fa21018b2936a668894":[5,0,1,74,0], +"profiles_8php.html":[5,0,1,76], +"profiles_8php.html#a2a3ac90f51941ff78b85e9389304969c":[5,0,1,76,0], +"profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e":[5,0,1,76,2], +"profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00":[5,0,1,76,1], +"profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04":[5,0,1,76,3], +"profperm_8php.html":[5,0,1,77], +"profperm_8php.html#a17fb64ec05edee1dc94d95438807d6c6":[5,0,1,77,2], +"profperm_8php.html#a77fd398ae7c25142e1d9ad724ec347cc":[5,0,1,77,0], +"profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023":[5,0,1,77,1], +"pubsites_8php.html":[5,0,1,78], +"pubsites_8php.html#af614e279aab54065345bda6b03eafdf0":[5,0,1,78,0], +"qsearch_8php.html":[5,0,1,79], +"qsearch_8php.html#a0501887b95bd8fa21018b2936a668894":[5,0,1,79,0], "queue_8php.html":[5,0,0,59], "queue_8php.html#af8c93de86d866c3200174c8450a0f341":[5,0,0,59,0], "queue__fn_8php.html":[5,0,0,60], "queue__fn_8php.html#a4c2876181f75a4a61e85b7f00dfdbba1":[5,0,0,60,1], "queue__fn_8php.html#a8fe71e981399bbf5d000a6ca42f57b24":[5,0,0,60,0], -"randprof_8php.html":[5,0,1,75], -"randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[5,0,1,75,0], +"randprof_8php.html":[5,0,1,80], +"randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[5,0,1,80,0], "redbasic_2php_2style_8php.html":[5,0,3,1,0,0,1], "redbasic_2php_2style_8php.html#a02d39b683a42fffbb27823d3860283bd":[5,0,3,1,0,0,1,14], "redbasic_2php_2style_8php.html#a03a72942b7428fd9af1224770d20a8ba":[5,0,3,1,0,0,1,5], @@ -236,18 +249,5 @@ var NAVTREEINDEX5 = "redbasic_2php_2style_8php.html#aa658152b727ea1233f6df6ded6437dad":[5,0,3,1,0,0,1,1], "redbasic_2php_2style_8php.html#ac4c6bc3cd9cc92204f04cf6cb34b47dd":[5,0,3,1,0,0,1,19], "redbasic_2php_2style_8php.html#acb3046ad9c01b7d60cde20f58d77c548":[5,0,3,1,0,0,1,12], -"redbasic_2php_2style_8php.html#acc190405dda0a23a80551dee11c74c0c":[5,0,3,1,0,0,1,6], -"redbasic_2php_2style_8php.html#adcfa918e05b5a98cbddc84bc3f1c15cc":[5,0,3,1,0,0,1,11], -"redbasic_2php_2style_8php.html#addf42c3d02e53f8e4153f3bb9dabfcda":[5,0,3,1,0,0,1,10], -"redbasic_2php_2style_8php.html#aef266cfcb27c6ddb3292584c945bab33":[5,0,3,1,0,0,1,7], -"redbasic_2php_2style_8php.html#af3a16c5f0dd7a74cf9acf6a49fff73a7":[5,0,3,1,0,0,1,18], -"redbasic_2php_2theme_8php.html":[5,0,3,1,0,0,2], -"redbasic_2php_2theme_8php.html#af6eb813e9fc7e2d76ac1b82bc5c0ed9b":[5,0,3,1,0,0,2,0], -"redir_8php.html":[5,0,1,76], -"redir_8php.html#a9ac266c3f5cf0d94ef63e6d0f2edf1f5":[5,0,1,76,0], -"redstrap_2php_2style_8php.html":[5,0,3,1,1,0,2], -"redstrap_2php_2style_8php.html#a02d39b683a42fffbb27823d3860283bd":[5,0,3,1,1,0,2,13], -"redstrap_2php_2style_8php.html#a03a72942b7428fd9af1224770d20a8ba":[5,0,3,1,1,0,2,5], -"redstrap_2php_2style_8php.html#a0b942d36d8862908864e2ffa4521be70":[5,0,3,1,1,0,2,12], -"redstrap_2php_2style_8php.html#a0c4684da834439885ae2285649d1aaea":[5,0,3,1,1,0,2,16] +"redbasic_2php_2style_8php.html#acc190405dda0a23a80551dee11c74c0c":[5,0,3,1,0,0,1,6] }; diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index 4a6aaa636..6c9ad83c4 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -1,5 +1,18 @@ var NAVTREEINDEX6 = { +"redbasic_2php_2style_8php.html#adcfa918e05b5a98cbddc84bc3f1c15cc":[5,0,3,1,0,0,1,11], +"redbasic_2php_2style_8php.html#addf42c3d02e53f8e4153f3bb9dabfcda":[5,0,3,1,0,0,1,10], +"redbasic_2php_2style_8php.html#aef266cfcb27c6ddb3292584c945bab33":[5,0,3,1,0,0,1,7], +"redbasic_2php_2style_8php.html#af3a16c5f0dd7a74cf9acf6a49fff73a7":[5,0,3,1,0,0,1,18], +"redbasic_2php_2theme_8php.html":[5,0,3,1,0,0,2], +"redbasic_2php_2theme_8php.html#af6eb813e9fc7e2d76ac1b82bc5c0ed9b":[5,0,3,1,0,0,2,0], +"redir_8php.html":[5,0,1,81], +"redir_8php.html#a9ac266c3f5cf0d94ef63e6d0f2edf1f5":[5,0,1,81,0], +"redstrap_2php_2style_8php.html":[5,0,3,1,1,0,2], +"redstrap_2php_2style_8php.html#a02d39b683a42fffbb27823d3860283bd":[5,0,3,1,1,0,2,13], +"redstrap_2php_2style_8php.html#a03a72942b7428fd9af1224770d20a8ba":[5,0,3,1,1,0,2,5], +"redstrap_2php_2style_8php.html#a0b942d36d8862908864e2ffa4521be70":[5,0,3,1,1,0,2,12], +"redstrap_2php_2style_8php.html#a0c4684da834439885ae2285649d1aaea":[5,0,3,1,1,0,2,16], "redstrap_2php_2style_8php.html#a232513bf4339fe34908c4c63cb93168b":[5,0,3,1,1,0,2,4], "redstrap_2php_2style_8php.html#a4086b1a341b7c8462a47fb1b25fd49ab":[5,0,3,1,1,0,2,0], "redstrap_2php_2style_8php.html#a4131d1765ee4deb28e83fc4527943ee0":[5,0,3,1,1,0,2,2], @@ -15,28 +28,28 @@ var NAVTREEINDEX6 = "redstrap_2php_2style_8php.html#aef266cfcb27c6ddb3292584c945bab33":[5,0,3,1,1,0,2,7], "redstrap_2php_2theme_8php.html":[5,0,3,1,1,0,3], "redstrap_2php_2theme_8php.html#a4dac61d466b4261deca2846f548e484a":[5,0,3,1,1,0,3,0], -"register_8php.html":[5,0,1,77], -"register_8php.html#a0e91f57f111407ea8d3223a05022bb2a":[5,0,1,77,0], -"register_8php.html#a51731dcc1917c58a790eb1c0f6132271":[5,0,1,77,2], -"register_8php.html#ae20c0cd40f738d6295de58b9202c83d5":[5,0,1,77,1], -"regmod_8php.html":[5,0,1,78], -"regmod_8php.html#a7953df4e32e63946565e90cdd5d50409":[5,0,1,78,0], -"removeme_8php.html":[5,0,1,79], -"removeme_8php.html#a065a589caa2aa84c60f7073a28f0ad9c":[5,0,1,79,0], -"removeme_8php.html#a7be08738beca44bb98a79e01cdb2ee88":[5,0,1,79,1], -"rmagic_8php.html":[5,0,1,80], -"rmagic_8php.html#a3e28db1e5cfa7e5c2617f90222c1caef":[5,0,1,80,0], -"rmagic_8php.html#a869de069d081b3c4e98b957d06bbf08f":[5,0,1,80,2], -"rmagic_8php.html#a95455edd43f1bff39446a57388cdde16":[5,0,1,80,1], -"rsd__xml_8php.html":[5,0,1,81], -"rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82":[5,0,1,81,0], -"search_8php.html":[5,0,1,82], -"search_8php.html#a230ec9681ddee3b5b8b40c8d550f32f7":[5,0,1,82,2], -"search_8php.html#aa911f7c7f0cdb0284e35d0ed610f19c6":[5,0,1,82,3], -"search_8php.html#ab2568591359edde5b483a6cd9a24b2cc":[5,0,1,82,0], -"search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[5,0,1,82,1], -"search__ac_8php.html":[5,0,1,83], -"search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[5,0,1,83,0], +"register_8php.html":[5,0,1,82], +"register_8php.html#a0e91f57f111407ea8d3223a05022bb2a":[5,0,1,82,0], +"register_8php.html#a51731dcc1917c58a790eb1c0f6132271":[5,0,1,82,2], +"register_8php.html#ae20c0cd40f738d6295de58b9202c83d5":[5,0,1,82,1], +"regmod_8php.html":[5,0,1,83], +"regmod_8php.html#a7953df4e32e63946565e90cdd5d50409":[5,0,1,83,0], +"removeme_8php.html":[5,0,1,84], +"removeme_8php.html#a065a589caa2aa84c60f7073a28f0ad9c":[5,0,1,84,0], +"removeme_8php.html#a7be08738beca44bb98a79e01cdb2ee88":[5,0,1,84,1], +"rmagic_8php.html":[5,0,1,85], +"rmagic_8php.html#a3e28db1e5cfa7e5c2617f90222c1caef":[5,0,1,85,0], +"rmagic_8php.html#a869de069d081b3c4e98b957d06bbf08f":[5,0,1,85,2], +"rmagic_8php.html#a95455edd43f1bff39446a57388cdde16":[5,0,1,85,1], +"rsd__xml_8php.html":[5,0,1,86], +"rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82":[5,0,1,86,0], +"search_8php.html":[5,0,1,87], +"search_8php.html#a230ec9681ddee3b5b8b40c8d550f32f7":[5,0,1,87,2], +"search_8php.html#aa911f7c7f0cdb0284e35d0ed610f19c6":[5,0,1,87,3], +"search_8php.html#ab2568591359edde5b483a6cd9a24b2cc":[5,0,1,87,0], +"search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[5,0,1,87,1], +"search__ac_8php.html":[5,0,1,88], +"search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[5,0,1,88,0], "security_8php.html":[5,0,0,61], "security_8php.html#a20f8b9851f23ee8894b8925584ef6821":[5,0,0,61,2], "security_8php.html#a444ac867dfa8c37cf0a7a226412bee28":[5,0,0,61,4], @@ -60,37 +73,37 @@ var NAVTREEINDEX6 = "session_8php.html#ac95373f4966862a028033dd2f94d4da1":[5,0,0,62,3], "session_8php.html#af0100a2642a5268594bbd5742a03d885":[5,0,0,62,9], "session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052":[5,0,0,62,2], -"settings_8php.html":[5,0,1,84], -"settings_8php.html#a39abc76ff5459c57e3b957664f273f18":[5,0,1,84,0], -"settings_8php.html#a3a4cde287482fced008583f54ba2a722":[5,0,1,84,2], -"settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586":[5,0,1,84,3], -"settings_8php.html#ae5aebccb006bee1300078576baaf5582":[5,0,1,84,1], -"setup_8php.html":[5,0,1,85], -"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[5,0,1,85,2], -"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[5,0,1,85,13], -"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[5,0,1,85,5], -"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[5,0,1,85,12], -"setup_8php.html#a2b375ddc555140236fc500135de99371":[5,0,1,85,9], -"setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f":[5,0,1,85,3], -"setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e":[5,0,1,85,1], -"setup_8php.html#a8652788e8589778c5f81634a9d5b9429":[5,0,1,85,7], -"setup_8php.html#a88247384a96e14516f474d7af6a465c1":[5,0,1,85,11], -"setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76":[5,0,1,85,4], -"setup_8php.html#abe405d227ba7232971964a706d4f3bce":[5,0,1,85,10], -"setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a":[5,0,1,85,8], -"setup_8php.html#addb24714bc2542aa4f4215e98fe48432":[5,0,1,85,15], -"setup_8php.html#ae8e4d9279a61de74d5f39962cb7b6ca1":[5,0,1,85,0], -"setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58":[5,0,1,85,14], -"setup_8php.html#afd8b0b3ade1507c45325caf377bf459d":[5,0,1,85,6], -"share_8php.html":[5,0,1,86], -"share_8php.html#afeb26046bdd02567ecd29ab5f188b249":[5,0,1,86,0], -"siteinfo_8php.html":[5,0,1,87], -"siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[5,0,1,87,1], -"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[5,0,1,87,0], -"sitelist_8php.html":[5,0,1,88], -"sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1":[5,0,1,88,0], -"smilies_8php.html":[5,0,1,89], -"smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[5,0,1,89,0], +"settings_8php.html":[5,0,1,89], +"settings_8php.html#a39abc76ff5459c57e3b957664f273f18":[5,0,1,89,0], +"settings_8php.html#a3a4cde287482fced008583f54ba2a722":[5,0,1,89,2], +"settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586":[5,0,1,89,3], +"settings_8php.html#ae5aebccb006bee1300078576baaf5582":[5,0,1,89,1], +"setup_8php.html":[5,0,1,90], +"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[5,0,1,90,2], +"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[5,0,1,90,13], +"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[5,0,1,90,5], +"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[5,0,1,90,12], +"setup_8php.html#a2b375ddc555140236fc500135de99371":[5,0,1,90,9], +"setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f":[5,0,1,90,3], +"setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e":[5,0,1,90,1], +"setup_8php.html#a8652788e8589778c5f81634a9d5b9429":[5,0,1,90,7], +"setup_8php.html#a88247384a96e14516f474d7af6a465c1":[5,0,1,90,11], +"setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76":[5,0,1,90,4], +"setup_8php.html#abe405d227ba7232971964a706d4f3bce":[5,0,1,90,10], +"setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a":[5,0,1,90,8], +"setup_8php.html#addb24714bc2542aa4f4215e98fe48432":[5,0,1,90,15], +"setup_8php.html#ae8e4d9279a61de74d5f39962cb7b6ca1":[5,0,1,90,0], +"setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58":[5,0,1,90,14], +"setup_8php.html#afd8b0b3ade1507c45325caf377bf459d":[5,0,1,90,6], +"share_8php.html":[5,0,1,91], +"share_8php.html#afeb26046bdd02567ecd29ab5f188b249":[5,0,1,91,0], +"siteinfo_8php.html":[5,0,1,92], +"siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[5,0,1,92,1], +"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[5,0,1,92,0], +"sitelist_8php.html":[5,0,1,93], +"sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1":[5,0,1,93,0], +"smilies_8php.html":[5,0,1,94], +"smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[5,0,1,94,0], "socgraph_8php.html":[5,0,0,63], "socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586":[5,0,0,63,0], "socgraph_8php.html#a5ef8bef37161df53718a21e93d02fbd6":[5,0,0,63,6], @@ -101,21 +114,21 @@ var NAVTREEINDEX6 = "socgraph_8php.html#ac343a846241d36cdf046b08f3396cfe9":[5,0,0,63,2], "socgraph_8php.html#af175807406d94407a5e11742a3287746":[5,0,0,63,5], "socgraph_8php.html#af29d056beec10b4e38e5209c92452894":[5,0,0,63,3], -"starred_8php.html":[5,0,1,90], -"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[5,0,1,90,0], -"subthread_8php.html":[5,0,1,91], -"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[5,0,1,91,0], -"suggest_8php.html":[5,0,1,92], -"suggest_8php.html#a4df91c84594d51ba56b5918de414230d":[5,0,1,92,0], -"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[5,0,1,92,1], -"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[5,0,1,92,2], +"starred_8php.html":[5,0,1,95], +"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[5,0,1,95,0], +"subthread_8php.html":[5,0,1,96], +"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[5,0,1,96,0], +"suggest_8php.html":[5,0,1,97], +"suggest_8php.html#a4df91c84594d51ba56b5918de414230d":[5,0,1,97,0], +"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[5,0,1,97,1], +"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[5,0,1,97,2], "system__unavailable_8php.html":[5,0,0,64], "system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa":[5,0,0,64,0], -"tagger_8php.html":[5,0,1,93], -"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[5,0,1,93,0], -"tagrm_8php.html":[5,0,1,94], -"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[5,0,1,94,1], -"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[5,0,1,94,0], +"tagger_8php.html":[5,0,1,98], +"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[5,0,1,98,0], +"tagrm_8php.html":[5,0,1,99], +"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[5,0,1,99,1], +"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[5,0,1,99,0], "taxonomy_8php.html":[5,0,0,65], "taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce":[5,0,0,65,6], "taxonomy_8php.html#a061b3db9426d4b074395f5824062cad4":[5,0,0,65,8], @@ -134,93 +147,97 @@ var NAVTREEINDEX6 = "template__processor_8php.html#ab2bcd8738f20f293636a6ae8e1099db5":[5,0,0,66,1], "template__processor_8php.html#ac635bb19a5f6eadd6b0cddefdd537c1e":[5,0,0,66,2], "text_8php.html":[5,0,0,67], -"text_8php.html#a0271381208acfa2d4cff36da281e3e23":[5,0,0,67,35], -"text_8php.html#a030fa5ecc64168af0c4f44897a9bce63":[5,0,0,67,40], -"text_8php.html#a05b7f26dc2df78681f57eeade53040c6":[5,0,0,67,25], +"text_8php.html#a0271381208acfa2d4cff36da281e3e23":[5,0,0,67,36], +"text_8php.html#a030fa5ecc64168af0c4f44897a9bce63":[5,0,0,67,42], +"text_8php.html#a05b7f26dc2df78681f57eeade53040c6":[5,0,0,67,26], "text_8php.html#a070384ec000fd65043fce11d5392d241":[5,0,0,67,6], -"text_8php.html#a0a1f7c0e97f9ecbebf3e5834582b014c":[5,0,0,67,15], +"text_8php.html#a0a1f7c0e97f9ecbebf3e5834582b014c":[5,0,0,67,16], "text_8php.html#a0c65597bb4aed3a039eb795ff540e5e3":[5,0,0,67,11], -"text_8php.html#a11255c8c4e5245b6c24f97684826aa54":[5,0,0,67,39], +"text_8php.html#a11255c8c4e5245b6c24f97684826aa54":[5,0,0,67,41], "text_8php.html#a13286f8a95d2de6b102966ecc270c8d6":[5,0,0,67,5], -"text_8php.html#a1360fed7f918d859daaca1c9f384f9af":[5,0,0,67,69], -"text_8php.html#a138a3a611fa7f4f3630674145fc826bf":[5,0,0,67,29], -"text_8php.html#a1557112a774ec00fa06ed6b6f6495506":[5,0,0,67,31], -"text_8php.html#a1af49756c8c71902a66c7e329c462beb":[5,0,0,67,46], -"text_8php.html#a1e510c53624933ce9b7d6715784894db":[5,0,0,67,41], -"text_8php.html#a24d441d30df4b8e6bf6780bf62a5e2c6":[5,0,0,67,42], -"text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728":[5,0,0,67,37], +"text_8php.html#a1360fed7f918d859daaca1c9f384f9af":[5,0,0,67,72], +"text_8php.html#a138a3a611fa7f4f3630674145fc826bf":[5,0,0,67,30], +"text_8php.html#a1557112a774ec00fa06ed6b6f6495506":[5,0,0,67,32], +"text_8php.html#a1633412120f52bdce5f43e0a127d9293":[5,0,0,67,46], +"text_8php.html#a1af49756c8c71902a66c7e329c462beb":[5,0,0,67,49], +"text_8php.html#a1e510c53624933ce9b7d6715784894db":[5,0,0,67,43], +"text_8php.html#a24d441d30df4b8e6bf6780bf62a5e2c6":[5,0,0,67,44], +"text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728":[5,0,0,67,39], "text_8php.html#a27cd2c1b3bcb49a0cfb7249e851725ca":[5,0,0,67,4], -"text_8php.html#a29988052f3944111def3b6aaf2c7a8f6":[5,0,0,67,76], -"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[5,0,0,67,67], -"text_8php.html#a2a902f5fdba8646333e997898ac45ea3":[5,0,0,67,43], +"text_8php.html#a29988052f3944111def3b6aaf2c7a8f6":[5,0,0,67,80], +"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[5,0,0,67,70], +"text_8php.html#a2a902f5fdba8646333e997898ac45ea3":[5,0,0,67,45], "text_8php.html#a2e8d6c402603be3a1256a16605e09c2a":[5,0,0,67,10], -"text_8php.html#a2ffd79c60cc87cec24ef76447b905187":[5,0,0,67,78], -"text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f":[5,0,0,67,72], -"text_8php.html#a3972701c5c83624ec4e2d06242f614e7":[5,0,0,67,27], -"text_8php.html#a3d225b253bb9e0f2498c11647d927b0b":[5,0,0,67,65], +"text_8php.html#a2ffd79c60cc87cec24ef76447b905187":[5,0,0,67,82], +"text_8php.html#a324c58f37f6acdf9cd1922aa76077d9f":[5,0,0,67,77], +"text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f":[5,0,0,67,75], +"text_8php.html#a3972701c5c83624ec4e2d06242f614e7":[5,0,0,67,28], +"text_8php.html#a3999a0b3e22e440f280ee791ce34d384":[5,0,0,67,38], +"text_8php.html#a3d225b253bb9e0f2498c11647d927b0b":[5,0,0,67,68], "text_8php.html#a3d2793d66db3345fd290b71e2eadf98e":[5,0,0,67,7], -"text_8php.html#a405afe814a23f3bd94d826101aa168ab":[5,0,0,67,74], -"text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a":[5,0,0,67,30], -"text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6":[5,0,0,67,64], -"text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623":[5,0,0,67,28], -"text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285":[5,0,0,67,38], -"text_8php.html#a4841df5beabdd1bdd1ed56781a915d61":[5,0,0,67,55], -"text_8php.html#a4bbb7d00c05cd20b4e043424f322388f":[5,0,0,67,44], -"text_8php.html#a4e7698aca48982512594b274543c3b9b":[5,0,0,67,54], -"text_8php.html#a543447c5ed766535221e2d9636b379ee":[5,0,0,67,71], +"text_8php.html#a405afe814a23f3bd94d826101aa168ab":[5,0,0,67,78], +"text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a":[5,0,0,67,31], +"text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6":[5,0,0,67,67], +"text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623":[5,0,0,67,29], +"text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285":[5,0,0,67,40], +"text_8php.html#a4841df5beabdd1bdd1ed56781a915d61":[5,0,0,67,58], +"text_8php.html#a4bbb7d00c05cd20b4e043424f322388f":[5,0,0,67,47], +"text_8php.html#a4e7698aca48982512594b274543c3b9b":[5,0,0,67,57], +"text_8php.html#a543447c5ed766535221e2d9636b379ee":[5,0,0,67,74], "text_8php.html#a55ab893be57feda59c2a7ba1e58ff2d0":[5,0,0,67,9], "text_8php.html#a63fb21c0bed2fc72eef2c1471ac42b63":[5,0,0,67,14], -"text_8php.html#a6a3d80a6c6fb234fd0bac44203b828eb":[5,0,0,67,70], -"text_8php.html#a71f6952243d3fe1c5a8154f78027e29c":[5,0,0,67,36], -"text_8php.html#a736db13a966b8abaf8c9198faa35911a":[5,0,0,67,24], -"text_8php.html#a740ad03e00459039a2c0992246c4e727":[5,0,0,67,68], +"text_8php.html#a6a3d80a6c6fb234fd0bac44203b828eb":[5,0,0,67,73], +"text_8php.html#a71f6952243d3fe1c5a8154f78027e29c":[5,0,0,67,37], +"text_8php.html#a736db13a966b8abaf8c9198faa35911a":[5,0,0,67,25], +"text_8php.html#a740ad03e00459039a2c0992246c4e727":[5,0,0,67,71], "text_8php.html#a75c243e06341ec16bd5a44b9b1cacd85":[5,0,0,67,1], -"text_8php.html#a76d1b3435c067978d7b484c45f56472b":[5,0,0,67,23], +"text_8php.html#a76d1b3435c067978d7b484c45f56472b":[5,0,0,67,24], "text_8php.html#a85e3a4851c16674834010d8419a5d7ca":[5,0,0,67,8], -"text_8php.html#a876e94892867019935b348b573299352":[5,0,0,67,62], -"text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13":[5,0,0,67,66], -"text_8php.html#a89929fa6f70a8ba54d5273fcf622b665":[5,0,0,67,19], -"text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6":[5,0,0,67,53], -"text_8php.html#a8d8c4a11e53461caca21181ebd72daca":[5,0,0,67,18], +"text_8php.html#a876e94892867019935b348b573299352":[5,0,0,67,65], +"text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13":[5,0,0,67,69], +"text_8php.html#a87a3cefc603302c78982f1d8e1245265":[5,0,0,67,15], +"text_8php.html#a89929fa6f70a8ba54d5273fcf622b665":[5,0,0,67,20], +"text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6":[5,0,0,67,56], +"text_8php.html#a8d8c4a11e53461caca21181ebd72daca":[5,0,0,67,19], "text_8php.html#a95fd2f8f23a1948414a03ebc963bac57":[5,0,0,67,3], -"text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee":[5,0,0,67,48], -"text_8php.html#a9c6ce4e12a4ac883c5e3f36fed6e1e09":[5,0,0,67,59], -"text_8php.html#a9d6a5ee1290de7a8b483fe78585daade":[5,0,0,67,57], -"text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c":[5,0,0,67,61], -"text_8php.html#aa46f941155c2ac1155f2f17ffb0adb66":[5,0,0,67,26], -"text_8php.html#aa5148a0dfea2a1ca64c3d52f10aa2d64":[5,0,0,67,16], -"text_8php.html#aa5528f41533927e1bd2da3618a74a6d7":[5,0,0,67,49], -"text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e":[5,0,0,67,32], -"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[5,0,0,67,77], -"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[5,0,0,67,73], -"text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4":[5,0,0,67,75], -"text_8php.html#ac19d2b33a58372a357a43d51eed19162":[5,0,0,67,50], -"text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e":[5,0,0,67,33], -"text_8php.html#aca0f589be74fab1a460c57e88dad9779":[5,0,0,67,63], -"text_8php.html#ace3c98538c63e09b70a363210b414112":[5,0,0,67,20], +"text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee":[5,0,0,67,51], +"text_8php.html#a9c6ce4e12a4ac883c5e3f36fed6e1e09":[5,0,0,67,62], +"text_8php.html#a9d6a5ee1290de7a8b483fe78585daade":[5,0,0,67,60], +"text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c":[5,0,0,67,64], +"text_8php.html#aa46f941155c2ac1155f2f17ffb0adb66":[5,0,0,67,27], +"text_8php.html#aa5148a0dfea2a1ca64c3d52f10aa2d64":[5,0,0,67,17], +"text_8php.html#aa5528f41533927e1bd2da3618a74a6d7":[5,0,0,67,52], +"text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e":[5,0,0,67,33], +"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[5,0,0,67,81], +"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[5,0,0,67,76], +"text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4":[5,0,0,67,79], +"text_8php.html#ac19d2b33a58372a357a43d51eed19162":[5,0,0,67,53], +"text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e":[5,0,0,67,34], +"text_8php.html#aca0f589be74fab1a460c57e88dad9779":[5,0,0,67,66], +"text_8php.html#ace3c98538c63e09b70a363210b414112":[5,0,0,67,21], "text_8php.html#acedb584f65114a33f389efb796172a91":[5,0,0,67,2], "text_8php.html#ad6432621d0fafcbcf3d3b9b49bef7784":[5,0,0,67,13], -"text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2":[5,0,0,67,58], -"text_8php.html#adba17ec946f4285285dc100f7860bf51":[5,0,0,67,45], -"text_8php.html#ae17b39d5e321debd3ad16dcbbde842b8":[5,0,0,67,34], -"text_8php.html#ae2126da85966da0e79c6bcbac63b0bda":[5,0,0,67,60], -"text_8php.html#ae4282a39492caa23ccbc2ce98e54f110":[5,0,0,67,17], -"text_8php.html#ae4df74296fbe55051ed3c035e55205e5":[5,0,0,67,51], -"text_8php.html#ae4f6881d7e13623f8eded6277595112a":[5,0,0,67,22], +"text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2":[5,0,0,67,61], +"text_8php.html#adba17ec946f4285285dc100f7860bf51":[5,0,0,67,48], +"text_8php.html#ae17b39d5e321debd3ad16dcbbde842b8":[5,0,0,67,35], +"text_8php.html#ae2126da85966da0e79c6bcbac63b0bda":[5,0,0,67,63], +"text_8php.html#ae4282a39492caa23ccbc2ce98e54f110":[5,0,0,67,18], +"text_8php.html#ae4df74296fbe55051ed3c035e55205e5":[5,0,0,67,54], +"text_8php.html#ae4f6881d7e13623f8eded6277595112a":[5,0,0,67,23], "text_8php.html#af8a3e3a66a7b862d4510f145d2e13186":[5,0,0,67,0], -"text_8php.html#afc998d2796a6b2a08e96f7cc061e7221":[5,0,0,67,56], -"text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28":[5,0,0,67,21], +"text_8php.html#afc998d2796a6b2a08e96f7cc061e7221":[5,0,0,67,59], +"text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28":[5,0,0,67,22], "text_8php.html#afe18627c4983ee5f7c940a0992818cd5":[5,0,0,67,12], -"text_8php.html#afe54312607d92f7ce9593f5760831f80":[5,0,0,67,52], -"text_8php.html#afe9f178d264d44a94dc1292aaf0fd585":[5,0,0,67,47], +"text_8php.html#afe54312607d92f7ce9593f5760831f80":[5,0,0,67,55], +"text_8php.html#afe9f178d264d44a94dc1292aaf0fd585":[5,0,0,67,50], "theme_2redstrap_2php_2default_8php.html":[5,0,3,1,1,0,1], "theme_2redstrap_2php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762":[5,0,3,1,1,0,1,0], "theme_2redstrap_2php_2theme__init_8php.html":[5,0,3,1,1,0,4], -"thing_8php.html":[5,0,1,95], -"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[5,0,1,95,0], -"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[5,0,1,95,1], -"toggle__mobile_8php.html":[5,0,1,96], -"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[5,0,1,96,0], +"thing_8php.html":[5,0,1,100], +"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[5,0,1,100,0], +"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[5,0,1,100,1], +"toggle__mobile_8php.html":[5,0,1,101], +"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[5,0,1,101,0], "tpldebug_8php.html":[5,0,2,7], "tpldebug_8php.html#a44778457a6c02554812fbfad19d32ba3":[5,0,2,7,0], "tpldebug_8php.html#a5358407d65f2ca826f96356a6642d149":[5,0,2,7,1], @@ -232,22 +249,5 @@ var NAVTREEINDEX6 = "typo_8php.html#a9590b15215a21e9b42eb546aeef79704":[5,0,2,8,2], "typo_8php.html#acebf83966ef6d7e5645a6b62ba368f9f":[5,0,2,8,0], "typohelper_8php.html":[5,0,2,9], -"typohelper_8php.html#a7542d95618011800c61773127fa625cf":[5,0,2,9,0], -"typohelper_8php.html#ab6fd357fb5b2a3ba8aab9e8b98c6a805":[5,0,2,9,1], -"uexport_8php.html":[5,0,1,97], -"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[5,0,1,97,0], -"update__channel_8php.html":[5,0,1,98], -"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[5,0,1,98,0], -"update__community_8php.html":[5,0,1,99], -"update__community_8php.html#abdcc5c4ecebbe0b5fcba2755c69cb3b1":[5,0,1,99,0], -"update__display_8php.html":[5,0,1,100], -"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[5,0,1,100,0], -"update__network_8php.html":[5,0,1,101], -"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[5,0,1,101,0], -"update__search_8php.html":[5,0,1,102], -"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[5,0,1,102,0], -"updatetpl_8py.html":[5,0,2,10], -"updatetpl_8py.html#a52a85ffa6b6d63d840b185a133478c12":[5,0,2,10,5], -"updatetpl_8py.html#a79c20eb62d568c999b56eb08530355d3":[5,0,2,10,2], -"updatetpl_8py.html#a988d937ed5d5c2b592b763036af5cf94":[5,0,2,10,1] +"typohelper_8php.html#a7542d95618011800c61773127fa625cf":[5,0,2,9,0] }; diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js index 0453d2f31..12923a8db 100644 --- a/doc/html/navtreeindex7.js +++ b/doc/html/navtreeindex7.js @@ -1,5 +1,22 @@ var NAVTREEINDEX7 = { +"typohelper_8php.html#ab6fd357fb5b2a3ba8aab9e8b98c6a805":[5,0,2,9,1], +"uexport_8php.html":[5,0,1,102], +"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[5,0,1,102,0], +"update__channel_8php.html":[5,0,1,103], +"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[5,0,1,103,0], +"update__community_8php.html":[5,0,1,104], +"update__community_8php.html#abdcc5c4ecebbe0b5fcba2755c69cb3b1":[5,0,1,104,0], +"update__display_8php.html":[5,0,1,105], +"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[5,0,1,105,0], +"update__network_8php.html":[5,0,1,106], +"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[5,0,1,106,0], +"update__search_8php.html":[5,0,1,107], +"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[5,0,1,107,0], +"updatetpl_8py.html":[5,0,2,10], +"updatetpl_8py.html#a52a85ffa6b6d63d840b185a133478c12":[5,0,2,10,5], +"updatetpl_8py.html#a79c20eb62d568c999b56eb08530355d3":[5,0,2,10,2], +"updatetpl_8py.html#a988d937ed5d5c2b592b763036af5cf94":[5,0,2,10,1], "updatetpl_8py.html#ab42dd79af65ee82201fd6f04715f62f6":[5,0,2,10,3], "updatetpl_8py.html#ac9d11279fed403a329a719298feafc4f":[5,0,2,10,0], "updatetpl_8py.html#ae694f5e1f25f8a92a945eb90c432dfe6":[5,0,2,10,4], @@ -11,34 +28,34 @@ var NAVTREEINDEX7 = "view_2theme_2redstrap_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[5,0,3,1,1,0,0,1], "view_2theme_2redstrap_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[5,0,3,1,1,0,0,2], "view_2theme_2redstrap_2php_2config_8php.html#af58e97b437c1e98a5e434886494cc70e":[5,0,3,1,1,0,0,0], -"view_8php.html":[5,0,1,103], -"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[5,0,1,103,0], -"viewconnections_8php.html":[5,0,1,104], -"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[5,0,1,104,2], -"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[5,0,1,104,1], -"viewconnections_8php.html#ae330cea4cddd091559659f8b469617b6":[5,0,1,104,0], -"viewsrc_8php.html":[5,0,1,105], -"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[5,0,1,105,0], -"vote_8php.html":[5,0,1,106], -"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[5,0,1,106,2], -"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[5,0,1,106,0], -"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[5,0,1,106,1], -"wall__attach_8php.html":[5,0,1,107], -"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[5,0,1,107,0], -"wall__upload_8php.html":[5,0,1,108], -"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[5,0,1,108,0], -"webfinger_8php.html":[5,0,1,109], -"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[5,0,1,109,0], -"webpages_8php.html":[5,0,1,110], -"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[5,0,1,110,0], -"wfinger_8php.html":[5,0,1,111], -"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[5,0,1,111,0], -"xchan_8php.html":[5,0,1,112], -"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[5,0,1,112,0], -"xrd_8php.html":[5,0,1,113], -"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[5,0,1,113,0], -"zfinger_8php.html":[5,0,1,114], -"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[5,0,1,114,0], +"view_8php.html":[5,0,1,108], +"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[5,0,1,108,0], +"viewconnections_8php.html":[5,0,1,109], +"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[5,0,1,109,2], +"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[5,0,1,109,1], +"viewconnections_8php.html#ae330cea4cddd091559659f8b469617b6":[5,0,1,109,0], +"viewsrc_8php.html":[5,0,1,110], +"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[5,0,1,110,0], +"vote_8php.html":[5,0,1,111], +"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[5,0,1,111,2], +"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[5,0,1,111,0], +"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[5,0,1,111,1], +"wall__attach_8php.html":[5,0,1,112], +"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[5,0,1,112,0], +"wall__upload_8php.html":[5,0,1,113], +"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[5,0,1,113,0], +"webfinger_8php.html":[5,0,1,114], +"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[5,0,1,114,0], +"webpages_8php.html":[5,0,1,115], +"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[5,0,1,115,0], +"wfinger_8php.html":[5,0,1,116], +"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[5,0,1,116,0], +"xchan_8php.html":[5,0,1,117], +"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[5,0,1,117,0], +"xrd_8php.html":[5,0,1,118], +"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[5,0,1,118,0], +"zfinger_8php.html":[5,0,1,119], +"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[5,0,1,119,0], "zot_8php.html":[5,0,0,68], "zot_8php.html#a083aec6c900d244e1bfc1406f9461465":[5,0,0,68,11], "zot_8php.html#a22e3f9b97b7969ddbe43ccf0db93a19c":[5,0,0,68,20], @@ -66,6 +83,8 @@ var NAVTREEINDEX7 = "zot_8php.html#ac34e479d27f32b82dd6b33542f81a6a7":[5,0,0,68,1], "zot_8php.html#acdea9362d78a63dce948fdf0ea73ef0e":[5,0,0,68,18], "zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72":[5,0,0,68,2], -"zotfeed_8php.html":[5,0,1,115], -"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,115,0] +"zotfeed_8php.html":[5,0,1,120], +"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,120,0], +"zping_8php.html":[5,0,1,121], +"zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75":[5,0,1,121,0] }; diff --git a/doc/html/permissions_8php.html b/doc/html/permissions_8php.html index 795dcf39e..9e0de525b 100644 --- a/doc/html/permissions_8php.html +++ b/doc/html/permissions_8php.html @@ -197,7 +197,7 @@ Functions
    Returns
    : array of all permissions, key is permission name, value is true or false
    -

    Referenced by change_channel(), channel_content(), connections_content(), editwebpage_content(), lastpost_content(), page_content(), photos_init(), webpages_content(), and zfinger_init().

    +

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

    diff --git a/doc/html/plugin_8php.html b/doc/html/plugin_8php.html index 13e7cf6f9..97a646d33 100644 --- a/doc/html/plugin_8php.html +++ b/doc/html/plugin_8php.html @@ -190,7 +190,7 @@ Functions
    -

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

    +

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

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

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

    +

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

    diff --git a/doc/html/redbasic_2php_2style_8php.html b/doc/html/redbasic_2php_2style_8php.html index 652450bfe..0f88577e4 100644 --- a/doc/html/redbasic_2php_2style_8php.html +++ b/doc/html/redbasic_2php_2style_8php.html @@ -400,7 +400,7 @@ Variables
    -

    Referenced by Template\_replcb_for(), Template\_replcb_if(), account_remove(), acl_init(), activity_sanitise(), admin_page_themes(), aes_encapsulate(), argv(), array_sanitise(), attach_store(), autoname(), build_sync_packet(), change_channel(), channel_content(), check_config(), check_form_security_token(), check_list_permissions(), check_webbie(), common_init(), construct_page(), conversation(), crepair_post(), photo_gd\cropImage(), photo_imagick\cropImage(), datesel(), datesel_format(), decode_tags(), deliver_run(), directory_content(), directory_run(), dirfind_content(), display_content(), email_header_encode(), encode_item(), encode_mail(), event_store(), expand_groups(), feature_enabled(), fetch_post_tags(), find_xchan_in_array(), findpeople_widget(), fix_private_photos(), fix_system_urls(), photo_gd\flip(), fsuggest_post(), generate_user_guid(), get_all_perms(), get_item_elements(), get_mail_elements(), get_mentions(), get_profile_elements(), get_terms_oftype(), gprobe_run(), ids_to_querystr(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), json_decode_plus(), json_return_and_die(), lastpost_content(), legal_webbie(), lrdd(), magic_init(), manage_content(), match_content(), menu_content(), menu_delete_id(), menu_fetch(), menu_render(), message_post(), navbar_complete(), network_content(), network_init(), new_channel_init(), new_contact(), notification(), notifier_run(), oembed_fetch_url(), onepoll_run(), parse_xml_string(), perm_is_allowed(), photos_post(), ping_init(), poco_load(), poller_run(), post_init(), post_post(), preg_heart(), prepare_body(), print_template(), private_messages_list(), proc_run(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), public_recips(), dba_mysql\q(), dba_mysqli\q(), randprof_init(), remove_community_tag(), photo_driver\save(), search_ac_init(), send_status_notifications(), App\set_widget(), site_default_perms(), smilies(), photo_driver\store(), stringify_array_elms(), sync_directories(), tag_deliver(), tagadelic(), tagrm_content(), tagrm_post(), theme_status(), timesel(), toggle_theme(), upgrade_bool_message(), upgrade_message(), valid_email(), webpages_content(), xchan_query(), xmlify(), zfinger_init(), zot_process_response(), zot_refresh(), and zot_register_hub().

    +

    Referenced by Template\_replcb_for(), Template\_replcb_if(), account_remove(), acl_init(), activity_sanitise(), admin_page_themes(), aes_encapsulate(), argv(), array_sanitise(), attach_store(), autoname(), blocks_content(), build_sync_packet(), change_channel(), channel_content(), check_config(), check_form_security_token(), check_list_permissions(), check_webbie(), common_init(), construct_page(), conversation(), crepair_post(), photo_gd\cropImage(), photo_imagick\cropImage(), datesel(), datesel_format(), decode_tags(), deliver_run(), directory_content(), directory_run(), dirfind_content(), display_content(), email_header_encode(), encode_item(), encode_mail(), event_store(), expand_groups(), feature_enabled(), fetch_post_tags(), find_xchan_in_array(), findpeople_widget(), fix_private_photos(), fix_system_urls(), photo_gd\flip(), fsuggest_post(), generate_user_guid(), get_all_perms(), get_item_elements(), get_mail_elements(), get_mentions(), get_profile_elements(), get_terms_oftype(), gprobe_run(), ids_to_querystr(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), json_decode_plus(), json_return_and_die(), lastpost_content(), layouts_content(), legal_webbie(), lrdd(), magic_init(), manage_content(), match_content(), menu_content(), menu_delete_id(), menu_fetch(), menu_render(), message_post(), mimetype_select(), navbar_complete(), network_content(), network_init(), new_channel_init(), new_contact(), notification(), notifier_run(), oembed_fetch_url(), onepoll_run(), parse_xml_string(), perm_is_allowed(), photos_post(), ping_init(), poco_load(), poller_run(), post_init(), post_post(), preg_heart(), prepare_body(), print_template(), private_messages_list(), proc_run(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), public_recips(), dba_mysql\q(), dba_mysqli\q(), randprof_init(), remove_community_tag(), photo_driver\save(), search_ac_init(), send_status_notifications(), App\set_widget(), site_default_perms(), smilies(), photo_driver\store(), stringify_array_elms(), sync_directories(), tag_deliver(), tagadelic(), tagrm_content(), tagrm_post(), theme_status(), timesel(), toggle_theme(), upgrade_bool_message(), upgrade_message(), valid_email(), webpages_content(), xchan_query(), xmlify(), zfinger_init(), zot_process_response(), zot_refresh(), and zot_register_hub().

    diff --git a/doc/html/search/all_62.js b/doc/html/search/all_62.js index 5436f11a4..acdb7f4e1 100644 --- a/doc/html/search/all_62.js +++ b/doc/html/search/all_62.js @@ -17,6 +17,8 @@ var searchData= ['bbtoevent',['bbtoevent',['../event_8php.html#a180cccd63c2a2f00ff432b03113531f3',1,'event.php']]], ['bbtovcal',['bbtovcal',['../event_8php.html#a184d6b9690e5b6dee35a0aa9edd47279',1,'event.php']]], ['best_5flink_5furl',['best_link_url',['../conversation_8php.html#ad470fc7766f0db66d138fa1916c7a8b7',1,'conversation.php']]], + ['blocks_2ephp',['blocks.php',['../blocks_8php.html',1,'']]], + ['blocks_5fcontent',['blocks_content',['../blocks_8php.html#a2531a8fd51db3cecb2eb20c002c66e12',1,'blocks.php']]], ['boot_2ephp',['boot.php',['../boot_8php.html',1,'']]], ['breaklines',['breaklines',['../html2plain_8php.html#a3214912e3d00cf0a948072daccf16740',1,'html2plain.php']]], ['build_5fpagehead',['build_pagehead',['../classApp.html#a08f0537964d98958d218066364cff785',1,'App']]], diff --git a/doc/html/search/all_63.js b/doc/html/search/all_63.js index ea4623c67..8da6083e4 100644 --- a/doc/html/search/all_63.js +++ b/doc/html/search/all_63.js @@ -57,10 +57,12 @@ var searchData= ['collect_5frecipients',['collect_recipients',['../items_8php.html#a01e3cf44e082fa9bd06dcde5bf713d70',1,'items.php']]], ['collecturls',['collecturls',['../html2plain_8php.html#ae1c203d0f089d5678d73a6c64a395201',1,'html2plain.php']]], ['comanche_2ephp',['comanche.php',['../comanche_8php.html',1,'']]], + ['comanche_5fblock',['comanche_block',['../comanche_8php.html#a5a7ab801717d38e91ac910b933973887',1,'comanche.php']]], ['comanche_5fmenu',['comanche_menu',['../comanche_8php.html#a1fe339e1454803aa502ac89379c17f5b',1,'comanche.php']]], ['comanche_5fparser',['comanche_parser',['../comanche_8php.html#a1a208fdb40dd83d6298caec4290ee922',1,'comanche.php']]], ['comanche_5fregion',['comanche_region',['../comanche_8php.html#a5718daeda40bf835345fe061e8808cdf',1,'comanche.php']]], ['comanche_5freplace_5fregion',['comanche_replace_region',['../comanche_8php.html#a028f004d5b8c23d6367816d899e17cfe',1,'comanche.php']]], + ['comanche_5fwebpage',['comanche_webpage',['../comanche_8php.html#ae9fe1ce574db3dd0931eada80234f82a',1,'comanche.php']]], ['comanche_5fwidget',['comanche_widget',['../comanche_8php.html#a45900dd1d6101b53e3d063db40eafa5e',1,'comanche.php']]], ['common_2ephp',['common.php',['../common_8php.html',1,'']]], ['common_5faside',['common_aside',['../common_8php.html#a3b12ec67b3d3edcf595c8d195da5d14a',1,'common.php']]], diff --git a/doc/html/search/all_64.js b/doc/html/search/all_64.js index 6dc2004fd..56988e68e 100644 --- a/doc/html/search/all_64.js +++ b/doc/html/search/all_64.js @@ -36,6 +36,7 @@ var searchData= ['deliver_2ephp',['deliver.php',['../deliver_8php.html',1,'']]], ['deliver_5fprivate',['deliver_private',['../classProtoDriver.html#ae5b44739f84c10d00a9b65adf3785181',1,'ProtoDriver\deliver_private()'],['../classZotDriver.html#afaaf9941169fc966e43e25b25e6daea6',1,'ZotDriver\deliver_private()']]], ['deliver_5frun',['deliver_run',['../deliver_8php.html#a397afcb9afecf0c1816b0951189dd346',1,'deliver.php']]], + ['design_5ftools',['design_tools',['../text_8php.html#a87a3cefc603302c78982f1d8e1245265',1,'text.php']]], ['destroy',['destroy',['../classphoto__driver.html#ae1a9edaf846983780dc65ea77d99e813',1,'photo_driver\destroy()'],['../classphoto__gd.html#a724703ecf71b1f1d04a80e86c76db6b1',1,'photo_gd\destroy()'],['../classphoto__imagick.html#afd49d64751ee3a298eac0c0ce0ba0207',1,'photo_imagick\destroy()']]], ['detect_5flanguage',['detect_language',['../language_8php.html#a632da17c7ac0d2dc1a00a4706870194b',1,'language.php']]], ['dfrn_5fdeliver',['dfrn_deliver',['../items_8php.html#a8395d189a36abfa0dfff81a2b0e70669',1,'items.php']]], diff --git a/doc/html/search/all_65.js b/doc/html/search/all_65.js index c19627cf7..1d34b9f5a 100644 --- a/doc/html/search/all_65.js +++ b/doc/html/search/all_65.js @@ -1,5 +1,9 @@ var searchData= [ + ['editblock_2ephp',['editblock.php',['../editblock_8php.html',1,'']]], + ['editblock_5fcontent',['editblock_content',['../editblock_8php.html#abbe8f55de06967bc8d79d620509a49e6',1,'editblock.php']]], + ['editlayout_2ephp',['editlayout.php',['../editlayout_8php.html',1,'']]], + ['editlayout_5fcontent',['editlayout_content',['../editlayout_8php.html#aa877e4157a26b099de904164181dd386',1,'editlayout.php']]], ['editpost_2ephp',['editpost.php',['../editpost_8php.html',1,'']]], ['editpost_5fcontent',['editpost_content',['../editpost_8php.html#a34011690864d122680c802e9e748ccfb',1,'editpost.php']]], ['editwebpage_2ephp',['editwebpage.php',['../editwebpage_8php.html',1,'']]], diff --git a/doc/html/search/all_6c.js b/doc/html/search/all_6c.js index 918fa8820..357e87efc 100644 --- a/doc/html/search/all_6c.js +++ b/doc/html/search/all_6c.js @@ -8,6 +8,9 @@ var searchData= ['lastpost_5faside',['lastpost_aside',['../lastpost_8php.html#a6108289ef2a767495c7c85a24f364983',1,'lastpost.php']]], ['lastpost_5fcontent',['lastpost_content',['../lastpost_8php.html#a82f14cce5d3cfe27f40bdbd2c679d493',1,'lastpost.php']]], ['lastpost_5finit',['lastpost_init',['../lastpost_8php.html#ab4c6ebd25736af678e64d55ce508ce8c',1,'lastpost.php']]], + ['layout_5fselect',['layout_select',['../text_8php.html#a3999a0b3e22e440f280ee791ce34d384',1,'text.php']]], + ['layouts_2ephp',['layouts.php',['../layouts_8php.html',1,'']]], + ['layouts_5fcontent',['layouts_content',['../layouts_8php.html#a6e0193759ad9eef76d3df2db24237b50',1,'layouts.php']]], ['ldelim',['ldelim',['../namespacefriendica-to-smarty-tpl.html#a0b4cf73d1a8d201a28d269eeb62a5d5c',1,'friendica-to-smarty-tpl']]], ['legal_5fwebbie',['legal_webbie',['../text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728',1,'text.php']]], ['like_2ephp',['like.php',['../like_8php.html',1,'']]], @@ -16,6 +19,7 @@ var searchData= ['limit_5fbody_5fsize',['limit_body_size',['../items_8php.html#af94c281016c6c912d06e064113336c5c',1,'items.php']]], ['link_5fcompare',['link_compare',['../text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285',1,'text.php']]], ['linkify',['linkify',['../text_8php.html#a11255c8c4e5245b6c24f97684826aa54',1,'text.php']]], + ['list_5fpublic_5fsites',['list_public_sites',['../dirsearch_8php.html#a985d410a170549429857af6ff2673149',1,'dirsearch.php']]], ['load',['load',['../classphoto__driver.html#a19e1af2b6af4c63aa6230abe69f83712',1,'photo_driver\load()'],['../classphoto__gd.html#a33092b889875b68bfb1c97ff123012d9',1,'photo_gd\load()'],['../classphoto__imagick.html#a2c9168f110ccd6c264095d766615dfa8',1,'photo_imagick\load()']]], ['load_5fconfig',['load_config',['../include_2config_8php.html#a27559f388c9b9af81c94e48d6889d1d1',1,'config.php']]], ['load_5fcontact_5flinks',['load_contact_links',['../boot_8php.html#a719c7f3972d5f9268f37a41c76cd4ef6',1,'boot.php']]], diff --git a/doc/html/search/all_6d.js b/doc/html/search/all_6d.js index 9da146382..f037c3653 100644 --- a/doc/html/search/all_6d.js +++ b/doc/html/search/all_6d.js @@ -44,6 +44,7 @@ var searchData= ['message_5fcontent',['message_content',['../mod_2message_8php.html#a3547ed86d09a4bb8fa64ec374a40ee79',1,'message.php']]], ['message_5fpost',['message_post',['../mod_2message_8php.html#a0db7030362a7e9ed9549b341d7b35718',1,'message.php']]], ['micropro',['micropro',['../text_8php.html#a2a902f5fdba8646333e997898ac45ea3',1,'text.php']]], + ['mimetype_5fselect',['mimetype_select',['../text_8php.html#a1633412120f52bdce5f43e0a127d9293',1,'text.php']]], ['mini_5fgroup_5fselect',['mini_group_select',['../include_2group_8php.html#ab4d9e5b59f48787cb01baae5dc6c381f',1,'group.php']]], ['minimal_2ephp',['minimal.php',['../minimal_8php.html',1,'']]], ['mitem_2ephp',['mitem.php',['../mitem_8php.html',1,'']]], diff --git a/doc/html/search/all_70.js b/doc/html/search/all_70.js index 6be6519c8..6c8ce271c 100644 --- a/doc/html/search/all_70.js +++ b/doc/html/search/all_70.js @@ -155,6 +155,8 @@ var searchData= ['protodriver_2ephp',['ProtoDriver.php',['../ProtoDriver_8php.html',1,'']]], ['public_5fpermissions_5fsql',['public_permissions_sql',['../security_8php.html#ab3bdd30dc60d9ee72370b866aa4a2d01',1,'security.php']]], ['public_5frecips',['public_recips',['../zot_8php.html#a083aec6c900d244e1bfc1406f9461465',1,'zot.php']]], + ['pubsites_2ephp',['pubsites.php',['../pubsites_8php.html',1,'']]], + ['pubsites_5fcontent',['pubsites_content',['../pubsites_8php.html#af614e279aab54065345bda6b03eafdf0',1,'pubsites.php']]], ['purify_5fhtml',['purify_html',['../text_8php.html#a4841df5beabdd1bdd1ed56781a915d61',1,'text.php']]], ['push_5flang',['push_lang',['../language_8php.html#ac9142ef1d01a235c760deb0f16643f5a',1,'language.php']]] ]; diff --git a/doc/html/search/all_7a.js b/doc/html/search/all_7a.js index 20e3146f1..f8fd43e4a 100644 --- a/doc/html/search/all_7a.js +++ b/doc/html/search/all_7a.js @@ -2,6 +2,7 @@ var searchData= [ ['z_5fbirthday',['z_birthday',['../boot_8php.html#ab55e545b72ec8c097e052ea7d373491f',1,'boot.php']]], ['z_5ffetch_5furl',['z_fetch_url',['../include_2network_8php.html#aafd06c0a75402aefb06cfb9f9740fa37',1,'network.php']]], + ['z_5finput_5ffilter',['z_input_filter',['../text_8php.html#a324c58f37f6acdf9cd1922aa76077d9f',1,'text.php']]], ['z_5fmime_5fcontent_5ftype',['z_mime_content_type',['../include_2attach_8php.html#a6fdd92775f31c07d2863e16e0026018a',1,'attach.php']]], ['z_5fpath',['z_path',['../boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda',1,'boot.php']]], ['z_5fpost_5furl',['z_post_url',['../include_2network_8php.html#a9129fd55e7fc175b4ea9a195cccc16bc',1,'network.php']]], @@ -31,5 +32,7 @@ var searchData= ['zot_5fzot',['zot_zot',['../zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142',1,'zot.php']]], ['zotdriver',['ZotDriver',['../classZotDriver.html',1,'']]], ['zotfeed_2ephp',['zotfeed.php',['../zotfeed_8php.html',1,'']]], - ['zotfeed_5finit',['zotfeed_init',['../zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac',1,'zotfeed.php']]] + ['zotfeed_5finit',['zotfeed_init',['../zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac',1,'zotfeed.php']]], + ['zping_2ephp',['zping.php',['../zping_8php.html',1,'']]], + ['zping_5fcontent',['zping_content',['../zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75',1,'zping.php']]] ]; diff --git a/doc/html/search/files_62.js b/doc/html/search/files_62.js index f982e5a2f..693ae9abd 100644 --- a/doc/html/search/files_62.js +++ b/doc/html/search/files_62.js @@ -3,5 +3,6 @@ var searchData= ['baseobject_2ephp',['BaseObject.php',['../BaseObject_8php.html',1,'']]], ['bb2diaspora_2ephp',['bb2diaspora.php',['../bb2diaspora_8php.html',1,'']]], ['bbcode_2ephp',['bbcode.php',['../bbcode_8php.html',1,'']]], + ['blocks_2ephp',['blocks.php',['../blocks_8php.html',1,'']]], ['boot_2ephp',['boot.php',['../boot_8php.html',1,'']]] ]; diff --git a/doc/html/search/files_65.js b/doc/html/search/files_65.js index c6417407a..26c3ac164 100644 --- a/doc/html/search/files_65.js +++ b/doc/html/search/files_65.js @@ -1,5 +1,7 @@ var searchData= [ + ['editblock_2ephp',['editblock.php',['../editblock_8php.html',1,'']]], + ['editlayout_2ephp',['editlayout.php',['../editlayout_8php.html',1,'']]], ['editpost_2ephp',['editpost.php',['../editpost_8php.html',1,'']]], ['editwebpage_2ephp',['editwebpage.php',['../editwebpage_8php.html',1,'']]], ['enotify_2ephp',['enotify.php',['../enotify_8php.html',1,'']]], diff --git a/doc/html/search/files_6c.js b/doc/html/search/files_6c.js index 8bbcf41b2..663f102d3 100644 --- a/doc/html/search/files_6c.js +++ b/doc/html/search/files_6c.js @@ -2,6 +2,7 @@ var searchData= [ ['language_2ephp',['language.php',['../language_8php.html',1,'']]], ['lastpost_2ephp',['lastpost.php',['../lastpost_8php.html',1,'']]], + ['layouts_2ephp',['layouts.php',['../layouts_8php.html',1,'']]], ['like_2ephp',['like.php',['../like_8php.html',1,'']]], ['lockview_2ephp',['lockview.php',['../lockview_8php.html',1,'']]], ['login_2ephp',['login.php',['../login_8php.html',1,'']]], diff --git a/doc/html/search/files_70.js b/doc/html/search/files_70.js index e36344f95..a05a85c69 100644 --- a/doc/html/search/files_70.js +++ b/doc/html/search/files_70.js @@ -27,5 +27,6 @@ var searchData= ['profile_5fselectors_2ephp',['profile_selectors.php',['../profile__selectors_8php.html',1,'']]], ['profiles_2ephp',['profiles.php',['../profiles_8php.html',1,'']]], ['profperm_2ephp',['profperm.php',['../profperm_8php.html',1,'']]], - ['protodriver_2ephp',['ProtoDriver.php',['../ProtoDriver_8php.html',1,'']]] + ['protodriver_2ephp',['ProtoDriver.php',['../ProtoDriver_8php.html',1,'']]], + ['pubsites_2ephp',['pubsites.php',['../pubsites_8php.html',1,'']]] ]; diff --git a/doc/html/search/files_7a.js b/doc/html/search/files_7a.js index f3e2fc21d..eafeb05f5 100644 --- a/doc/html/search/files_7a.js +++ b/doc/html/search/files_7a.js @@ -2,5 +2,6 @@ var searchData= [ ['zfinger_2ephp',['zfinger.php',['../zfinger_8php.html',1,'']]], ['zot_2ephp',['zot.php',['../zot_8php.html',1,'']]], - ['zotfeed_2ephp',['zotfeed.php',['../zotfeed_8php.html',1,'']]] + ['zotfeed_2ephp',['zotfeed.php',['../zotfeed_8php.html',1,'']]], + ['zping_2ephp',['zping.php',['../zping_8php.html',1,'']]] ]; diff --git a/doc/html/search/functions_62.js b/doc/html/search/functions_62.js index 9b6ac0476..ee238c6ee 100644 --- a/doc/html/search/functions_62.js +++ b/doc/html/search/functions_62.js @@ -13,6 +13,7 @@ var searchData= ['bbtoevent',['bbtoevent',['../event_8php.html#a180cccd63c2a2f00ff432b03113531f3',1,'event.php']]], ['bbtovcal',['bbtovcal',['../event_8php.html#a184d6b9690e5b6dee35a0aa9edd47279',1,'event.php']]], ['best_5flink_5furl',['best_link_url',['../conversation_8php.html#ad470fc7766f0db66d138fa1916c7a8b7',1,'conversation.php']]], + ['blocks_5fcontent',['blocks_content',['../blocks_8php.html#a2531a8fd51db3cecb2eb20c002c66e12',1,'blocks.php']]], ['breaklines',['breaklines',['../html2plain_8php.html#a3214912e3d00cf0a948072daccf16740',1,'html2plain.php']]], ['build_5fpagehead',['build_pagehead',['../classApp.html#a08f0537964d98958d218066364cff785',1,'App']]], ['build_5fquerystring',['build_querystring',['../boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e',1,'boot.php']]], diff --git a/doc/html/search/functions_63.js b/doc/html/search/functions_63.js index a1b79545e..ce0937bbc 100644 --- a/doc/html/search/functions_63.js +++ b/doc/html/search/functions_63.js @@ -47,10 +47,12 @@ var searchData= ['collect_5fprivate',['collect_private',['../classProtoDriver.html#af66171aa7dab9b62cee915cb4f1abe1b',1,'ProtoDriver\collect_private()'],['../classZotDriver.html#a2e15ff09772f0608203dad1c98299394',1,'ZotDriver\collect_private()']]], ['collect_5frecipients',['collect_recipients',['../items_8php.html#a01e3cf44e082fa9bd06dcde5bf713d70',1,'items.php']]], ['collecturls',['collecturls',['../html2plain_8php.html#ae1c203d0f089d5678d73a6c64a395201',1,'html2plain.php']]], + ['comanche_5fblock',['comanche_block',['../comanche_8php.html#a5a7ab801717d38e91ac910b933973887',1,'comanche.php']]], ['comanche_5fmenu',['comanche_menu',['../comanche_8php.html#a1fe339e1454803aa502ac89379c17f5b',1,'comanche.php']]], ['comanche_5fparser',['comanche_parser',['../comanche_8php.html#a1a208fdb40dd83d6298caec4290ee922',1,'comanche.php']]], ['comanche_5fregion',['comanche_region',['../comanche_8php.html#a5718daeda40bf835345fe061e8808cdf',1,'comanche.php']]], ['comanche_5freplace_5fregion',['comanche_replace_region',['../comanche_8php.html#a028f004d5b8c23d6367816d899e17cfe',1,'comanche.php']]], + ['comanche_5fwebpage',['comanche_webpage',['../comanche_8php.html#ae9fe1ce574db3dd0931eada80234f82a',1,'comanche.php']]], ['comanche_5fwidget',['comanche_widget',['../comanche_8php.html#a45900dd1d6101b53e3d063db40eafa5e',1,'comanche.php']]], ['common_5faside',['common_aside',['../common_8php.html#a3b12ec67b3d3edcf595c8d195da5d14a',1,'common.php']]], ['common_5fcontent',['common_content',['../common_8php.html#ab63408f39abef7a6915186e8dabc5a96',1,'common.php']]], diff --git a/doc/html/search/functions_64.js b/doc/html/search/functions_64.js index b2517d52c..db2f68646 100644 --- a/doc/html/search/functions_64.js +++ b/doc/html/search/functions_64.js @@ -22,6 +22,7 @@ var searchData= ['deliver',['deliver',['../classProtoDriver.html#a85e9063f6d0c304410cd246f7900ea1b',1,'ProtoDriver\deliver()'],['../classZotDriver.html#a876e3e0e4cad83c0b58c8696b344be6f',1,'ZotDriver\deliver()']]], ['deliver_5fprivate',['deliver_private',['../classProtoDriver.html#ae5b44739f84c10d00a9b65adf3785181',1,'ProtoDriver\deliver_private()'],['../classZotDriver.html#afaaf9941169fc966e43e25b25e6daea6',1,'ZotDriver\deliver_private()']]], ['deliver_5frun',['deliver_run',['../deliver_8php.html#a397afcb9afecf0c1816b0951189dd346',1,'deliver.php']]], + ['design_5ftools',['design_tools',['../text_8php.html#a87a3cefc603302c78982f1d8e1245265',1,'text.php']]], ['destroy',['destroy',['../classphoto__driver.html#ae1a9edaf846983780dc65ea77d99e813',1,'photo_driver\destroy()'],['../classphoto__gd.html#a724703ecf71b1f1d04a80e86c76db6b1',1,'photo_gd\destroy()'],['../classphoto__imagick.html#afd49d64751ee3a298eac0c0ce0ba0207',1,'photo_imagick\destroy()']]], ['detect_5flanguage',['detect_language',['../language_8php.html#a632da17c7ac0d2dc1a00a4706870194b',1,'language.php']]], ['dfrn_5fdeliver',['dfrn_deliver',['../items_8php.html#a8395d189a36abfa0dfff81a2b0e70669',1,'items.php']]], diff --git a/doc/html/search/functions_65.js b/doc/html/search/functions_65.js index 55e54cb35..2b67cb573 100644 --- a/doc/html/search/functions_65.js +++ b/doc/html/search/functions_65.js @@ -1,5 +1,7 @@ var searchData= [ + ['editblock_5fcontent',['editblock_content',['../editblock_8php.html#abbe8f55de06967bc8d79d620509a49e6',1,'editblock.php']]], + ['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']]], ['email_5fheader_5fencode',['email_header_encode',['../include_2network_8php.html#a540420ff3675a72cb781ef9a7e8c2cd9',1,'network.php']]], diff --git a/doc/html/search/functions_6c.js b/doc/html/search/functions_6c.js index c4c148c37..1464690de 100644 --- a/doc/html/search/functions_6c.js +++ b/doc/html/search/functions_6c.js @@ -4,12 +4,15 @@ var searchData= ['lastpost_5faside',['lastpost_aside',['../lastpost_8php.html#a6108289ef2a767495c7c85a24f364983',1,'lastpost.php']]], ['lastpost_5fcontent',['lastpost_content',['../lastpost_8php.html#a82f14cce5d3cfe27f40bdbd2c679d493',1,'lastpost.php']]], ['lastpost_5finit',['lastpost_init',['../lastpost_8php.html#ab4c6ebd25736af678e64d55ce508ce8c',1,'lastpost.php']]], + ['layout_5fselect',['layout_select',['../text_8php.html#a3999a0b3e22e440f280ee791ce34d384',1,'text.php']]], + ['layouts_5fcontent',['layouts_content',['../layouts_8php.html#a6e0193759ad9eef76d3df2db24237b50',1,'layouts.php']]], ['legal_5fwebbie',['legal_webbie',['../text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728',1,'text.php']]], ['like_5fcontent',['like_content',['../like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538',1,'like.php']]], ['like_5fpuller',['like_puller',['../conversation_8php.html#afe5b2f38d8b803edb0d7ec5fa2868db0',1,'conversation.php']]], ['limit_5fbody_5fsize',['limit_body_size',['../items_8php.html#af94c281016c6c912d06e064113336c5c',1,'items.php']]], ['link_5fcompare',['link_compare',['../text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285',1,'text.php']]], ['linkify',['linkify',['../text_8php.html#a11255c8c4e5245b6c24f97684826aa54',1,'text.php']]], + ['list_5fpublic_5fsites',['list_public_sites',['../dirsearch_8php.html#a985d410a170549429857af6ff2673149',1,'dirsearch.php']]], ['load',['load',['../classphoto__driver.html#a19e1af2b6af4c63aa6230abe69f83712',1,'photo_driver\load()'],['../classphoto__gd.html#a33092b889875b68bfb1c97ff123012d9',1,'photo_gd\load()'],['../classphoto__imagick.html#a2c9168f110ccd6c264095d766615dfa8',1,'photo_imagick\load()']]], ['load_5fconfig',['load_config',['../include_2config_8php.html#a27559f388c9b9af81c94e48d6889d1d1',1,'config.php']]], ['load_5fcontact_5flinks',['load_contact_links',['../boot_8php.html#a719c7f3972d5f9268f37a41c76cd4ef6',1,'boot.php']]], diff --git a/doc/html/search/functions_6d.js b/doc/html/search/functions_6d.js index 3fcb290fb..61dd6cb2e 100644 --- a/doc/html/search/functions_6d.js +++ b/doc/html/search/functions_6d.js @@ -27,6 +27,7 @@ var searchData= ['message_5fcontent',['message_content',['../mod_2message_8php.html#a3547ed86d09a4bb8fa64ec374a40ee79',1,'message.php']]], ['message_5fpost',['message_post',['../mod_2message_8php.html#a0db7030362a7e9ed9549b341d7b35718',1,'message.php']]], ['micropro',['micropro',['../text_8php.html#a2a902f5fdba8646333e997898ac45ea3',1,'text.php']]], + ['mimetype_5fselect',['mimetype_select',['../text_8php.html#a1633412120f52bdce5f43e0a127d9293',1,'text.php']]], ['mini_5fgroup_5fselect',['mini_group_select',['../include_2group_8php.html#ab4d9e5b59f48787cb01baae5dc6c381f',1,'group.php']]], ['mitem_5fcontent',['mitem_content',['../mitem_8php.html#a7a31b702ecad18eeb6a38b243ff0037e',1,'mitem.php']]], ['mitem_5finit',['mitem_init',['../mitem_8php.html#a9627cd857cafdf04e4fc0ae48c8e8518',1,'mitem.php']]], diff --git a/doc/html/search/functions_70.js b/doc/html/search/functions_70.js index f63d7379c..d9f5ca8ce 100644 --- a/doc/html/search/functions_70.js +++ b/doc/html/search/functions_70.js @@ -83,6 +83,7 @@ var searchData= ['protect_5fsprintf',['protect_sprintf',['../text_8php.html#a4e7698aca48982512594b274543c3b9b',1,'text.php']]], ['public_5fpermissions_5fsql',['public_permissions_sql',['../security_8php.html#ab3bdd30dc60d9ee72370b866aa4a2d01',1,'security.php']]], ['public_5frecips',['public_recips',['../zot_8php.html#a083aec6c900d244e1bfc1406f9461465',1,'zot.php']]], + ['pubsites_5fcontent',['pubsites_content',['../pubsites_8php.html#af614e279aab54065345bda6b03eafdf0',1,'pubsites.php']]], ['purify_5fhtml',['purify_html',['../text_8php.html#a4841df5beabdd1bdd1ed56781a915d61',1,'text.php']]], ['push_5flang',['push_lang',['../language_8php.html#ac9142ef1d01a235c760deb0f16643f5a',1,'language.php']]] ]; diff --git a/doc/html/search/functions_7a.js b/doc/html/search/functions_7a.js index 9c1b34db7..9b194afe1 100644 --- a/doc/html/search/functions_7a.js +++ b/doc/html/search/functions_7a.js @@ -2,6 +2,7 @@ var searchData= [ ['z_5fbirthday',['z_birthday',['../boot_8php.html#ab55e545b72ec8c097e052ea7d373491f',1,'boot.php']]], ['z_5ffetch_5furl',['z_fetch_url',['../include_2network_8php.html#aafd06c0a75402aefb06cfb9f9740fa37',1,'network.php']]], + ['z_5finput_5ffilter',['z_input_filter',['../text_8php.html#a324c58f37f6acdf9cd1922aa76077d9f',1,'text.php']]], ['z_5fmime_5fcontent_5ftype',['z_mime_content_type',['../include_2attach_8php.html#a6fdd92775f31c07d2863e16e0026018a',1,'attach.php']]], ['z_5fpath',['z_path',['../boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda',1,'boot.php']]], ['z_5fpost_5furl',['z_post_url',['../include_2network_8php.html#a9129fd55e7fc175b4ea9a195cccc16bc',1,'network.php']]], @@ -25,5 +26,6 @@ var searchData= ['zot_5frefresh',['zot_refresh',['../zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d',1,'zot.php']]], ['zot_5fregister_5fhub',['zot_register_hub',['../zot_8php.html#a5bcdfef419b16075a0eca990956223dc',1,'zot.php']]], ['zot_5fzot',['zot_zot',['../zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142',1,'zot.php']]], - ['zotfeed_5finit',['zotfeed_init',['../zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac',1,'zotfeed.php']]] + ['zotfeed_5finit',['zotfeed_init',['../zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac',1,'zotfeed.php']]], + ['zping_5fcontent',['zping_content',['../zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75',1,'zping.php']]] ]; diff --git a/doc/html/taxonomy_8php.html b/doc/html/taxonomy_8php.html index bf42e21e7..71a42aaba 100644 --- a/doc/html/taxonomy_8php.html +++ b/doc/html/taxonomy_8php.html @@ -246,7 +246,7 @@ Functions diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index 26822ca21..950b26d07 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -121,6 +121,8 @@ Functions    escape_tags ($string)   + z_input_filter ($channel_id, $s, $type= 'text/bbcode') +   purify_html ($s)    autoname ($len) @@ -213,6 +215,10 @@ Functions    unamp ($s)   + layout_select ($channel_id, $current= '') +  + mimetype_select ($channel_id, $current= 'text/bbcode') +   lang_selector ()    return_bytes ($size_str) @@ -267,6 +273,8 @@ Functions    json_decode_plus ($s)   + design_tools () +  @@ -459,7 +467,7 @@ Variables

    Variables

    @@ -601,6 +609,23 @@ Variables

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

    + + + +
    +
    + + + + + + + +
    design_tools ()
    +
    @@ -651,7 +676,7 @@ Variables
    Returns
    string
    -

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

    +

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

    @@ -1046,6 +1071,34 @@ Variables

    Referenced by nav().

    + + + +
    +
    + + + + + + + + + + + + + + + + + + +
    layout_select ( $channel_id,
     $current = '' 
    )
    +
    + +

    Referenced by editwebpage_content().

    +
    @@ -1140,7 +1193,7 @@ Variables
    -

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

    +

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

    @@ -1232,6 +1285,32 @@ Variables

    Referenced by contact_block().

    + + + +
    +
    + + + + + + + + + + + + + + + + + + +
    mimetype_select ( $channel_id,
     $current = 'text/bbcode' 
    )
    +
    +
    @@ -1418,7 +1497,7 @@ Variables @@ -1488,7 +1567,7 @@ Variables @@ -1597,7 +1676,7 @@ Variables
    Returns
    string substituted string
    -

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

    +

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

    @@ -1797,7 +1876,7 @@ Variables @@ -1907,6 +1986,40 @@ Variables

    Referenced by array_xmlify(), atom_author(), atom_entry(), construct_activity_object(), construct_activity_target(), encode_rel_links(), get_atom_elements(), get_feed_for(), item_getfeedattach(), photos_post(), subthread_content(), tagger_content(), and xml_status().

    + + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    z_input_filter ( $channel_id,
     $s,
     $type = 'text/bbcode' 
    )
    +
    + +

    Referenced by item_post(), and item_store().

    +
    diff --git a/doc/html/text_8php.js b/doc/html/text_8php.js index 95f22ca57..8d9ca1c8f 100644 --- a/doc/html/text_8php.js +++ b/doc/html/text_8php.js @@ -15,6 +15,7 @@ var text_8php = [ "cleardiv", "text_8php.html#afe18627c4983ee5f7c940a0992818cd5", null ], [ "contact_block", "text_8php.html#ad6432621d0fafcbcf3d3b9b49bef7784", null ], [ "day_translate", "text_8php.html#a63fb21c0bed2fc72eef2c1471ac42b63", null ], + [ "design_tools", "text_8php.html#a87a3cefc603302c78982f1d8e1245265", null ], [ "dlogger", "text_8php.html#a0a1f7c0e97f9ecbebf3e5834582b014c", null ], [ "escape_tags", "text_8php.html#aa5148a0dfea2a1ca64c3d52f10aa2d64", null ], [ "expand_acl", "text_8php.html#ae4282a39492caa23ccbc2ce98e54f110", null ], @@ -37,6 +38,7 @@ var text_8php = [ "jindent", "text_8php.html#ae17b39d5e321debd3ad16dcbbde842b8", null ], [ "json_decode_plus", "text_8php.html#a0271381208acfa2d4cff36da281e3e23", null ], [ "lang_selector", "text_8php.html#a71f6952243d3fe1c5a8154f78027e29c", null ], + [ "layout_select", "text_8php.html#a3999a0b3e22e440f280ee791ce34d384", null ], [ "legal_webbie", "text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728", null ], [ "link_compare", "text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285", null ], [ "linkify", "text_8php.html#a11255c8c4e5245b6c24f97684826aa54", null ], @@ -44,6 +46,7 @@ var text_8php = [ "magic_link", "text_8php.html#a1e510c53624933ce9b7d6715784894db", null ], [ "magiclink_url", "text_8php.html#a24d441d30df4b8e6bf6780bf62a5e2c6", null ], [ "micropro", "text_8php.html#a2a902f5fdba8646333e997898ac45ea3", null ], + [ "mimetype_select", "text_8php.html#a1633412120f52bdce5f43e0a127d9293", null ], [ "normalise_link", "text_8php.html#a4bbb7d00c05cd20b4e043424f322388f", null ], [ "normalise_openid", "text_8php.html#adba17ec946f4285285dc100f7860bf51", null ], [ "notags", "text_8php.html#a1af49756c8c71902a66c7e329c462beb", null ], @@ -74,6 +77,7 @@ var text_8php = [ "xchan_mail_query", "text_8php.html#a543447c5ed766535221e2d9636b379ee", null ], [ "xchan_query", "text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f", null ], [ "xmlify", "text_8php.html#aaed4413ed8918838b517e3b2fafaea0d", null ], + [ "z_input_filter", "text_8php.html#a324c58f37f6acdf9cd1922aa76077d9f", null ], [ "zidify_callback", "text_8php.html#a405afe814a23f3bd94d826101aa168ab", null ], [ "zidify_img_callback", "text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4", null ], [ "zidify_links", "text_8php.html#a29988052f3944111def3b6aaf2c7a8f6", null ], diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html index 19c251680..f7eee63fd 100644 --- a/doc/html/typo_8php.html +++ b/doc/html/typo_8php.html @@ -134,7 +134,7 @@ Variables
    -

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

    +

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

    diff --git a/doc/html/zot_8php.html b/doc/html/zot_8php.html index ce7997d6d..bcfd1c834 100644 --- a/doc/html/zot_8php.html +++ b/doc/html/zot_8php.html @@ -637,7 +637,7 @@ Functions @@ -905,7 +905,7 @@ Functions
    Returns
    : array => see z_post_url for returned data format
    -

    Referenced by deliver_run(), directory_run(), notifier_run(), post_init(), queue_run(), and zot_fetch().

    +

    Referenced by deliver_run(), directory_run(), notifier_run(), post_init(), queue_run(), zot_fetch(), and zping_content().

    diff --git a/mod/editblock.php b/mod/editblock.php index 25ae8d8b6..256bd1607 100644 --- a/mod/editblock.php +++ b/mod/editblock.php @@ -65,6 +65,20 @@ function editblock_content(&$a) { if(feature_enabled(local_user(),'richtext')) $plaintext = false; + $mimeselect = ''; + + if($mimetype != 'text/bbcode') + $plaintext = true; + + if(get_config('system','page_mimetype')) + $mimeselect = ''; + else + $mimeselect = mimetype_select($item[0]['uid'],$mimetype); + + + + + $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( '$title' => t('Edit block') )); @@ -110,6 +124,7 @@ function editblock_content(&$a) { '$wait' => t('Please wait'), '$permset' => t('Permission settings'), '$ptyp' => $itm[0]['type'], + '$mimeselect' => $mimeselect, '$content' => undo_post_tagging($itm[0]['body']), '$post_id' => $post_id, '$baseurl' => $a->get_baseurl(), diff --git a/mod/editwebpage.php b/mod/editwebpage.php index 6ce5a9493..66137c474 100644 --- a/mod/editwebpage.php +++ b/mod/editwebpage.php @@ -71,8 +71,11 @@ function editwebpage_content(&$a) { if($mimetype != 'text/bbcode') $plaintext = true; - $mimeselect = ''; - + + if(get_config('system','page_mimetype')) + $mimeselect = ''; + else + $mimeselect = mimetype_select($item[0]['uid'],$mimetype); $layout = get_config('system','page_layout'); if($layout) diff --git a/mod/item.php b/mod/item.php index dc00efd35..3069bfa4d 100644 --- a/mod/item.php +++ b/mod/item.php @@ -627,9 +627,10 @@ function item_post(&$a) { if($orig_post) { - $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `attach` = '%s', `edited` = '%s', layout_mid = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1", + $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `mimetype` = '%s', `attach` = '%s', `edited` = '%s', layout_mid = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1", dbesc($datarray['title']), dbesc($datarray['body']), + dbesc($datarray['mimetype']), dbesc($datarray['attach']), dbesc(datetime_convert()), dbesc($layout_mid), diff --git a/util/messages.po b/util/messages.po index d416296dd..6b6d2b467 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2013-08-30.421\n" +"Project-Id-Version: 2013-09-06.428\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-30 00:01-0700\n" +"POT-Creation-Date: 2013-09-06 00:01-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -242,13 +242,13 @@ msgstr "" msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: ../../include/comanche.php:39 +#: ../../include/comanche.php:33 msgid "Default" msgstr "" #: ../../include/Contact.php:87 ../../include/contact_widgets.php:9 #: ../../mod/directory.php:163 ../../mod/match.php:58 ../../mod/suggest.php:56 -#: ../../boot.php:1686 +#: ../../boot.php:1687 msgid "Connect" msgstr "" @@ -260,33 +260,33 @@ msgstr "" msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/Contact.php:462 ../../include/conversation.php:914 +#: ../../include/Contact.php:462 ../../include/conversation.php:920 msgid "Poke" msgstr "" -#: ../../include/Contact.php:463 ../../include/conversation.php:908 +#: ../../include/Contact.php:463 ../../include/conversation.php:914 msgid "View Status" msgstr "" #: ../../include/Contact.php:464 ../../include/nav.php:75 -#: ../../include/conversation.php:909 ../../mod/connections.php:304 +#: ../../include/conversation.php:915 ../../mod/connections.php:304 #: ../../mod/connections.php:411 msgid "View Profile" msgstr "" -#: ../../include/Contact.php:465 ../../include/conversation.php:910 +#: ../../include/Contact.php:465 ../../include/conversation.php:916 msgid "View Photos" msgstr "" -#: ../../include/Contact.php:466 ../../include/conversation.php:911 +#: ../../include/Contact.php:466 ../../include/conversation.php:917 msgid "Network Posts" msgstr "" -#: ../../include/Contact.php:467 ../../include/conversation.php:912 +#: ../../include/Contact.php:467 ../../include/conversation.php:918 msgid "Edit Contact" msgstr "" -#: ../../include/Contact.php:468 ../../include/conversation.php:913 +#: ../../include/Contact.php:468 ../../include/conversation.php:919 msgid "Send PM" msgstr "" @@ -351,7 +351,7 @@ msgid "RSS/Atom" msgstr "" #: ../../include/contact_selectors.php:77 ../../mod/admin.php:636 -#: ../../mod/admin.php:645 ../../boot.php:1421 +#: ../../mod/admin.php:645 ../../boot.php:1422 msgid "Email" msgstr "" @@ -550,7 +550,7 @@ msgid "Finishes:" msgstr "" #: ../../include/event.php:40 ../../include/bb2diaspora.php:455 -#: ../../mod/events.php:450 ../../mod/directory.php:138 ../../boot.php:1736 +#: ../../mod/events.php:450 ../../mod/directory.php:138 ../../boot.php:1737 msgid "Location:" msgstr "" @@ -915,7 +915,7 @@ msgid "Full Name:" msgstr "" #: ../../include/profile_advanced.php:17 ../../mod/directory.php:140 -#: ../../boot.php:1738 +#: ../../boot.php:1739 msgid "Gender:" msgstr "" @@ -936,7 +936,7 @@ msgid "Age:" msgstr "" #: ../../include/profile_advanced.php:37 ../../mod/directory.php:142 -#: ../../boot.php:1739 +#: ../../boot.php:1740 msgid "Status:" msgstr "" @@ -950,7 +950,7 @@ msgid "Sexual Preference:" msgstr "" #: ../../include/profile_advanced.php:48 ../../mod/directory.php:144 -#: ../../boot.php:1740 +#: ../../boot.php:1741 msgid "Homepage:" msgstr "" @@ -1018,7 +1018,7 @@ msgstr "" msgid "School/education:" msgstr "" -#: ../../include/nav.php:71 ../../include/nav.php:86 ../../boot.php:1418 +#: ../../include/nav.php:71 ../../include/nav.php:86 ../../boot.php:1419 msgid "Logout" msgstr "" @@ -1047,7 +1047,7 @@ msgstr "" msgid "Manage/Edit Profiles" msgstr "" -#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2176 +#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2180 msgid "Photos" msgstr "" @@ -1055,7 +1055,7 @@ msgstr "" msgid "Your photos" msgstr "" -#: ../../include/nav.php:84 ../../boot.php:1419 +#: ../../include/nav.php:84 ../../boot.php:1420 msgid "Login" msgstr "" @@ -1076,7 +1076,7 @@ msgstr "" msgid "Home Page" msgstr "" -#: ../../include/nav.php:120 ../../mod/register.php:181 ../../boot.php:1394 +#: ../../include/nav.php:120 ../../mod/register.php:187 ../../boot.php:1395 msgid "Register" msgstr "" @@ -1100,8 +1100,8 @@ msgstr "" msgid "Addon applications, utilities, games" msgstr "" -#: ../../include/nav.php:130 ../../include/text.php:701 -#: ../../include/text.php:702 ../../mod/search.php:96 +#: ../../include/nav.php:130 ../../include/text.php:729 +#: ../../include/text.php:730 ../../mod/search.php:96 msgid "Search" msgstr "" @@ -1197,7 +1197,7 @@ msgstr "" msgid "New Message" msgstr "" -#: ../../include/nav.php:169 ../../mod/events.php:348 ../../boot.php:2187 +#: ../../include/nav.php:169 ../../mod/events.php:348 ../../boot.php:2191 msgid "Events" msgstr "" @@ -1275,7 +1275,7 @@ msgstr "" #: ../../include/attach.php:133 ../../include/attach.php:189 #: ../../include/attach.php:204 ../../include/attach.php:237 #: ../../include/attach.php:251 ../../include/attach.php:272 -#: ../../include/attach.php:464 ../../include/items.php:3316 +#: ../../include/attach.php:464 ../../include/items.php:3336 #: ../../mod/common.php:43 ../../mod/events.php:134 ../../mod/invite.php:13 #: ../../mod/invite.php:102 ../../mod/allfriends.php:10 #: ../../mod/webpages.php:40 ../../mod/api.php:26 ../../mod/api.php:31 @@ -1284,15 +1284,18 @@ msgstr "" #: ../../mod/viewconnections.php:38 ../../mod/delegate.php:6 #: ../../mod/mitem.php:92 ../../mod/group.php:15 ../../mod/photos.php:74 #: ../../mod/photos.php:645 ../../mod/viewsrc.php:12 ../../mod/menu.php:40 -#: ../../mod/message.php:204 ../../mod/item.php:152 ../../mod/network.php:7 -#: ../../mod/intro.php:50 ../../mod/connections.php:174 -#: ../../mod/profiles.php:163 ../../mod/profiles.php:476 -#: ../../mod/new_channel.php:66 ../../mod/new_channel.php:97 -#: ../../mod/manage.php:6 ../../mod/crepair.php:115 ../../mod/nogroup.php:25 -#: ../../mod/profile_photo.php:197 ../../mod/profile_photo.php:210 -#: ../../mod/editwebpage.php:49 ../../mod/notifications.php:66 -#: ../../mod/editpost.php:11 ../../mod/poke.php:128 ../../mod/channel.php:115 -#: ../../mod/fsuggest.php:78 ../../mod/suggest.php:32 +#: ../../mod/message.php:204 ../../mod/layouts.php:27 ../../mod/layouts.php:42 +#: ../../mod/item.php:152 ../../mod/network.php:7 ../../mod/intro.php:50 +#: ../../mod/connections.php:174 ../../mod/profiles.php:163 +#: ../../mod/profiles.php:476 ../../mod/new_channel.php:66 +#: ../../mod/new_channel.php:97 ../../mod/manage.php:6 +#: ../../mod/crepair.php:115 ../../mod/editlayout.php:49 +#: ../../mod/nogroup.php:25 ../../mod/profile_photo.php:197 +#: ../../mod/profile_photo.php:210 ../../mod/editwebpage.php:43 +#: ../../mod/editwebpage.php:65 ../../mod/notifications.php:66 +#: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/editpost.php:13 +#: ../../mod/poke.php:128 ../../mod/channel.php:115 ../../mod/fsuggest.php:78 +#: ../../mod/editblock.php:49 ../../mod/suggest.php:32 #: ../../mod/register.php:60 ../../mod/regmod.php:18 ../../mod/mood.php:112 #: ../../index.php:178 ../../index.php:340 msgid "Permission denied." @@ -1315,7 +1318,7 @@ msgstr "" msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:287 ../../boot.php:2179 +#: ../../include/photos.php:287 ../../boot.php:2183 msgid "Photo Albums" msgstr "" @@ -1689,331 +1692,359 @@ msgstr "" msgid "Encrypted content" msgstr "" -#: ../../include/text.php:281 +#: ../../include/text.php:309 msgid "prev" msgstr "" -#: ../../include/text.php:283 +#: ../../include/text.php:311 msgid "first" msgstr "" -#: ../../include/text.php:312 +#: ../../include/text.php:340 msgid "last" msgstr "" -#: ../../include/text.php:315 +#: ../../include/text.php:343 msgid "next" msgstr "" -#: ../../include/text.php:327 +#: ../../include/text.php:355 msgid "older" msgstr "" -#: ../../include/text.php:329 +#: ../../include/text.php:357 msgid "newer" msgstr "" -#: ../../include/text.php:620 +#: ../../include/text.php:648 msgid "No connections" msgstr "" -#: ../../include/text.php:631 +#: ../../include/text.php:659 #, php-format msgid "%d Connection" msgid_plural "%d Connections" msgstr[0] "" msgstr[1] "" -#: ../../include/text.php:643 +#: ../../include/text.php:671 msgid "View Connections" msgstr "" -#: ../../include/text.php:704 ../../mod/filer.php:36 +#: ../../include/text.php:732 ../../mod/filer.php:36 msgid "Save" msgstr "" -#: ../../include/text.php:742 +#: ../../include/text.php:770 msgid "poke" msgstr "" -#: ../../include/text.php:742 ../../include/conversation.php:230 +#: ../../include/text.php:770 ../../include/conversation.php:236 msgid "poked" msgstr "" -#: ../../include/text.php:743 +#: ../../include/text.php:771 msgid "ping" msgstr "" -#: ../../include/text.php:743 +#: ../../include/text.php:771 msgid "pinged" msgstr "" -#: ../../include/text.php:744 +#: ../../include/text.php:772 msgid "prod" msgstr "" -#: ../../include/text.php:744 +#: ../../include/text.php:772 msgid "prodded" msgstr "" -#: ../../include/text.php:745 +#: ../../include/text.php:773 msgid "slap" msgstr "" -#: ../../include/text.php:745 +#: ../../include/text.php:773 msgid "slapped" msgstr "" -#: ../../include/text.php:746 +#: ../../include/text.php:774 msgid "finger" msgstr "" -#: ../../include/text.php:746 +#: ../../include/text.php:774 msgid "fingered" msgstr "" -#: ../../include/text.php:747 +#: ../../include/text.php:775 msgid "rebuff" msgstr "" -#: ../../include/text.php:747 +#: ../../include/text.php:775 msgid "rebuffed" msgstr "" -#: ../../include/text.php:759 +#: ../../include/text.php:787 msgid "happy" msgstr "" -#: ../../include/text.php:760 +#: ../../include/text.php:788 msgid "sad" msgstr "" -#: ../../include/text.php:761 +#: ../../include/text.php:789 msgid "mellow" msgstr "" -#: ../../include/text.php:762 +#: ../../include/text.php:790 msgid "tired" msgstr "" -#: ../../include/text.php:763 +#: ../../include/text.php:791 msgid "perky" msgstr "" -#: ../../include/text.php:764 +#: ../../include/text.php:792 msgid "angry" msgstr "" -#: ../../include/text.php:765 +#: ../../include/text.php:793 msgid "stupified" msgstr "" -#: ../../include/text.php:766 +#: ../../include/text.php:794 msgid "puzzled" msgstr "" -#: ../../include/text.php:767 +#: ../../include/text.php:795 msgid "interested" msgstr "" -#: ../../include/text.php:768 +#: ../../include/text.php:796 msgid "bitter" msgstr "" -#: ../../include/text.php:769 +#: ../../include/text.php:797 msgid "cheerful" msgstr "" -#: ../../include/text.php:770 +#: ../../include/text.php:798 msgid "alive" msgstr "" -#: ../../include/text.php:771 +#: ../../include/text.php:799 msgid "annoyed" msgstr "" -#: ../../include/text.php:772 +#: ../../include/text.php:800 msgid "anxious" msgstr "" -#: ../../include/text.php:773 +#: ../../include/text.php:801 msgid "cranky" msgstr "" -#: ../../include/text.php:774 +#: ../../include/text.php:802 msgid "disturbed" msgstr "" -#: ../../include/text.php:775 +#: ../../include/text.php:803 msgid "frustrated" msgstr "" -#: ../../include/text.php:776 +#: ../../include/text.php:804 msgid "motivated" msgstr "" -#: ../../include/text.php:777 +#: ../../include/text.php:805 msgid "relaxed" msgstr "" -#: ../../include/text.php:778 +#: ../../include/text.php:806 msgid "surprised" msgstr "" -#: ../../include/text.php:940 +#: ../../include/text.php:968 msgid "Monday" msgstr "" -#: ../../include/text.php:940 +#: ../../include/text.php:968 msgid "Tuesday" msgstr "" -#: ../../include/text.php:940 +#: ../../include/text.php:968 msgid "Wednesday" msgstr "" -#: ../../include/text.php:940 +#: ../../include/text.php:968 msgid "Thursday" msgstr "" -#: ../../include/text.php:940 +#: ../../include/text.php:968 msgid "Friday" msgstr "" -#: ../../include/text.php:940 +#: ../../include/text.php:968 msgid "Saturday" msgstr "" -#: ../../include/text.php:940 +#: ../../include/text.php:968 msgid "Sunday" msgstr "" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "January" msgstr "" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "February" msgstr "" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "March" msgstr "" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "April" msgstr "" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "May" msgstr "" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "June" msgstr "" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "July" msgstr "" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "August" msgstr "" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "September" msgstr "" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "October" msgstr "" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "November" msgstr "" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "December" msgstr "" -#: ../../include/text.php:1029 ../../mod/message.php:400 +#: ../../include/text.php:1057 ../../mod/message.php:400 msgid "unknown.???" msgstr "" -#: ../../include/text.php:1030 ../../mod/message.php:401 +#: ../../include/text.php:1058 ../../mod/message.php:401 msgid "bytes" msgstr "" -#: ../../include/text.php:1066 ../../include/text.php:1081 -#: ../../include/conversation.php:814 +#: ../../include/text.php:1094 ../../include/text.php:1109 +#: ../../include/conversation.php:820 msgid "remove" msgstr "" -#: ../../include/text.php:1066 ../../include/text.php:1081 +#: ../../include/text.php:1094 ../../include/text.php:1109 msgid "[remove]" msgstr "" -#: ../../include/text.php:1069 ../../include/conversation.php:661 +#: ../../include/text.php:1097 ../../include/conversation.php:667 msgid "Categories:" msgstr "" -#: ../../include/text.php:1084 ../../include/conversation.php:662 +#: ../../include/text.php:1112 ../../include/conversation.php:668 msgid "Filed under:" msgstr "" -#: ../../include/text.php:1100 ../../include/text.php:1112 +#: ../../include/text.php:1128 ../../include/text.php:1140 msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1280 ../../mod/events.php:326 +#: ../../include/text.php:1311 ../../mod/events.php:326 msgid "link to source" msgstr "" -#: ../../include/text.php:1312 +#: ../../include/text.php:1330 +msgid "Select a page layout: " +msgstr "" + +#: ../../include/text.php:1333 ../../include/text.php:1398 msgid "default" msgstr "" -#: ../../include/text.php:1324 +#: ../../include/text.php:1369 +msgid "Page content type: " +msgstr "" + +#: ../../include/text.php:1410 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1476 ../../include/conversation.php:111 +#: ../../include/text.php:1562 ../../include/conversation.php:117 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45 msgid "photo" msgstr "" -#: ../../include/text.php:1479 ../../include/conversation.php:114 +#: ../../include/text.php:1565 ../../include/conversation.php:120 #: ../../mod/tagger.php:49 msgid "event" msgstr "" -#: ../../include/text.php:1482 ../../include/conversation.php:139 +#: ../../include/text.php:1568 ../../include/conversation.php:145 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53 msgid "status" msgstr "" -#: ../../include/text.php:1484 ../../include/conversation.php:141 +#: ../../include/text.php:1570 ../../include/conversation.php:147 #: ../../mod/tagger.php:55 msgid "comment" msgstr "" -#: ../../include/text.php:1489 +#: ../../include/text.php:1575 msgid "activity" msgstr "" +#: ../../include/text.php:1836 +msgid "Design" +msgstr "" + +#: ../../include/text.php:1837 +msgid "Blocks" +msgstr "" + +#: ../../include/text.php:1838 +msgid "Menus" +msgstr "" + +#: ../../include/text.php:1839 +msgid "Layouts" +msgstr "" + +#: ../../include/text.php:1840 +msgid "Pages" +msgstr "" + #: ../../include/page_widgets.php:6 msgid "New Page" msgstr "" -#: ../../include/auth.php:65 +#: ../../include/auth.php:66 msgid "Logged out." msgstr "" -#: ../../include/auth.php:177 +#: ../../include/auth.php:178 msgid "Failed authentication" msgstr "" -#: ../../include/auth.php:186 +#: ../../include/auth.php:187 msgid "Login failed." msgstr "" @@ -2194,20 +2225,22 @@ msgstr "" msgid "Private Message" msgstr "" -#: ../../include/ItemObject.php:92 ../../mod/webpages.php:81 -#: ../../mod/settings.php:683 ../../mod/menu.php:52 -#: ../../mod/editwebpage.php:101 ../../mod/editpost.php:76 +#: ../../include/ItemObject.php:92 ../../mod/webpages.php:98 +#: ../../mod/settings.php:683 ../../mod/menu.php:55 ../../mod/layouts.php:89 +#: ../../mod/editlayout.php:101 ../../mod/editwebpage.php:117 +#: ../../mod/blocks.php:92 ../../mod/editpost.php:94 +#: ../../mod/editblock.php:101 msgid "Edit" msgstr "" -#: ../../include/ItemObject.php:104 ../../include/conversation.php:625 +#: ../../include/ItemObject.php:104 ../../include/conversation.php:631 #: ../../mod/settings.php:684 ../../mod/group.php:182 #: ../../mod/photos.php:1123 ../../mod/connections.php:344 #: ../../mod/admin.php:640 msgid "Delete" msgstr "" -#: ../../include/ItemObject.php:110 ../../include/conversation.php:624 +#: ../../include/ItemObject.php:110 ../../include/conversation.php:630 msgid "Select" msgstr "" @@ -2268,15 +2301,16 @@ msgstr "" msgid "via Wall-To-Wall:" msgstr "" -#: ../../include/ItemObject.php:206 ../../include/conversation.php:671 +#: ../../include/ItemObject.php:206 ../../include/conversation.php:677 #, php-format msgid " from %s" msgstr "" -#: ../../include/ItemObject.php:233 ../../include/conversation.php:690 -#: ../../include/conversation.php:1061 ../../mod/photos.php:1056 +#: ../../include/ItemObject.php:233 ../../include/conversation.php:696 +#: ../../include/conversation.php:1092 ../../mod/photos.php:1056 #: ../../mod/message.php:298 ../../mod/message.php:461 -#: ../../mod/editwebpage.php:110 ../../mod/editpost.php:85 +#: ../../mod/editlayout.php:110 ../../mod/editwebpage.php:126 +#: ../../mod/editpost.php:103 ../../mod/editblock.php:110 msgid "Please wait" msgstr "" @@ -2343,228 +2377,239 @@ msgstr "" msgid "Video" msgstr "" -#: ../../include/ItemObject.php:514 ../../include/conversation.php:1079 -#: ../../mod/photos.php:1075 ../../mod/editwebpage.php:130 -#: ../../mod/editpost.php:105 +#: ../../include/ItemObject.php:514 ../../include/conversation.php:1112 +#: ../../mod/photos.php:1075 ../../mod/editlayout.php:130 +#: ../../mod/editwebpage.php:148 ../../mod/editpost.php:123 +#: ../../mod/editblock.php:130 msgid "Preview" msgstr "" -#: ../../include/conversation.php:117 +#: ../../include/conversation.php:123 msgid "channel" msgstr "" -#: ../../include/conversation.php:155 ../../mod/like.php:134 +#: ../../include/conversation.php:161 ../../mod/like.php:134 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../include/conversation.php:158 ../../mod/like.php:136 +#: ../../include/conversation.php:164 ../../mod/like.php:136 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "" -#: ../../include/conversation.php:195 +#: ../../include/conversation.php:201 #, php-format msgid "%1$s is now connected with %2$s" msgstr "" -#: ../../include/conversation.php:226 +#: ../../include/conversation.php:232 #, php-format msgid "%1$s poked %2$s" msgstr "" -#: ../../include/conversation.php:248 ../../mod/mood.php:63 +#: ../../include/conversation.php:254 ../../mod/mood.php:63 #, php-format msgid "%1$s is currently %2$s" msgstr "" -#: ../../include/conversation.php:649 +#: ../../include/conversation.php:655 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:688 +#: ../../include/conversation.php:694 msgid "View in context" msgstr "" -#: ../../include/conversation.php:818 +#: ../../include/conversation.php:824 msgid "Loading..." msgstr "" -#: ../../include/conversation.php:819 +#: ../../include/conversation.php:825 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:907 +#: ../../include/conversation.php:913 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:976 -#, php-format -msgid "%s likes this." -msgstr "" - -#: ../../include/conversation.php:976 -#, php-format -msgid "%s doesn't like this." -msgstr "" - -#: ../../include/conversation.php:980 -#, php-format -msgid "%2$d people like this." -msgstr "" - #: ../../include/conversation.php:982 #, php-format -msgid "%2$d people don't like this." +msgid "%s likes this." +msgstr "" + +#: ../../include/conversation.php:982 +#, php-format +msgid "%s doesn't like this." +msgstr "" + +#: ../../include/conversation.php:986 +#, php-format +msgid "%2$d people like this." msgstr "" #: ../../include/conversation.php:988 +#, php-format +msgid "%2$d people don't like this." +msgstr "" + +#: ../../include/conversation.php:994 msgid "and" msgstr "" -#: ../../include/conversation.php:991 +#: ../../include/conversation.php:997 #, php-format msgid ", and %d other people" msgstr "" -#: ../../include/conversation.php:992 +#: ../../include/conversation.php:998 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:992 +#: ../../include/conversation.php:998 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1017 +#: ../../include/conversation.php:1048 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:1018 ../../mod/message.php:253 +#: ../../include/conversation.php:1049 ../../mod/message.php:253 #: ../../mod/message.php:365 msgid "Please enter a link URL:" msgstr "" -#: ../../include/conversation.php:1019 +#: ../../include/conversation.php:1050 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:1020 +#: ../../include/conversation.php:1051 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:1021 +#: ../../include/conversation.php:1052 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1022 ../../mod/filer.php:35 +#: ../../include/conversation.php:1053 ../../mod/filer.php:35 msgid "Save to Folder:" msgstr "" -#: ../../include/conversation.php:1023 +#: ../../include/conversation.php:1054 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1038 ../../mod/photos.php:1055 +#: ../../include/conversation.php:1069 ../../mod/photos.php:1055 msgid "Share" msgstr "" -#: ../../include/conversation.php:1040 +#: ../../include/conversation.php:1071 msgid "Page link title" msgstr "" -#: ../../include/conversation.php:1042 ../../mod/message.php:295 -#: ../../mod/message.php:457 ../../mod/editwebpage.php:102 -#: ../../mod/editpost.php:77 +#: ../../include/conversation.php:1073 ../../mod/message.php:295 +#: ../../mod/message.php:457 ../../mod/editlayout.php:102 +#: ../../mod/editwebpage.php:118 ../../mod/editpost.php:95 +#: ../../mod/editblock.php:102 msgid "Upload photo" msgstr "" -#: ../../include/conversation.php:1043 +#: ../../include/conversation.php:1074 msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1044 ../../mod/message.php:296 -#: ../../mod/message.php:458 ../../mod/editwebpage.php:103 -#: ../../mod/editpost.php:78 +#: ../../include/conversation.php:1075 ../../mod/message.php:296 +#: ../../mod/message.php:458 ../../mod/editlayout.php:103 +#: ../../mod/editwebpage.php:119 ../../mod/editpost.php:96 +#: ../../mod/editblock.php:103 msgid "Attach file" msgstr "" -#: ../../include/conversation.php:1045 +#: ../../include/conversation.php:1076 msgid "attach file" msgstr "" -#: ../../include/conversation.php:1046 ../../mod/message.php:297 -#: ../../mod/message.php:459 ../../mod/editwebpage.php:104 -#: ../../mod/editpost.php:79 +#: ../../include/conversation.php:1077 ../../mod/message.php:297 +#: ../../mod/message.php:459 ../../mod/editlayout.php:104 +#: ../../mod/editwebpage.php:120 ../../mod/editpost.php:97 +#: ../../mod/editblock.php:104 msgid "Insert web link" msgstr "" -#: ../../include/conversation.php:1047 +#: ../../include/conversation.php:1078 msgid "web link" msgstr "" -#: ../../include/conversation.php:1048 +#: ../../include/conversation.php:1079 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:1049 +#: ../../include/conversation.php:1080 msgid "video link" msgstr "" -#: ../../include/conversation.php:1050 +#: ../../include/conversation.php:1081 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:1051 +#: ../../include/conversation.php:1082 msgid "audio link" msgstr "" -#: ../../include/conversation.php:1052 ../../mod/editwebpage.php:108 -#: ../../mod/editpost.php:83 +#: ../../include/conversation.php:1083 ../../mod/editlayout.php:108 +#: ../../mod/editwebpage.php:124 ../../mod/editpost.php:101 +#: ../../mod/editblock.php:108 msgid "Set your location" msgstr "" -#: ../../include/conversation.php:1053 +#: ../../include/conversation.php:1084 msgid "set location" msgstr "" -#: ../../include/conversation.php:1054 ../../mod/editwebpage.php:109 -#: ../../mod/editpost.php:84 +#: ../../include/conversation.php:1085 ../../mod/editlayout.php:109 +#: ../../mod/editwebpage.php:125 ../../mod/editpost.php:102 +#: ../../mod/editblock.php:109 msgid "Clear browser location" msgstr "" -#: ../../include/conversation.php:1055 +#: ../../include/conversation.php:1086 msgid "clear location" msgstr "" -#: ../../include/conversation.php:1057 ../../mod/editwebpage.php:122 -#: ../../mod/editpost.php:97 +#: ../../include/conversation.php:1088 ../../mod/editlayout.php:122 +#: ../../mod/editwebpage.php:140 ../../mod/editpost.php:115 +#: ../../mod/editblock.php:122 msgid "Set title" msgstr "" -#: ../../include/conversation.php:1060 ../../mod/editwebpage.php:124 -#: ../../mod/editpost.php:99 +#: ../../include/conversation.php:1091 ../../mod/editlayout.php:124 +#: ../../mod/editwebpage.php:142 ../../mod/editpost.php:117 +#: ../../mod/editblock.php:124 msgid "Categories (comma-separated list)" msgstr "" -#: ../../include/conversation.php:1062 ../../mod/editwebpage.php:111 -#: ../../mod/editpost.php:86 +#: ../../include/conversation.php:1093 ../../mod/editlayout.php:111 +#: ../../mod/editwebpage.php:127 ../../mod/editpost.php:104 +#: ../../mod/editblock.php:111 msgid "Permission settings" msgstr "" -#: ../../include/conversation.php:1063 +#: ../../include/conversation.php:1094 msgid "permissions" msgstr "" -#: ../../include/conversation.php:1071 ../../mod/editwebpage.php:119 -#: ../../mod/editpost.php:94 +#: ../../include/conversation.php:1102 ../../mod/editlayout.php:119 +#: ../../mod/editwebpage.php:135 ../../mod/editpost.php:112 +#: ../../mod/editblock.php:119 msgid "Public post" msgstr "" -#: ../../include/conversation.php:1073 ../../mod/editwebpage.php:125 -#: ../../mod/editpost.php:100 +#: ../../include/conversation.php:1104 ../../mod/editlayout.php:125 +#: ../../mod/editwebpage.php:143 ../../mod/editpost.php:118 +#: ../../mod/editblock.php:125 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -2573,25 +2618,25 @@ msgstr "" msgid "Permission denied" msgstr "" -#: ../../include/items.php:3265 ../../mod/page.php:60 ../../mod/viewsrc.php:18 +#: ../../include/items.php:3285 ../../mod/page.php:60 ../../mod/viewsrc.php:18 #: ../../mod/home.php:64 ../../mod/admin.php:142 ../../mod/admin.php:677 #: ../../mod/admin.php:876 ../../mod/display.php:33 msgid "Item not found." msgstr "" -#: ../../include/items.php:3437 +#: ../../include/items.php:3457 msgid "Archives" msgstr "" -#: ../../include/items.php:3598 ../../mod/group.php:44 ../../mod/group.php:146 +#: ../../include/items.php:3618 ../../mod/group.php:44 ../../mod/group.php:146 msgid "Collection not found." msgstr "" -#: ../../include/items.php:3608 +#: ../../include/items.php:3628 msgid "Collection has no members." msgstr "" -#: ../../include/items.php:3624 +#: ../../include/items.php:3644 msgid "Connection not found." msgstr "" @@ -2816,12 +2861,12 @@ msgstr "" msgid "No friends to display." msgstr "" -#: ../../mod/webpages.php:8 ../../mod/connect.php:13 ../../mod/profile.php:8 -#: ../../boot.php:1592 +#: ../../mod/webpages.php:8 ../../mod/connect.php:13 ../../mod/layouts.php:8 +#: ../../mod/blocks.php:10 ../../mod/profile.php:8 ../../boot.php:1593 msgid "Requested profile is not available." msgstr "" -#: ../../mod/webpages.php:84 +#: ../../mod/webpages.php:101 ../../mod/layouts.php:92 ../../mod/blocks.php:95 msgid "View" msgstr "" @@ -3805,7 +3850,7 @@ msgstr "" msgid "No matches" msgstr "" -#: ../../mod/mitem.php:13 ../../mod/menu.php:84 +#: ../../mod/mitem.php:13 ../../mod/menu.php:87 msgid "Menu not found." msgstr "" @@ -3825,95 +3870,95 @@ msgstr "" msgid "Unable to add menu element." msgstr "" -#: ../../mod/mitem.php:97 ../../mod/xchan.php:25 ../../mod/menu.php:110 +#: ../../mod/mitem.php:97 ../../mod/xchan.php:25 ../../mod/menu.php:113 msgid "Not found." msgstr "" -#: ../../mod/mitem.php:114 +#: ../../mod/mitem.php:116 msgid "Manage Menu Elements" msgstr "" -#: ../../mod/mitem.php:117 +#: ../../mod/mitem.php:119 msgid "Edit menu" msgstr "" -#: ../../mod/mitem.php:120 +#: ../../mod/mitem.php:122 msgid "Edit element" msgstr "" -#: ../../mod/mitem.php:121 +#: ../../mod/mitem.php:123 msgid "Drop element" msgstr "" -#: ../../mod/mitem.php:122 +#: ../../mod/mitem.php:124 msgid "New element" msgstr "" -#: ../../mod/mitem.php:123 +#: ../../mod/mitem.php:125 msgid "Edit this menu container" msgstr "" -#: ../../mod/mitem.php:124 +#: ../../mod/mitem.php:126 msgid "Add menu element" msgstr "" -#: ../../mod/mitem.php:125 +#: ../../mod/mitem.php:127 msgid "Delete this menu item" msgstr "" -#: ../../mod/mitem.php:126 +#: ../../mod/mitem.php:128 msgid "Edit this menu item" msgstr "" -#: ../../mod/mitem.php:140 +#: ../../mod/mitem.php:142 msgid "New Menu Element" msgstr "" -#: ../../mod/mitem.php:142 ../../mod/mitem.php:183 +#: ../../mod/mitem.php:144 ../../mod/mitem.php:185 msgid "Link text" msgstr "" -#: ../../mod/mitem.php:143 ../../mod/mitem.php:184 +#: ../../mod/mitem.php:145 ../../mod/mitem.php:186 msgid "URL of link" msgstr "" -#: ../../mod/mitem.php:144 ../../mod/mitem.php:185 +#: ../../mod/mitem.php:146 ../../mod/mitem.php:187 msgid "Use Red magic-auth if available" msgstr "" -#: ../../mod/mitem.php:145 ../../mod/mitem.php:186 +#: ../../mod/mitem.php:147 ../../mod/mitem.php:188 msgid "Open link in new window" msgstr "" -#: ../../mod/mitem.php:147 ../../mod/mitem.php:188 +#: ../../mod/mitem.php:149 ../../mod/mitem.php:190 msgid "Order in list" msgstr "" -#: ../../mod/mitem.php:147 ../../mod/mitem.php:188 +#: ../../mod/mitem.php:149 ../../mod/mitem.php:190 msgid "Higher numbers will sink to bottom of listing" msgstr "" -#: ../../mod/mitem.php:148 ../../mod/menu.php:76 ../../mod/new_channel.php:117 +#: ../../mod/mitem.php:150 ../../mod/menu.php:79 ../../mod/new_channel.php:117 msgid "Create" msgstr "" -#: ../../mod/mitem.php:160 +#: ../../mod/mitem.php:162 msgid "Menu item not found." msgstr "" -#: ../../mod/mitem.php:169 +#: ../../mod/mitem.php:171 msgid "Menu item deleted." msgstr "" -#: ../../mod/mitem.php:171 +#: ../../mod/mitem.php:173 msgid "Menu item could not be deleted." msgstr "" -#: ../../mod/mitem.php:180 +#: ../../mod/mitem.php:182 msgid "Edit Menu Element" msgstr "" -#: ../../mod/mitem.php:189 ../../mod/menu.php:104 +#: ../../mod/mitem.php:191 ../../mod/menu.php:107 msgid "Modify" msgstr "" @@ -4109,11 +4154,11 @@ msgstr "" msgid "added your channel" msgstr "" -#: ../../mod/ping.php:230 ../../boot.php:1798 ../../boot.php:1878 +#: ../../mod/ping.php:230 ../../boot.php:1799 ../../boot.php:1879 msgid "g A l F d" msgstr "" -#: ../../mod/ping.php:252 ../../boot.php:1844 ../../boot.php:1919 +#: ../../mod/ping.php:252 ../../boot.php:1845 ../../boot.php:1920 msgid "[today]" msgstr "" @@ -4141,68 +4186,68 @@ msgstr "" msgid "Unable to create menu." msgstr "" -#: ../../mod/menu.php:50 +#: ../../mod/menu.php:53 msgid "Manage Menus" msgstr "" -#: ../../mod/menu.php:53 +#: ../../mod/menu.php:56 msgid "Drop" msgstr "" -#: ../../mod/menu.php:54 ../../mod/network.php:298 +#: ../../mod/menu.php:57 ../../mod/network.php:298 #: ../../mod/connections.php:521 msgid "New" msgstr "" -#: ../../mod/menu.php:55 +#: ../../mod/menu.php:58 msgid "Create a new menu" msgstr "" -#: ../../mod/menu.php:56 +#: ../../mod/menu.php:59 msgid "Delete this menu" msgstr "" -#: ../../mod/menu.php:57 ../../mod/menu.php:101 +#: ../../mod/menu.php:60 ../../mod/menu.php:104 msgid "Edit menu contents" msgstr "" -#: ../../mod/menu.php:58 +#: ../../mod/menu.php:61 msgid "Edit this menu" msgstr "" -#: ../../mod/menu.php:73 +#: ../../mod/menu.php:76 msgid "New Menu" msgstr "" -#: ../../mod/menu.php:74 ../../mod/menu.php:102 +#: ../../mod/menu.php:77 ../../mod/menu.php:105 msgid "Menu name" msgstr "" -#: ../../mod/menu.php:74 ../../mod/menu.php:102 +#: ../../mod/menu.php:77 ../../mod/menu.php:105 msgid "Must be unique, only seen by you" msgstr "" -#: ../../mod/menu.php:75 ../../mod/menu.php:103 +#: ../../mod/menu.php:78 ../../mod/menu.php:106 msgid "Menu title" msgstr "" -#: ../../mod/menu.php:75 ../../mod/menu.php:103 +#: ../../mod/menu.php:78 ../../mod/menu.php:106 msgid "Menu title as seen by others" msgstr "" -#: ../../mod/menu.php:90 +#: ../../mod/menu.php:93 msgid "Menu deleted." msgstr "" -#: ../../mod/menu.php:92 +#: ../../mod/menu.php:95 msgid "Menu could not be deleted." msgstr "" -#: ../../mod/menu.php:98 +#: ../../mod/menu.php:101 msgid "Edit Menu" msgstr "" -#: ../../mod/menu.php:100 +#: ../../mod/menu.php:103 msgid "Add or remove entries to this menu" msgstr "" @@ -4321,11 +4366,15 @@ msgstr "" msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:754 +#: ../../mod/item.php:334 +msgid "Executable content type not permitted to this channel." +msgstr "" + +#: ../../mod/item.php:779 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:1031 ../../mod/wall_upload.php:41 +#: ../../mod/item.php:1064 ../../mod/wall_upload.php:41 msgid "Wall Photos" msgstr "" @@ -5120,23 +5169,23 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:624 ../../boot.php:1700 +#: ../../mod/profiles.php:624 ../../boot.php:1701 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:625 ../../boot.php:1707 +#: ../../mod/profiles.php:625 ../../boot.php:1708 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:636 ../../boot.php:1721 +#: ../../mod/profiles.php:636 ../../boot.php:1722 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:639 ../../boot.php:1724 +#: ../../mod/profiles.php:639 ../../boot.php:1725 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:640 ../../boot.php:1725 +#: ../../mod/profiles.php:640 ../../boot.php:1726 msgid "Edit visibility" msgstr "" @@ -5275,7 +5324,7 @@ msgstr "" msgid "Free Access" msgstr "" -#: ../../mod/admin.php:410 ../../mod/register.php:166 +#: ../../mod/admin.php:410 ../../mod/register.php:172 msgid "Registration" msgstr "" @@ -5688,7 +5737,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1429 +#: ../../mod/lostpass.php:85 ../../boot.php:1430 msgid "Password Reset" msgstr "" @@ -5931,6 +5980,30 @@ msgstr "" msgid "Channel added." msgstr "" +#: ../../mod/editlayout.php:37 ../../mod/editwebpage.php:31 +#: ../../mod/editpost.php:20 ../../mod/editblock.php:37 +msgid "Item not found" +msgstr "" + +#: ../../mod/editlayout.php:69 ../../mod/editblock.php:69 +msgid "Edit block" +msgstr "" + +#: ../../mod/editlayout.php:105 ../../mod/editwebpage.php:121 +#: ../../mod/editpost.php:98 ../../mod/editblock.php:105 +msgid "Insert YouTube video" +msgstr "" + +#: ../../mod/editlayout.php:106 ../../mod/editwebpage.php:122 +#: ../../mod/editpost.php:99 ../../mod/editblock.php:106 +msgid "Insert Vorbis [.ogg] video" +msgstr "" + +#: ../../mod/editlayout.php:107 ../../mod/editwebpage.php:123 +#: ../../mod/editpost.php:100 ../../mod/editblock.php:107 +msgid "Insert Vorbis [.ogg] audio" +msgstr "" + #: ../../mod/nogroup.php:58 msgid "Contacts who are not members of a group" msgstr "" @@ -6011,26 +6084,10 @@ msgstr "" msgid "Image size reduction [%s] failed." msgstr "" -#: ../../mod/editwebpage.php:37 ../../mod/editpost.php:18 -msgid "Item not found" -msgstr "" - -#: ../../mod/editwebpage.php:69 ../../mod/editpost.php:38 +#: ../../mod/editwebpage.php:85 ../../mod/editpost.php:40 msgid "Edit post" msgstr "" -#: ../../mod/editwebpage.php:105 ../../mod/editpost.php:80 -msgid "Insert YouTube video" -msgstr "" - -#: ../../mod/editwebpage.php:106 ../../mod/editpost.php:81 -msgid "Insert Vorbis [.ogg] video" -msgstr "" - -#: ../../mod/editwebpage.php:107 ../../mod/editpost.php:82 -msgid "Insert Vorbis [.ogg] audio" -msgstr "" - #: ../../mod/notifications.php:26 msgid "Invalid request identifier." msgstr "" @@ -6169,7 +6226,7 @@ msgstr "" msgid "Post successful." msgstr "" -#: ../../mod/editpost.php:29 +#: ../../mod/editpost.php:31 msgid "Item is not editable" msgstr "" @@ -6299,6 +6356,22 @@ msgstr "" msgid "Ignore/Hide" msgstr "" +#: ../../mod/pubsites.php:22 +msgid "Public Sites" +msgstr "" + +#: ../../mod/pubsites.php:28 +msgid "Site URL" +msgstr "" + +#: ../../mod/pubsites.php:28 +msgid "Access Type" +msgstr "" + +#: ../../mod/pubsites.php:28 +msgid "Registration Policy" +msgstr "" + #: ../../mod/register.php:35 msgid "Maximum daily site registrations exceeded. Please try again tomorrow." msgstr "" @@ -6308,56 +6381,60 @@ msgid "" "Please indicate acceptance of the Terms of Service. Registration failed." msgstr "" -#: ../../mod/register.php:91 +#: ../../mod/register.php:69 +msgid "Passwords do not match." +msgstr "" + +#: ../../mod/register.php:97 msgid "" "Registration successful. Please check your email for validation instructions." msgstr "" -#: ../../mod/register.php:97 +#: ../../mod/register.php:103 msgid "Your registration is pending approval by the site owner." msgstr "" -#: ../../mod/register.php:100 +#: ../../mod/register.php:106 msgid "Your registration can not be processed." msgstr "" -#: ../../mod/register.php:135 +#: ../../mod/register.php:141 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." msgstr "" -#: ../../mod/register.php:146 +#: ../../mod/register.php:152 msgid "Terms of Service" msgstr "" -#: ../../mod/register.php:152 +#: ../../mod/register.php:158 #, php-format msgid "I accept the %s for this website" msgstr "" -#: ../../mod/register.php:154 +#: ../../mod/register.php:160 #, php-format msgid "I am over 13 years of age and accept the %s for this website" msgstr "" -#: ../../mod/register.php:169 +#: ../../mod/register.php:175 msgid "Membership on this site is by invitation only." msgstr "" -#: ../../mod/register.php:170 +#: ../../mod/register.php:176 msgid "Please enter your invitation code" msgstr "" -#: ../../mod/register.php:173 +#: ../../mod/register.php:179 msgid "Your email address" msgstr "" -#: ../../mod/register.php:174 +#: ../../mod/register.php:180 msgid "Choose a password" msgstr "" -#: ../../mod/register.php:175 +#: ../../mod/register.php:181 msgid "Please re-enter your password" msgstr "" @@ -6459,94 +6536,94 @@ msgstr "" msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1393 +#: ../../boot.php:1394 msgid "Create a New Account" msgstr "" -#: ../../boot.php:1422 +#: ../../boot.php:1423 msgid "Password" msgstr "" -#: ../../boot.php:1423 +#: ../../boot.php:1424 msgid "Remember me" msgstr "" -#: ../../boot.php:1428 +#: ../../boot.php:1429 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1547 +#: ../../boot.php:1548 msgid "Requested channel is not available." msgstr "" -#: ../../boot.php:1559 +#: ../../boot.php:1560 msgid " Sorry, you don't have the permission to view this profile. " msgstr "" -#: ../../boot.php:1706 +#: ../../boot.php:1707 msgid "Profiles" msgstr "" -#: ../../boot.php:1706 +#: ../../boot.php:1707 msgid "Manage/edit profiles" msgstr "" -#: ../../boot.php:1710 +#: ../../boot.php:1711 msgid "Edit Profile" msgstr "" -#: ../../boot.php:1799 ../../boot.php:1879 +#: ../../boot.php:1800 ../../boot.php:1880 msgid "F d" msgstr "" -#: ../../boot.php:1856 +#: ../../boot.php:1857 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1857 +#: ../../boot.php:1858 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1912 +#: ../../boot.php:1913 msgid "[No description]" msgstr "" -#: ../../boot.php:1930 +#: ../../boot.php:1931 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1931 +#: ../../boot.php:1932 msgid "Events this week:" msgstr "" -#: ../../boot.php:2162 +#: ../../boot.php:2166 msgid "Channel" msgstr "" -#: ../../boot.php:2165 +#: ../../boot.php:2169 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:2169 +#: ../../boot.php:2173 msgid "About" msgstr "" -#: ../../boot.php:2172 +#: ../../boot.php:2176 msgid "Profile Details" msgstr "" -#: ../../boot.php:2190 +#: ../../boot.php:2194 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:2195 +#: ../../boot.php:2199 msgid "Webpages" msgstr "" -#: ../../boot.php:2198 +#: ../../boot.php:2202 msgid "Manage Webpages" msgstr "" -#: ../../boot.php:2469 +#: ../../boot.php:2484 msgid "toggle mobile" msgstr "" diff --git a/version.inc b/version.inc index a99b76c17..87ad45fad 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-09-05.427 +2013-09-06.428 From 77ba2dcb06e67aff3768ff6c17cb6244fa2b5f03 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 6 Sep 2013 03:11:08 -0700 Subject: [PATCH 099/330] doc updates --- doc/html/blocks_8php.html | 137 ++++++++++++++++++++++++++++++++++ doc/html/blocks_8php.js | 4 + doc/html/editblock_8php.html | 137 ++++++++++++++++++++++++++++++++++ doc/html/editblock_8php.js | 4 + doc/html/editlayout_8php.html | 137 ++++++++++++++++++++++++++++++++++ doc/html/editlayout_8php.js | 4 + doc/html/layouts_8php.html | 137 ++++++++++++++++++++++++++++++++++ doc/html/layouts_8php.js | 4 + doc/html/pubsites_8php.html | 137 ++++++++++++++++++++++++++++++++++ doc/html/pubsites_8php.js | 4 + doc/html/zping_8php.html | 137 ++++++++++++++++++++++++++++++++++ doc/html/zping_8php.js | 4 + 12 files changed, 846 insertions(+) create mode 100644 doc/html/blocks_8php.html create mode 100644 doc/html/blocks_8php.js create mode 100644 doc/html/editblock_8php.html create mode 100644 doc/html/editblock_8php.js create mode 100644 doc/html/editlayout_8php.html create mode 100644 doc/html/editlayout_8php.js create mode 100644 doc/html/layouts_8php.html create mode 100644 doc/html/layouts_8php.js create mode 100644 doc/html/pubsites_8php.html create mode 100644 doc/html/pubsites_8php.js create mode 100644 doc/html/zping_8php.html create mode 100644 doc/html/zping_8php.js diff --git a/doc/html/blocks_8php.html b/doc/html/blocks_8php.html new file mode 100644 index 000000000..b99143aee --- /dev/null +++ b/doc/html/blocks_8php.html @@ -0,0 +1,137 @@ + + + + + + +The Red Matrix: mod/blocks.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    + +
    +
    blocks.php File Reference
    +
    +
    + + + + +

    +Functions

     blocks_content (&$a)
     
    +

    Function Documentation

    + +
    +
    + + + + + + + + +
    blocks_content ($a)
    +
    + +
    +
    +
    +
    + diff --git a/doc/html/blocks_8php.js b/doc/html/blocks_8php.js new file mode 100644 index 000000000..b2123aa00 --- /dev/null +++ b/doc/html/blocks_8php.js @@ -0,0 +1,4 @@ +var blocks_8php = +[ + [ "blocks_content", "blocks_8php.html#a2531a8fd51db3cecb2eb20c002c66e12", null ] +]; \ No newline at end of file diff --git a/doc/html/editblock_8php.html b/doc/html/editblock_8php.html new file mode 100644 index 000000000..12660853a --- /dev/null +++ b/doc/html/editblock_8php.html @@ -0,0 +1,137 @@ + + + + + + +The Red Matrix: mod/editblock.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    + +
    +
    editblock.php File Reference
    +
    +
    + + + + +

    +Functions

     editblock_content (&$a)
     
    +

    Function Documentation

    + +
    +
    + + + + + + + + +
    editblock_content ($a)
    +
    + +
    +
    +
    +
    + diff --git a/doc/html/editblock_8php.js b/doc/html/editblock_8php.js new file mode 100644 index 000000000..dae23cf05 --- /dev/null +++ b/doc/html/editblock_8php.js @@ -0,0 +1,4 @@ +var editblock_8php = +[ + [ "editblock_content", "editblock_8php.html#abbe8f55de06967bc8d79d620509a49e6", null ] +]; \ No newline at end of file diff --git a/doc/html/editlayout_8php.html b/doc/html/editlayout_8php.html new file mode 100644 index 000000000..c32a6bd5b --- /dev/null +++ b/doc/html/editlayout_8php.html @@ -0,0 +1,137 @@ + + + + + + +The Red Matrix: mod/editlayout.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    + +
    +
    editlayout.php File Reference
    +
    +
    + + + + +

    +Functions

     editlayout_content (&$a)
     
    +

    Function Documentation

    + +
    +
    + + + + + + + + +
    editlayout_content ($a)
    +
    + +
    +
    +
    +
    + diff --git a/doc/html/editlayout_8php.js b/doc/html/editlayout_8php.js new file mode 100644 index 000000000..a41acddd1 --- /dev/null +++ b/doc/html/editlayout_8php.js @@ -0,0 +1,4 @@ +var editlayout_8php = +[ + [ "editlayout_content", "editlayout_8php.html#aa877e4157a26b099de904164181dd386", null ] +]; \ No newline at end of file diff --git a/doc/html/layouts_8php.html b/doc/html/layouts_8php.html new file mode 100644 index 000000000..809bee6c7 --- /dev/null +++ b/doc/html/layouts_8php.html @@ -0,0 +1,137 @@ + + + + + + +The Red Matrix: mod/layouts.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    + +
    +
    layouts.php File Reference
    +
    +
    + + + + +

    +Functions

     layouts_content (&$a)
     
    +

    Function Documentation

    + +
    +
    + + + + + + + + +
    layouts_content ($a)
    +
    + +
    +
    +
    +
    + diff --git a/doc/html/layouts_8php.js b/doc/html/layouts_8php.js new file mode 100644 index 000000000..ee929d2fc --- /dev/null +++ b/doc/html/layouts_8php.js @@ -0,0 +1,4 @@ +var layouts_8php = +[ + [ "layouts_content", "layouts_8php.html#a6e0193759ad9eef76d3df2db24237b50", null ] +]; \ No newline at end of file diff --git a/doc/html/pubsites_8php.html b/doc/html/pubsites_8php.html new file mode 100644 index 000000000..46c645e55 --- /dev/null +++ b/doc/html/pubsites_8php.html @@ -0,0 +1,137 @@ + + + + + + +The Red Matrix: mod/pubsites.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    + +
    +
    pubsites.php File Reference
    +
    +
    + + + + +

    +Functions

     pubsites_content (&$a)
     
    +

    Function Documentation

    + +
    +
    + + + + + + + + +
    pubsites_content ($a)
    +
    + +
    +
    +
    +
    + diff --git a/doc/html/pubsites_8php.js b/doc/html/pubsites_8php.js new file mode 100644 index 000000000..fe78b19d4 --- /dev/null +++ b/doc/html/pubsites_8php.js @@ -0,0 +1,4 @@ +var pubsites_8php = +[ + [ "pubsites_content", "pubsites_8php.html#af614e279aab54065345bda6b03eafdf0", null ] +]; \ No newline at end of file diff --git a/doc/html/zping_8php.html b/doc/html/zping_8php.html new file mode 100644 index 000000000..76fcac8a3 --- /dev/null +++ b/doc/html/zping_8php.html @@ -0,0 +1,137 @@ + + + + + + +The Red Matrix: mod/zping.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    + +
    +
    zping.php File Reference
    +
    +
    + + + + +

    +Functions

     zping_content (&$a)
     
    +

    Function Documentation

    + +
    +
    + + + + + + + + +
    zping_content ($a)
    +
    + +
    +
    +
    +
    + diff --git a/doc/html/zping_8php.js b/doc/html/zping_8php.js new file mode 100644 index 000000000..28a58de4a --- /dev/null +++ b/doc/html/zping_8php.js @@ -0,0 +1,4 @@ +var zping_8php = +[ + [ "zping_content", "zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75", null ] +]; \ No newline at end of file From c09f1a437b65e340cbf5899e3ebf773bd342b3bc Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 6 Sep 2013 03:13:23 -0700 Subject: [PATCH 100/330] Add a border until we can theme this sucker --- mod/pubsites.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/pubsites.php b/mod/pubsites.php index 694541b7a..72a93c810 100644 --- a/mod/pubsites.php +++ b/mod/pubsites.php @@ -25,7 +25,7 @@ function pubsites_content(&$a) { if($ret['success']) { $j = json_decode($ret['body'],true); if($j) { - $o .= ''; + $o .= '
    ' . t('Site URL') . '' . t('Access Type') . '' . t('Registration Policy') . '
    '; foreach($j['sites'] as $jj) { $o .= ''; } From 0387fa10c9730d0576c850ecfa14f596d65db6fd Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 6 Sep 2013 03:16:04 -0700 Subject: [PATCH 101/330] linkify the site url --- mod/pubsites.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/pubsites.php b/mod/pubsites.php index 72a93c810..d226f5d9f 100644 --- a/mod/pubsites.php +++ b/mod/pubsites.php @@ -27,7 +27,7 @@ function pubsites_content(&$a) { if($j) { $o .= '
    ' . t('Site URL') . '' . t('Access Type') . '' . t('Registration Policy') . '
    ' . $jj['url'] . '' . $jj['access'] . '' . $jj['register'] . '
    '; foreach($j['sites'] as $jj) { - $o .= ''; + $o .= ''; } $o .= '
    ' . t('Site URL') . '' . t('Access Type') . '' . t('Registration Policy') . '
    ' . $jj['url'] . '' . $jj['access'] . '' . $jj['register'] . '
    ' . '' . $jj['url'] . '' . '' . $jj['access'] . '' . $jj['register'] . '
    '; From c3d535151538ad62a69f16bb8dfef50f47752341 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 6 Sep 2013 03:56:47 -0700 Subject: [PATCH 102/330] fix mimeselect on edit --- mod/editblock.php | 2 +- mod/editwebpage.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/editblock.php b/mod/editblock.php index 256bd1607..6654a66b5 100644 --- a/mod/editblock.php +++ b/mod/editblock.php @@ -73,7 +73,7 @@ function editblock_content(&$a) { if(get_config('system','page_mimetype')) $mimeselect = ''; else - $mimeselect = mimetype_select($item[0]['uid'],$mimetype); + $mimeselect = mimetype_select($itm[0]['uid'],$mimetype); diff --git a/mod/editwebpage.php b/mod/editwebpage.php index 66137c474..273c6a465 100644 --- a/mod/editwebpage.php +++ b/mod/editwebpage.php @@ -75,7 +75,7 @@ function editwebpage_content(&$a) { if(get_config('system','page_mimetype')) $mimeselect = ''; else - $mimeselect = mimetype_select($item[0]['uid'],$mimetype); + $mimeselect = mimetype_select($itm[0]['uid'],$mimetype); $layout = get_config('system','page_layout'); if($layout) From f2f3372aa9fd6ce5e121f52359bc4a05a79592d1 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 6 Sep 2013 04:07:43 -0700 Subject: [PATCH 103/330] provide ability to delete webpages, layouts and blocks --- mod/editblock.php | 8 +++++++- mod/editlayout.php | 7 ++++++- mod/editwebpage.php | 7 ++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/mod/editblock.php b/mod/editblock.php index 6654a66b5..48136b126 100644 --- a/mod/editblock.php +++ b/mod/editblock.php @@ -80,7 +80,7 @@ function editblock_content(&$a) { $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( - '$title' => t('Edit block') + '$title' => t('Edit Block') )); @@ -147,6 +147,12 @@ function editblock_content(&$a) { '$sourceapp' => t($a->sourcename), )); + + $ob = get_observer_hash(); + + if(($itm[0]['author_xchan'] === $ob) || ($itm[0]['owner_xchan'] === $ob)) + $o .= '

    ' . t('Delete Block') . '
    '; + return $o; } diff --git a/mod/editlayout.php b/mod/editlayout.php index 1cebdc845..474244653 100644 --- a/mod/editlayout.php +++ b/mod/editlayout.php @@ -66,7 +66,7 @@ function editlayout_content(&$a) { $plaintext = false; $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( - '$title' => t('Edit block') + '$title' => t('Edit Layout') )); @@ -132,6 +132,11 @@ function editlayout_content(&$a) { '$sourceapp' => t($a->sourcename), )); + $ob = get_observer_hash(); + + if(($itm[0]['author_xchan'] === $ob) || ($itm[0]['owner_xchan'] === $ob)) + $o .= '

    ' . t('Delete Layout') . '
    '; + return $o; } diff --git a/mod/editwebpage.php b/mod/editwebpage.php index 273c6a465..ea07a3758 100644 --- a/mod/editwebpage.php +++ b/mod/editwebpage.php @@ -85,7 +85,7 @@ function editwebpage_content(&$a) { $o .= replace_macros(get_markup_template('edpost_head.tpl'), array( - '$title' => t('Edit post') + '$title' => t('Edit Webpage') )); @@ -153,6 +153,11 @@ function editwebpage_content(&$a) { '$sourceapp' => t($a->sourcename), )); + $ob = get_observer_hash(); + + if(($itm[0]['author_xchan'] === $ob) || ($itm[0]['owner_xchan'] === $ob)) + $o .= '

    ' . t('Delete Webpage') . '
    '; + return $o; } From d194ee091af0ee15c7f63def7e8c07ee29e38f39 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 6 Sep 2013 05:25:10 -0700 Subject: [PATCH 104/330] encode and decode channel names containing HTML special characters and quotes so they will survive a reshare without mangling --- include/bbcode.php | 22 +--------------------- mod/display.php | 6 +++--- mod/share.php | 2 +- 3 files changed, 5 insertions(+), 25 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index 4647b8567..997cbac2e 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -106,48 +106,28 @@ function bb_ShareAttributes($match) { $author = ""; preg_match("/author='(.*?)'/ism", $attributes, $matches); if ($matches[1] != "") - $author = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8'); - - preg_match('/author="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") - $author = $matches[1]; + $author = urldecode($matches[1]); $link = ""; preg_match("/link='(.*?)'/ism", $attributes, $matches); if ($matches[1] != "") $link = $matches[1]; - preg_match('/link="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") - $link = $matches[1]; - $avatar = ""; preg_match("/avatar='(.*?)'/ism", $attributes, $matches); if ($matches[1] != "") $avatar = $matches[1]; - preg_match('/avatar="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") - $avatar = $matches[1]; - $profile = ""; preg_match("/profile='(.*?)'/ism", $attributes, $matches); if ($matches[1] != "") $profile = $matches[1]; - preg_match('/profile="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") - $profile = $matches[1]; - $posted = ""; preg_match("/posted='(.*?)'/ism", $attributes, $matches); if ($matches[1] != "") $posted = $matches[1]; - preg_match('/posted="(.*?)"/ism', $attributes, $matches); - if ($matches[1] != "") - $posted = $matches[1]; - // FIXME - this should really be a wall-item-ago so it will get updated on the client $reldate = (($posted) ? relative_date($posted) : ''); diff --git a/mod/display.php b/mod/display.php index 110dd1807..63b5fa29b 100644 --- a/mod/display.php +++ b/mod/display.php @@ -19,7 +19,6 @@ function display_content(&$a, $update = 0, $load = false) { $a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'), array()); - if(argc() > 1 && argv(1) !== 'load') $item_hash = argv(1); @@ -91,7 +90,6 @@ function display_content(&$a, $update = 0, $load = false) { $sql_extra = public_permissions_sql(get_observer_hash()); - if($update && $load) { $updateable = false; @@ -109,8 +107,10 @@ function display_content(&$a, $update = 0, $load = false) { intval(local_user()), dbesc($target_item['parent_mid']) ); - if($r) + if($r) { $updateable = true; + + } } if($r === null) { $r = q("SELECT * from item diff --git a/mod/share.php b/mod/share.php index f0b14541f..1f767578d 100644 --- a/mod/share.php +++ b/mod/share.php @@ -21,7 +21,7 @@ function share_init(&$a) { $pos = strpos($r[0]['body'], "[share"); $o = substr($r[0]['body'], $pos); } else { - $o = "[share author='".str_replace("'", "'",$r[0]['author']['xchan_name']). + $o = "[share author='".urlencode($r[0]['author']['xchan_name']). "' profile='".$r[0]['author']['xchan_url'] . "' avatar='".$r[0]['author']['xchan_photo_s']. "' link='".$r[0]['plink']. From ba980e2c1f3d673ab07e6c3ac1c3657294f95708 Mon Sep 17 00:00:00 2001 From: Michael Johnston Date: Tue, 3 Sep 2013 23:58:46 -0400 Subject: [PATCH 105/330] filter by category fixes --- mod/channel.php | 5 ++++- view/tpl/build_query.tpl | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mod/channel.php b/mod/channel.php index aa158d330..5d3855269 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -90,6 +90,8 @@ function channel_content(&$a, $update = 0, $load = false) { require_once('include/permissions.php'); + $category = ((x($_REQUEST,'cat')) ? $_REQUEST['cat'] : ''); + $groups = array(); $o = ''; @@ -171,8 +173,9 @@ function channel_content(&$a, $update = 0, $load = false) { } else { + if(x($category)) { - $sql_extra .= protect_sprintf(file_tag_file_query('item',$category,'category')); + $sql_extra .= protect_sprintf(term_query('item', $category, TERM_CATEGORY)); } if($datequery) { diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl index e5bf3acce..53a8c0f6b 100755 --- a/view/tpl/build_query.tpl +++ b/view/tpl/build_query.tpl @@ -41,7 +41,7 @@ if(bParam_search != "") bCmd = bCmd + "&search=" + bParam_search; if(bParam_order != "") bCmd = bCmd + "&order=" + bParam_order; if(bParam_file != "") bCmd = bCmd + "&file=" + bParam_file; - if(bParam_cats != "") bCmd = bCmd + "&cats=" + bParam_cats; + if(bParam_cats != "") bCmd = bCmd + "&cat=" + bParam_cats; if(bParam_dend != "") bCmd = bCmd + "&dend=" + bParam_dend; if(bParam_dbegin != "") bCmd = bCmd + "&dbegin=" + bParam_dbegin; if(bParam_mid != "") bCmd = bCmd + "&mid=" + bParam_mid; From 9ba6fd7d2872f5c64a9a71922f5791ed2f237ccb Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 7 Sep 2013 02:04:15 -0700 Subject: [PATCH 106/330] allow menu management even if there are no menu items --- mod/mitem.php | 33 ++++++++++++++++----------------- version.inc | 2 +- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/mod/mitem.php b/mod/mitem.php index ee690907e..6a5785114 100644 --- a/mod/mitem.php +++ b/mod/mitem.php @@ -111,24 +111,23 @@ function mitem_content(&$a) { local_user() ); - if($r) { - $o = replace_macros(get_markup_template('mitemlist.tpl'),array( - '$title' => t('Manage Menu Elements'), - '$menuname' => $a->data['menu']['menu_name'], - '$menudesc' => $a->data['menu']['menu_desc'], - '$edmenu' => t('Edit menu'), - '$menu_id' => $a->data['menu']['menu_id'], - '$mlist' => $r, - '$edit' => t('Edit element'), - '$drop' => t('Drop element'), - '$new' => t('New element'), - '$hintmenu' => t('Edit this menu container'), - '$hintnew' => t('Add menu element'), - '$hintdrop' => t('Delete this menu item'), - '$hintedit' => t('Edit this menu item') - )); - } + $o .= replace_macros(get_markup_template('mitemlist.tpl'),array( + '$title' => t('Manage Menu Elements'), + '$menuname' => $a->data['menu']['menu_name'], + '$menudesc' => $a->data['menu']['menu_desc'], + '$edmenu' => t('Edit menu'), + '$menu_id' => $a->data['menu']['menu_id'], + '$mlist' => $r, + '$edit' => t('Edit element'), + '$drop' => t('Drop element'), + '$new' => t('New element'), + '$hintmenu' => t('Edit this menu container'), + '$hintnew' => t('Add menu element'), + '$hintdrop' => t('Delete this menu item'), + '$hintedit' => t('Edit this menu item') + )); + return $o; diff --git a/version.inc b/version.inc index 87ad45fad..5912f3e76 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-09-06.428 +2013-09-07.429 From fe5f470c62a45191ed261808aa41400234dd306d Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 7 Sep 2013 04:36:47 -0700 Subject: [PATCH 107/330] mod/page - display most recent revision by default, or numbered revision specified by rev URL parameter --- mod/page.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mod/page.php b/mod/page.php index d91f8d866..452341cb1 100644 --- a/mod/page.php +++ b/mod/page.php @@ -48,9 +48,15 @@ function page_content(&$a) { return; } + if($_REQUEST['rev']) + $revision = " and revision = " . intval($_REQUEST['rev']) . " "; + else + $revision = " order by revision desc "; + + $r = q("select item.* from item left join item_id on item.id = item_id.iid where item.uid = %d and sid = '%s' and service = 'WEBPAGE' and - item_restrict = %d limit 1", + item_restrict = %d $revision limit 1", intval($u[0]['channel_id']), dbesc($page_id), intval(ITEM_WEBPAGE) From 94fb9c240661a9cd2b7199a648e9c5b4f9b69e8d Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 8 Sep 2013 00:21:42 +0200 Subject: [PATCH 108/330] Service class identity, follow, photo upload, att upload --- include/contact_widgets.php | 19 +++++++++++++++++-- include/identity.php | 7 +++++-- include/plugin.php | 19 ++++++++++++------- mod/manage.php | 12 ++++++++++++ view/tpl/channels.tpl | 5 +++++ view/tpl/follow.tpl | 3 +++ view/tpl/photos_upload.tpl | 2 +- 7 files changed, 55 insertions(+), 12 deletions(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index e5f778e49..cc7d92508 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -1,12 +1,27 @@ channel['channel_id']; + $r = q("select count(*) as total from abook where abook_channel = %d and not (abook_flags & %d) ", + intval($uid), + intval(ABOOK_FLAG_SELF) + ); + if($r) + $total_channels = $r[0]['total']; + $limit = service_class_fetch($uid,'total_channels'); + if($limit !== false) { + $abook_usage_message = sprintf( t("You have %1$.0f of %2$.0f allowed connections."), $total_channels, $limit); + } + else { + $abook_usage_message = ''; + } return replace_macros(get_markup_template('follow.tpl'),array( '$connect' => t('Add New Connection'), '$desc' => t('Enter the channel address'), '$hint' => t('Example: bob@example.com, http://example.com/barbara'), - '$follow' => t('Connect') + '$follow' => t('Connect'), + '$abook_usage_message' => $abook_usage_message )); } diff --git a/include/identity.php b/include/identity.php index 8db6355c0..98209c8ae 100644 --- a/include/identity.php +++ b/include/identity.php @@ -7,7 +7,7 @@ require_once('include/crypto.php'); function identity_check_service_class($account_id) { $ret = array('success' => false, $message => ''); - $r = q("select count(channel_id) as total from channel were channel_account_id = %d ", + $r = q("select count(channel_id) as total from channel where channel_account_id = %d ", intval($account_id) ); if(! ($r && count($r))) { @@ -80,7 +80,10 @@ function create_identity($arr) { $ret['message'] = t('No account identifier'); return $ret; } - + $ret=identity_check_service_class($arr['account_id']); + if (!$ret['success']) { + return $ret; + } $nick = mb_strtolower(trim($arr['nickname'])); $name = escape_tags($arr['name']); $pageflags = ((x($arr,'pageflags')) ? intval($arr['pageflags']) : PAGE_NORMAL); diff --git a/include/plugin.php b/include/plugin.php index 01ee99786..ea88a61df 100755 --- a/include/plugin.php +++ b/include/plugin.php @@ -374,12 +374,14 @@ function get_theme_screenshot($theme) { function service_class_allows($uid,$property,$usage = false) { - + $a = get_app(); if($uid == local_user()) { - $service_class = $a->user['service_class']; + $service_class = $a->account['account_service_class']; } else { - $r = q("select service_class from user where uid = %d limit 1", + $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)) { @@ -404,13 +406,15 @@ function service_class_allows($uid,$property,$usage = false) { function service_class_fetch($uid,$property) { - + $a = get_app(); if($uid == local_user()) { - $service_class = $a->user['service_class']; + $service_class = $a->account['account_service_class']; } else { - $r = q("select service_class from user where uid = %d limit 1", - intval($uid) + $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']; @@ -420,6 +424,7 @@ function service_class_fetch($uid,$property) { return false; // everything is allowed $arr = get_config('service_class',$service_class); + if(! is_array($arr) || (! count($arr))) return false; diff --git a/mod/manage.php b/mod/manage.php index 2cdfce115..fad359535 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -53,6 +53,17 @@ function manage_content(&$a) { $channels[$x]['default_links'] = '1'; } } + + $r = q("select count(channel_id) as total from channel where channel_account_id = %d ", + intval($account) + ); + $limit = service_class_fetch(local_user(),'total_identities'); + if($limit !== false) { + $channel_usage_message = sprintf( t("You have created %1$.0f of %2$.0f allowed channels."), $r[0]['total'], $limit); + } + else { + $channel_usage_message = ''; + } } $links = array( @@ -69,6 +80,7 @@ function manage_content(&$a) { '$msg_make_default' => t('Make Default'), '$links' => $links, '$all_channels' => $channels, + '$channel_usage_message' => $channel_usage_message, )); diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl index 317384661..af6b36b1d 100755 --- a/view/tpl/channels.tpl +++ b/view/tpl/channels.tpl @@ -7,6 +7,11 @@ {{/foreach}} {{/if}} +{{if $channel_usage_message}} +
    +{{$channel_usage_message}} +
    +{{/if}} {{if $selected}}
    {{$msg_selected}}
    diff --git a/view/tpl/follow.tpl b/view/tpl/follow.tpl index 350f8d910..b0597e9b6 100755 --- a/view/tpl/follow.tpl +++ b/view/tpl/follow.tpl @@ -4,5 +4,8 @@
    + {{if $abook_usage_message}} +
    {{$abook_usage_message}}
    + {{/if}}
    diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl index 707024cb9..102c4d872 100755 --- a/view/tpl/photos_upload.tpl +++ b/view/tpl/photos_upload.tpl @@ -1,6 +1,6 @@

    {{$pagename}}

    -
    {{$usage}}
    +
    {{$usage}}
    From b88f60b51ff9416c35b5af9ce849026666c47cc8 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sun, 8 Sep 2013 03:15:01 +0100 Subject: [PATCH 109/330] More content wrappers. --- view/tpl/settings.tpl | 2 ++ view/tpl/settings_account.tpl | 4 ++-- view/tpl/settings_addons.tpl | 2 ++ view/tpl/settings_display.tpl | 2 ++ view/tpl/settings_features.tpl | 2 ++ view/tpl/settings_oauth.tpl | 2 ++ 6 files changed, 12 insertions(+), 2 deletions(-) diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 0471546a6..f50e5dd74 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -1,3 +1,4 @@ +

    {{$ptitle}}

    {{$nickname_block}} @@ -125,3 +126,4 @@
    + diff --git a/view/tpl/settings_account.tpl b/view/tpl/settings_account.tpl index 198ac9565..fcddb3f86 100755 --- a/view/tpl/settings_account.tpl +++ b/view/tpl/settings_account.tpl @@ -1,3 +1,4 @@ +

    {{$title}}

    @@ -24,5 +25,4 @@ {{$account_settings}} - - +
    diff --git a/view/tpl/settings_addons.tpl b/view/tpl/settings_addons.tpl index cad6a2274..3e447cd0a 100755 --- a/view/tpl/settings_addons.tpl +++ b/view/tpl/settings_addons.tpl @@ -1,3 +1,4 @@ +

    {{$title}}

    @@ -8,3 +9,4 @@ +
    diff --git a/view/tpl/settings_display.tpl b/view/tpl/settings_display.tpl index 2645ce740..ddd3ca56d 100755 --- a/view/tpl/settings_display.tpl +++ b/view/tpl/settings_display.tpl @@ -1,3 +1,4 @@ +

    {{$ptitle}}

    @@ -20,3 +21,4 @@ {{/if}}
    +
    diff --git a/view/tpl/settings_features.tpl b/view/tpl/settings_features.tpl index 47d755ee6..31371e0af 100755 --- a/view/tpl/settings_features.tpl +++ b/view/tpl/settings_features.tpl @@ -1,3 +1,4 @@ +

    {{$title}}

    @@ -18,3 +19,4 @@ +
    diff --git a/view/tpl/settings_oauth.tpl b/view/tpl/settings_oauth.tpl index 11c61a43e..fa1d0946f 100755 --- a/view/tpl/settings_oauth.tpl +++ b/view/tpl/settings_oauth.tpl @@ -1,3 +1,4 @@ +

    {{$title}}

    @@ -29,3 +30,4 @@ {{/foreach}} +
    From f4dfb90dbc9b7590d9b8bf84df9ca746f1aa1d6f Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 8 Sep 2013 17:19:09 +0200 Subject: [PATCH 110/330] Service class items Items / webpages /attachment message --- include/attach.php | 2 +- mod/item.php | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/include/attach.php b/include/attach.php index 46d406f4b..da08154c6 100644 --- a/include/attach.php +++ b/include/attach.php @@ -339,7 +339,7 @@ function attach_store($channel,$observer_hash,$options = '',$arr = null) { intval($channel_id) ); if(($r) && (($r[0]['total'] + $filesize) > ($limit - $existing_size))) { - $ret['message'] = upgrade_message(true); + $ret['message'] = upgrade_message(true).sprintf(t("You have reached your limit of %1$.0f Mbytes attachment storage."),$limit / 1024000); @unlink($src); return $ret; } diff --git a/mod/item.php b/mod/item.php index 1893a6ef4..695fdb7bb 100644 --- a/mod/item.php +++ b/mod/item.php @@ -71,7 +71,18 @@ function item_post(&$a) { $webpage = ((x($_REQUEST,'webpage')) ? intval($_REQUEST['webpage']) : 0); $pagetitle = ((x($_REQUEST,'pagetitle')) ? escape_tags($_REQUEST['pagetitle']): ''); $buildblock = ((x($_REQUEST,'buildblock')) ? intval($_REQUEST['buildblock']) : 0); + /* + Check service class limits + */ + if (local_user() && !(x($_REQUEST,'parent')) && !(x($_REQUEST,'post_id'))) { + $ret=item_check_service_class(local_user(),x($_REQUEST,'webpage')); + if (!$ret['success']) { + notice( t($ret['message']) . EOL) ; + goaway($a->get_baseurl() . "/" . $return_path ); + killme(); + } + } if($pagetitle) { require_once('library/urlify/URLify.php'); $pagetitle = strtolower(URLify::transliterate($pagetitle)); @@ -1081,3 +1092,40 @@ function fix_attached_file_permissions($channel,$observer_hash,$body, } } } +function item_check_service_class($channel_id,$iswebpage) { + $ret = array('success' => false, $message => ''); + if ($iswebpage) { + $r = q("select count(i.id) as total from item i + right join channel c on (i.author_xchan=c.channel_hash and i.uid=c.channel_id ) + and i.parent=i.id and (i.item_restrict & %d) and i.uid= %d ", + intval(ITEM_WEBPAGE), + intval($channel_id) + ); + } + else { + $r = q("select count(i.id) as total from item i + right join channel c on (i.author_xchan=c.channel_hash and i.uid=c.channel_id ) + and i.parent=i.id and (i.item_restrict=0) and i.uid= %d ", + intval($channel_id) + ); + } + if(! ($r && count($r))) { + $ret['message'] = t('Unable to obtain identity information from database'); + return $ret; + } + if (!$iswebpage) { + if(! service_class_allows($channel_id,'total_items',$r[0]['total'])) { + $result['message'] .= upgrade_message().sprintf(t("You have reached your limit of %1$.0f top level posts."),$r[0]['total']); + return $result; + } + } + else { + if(! service_class_allows($channel_id,'total_pages',$r[0]['total'])) { + $result['message'] .= upgrade_message().sprintf(t("You have reached your limit of %1$.0f webpages."),$r[0]['total']); + return $result; + } + } + + $ret['success'] = true; + return $ret; +} From a1b3a72f9ee893f648daffa818fc61706da0842f Mon Sep 17 00:00:00 2001 From: Michael Johnston Date: Sun, 8 Sep 2013 13:55:37 -0400 Subject: [PATCH 111/330] only show categories this channel has used --- include/contact_widgets.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index e5f778e49..6bebf96e3 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -76,9 +76,16 @@ function categories_widget($baseurl,$selected = '') { return ''; $terms = array(); - $r = q("select distinct(term) from term where uid = %d and type = %d order by term asc", + $r = q("select distinct(term.term) + from term join item on term.oid = item.id + where item.uid = %d + and term.uid = item.uid + and term.type = %d + and item.author_xchan = '%s' + order by term.term asc", intval($a->profile['profile_uid']), - intval(TERM_CATEGORY) + intval(TERM_CATEGORY), + $a->profile['channel_hash'] ); if($r && count($r)) { foreach($r as $rr) From a36abb764d04a92d97507b368b1b622a9483348a Mon Sep 17 00:00:00 2001 From: Michael Johnston Date: Sun, 8 Sep 2013 14:53:14 -0400 Subject: [PATCH 112/330] added dbesc --- include/contact_widgets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 6bebf96e3..18c9d6510 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -85,7 +85,7 @@ function categories_widget($baseurl,$selected = '') { order by term.term asc", intval($a->profile['profile_uid']), intval(TERM_CATEGORY), - $a->profile['channel_hash'] + dbesc($a->profile['channel_hash']) ); if($r && count($r)) { foreach($r as $rr) From a73f8291c31364b16b447efd9190f5b99d9a01c5 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 8 Sep 2013 21:45:35 +0200 Subject: [PATCH 113/330] retrun check --- mod/item.php | 1 + 1 file changed, 1 insertion(+) diff --git a/mod/item.php b/mod/item.php index f47180f19..b8421b22f 100644 --- a/mod/item.php +++ b/mod/item.php @@ -78,6 +78,7 @@ function item_post(&$a) { $ret=item_check_service_class(local_user(),x($_REQUEST,'webpage')); if (!$ret['success']) { notice( t($ret['message']) . EOL) ; + if(x($_REQUEST,'return')) goaway($a->get_baseurl() . "/" . $return_path ); killme(); } From b4a2361efc7bc4b49f5195a2c14573a41c55f300 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 8 Sep 2013 21:52:05 +0200 Subject: [PATCH 114/330] . --- mod/item.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/item.php b/mod/item.php index b8421b22f..fd93d1dff 100644 --- a/mod/item.php +++ b/mod/item.php @@ -77,7 +77,7 @@ function item_post(&$a) { if (local_user() && !(x($_REQUEST,'parent')) && !(x($_REQUEST,'post_id'))) { $ret=item_check_service_class(local_user(),x($_REQUEST,'webpage')); if (!$ret['success']) { - notice( t($ret['message']) . EOL) ; + notice( t($ret['message']) . EOL) ; if(x($_REQUEST,'return')) goaway($a->get_baseurl() . "/" . $return_path ); killme(); From e60c8e91740328be75da1d7d8829325899f9b5a8 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Sep 2013 17:26:17 -0700 Subject: [PATCH 115/330] rev update --- version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.inc b/version.inc index 5912f3e76..3af904dac 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-09-07.429 +2013-09-08.430 From d2b4ba7be6adee976972091d4fe11fe08016341b Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 9 Sep 2013 02:06:21 +0100 Subject: [PATCH 116/330] Quick and dirty file storage module. --- mod/filestorage.php | 73 ++++++++++++++++++++++++++++++++++++++++ view/tpl/filestorage.tpl | 22 ++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 mod/filestorage.php create mode 100644 view/tpl/filestorage.tpl diff --git a/mod/filestorage.php b/mod/filestorage.php new file mode 100644 index 000000000..72112271d --- /dev/null +++ b/mod/filestorage.php @@ -0,0 +1,73 @@ + 1) + $which = argv(1); + else { + notice( t('Requested profile is not available.') . EOL ); + $a->error = 404; + return; + } + + $r = q("select channel_id from channel where channel_address = '%s'", + dbesc($which) + ); + if($r) { + $owner = intval($r[0]['channel_id']); + } + + $is_owner = (((local_user()) && ($owner == local_user())) ? true : false); + if (! $is_owner) { + info( t('Permission Denied.') . EOL ); + return; + } + if ((argc() > 3 && argv(3) === 'delete') ? true : false);{ + $file = argv(2); + $r = q("delete from attach where id = '%s' and uid = '%s' limit 1", + dbesc($file), + intval($owner) + ); + + + } + + +$r = q("select * from attach where uid = %d order by filename asc", + intval($owner) +); + + $files = null; + + if($r) { + $files = array(); + foreach($r as $rr) { + $files[$rr['id']][] = array('id' => $rr['id'],'download' => $rr['hash'], 'title' => $rr['filename'], 'size' => $rr['filesize']); + } + } + + + $limit = service_class_fetch ($owner,'attach_upload_limit'); +// if($limit !== false) { + $r = q("select sum(filesize) as total from attach where uid = %d ", + intval($owner) + ); + $used = $r[0]['total']; +//} + logger('limit: ' . print_r($limit,true)); + + $url = z_root() . "/filestorage/" . $which; + return $o . replace_macros(get_markup_template("filestorage.tpl"), array( + '$baseurl' => $url, + '$download' => t('Download'), + '$files' => $files, + '$channel' => $which, + '$delete' => t('Delete'), + '$used' => $used, + '$usedlabel' => t('Used: '), + '$limit' => $limit, + '$limitlabel' => t('Limit: '), + )); + + +} diff --git a/view/tpl/filestorage.tpl b/view/tpl/filestorage.tpl new file mode 100644 index 000000000..995b52cc8 --- /dev/null +++ b/view/tpl/filestorage.tpl @@ -0,0 +1,22 @@ +{{if $files}} + +
    + {{if $limit}}{{$limitlabel}}{{$limit}}{{/if}} {{if $used}} {{$usedlabel}}{{$used}}{{/if}} + + + {{foreach $files as $key => $items}} + {{foreach $items as $item}} +
    + {{$download}} | + {{$delete}} + {{$title}} {{$item.title}} | + {{$item.size}} bytes + +
    + {{/foreach}} + {{/foreach}} +
    + +
    + +{{/if}} From 256ee236ad53beb1bc3fec43d716ce25856f618d Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 9 Sep 2013 02:11:26 +0100 Subject: [PATCH 117/330] Kill logger --- mod/filestorage.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/mod/filestorage.php b/mod/filestorage.php index 72112271d..41055f98e 100644 --- a/mod/filestorage.php +++ b/mod/filestorage.php @@ -48,13 +48,10 @@ $r = q("select * from attach where uid = %d order by filename asc", $limit = service_class_fetch ($owner,'attach_upload_limit'); -// if($limit !== false) { $r = q("select sum(filesize) as total from attach where uid = %d ", intval($owner) ); $used = $r[0]['total']; -//} - logger('limit: ' . print_r($limit,true)); $url = z_root() . "/filestorage/" . $which; return $o . replace_macros(get_markup_template("filestorage.tpl"), array( From 135c1887328f7c2e03d03c0c41d6ab4773996519 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Sep 2013 19:12:23 -0700 Subject: [PATCH 118/330] description of the chanman module and what it will need to do. --- mod/chanman.php | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 mod/chanman.php diff --git a/mod/chanman.php b/mod/chanman.php new file mode 100644 index 000000000..2657e7be9 --- /dev/null +++ b/mod/chanman.php @@ -0,0 +1,29 @@ + Date: Sun, 8 Sep 2013 20:38:15 -0700 Subject: [PATCH 119/330] make sure new contacts who are not yet in the address book are sync'd across clone instances --- include/zot.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/zot.php b/include/zot.php index 33522b485..46c894351 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1745,6 +1745,20 @@ function process_channel_sync_delivery($sender,$arr,$deliveries) { if(! array_key_exists('abook_xchan',$clean)) continue; + $r = q("select * from abook where abook_xchan = '%s' and abook_channel = %d limit 1", + dbesc($clean['abook_xchan']), + intval($channel['channel_id']) + ); + + // make sure we have an abook entry for this xchan on this system + + if(! $r) { + q("insert into abook ( abook_xchan, abook_channel ) values ('%s', %d ) ", + dbesc($clean['abook_xchan']), + intval($channel['channel_id']) + ); + } + if(count($clean)) { foreach($clean as $k => $v) { $r = dbq("UPDATE abook set " . dbesc($k) . " = '" . dbesc($v) From a09829a1ee62ec33904348979c5d5fbc6eb1bd6c Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Sep 2013 21:05:39 -0700 Subject: [PATCH 120/330] perform a refresh_all when an import has completed so that all your connections get a fresh update. --- include/notifier.php | 5 ++--- mod/import.php | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/notifier.php b/include/notifier.php index 5dcd7b58c..e813f7951 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -208,9 +208,8 @@ function notifier_run($argv, $argc){ $channel = $s[0]; $uid = $item_id; $recipients = array(); - $r = q("select * from abook where abook_channel = %d and not (abook_flags & %d)", - intval($item_id), - intval(ABOOK_FLAG_SELF) + $r = q("select abook_xchan from abook where abook_channel = %d", + intval($item_id) ); if($r) { foreach($r as $rr) { diff --git a/mod/import.php b/mod/import.php index 08311013a..a63ccb875 100644 --- a/mod/import.php +++ b/mod/import.php @@ -347,6 +347,8 @@ function import_post(&$a) { } + proc_run('php', 'include/notifier.php', 'refresh_all', $channel['channel_id']); + // send out refresh requests notice( t('Import completed.') . EOL); From 2c90a73695df8435557895eafa5d77bc0c6b9839 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Sep 2013 21:12:23 -0700 Subject: [PATCH 121/330] change from refresh_all to a directory update - which does a refresh_all and also updates the directory. --- mod/import.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mod/import.php b/mod/import.php index a63ccb875..e2e54c0cd 100644 --- a/mod/import.php +++ b/mod/import.php @@ -347,7 +347,9 @@ function import_post(&$a) { } - proc_run('php', 'include/notifier.php', 'refresh_all', $channel['channel_id']); + // This will indirectly perform a refresh_all *and* update the directory + + proc_run('php', 'include/directory.php', $channel['channel_id']); // send out refresh requests From 6b0c8831ffc5ae3b5cf707e04eb38c742ffd74f3 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Sep 2013 22:56:53 -0700 Subject: [PATCH 122/330] fix the recipient and subject localisation of failed update emails --- boot.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index 483e98bba..313a93f2c 100755 --- a/boot.php +++ b/boot.php @@ -1234,10 +1234,10 @@ function check_config(&$a) { '$error' => sprintf( t('Update %s failed. See error logs.'), $x) )); - $subject=sprintf(t('Update Error at %s'), $a->get_baseurl()); + $subject = email_header_encode(sprintf(t('Update Error at %s'), $a->get_baseurl())); - mail($a->config['admin_email'], $subject, $email_msg, - 'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" + mail($a->config['system']['admin_email'], $subject, $email_msg, + 'From: Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-transfer-encoding: 8bit' ); //try the logger From f5519d9c773fc323eed1fa6429864cd4d5f57738 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 8 Sep 2013 22:59:06 -0700 Subject: [PATCH 123/330] fix the sitename also --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 313a93f2c..2f6fda1f0 100755 --- a/boot.php +++ b/boot.php @@ -1228,7 +1228,7 @@ function check_config(&$a) { $email_tpl = get_intltext_template("update_fail_eml.tpl"); $email_msg = replace_macros($email_tpl, array( - '$sitename' => $a->config['sitename'], + '$sitename' => $a->config['system']['sitename'], '$siteurl' => $a->get_baseurl(), '$update' => $x, '$error' => sprintf( t('Update %s failed. See error logs.'), $x) From 25a5a5ff4dd457398d762f0ff92f01b134b92eaa Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 9 Sep 2013 01:05:29 -0700 Subject: [PATCH 124/330] some alteration to the way directory sync was originally supposed to work. I'm making this up as I go and not exactly certain where to go next but it makes more sense now and I think the basic idea will actually work. I'll just have to keep making it up until it does work. --- include/zot.php | 39 ++++++++++++++------------------------- version.inc | 2 +- 2 files changed, 15 insertions(+), 26 deletions(-) diff --git a/include/zot.php b/include/zot.php index 46c894351..88a7f4529 100644 --- a/include/zot.php +++ b/include/zot.php @@ -493,7 +493,6 @@ function import_xchan($arr) { logger('import_xchan: existing: ' . print_r($r[0],true), LOGGER_DATA); logger('import_xchan: new: ' . print_r($arr,true), LOGGER_DATA); - update_modtime($xchan_hash); $changed = true; } } @@ -532,7 +531,7 @@ function import_xchan($arr) { dbesc($arr['name_updated']), intval($new_flags) ); - update_modtime($xchan_hash); + $changed = true; } @@ -553,7 +552,7 @@ function import_xchan($arr) { dbesc($xchan_hash) ); - update_modtime($xchan_hash); + $changed = true; } @@ -601,7 +600,7 @@ function import_xchan($arr) { dbesc(datetime_convert()), intval($r[0]['hubloc_id']) ); - update_modtime($xchan_hash); + $changed = true; } continue; @@ -641,7 +640,7 @@ function import_xchan($arr) { dbesc(datetime_convert()), dbesc(datetime_convert()) ); - update_modtime($xchan_hash); + $changed = true; } @@ -653,7 +652,7 @@ function import_xchan($arr) { $r = q("delete from hubloc where hubloc_id = %d limit 1", intval($x['hubloc_id']) ); - update_modtime($xchan_hash); + $changed = true; } } @@ -667,7 +666,7 @@ function import_xchan($arr) { if(array_key_exists('profile',$arr) && is_array($arr['profile'])) { $profile_changed = import_directory_profile($xchan_hash,$arr['profile']); if($profile_changed) { - update_modtime($xchan_hash); + $changed = true; } } @@ -686,7 +685,6 @@ function import_xchan($arr) { if(array_key_exists('site',$arr) && is_array($arr['site'])) { $profile_changed = import_site($arr['site'],$arr['key']); if($profile_changed) { - update_modtime($xchan_hash); $changed = true; } } @@ -694,9 +692,8 @@ function import_xchan($arr) { if($changed) { - // send out a directory mirror update packet if we're a directory server or some kind - - + $guid = random_string() . '@' . get_app()->get_hostname(); + update_modtime($xchan_hash,$guid); } if(! x($ret,'message')) { @@ -1431,7 +1428,7 @@ function import_directory_profile($hash,$profile) { call_hooks('import_directory_profile', $d); if($d['update']) - update_modtime($arr['xprof_hash']); + update_modtime($arr['xprof_hash'],random_string() . '@' . get_app()->get_hostname()); return $d['update']; } @@ -1470,20 +1467,12 @@ function import_directory_keywords($hash,$keywords) { } -function update_modtime($hash) { - $r = q("select * from updates where ud_hash = '%s' limit 1", - dbesc($hash) +function update_modtime($hash,$guid) { + q("insert into updates (ud_hash, ud_guid, ud_date) values ( '%s', '%s', '%s' )", + dbesc($hash), + dbesc($guid), + dbesc(datetime_convert()) ); - if($r) - q("update updates set ud_date = '%s' where ud_hash = '%s' limit 1", - dbesc(datetime_convert()), - dbesc($hash) - ); - else - q("insert into updates (ud_hash, ud_date) values ( '%s', '%s' )", - dbesc($hash), - dbesc(datetime_convert()) - ); } diff --git a/version.inc b/version.inc index 3af904dac..409e919d6 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-09-08.430 +2013-09-09.431 From fd540cd5969f1c1d7234874340daa1aeb007ecfe Mon Sep 17 00:00:00 2001 From: Michael Meer Date: Mon, 9 Sep 2013 10:30:37 +0200 Subject: [PATCH 125/330] just a typo --- include/zot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/zot.php b/include/zot.php index 88a7f4529..e9084496c 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1538,7 +1538,7 @@ function import_site($arr,$pubkey) { } } else { - $r = q("insert into site ( site_url, site_acccess, site_flags, site_update, site_directory, site_register ) + $r = q("insert into site ( site_url, site_access, site_flags, site_update, site_directory, site_register ) values ( '%s', %d, %d, '%s', '%s', %d )", dbesc(htmlentities($arr['url'],ENT_COMPAT,'UTF-8',false)), intval($site_directory), From f9e6e1c3d21b3503ed723de40a953d48ceb4ca32 Mon Sep 17 00:00:00 2001 From: Michael Meer Date: Mon, 9 Sep 2013 12:18:39 +0200 Subject: [PATCH 126/330] Preparation to maintain HubLocs from adminpanel. This should act as basis for a kind of traffic light to get an overview. --- boot.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/boot.php b/boot.php index 2f6fda1f0..b4b0c1cc7 100755 --- a/boot.php +++ b/boot.php @@ -346,6 +346,17 @@ define ( 'XCHAN_FLAGS_HIDDEN', 0x0001); define ( 'XCHAN_FLAGS_ORPHAN', 0x0002); +/* + * Traficlights for Administration of HubLoc + * to detect problems in inter server communication + */ +define ('HUBLOC_NOTUSED', 0x0000); +define ('HUBLOC_SEND_ERROR', 0x0001); +define ('HUBLOC_RECEIVE_ERROR', 0x0002); +define ('HUBLOC_WORKS', 0x0004); +define ('HUBLOC_OFFLINE', 0x0008); + + /** * Tag/term types */ From 0565a6ef01b7c513be8ee90f805867eb2ed664e8 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 9 Sep 2013 04:55:43 -0700 Subject: [PATCH 127/330] change primary key on updates table --- boot.php | 2 +- install/database.sql | 4 +++- install/update.php | 9 ++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index 2f6fda1f0..64d3633cd 100755 --- a/boot.php +++ b/boot.php @@ -43,7 +43,7 @@ require_once('include/taxonomy.php'); define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1067 ); +define ( 'DB_UPDATE_VERSION', 1068 ); define ( 'EOL', '
    ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/install/database.sql b/install/database.sql index ce46149c4..9b1b6cad2 100644 --- a/install/database.sql +++ b/install/database.sql @@ -883,10 +883,12 @@ CREATE TABLE IF NOT EXISTS `tokens` ( ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `updates` ( + `ud_id` int(10) unsigned NOT NULL AUTO INCREMENT, `ud_hash` char(128) NOT NULL, `ud_guid` char(255) NOT NULL DEFAULT '', `ud_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - PRIMARY KEY (`ud_hash`), + PRIMARY KEY (`ud_id`), + KEY `ud_hash` (`ud_hash`), KEY `ud_guid` (`ud_guid`), KEY `ud_date` (`ud_date`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/install/update.php b/install/update.php index 36a85afec..1b6a2218e 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Mon, 9 Sep 2013 22:00:39 +0200 Subject: [PATCH 128/330] usage message showed wrong number of channels --- mod/manage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/manage.php b/mod/manage.php index fad359535..27e45aa47 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -55,7 +55,7 @@ function manage_content(&$a) { } $r = q("select count(channel_id) as total from channel where channel_account_id = %d ", - intval($account) + intval(get_account_id()) ); $limit = service_class_fetch(local_user(),'total_identities'); if($limit !== false) { From 75dfcf9c4f558de41798166329dd5b6e4bf35fd0 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 9 Sep 2013 13:45:51 -0700 Subject: [PATCH 129/330] quick fix to directory --- mod/dirsearch.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mod/dirsearch.php b/mod/dirsearch.php index 064c3f287..6034fdc12 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -113,11 +113,11 @@ function dirsearch_content(&$a) { if($mtime) { $qlimit = ''; - $sql_extra .= " and xchan_hash in ( select ud_hash from updates where ud_date > '" . dbesc($mtime) . "' ) "; +// $sql_extra .= " and xchan_hash in ( select ud_hash from updates where ud_date > '" . dbesc($mtime) . "' ) "; } if($sort_order == 'date') - $order = " order by ud_date desc "; + $order = ""; // " order by ud_date desc "; elseif($sort_order == 'reverse') $order = " order by xchan_name desc "; else @@ -125,7 +125,7 @@ function dirsearch_content(&$a) { - $r = q("SELECT xchan.*, xprof.*, updates.* from xchan left join xprof on xchan_hash = xprof_hash left join updates on xchan_hash = ud_hash where $logic $sql_extra and not ( xchan_flags & %d ) and not ( xchan_flags & %d ) $order $qlimit ", + $r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash where $logic $sql_extra and not ( xchan_flags & %d ) and not ( xchan_flags & %d ) $order $qlimit ", intval(XCHAN_FLAGS_HIDDEN), intval(XCHAN_FLAGS_ORPHAN) ); From 933c30d95d73c039257428081a38206cfcd3756d Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 9 Sep 2013 19:02:38 -0700 Subject: [PATCH 130/330] site rename issue --- boot.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boot.php b/boot.php index b3c8701fd..4c2e27f93 100755 --- a/boot.php +++ b/boot.php @@ -1339,7 +1339,8 @@ function fix_system_urls($oldurl,$newurl) { if($r) { foreach($r as $rr) { $channel = substr($rr['xchan_addr'],0,strpos($rr['xchan_addr'],'@')); - $parsed = @parse_url($rr['xchan_url']); + + $parsed = @parse_url($newurl); if(! $parsed) continue; $newhost = $parsed['host']; From f93e92c260ca4ef248e5b079b1cd02a4a7d08d6c Mon Sep 17 00:00:00 2001 From: Michael Meer Date: Tue, 10 Sep 2013 14:18:51 +0200 Subject: [PATCH 131/330] extends DB in hubloc to maintain hubloc connectivity --- boot.php | 6 +----- install/database.sql | 2 ++ install/update.php | 9 ++++++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/boot.php b/boot.php index 4c2e27f93..ed645f6ea 100755 --- a/boot.php +++ b/boot.php @@ -43,7 +43,7 @@ require_once('include/taxonomy.php'); define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1068 ); +define ( 'DB_UPDATE_VERSION', 1069 ); define ( 'EOL', '
    ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -1206,7 +1206,6 @@ function check_config(&$a) { // We're reporting a different version than what is currently installed. // Run any existing update scripts to bring the database up to current. - require_once('install/update.php'); // make sure that boot.php and update.php are the same release, we might be @@ -1214,10 +1213,8 @@ function check_config(&$a) { // file may not be here yet. This can happen on a very busy site. if(DB_UPDATE_VERSION == UPDATE_VERSION) { - for($x = $stored; $x < $current; $x ++) { if(function_exists('update_r' . $x)) { - // There could be a lot of processes running or about to run. // We want exactly one process to run the update command. // So store the fact that we're taking responsibility @@ -1229,7 +1226,6 @@ function check_config(&$a) { if(get_config('database','update_r' . $x)) break; set_config('database','update_r' . $x, '1'); - // call the specific update $func = 'update_r' . $x; diff --git a/install/database.sql b/install/database.sql index 9b1b6cad2..9ecbad5a6 100644 --- a/install/database.sql +++ b/install/database.sql @@ -367,6 +367,7 @@ CREATE TABLE IF NOT EXISTS `hubloc` ( `hubloc_hash` char(255) NOT NULL, `hubloc_addr` char(255) NOT NULL DEFAULT '', `hubloc_flags` int(10) unsigned NOT NULL DEFAULT '0', + `hubloc_status` int(10) unsigned NOT NULL DEFAULT '0', `hubloc_url` char(255) NOT NULL DEFAULT '', `hubloc_url_sig` text NOT NULL, `hubloc_host` char(255) NOT NULL DEFAULT '', @@ -379,6 +380,7 @@ CREATE TABLE IF NOT EXISTS `hubloc` ( KEY `hubloc_url` (`hubloc_url`), KEY `hubloc_guid` (`hubloc_guid`), KEY `hubloc_flags` (`hubloc_flags`), + KEY `hubloc_status` (`hubloc_status`), KEY `hubloc_connect` (`hubloc_connect`), KEY `hubloc_host` (`hubloc_host`), KEY `hubloc_addr` (`hubloc_addr`), diff --git a/install/update.php b/install/update.php index 1b6a2218e..24aed374d 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Tue, 10 Sep 2013 20:15:09 +0100 Subject: [PATCH 132/330] Admin templates. --- view/tpl/admin_logs.tpl | 2 +- view/tpl/admin_plugins.tpl | 2 +- view/tpl/admin_plugins_details.tpl | 2 +- view/tpl/admin_site.tpl | 2 +- view/tpl/admin_summary.tpl | 2 +- view/tpl/admin_users.tpl | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/view/tpl/admin_logs.tpl b/view/tpl/admin_logs.tpl index e5412429f..3d2adc660 100755 --- a/view/tpl/admin_logs.tpl +++ b/view/tpl/admin_logs.tpl @@ -1,4 +1,4 @@ -
    +

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

    diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl index 01c178c3e..729ba5dc8 100755 --- a/view/tpl/admin_plugins.tpl +++ b/view/tpl/admin_plugins.tpl @@ -1,4 +1,4 @@ -
    +

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

      diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl index 47c33bec3..f72142e41 100755 --- a/view/tpl/admin_plugins_details.tpl +++ b/view/tpl/admin_plugins_details.tpl @@ -1,4 +1,4 @@ -
      +

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

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

      diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 32c5db8fc..d0a5254fe 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -34,7 +34,7 @@ }); }); -
      +

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

      diff --git a/view/tpl/admin_summary.tpl b/view/tpl/admin_summary.tpl index 88d87c35d..d3665626f 100755 --- a/view/tpl/admin_summary.tpl +++ b/view/tpl/admin_summary.tpl @@ -1,4 +1,4 @@ -
      +

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

      diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index 86389e9f2..770df7eba 100755 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -10,7 +10,7 @@ return false; } -
      +

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

      From fec0c71445db41c5099ff4a5ca22c1db23b1568c Mon Sep 17 00:00:00 2001 From: marijus Date: Tue, 10 Sep 2013 21:52:13 +0200 Subject: [PATCH 133/330] make /channel respect "Maximum number of conversations to load at any time" setting like /network does. --- mod/channel.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mod/channel.php b/mod/channel.php index 5d3855269..652084cf0 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -185,9 +185,8 @@ function channel_content(&$a, $update = 0, $load = false) { $sql_extra2 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert(date_default_timezone_get(),'',$datequery2)))); } - - $a->set_pager_itemspage(40); - + $itemspage = get_pconfig(local_user(),'system','itemspage'); + $a->set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20)); $pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage'])); if($load) { From 517baa86a3372f1bdb09f98a85c8f781365bcb1f Mon Sep 17 00:00:00 2001 From: Olaf Conradi Date: Wed, 11 Sep 2013 00:29:27 +0200 Subject: [PATCH 134/330] No need to add name_updated twice in zfinger response --- mod/zfinger.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mod/zfinger.php b/mod/zfinger.php index 320f0ca71..36c1cc493 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -130,7 +130,6 @@ function zfinger_init(&$a) { $ret['photo_updated'] = $e['xchan_photo_date']; $ret['url'] = $e['xchan_url']; $ret['connections_url']= (($e['xchan_connurl']) ? $e['xchan_connurl'] : z_root() . '/poco/' . $e['channel_address']); - $ret['name_updated'] = $e['xchan_name_date']; $ret['target'] = $ztarget; $ret['target_sig'] = $zsig; $ret['searchable'] = $searchable; @@ -250,4 +249,4 @@ function zfinger_init(&$a) { } json_return_and_die($ret); -} \ No newline at end of file +} From 72f562c190630e69fa5a223855cd6f3a3bc66e49 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 10 Sep 2013 17:09:10 -0700 Subject: [PATCH 135/330] z_fetch_url - include curl debug info in return array and log it (at logger_data level) on failure This should probably be at a lower log level, but unsuccessful connections could happen a lot on a busy production site so we'll try to keep the log noise down unless somebody really needs to track this info. --- include/network.php | 10 ++++++++++ version.inc | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/include/network.php b/include/network.php index 8b9a8a6a6..00d931f19 100644 --- a/include/network.php +++ b/include/network.php @@ -312,8 +312,13 @@ function z_fetch_url($url, $binary = false, $redirects = 0, $opts = array()) { $rc = intval($http_code); $ret['return_code'] = $rc; $ret['success'] = (($rc >= 200 && $rc <= 299) ? true : false); + if(! $ret['success']) { + $ret['debug'] = $curl_info; + logger('z_fetch_url: debug:' . print_r($curl_info,true), LOGGER_DATA); + } $ret['body'] = substr($s,strlen($header)); $ret['header'] = $header; + @curl_close($ch); return($ret); } @@ -407,6 +412,11 @@ function z_post_url($url,$params, $redirects = 0, $opts = array()) { $rc = intval($http_code); $ret['return_code'] = $rc; $ret['success'] = (($rc >= 200 && $rc <= 299) ? true : false); + if(! $ret['success']) { + $ret['debug'] = $curl_info; + logger('z_fetch_url: debug:' . print_r($curl_info,true), LOGGER_DATA); + } + $ret['body'] = substr($s,strlen($header)); $ret['header'] = $header; curl_close($ch); diff --git a/version.inc b/version.inc index 409e919d6..23045eee8 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-09-09.431 +2013-09-10.432 From 3e5414cf35f3781297490e058c6d366bca45748e Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 10 Sep 2013 19:06:06 -0700 Subject: [PATCH 136/330] provide detailed error to remote site for the myriad of things that can go wrong inside item_store(), !! this changes the return of item_store !! --- include/activities.php | 3 +- include/event.php | 3 +- include/items.php | 63 +++++++++++++++++++++++++++++------------- include/photos.php | 6 ++-- include/zot.php | 12 +++++--- mod/item.php | 3 +- mod/like.php | 3 +- mod/mood.php | 4 ++- mod/photos.php | 4 ++- mod/subthread.php | 3 +- 10 files changed, 72 insertions(+), 32 deletions(-) diff --git a/include/activities.php b/include/activities.php index 7ef26abeb..73180eae0 100644 --- a/include/activities.php +++ b/include/activities.php @@ -75,7 +75,8 @@ function profile_activity($changed, $value) { $arr['deny_cid'] = $self['channel_deny_cid']; $arr['deny_gid'] = $self['channel_deny_gid']; - $i = item_store($arr); + $res = item_store($arr); + $i = $res['item_id']; if($i) { // FIXME - limit delivery in notifier.php to those specificed in the perms argument diff --git a/include/event.php b/include/event.php index 29ada2e96..7873de1ef 100644 --- a/include/event.php +++ b/include/event.php @@ -360,7 +360,8 @@ function event_store($arr) { } - $item_id = item_store($item_arr); + $res = item_store($item_arr); + $item_id = $res['item_id']; call_hooks("event_created", $event['id']); diff --git a/include/items.php b/include/items.php index cd3ef7f68..2648a0629 100755 --- a/include/items.php +++ b/include/items.php @@ -193,7 +193,9 @@ function post_activity_item($arr) { } - $post_id = item_store($arr); + $post = item_store($arr); + if($post['result']) + $post_id = $post['item_id']; if($post_id) { $arr['id'] = $post_id; @@ -1365,9 +1367,12 @@ function encode_rel_links($links) { function item_store($arr,$allow_exec = false) { + $ret = array('result' => false, 'item_id' => 0); + if(! $arr['uid']) { logger('item_store: no uid'); - return 0; + $ret['message'] = 'No uid.'; + return ret; } // If a page layout is provided, ensure it exists and belongs to us. @@ -1392,7 +1397,8 @@ function item_store($arr,$allow_exec = false) { if(($arr['mimetype'] == 'application/x-php') && (! $allow_exec)) { logger('item_store: php mimetype but allow_exec is denied.'); - return 0; + $ret['message'] = 'exec denied.'; + return $ret; } @@ -1424,7 +1430,8 @@ function item_store($arr,$allow_exec = false) { call_hooks('item_translate', $translate); if((! $translate['translated']) && (intval(get_pconfig($arr['uid'],'system','reject_disallowed_languages')))) { logger('item_store: language ' . $arr['lang'] . ' not accepted for uid ' . $arr['uid']); - return; + $ret['message'] = 'language not accepted'; + return $ret; } $arr = $translate['item']; } @@ -1570,7 +1577,8 @@ function item_store($arr,$allow_exec = false) { } else { logger('item_store: item parent was not found - ignoring item'); - return 0; + $ret['message'] = 'parent not found.'; + return $ret; } } @@ -1584,14 +1592,16 @@ function item_store($arr,$allow_exec = false) { ); if($r) { logger('item-store: duplicate item ignored. ' . print_r($arr,true)); - return 0; + $ret['message'] = 'duplicate post.'; + return $ret; } call_hooks('post_remote',$arr); if(x($arr,'cancel')) { logger('item_store: post cancelled by plugin.'); - return 0; + $ret['message'] = 'cancelled.'; + return $ret; } // pull out all the taxonomy stuff for separate storage @@ -1625,7 +1635,8 @@ function item_store($arr,$allow_exec = false) { } else { logger('item_store: could not locate created item'); - return 0; + $ret['message'] = 'unable to retrieve.'; + return $ret; } if(count($r) > 1) { logger('item_store: duplicated post occurred. Removing duplicates.'); @@ -1697,21 +1708,26 @@ function item_store($arr,$allow_exec = false) { send_status_notifications($current_post,$arr); tag_deliver($arr['uid'],$current_post); + $ret['success'] = true; + $ret['item_id'] = $current_post; - return $current_post; + return $ret; } function item_store_update($arr,$allow_exec = false) { + $ret = array('result' => false, 'item_id' => 0); if(! intval($arr['uid'])) { logger('item_store_update: no uid'); - return 0; + $ret['message'] = 'no uid.'; + return $ret; } if(! intval($arr['id'])) { logger('item_store_update: no id'); - return 0; + $ret['message'] = 'no id.'; + return $ret; } $orig_post_id = $arr['id']; @@ -1729,7 +1745,8 @@ function item_store_update($arr,$allow_exec = false) { call_hooks('item_translate', $translate); if((! $translate['translated']) && (intval(get_pconfig($arr['uid'],'system','reject_disallowed_languages')))) { logger('item_store: language ' . $arr['lang'] . ' not accepted for uid ' . $arr['uid']); - return; + $ret['message'] = 'language not accepted'; + return $ret; } $arr = $translate['item']; } @@ -1738,7 +1755,8 @@ function item_store_update($arr,$allow_exec = false) { if(($arr['mimetype'] == 'application/x-php') && (! $allow_exec)) { logger('item_store: php mimetype but allow_exec is denied.'); - return 0; + $ret['message'] = 'exec denied.'; + return $ret; } @@ -1771,7 +1789,8 @@ function item_store_update($arr,$allow_exec = false) { ); if(! $orig) { logger('item_store_update: original post not found: ' . $orig_post_id); - return 0; + $ret['message'] = 'no original'; + return $ret; } unset($arr['aid']); @@ -1814,7 +1833,8 @@ function item_store_update($arr,$allow_exec = false) { if(x($arr,'cancel')) { logger('item_store_update: post cancelled by plugin.'); - return 0; + $ret['message'] = 'cancelled.'; + return $ret; } // pull out all the taxonomy stuff for separate storage @@ -1842,7 +1862,8 @@ function item_store_update($arr,$allow_exec = false) { logger('item_store_update: updated item ' . $orig_post_id, LOGGER_DEBUG); else { logger('item_store_update: could not update item'); - return 0; + $ret['message'] = 'DB update failed.'; + return $ret; } $r = q("delete from term where oid = %d and otype = %d", @@ -1871,8 +1892,10 @@ function item_store_update($arr,$allow_exec = false) { send_status_notifications($orig_post_id,$arr); tag_deliver($uid,$orig_post_id); + $ret['success'] = true; + $ret['item_id'] = $orig_post_id; - return $orig_post_id; + return $ret; } @@ -2749,7 +2772,8 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) } } - $r = item_store($datarray); + $xx = item_store($datarray); + $r = $xx['item_id']; continue; } @@ -2879,7 +2903,8 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) continue; - $r = item_store($datarray); + $xx = item_store($datarray); + $r = $xx['item_id']; continue; } diff --git a/include/photos.php b/include/photos.php index c670bd90c..517212e57 100644 --- a/include/photos.php +++ b/include/photos.php @@ -222,7 +222,8 @@ function photo_upload($channel, $observer, $args) { . '[zmg]' . z_root() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/zmg]' . '[/zrl]'; - $item_id = item_store($arr); + $result = item_store($arr); + $item_id = $result['item_id']; if($visible) proc_run('php', "include/notifier.php", 'wall-new', $item_id); @@ -402,7 +403,8 @@ function photos_create_item($channel, $creator_hash, $photo, $visible = false) { . '[zmg]' . z_root() . '/photo/' . $photo['resource_id'] . '-' . $photo['scale'] . '[/zmg]' . '[/zrl]'; - $item_id = item_store($arr); + $result = item_store($arr); + $item_id = $result['item_id']; return $item_id; } \ No newline at end of file diff --git a/include/zot.php b/include/zot.php index e9084496c..6deee4d52 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1154,8 +1154,9 @@ function process_delivery($sender,$arr,$deliveries,$relay) { else { $arr['aid'] = $channel['channel_account_id']; $arr['uid'] = $channel['channel_id']; - $item_id = item_store($arr); - $result[] = array($d['hash'],(($item_id) ? 'posted' : 'storage failed'),$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>'); + $item_result = item_store($arr); + $item_id = $item_result['item_id']; + $result[] = array($d['hash'],(($item_id) ? 'posted' : 'storage failed:' . $item_result['message']),$channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>'); } if($relay && $item_id) { @@ -1238,8 +1239,11 @@ function remove_community_tag($sender,$arr,$uid) { function update_imported_item($sender,$item,$uid) { - item_store_update($item); - logger('update_imported_item'); + $x = item_store_update($item); + if(! $x['item_id']) + logger('update_imported_item: failed: ' . $x['message']); + else + logger('update_imported_item'); } diff --git a/mod/item.php b/mod/item.php index fd93d1dff..367a0c4be 100644 --- a/mod/item.php +++ b/mod/item.php @@ -689,7 +689,8 @@ function item_post(&$a) { $post_id = 0; - $post_id = item_store($datarray,$execflag); + $post = item_store($datarray,$execflag); + $post_id = $post['item_id']; if($post_id) { logger('mod_item: saved item ' . $post_id); diff --git a/mod/like.php b/mod/like.php index 0de65f129..84b0a6592 100755 --- a/mod/like.php +++ b/mod/like.php @@ -171,7 +171,8 @@ function like_content(&$a) { $arr['deny_cid'] = $item['deny_cid']; $arr['deny_gid'] = $item['deny_gid']; - $post_id = item_store($arr); + $post = item_store($arr); + $post_id = $post['item_id']; $arr['id'] = $post_id; diff --git a/mod/mood.php b/mod/mood.php index 7b6a0c392..83b8bfb57 100755 --- a/mod/mood.php +++ b/mod/mood.php @@ -84,7 +84,9 @@ function mood_init(&$a) { $arr['verb'] = $activity; $arr['body'] = $action; - $item_id = item_store($arr); + $post = item_store($arr); + $item_id = $post['item_id']; + if($item_id) { // q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1", // dbesc($a->get_baseurl() . '/display/' . $poster['nickname'] . '/' . $item_id), diff --git a/mod/photos.php b/mod/photos.php index 7da3d3e92..d60029688 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -506,7 +506,9 @@ function photos_post(&$a) { . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource_id'] . ''; $arr['target'] .= '' . xmlify('' . "\n" . '') . ''; - $item_id = item_store($arr); + $post = item_store($arr); + $item_id = $post['item_id']; + if($item_id) { q("UPDATE `item` SET `plink` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1", dbesc($a->get_baseurl() . '/display/' . $owner_record['nickname'] . '/' . $item_id), diff --git a/mod/subthread.php b/mod/subthread.php index 66dc86eb2..11b7236fb 100755 --- a/mod/subthread.php +++ b/mod/subthread.php @@ -142,7 +142,8 @@ EOT; $arr['unseen'] = 1; $arr['last-child'] = 0; - $post_id = item_store($arr); + $post = item_store($arr); + $post_id = $post['item_id']; if(! $item['visible']) { $r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d AND `uid` = %d LIMIT 1", From 46c66e2e4cc5c2f02bcbd4f92c78520a3d029ed8 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 10 Sep 2013 20:14:12 -0700 Subject: [PATCH 137/330] change wording on item_store message so we can find failures fast with grep item_store logfile | grep -v created --- include/items.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index 2648a0629..b1aa493b5 100755 --- a/include/items.php +++ b/include/items.php @@ -1634,7 +1634,7 @@ function item_store($arr,$allow_exec = false) { logger('item_store: created item ' . $current_post, LOGGER_DEBUG); } else { - logger('item_store: could not locate created item'); + logger('item_store: could not locate stored item'); $ret['message'] = 'unable to retrieve.'; return $ret; } From 3c328083d25d2e6a2d901c4ea32f8a593ac78262 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 10 Sep 2013 21:10:56 -0700 Subject: [PATCH 138/330] this should fix the foreign language like notifications (again) --- include/items.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/items.php b/include/items.php index b1aa493b5..5a5dfdba1 100755 --- a/include/items.php +++ b/include/items.php @@ -1479,7 +1479,7 @@ function item_store($arr,$allow_exec = false) { $arr['changed'] = datetime_convert(); $arr['location'] = ((x($arr,'location')) ? notags(trim($arr['location'])) : ''); $arr['coord'] = ((x($arr,'coord')) ? notags(trim($arr['coord'])) : ''); - $arr['parent_mid'] = ((x($arr,'parent_mid')) ? notags(trim($arr['parent_mid'])) : ''); + $arr['parent_mid'] = ((x($arr,'parent_mid')) ? notags(trim($arr['parent_mid'])) : $arr['mid']); $arr['thr_parent'] = ((x($arr,'thr_parent')) ? notags(trim($arr['thr_parent'])) : $arr['parent_mid']); $arr['verb'] = ((x($arr,'verb')) ? notags(trim($arr['verb'])) : ''); $arr['obj_type'] = ((x($arr,'obj_type')) ? notags(trim($arr['obj_type'])) : ''); @@ -1591,7 +1591,7 @@ function item_store($arr,$allow_exec = false) { intval($arr['uid']) ); if($r) { - logger('item-store: duplicate item ignored. ' . print_r($arr,true)); + logger('item_store: duplicate item ignored. ' . print_r($arr,true)); $ret['message'] = 'duplicate post.'; return $ret; } @@ -1631,6 +1631,7 @@ function item_store($arr,$allow_exec = false) { if($r && count($r)) { $current_post = $r[0]['id']; + $arr = $r[0]; // This will gives us a fresh copy of what's now in the DB and undo the db escaping, which really messes up the notifications logger('item_store: created item ' . $current_post, LOGGER_DEBUG); } else { @@ -1668,6 +1669,7 @@ function item_store($arr,$allow_exec = false) { intval($current_post) ); + // These are probably redundant now that we've queried the just stored post $arr['id'] = $current_post; $arr['parent'] = $parent_id; $arr['allow_cid'] = $allow_cid; From de777d2f9c7a78c9b43381db2b3369da04750c5c Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 10 Sep 2013 21:17:33 -0700 Subject: [PATCH 139/330] remove old debugging cruft --- mod/display.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/display.php b/mod/display.php index 63b5fa29b..d19502eb1 100644 --- a/mod/display.php +++ b/mod/display.php @@ -3,7 +3,7 @@ function display_content(&$a, $update = 0, $load = false) { - logger("mod-display: update = $update load = $load"); +// logger("mod-display: update = $update load = $load"); if(intval(get_config('system','block_public')) && (! local_user()) && (! remote_user())) { notice( t('Public access denied.') . EOL); From 5e230edb85a2f10c43486e8d12b96e2a6ed1109c Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 10 Sep 2013 22:45:04 -0700 Subject: [PATCH 140/330] well that really stuffed things up... --- include/items.php | 2 +- include/zot.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/items.php b/include/items.php index 5a5dfdba1..60a678d1b 100755 --- a/include/items.php +++ b/include/items.php @@ -1479,7 +1479,7 @@ function item_store($arr,$allow_exec = false) { $arr['changed'] = datetime_convert(); $arr['location'] = ((x($arr,'location')) ? notags(trim($arr['location'])) : ''); $arr['coord'] = ((x($arr,'coord')) ? notags(trim($arr['coord'])) : ''); - $arr['parent_mid'] = ((x($arr,'parent_mid')) ? notags(trim($arr['parent_mid'])) : $arr['mid']); + $arr['parent_mid'] = ((x($arr,'parent_mid')) ? notags(trim($arr['parent_mid'])) : ''); $arr['thr_parent'] = ((x($arr,'thr_parent')) ? notags(trim($arr['thr_parent'])) : $arr['parent_mid']); $arr['verb'] = ((x($arr,'verb')) ? notags(trim($arr['verb'])) : ''); $arr['obj_type'] = ((x($arr,'obj_type')) ? notags(trim($arr['obj_type'])) : ''); diff --git a/include/zot.php b/include/zot.php index 6deee4d52..dd6d1842c 100644 --- a/include/zot.php +++ b/include/zot.php @@ -945,9 +945,9 @@ function public_recips($msg) { if($msg['notify']['sender']['url'] === z_root()) - $sql = " where (( " . $col . " & " . PERMS_NETWORK . " ) or ( " . $col . " & " . PERMS_SITE . " )) "; + $sql = " where (( " . $col . " & " . PERMS_NETWORK . " ) or ( " . $col . " & " . PERMS_SITE . " ) or ( " . $col . " & " . PERMS_PUBLIC . ")) "; else - $sql = " where ( " . $col . " & " . PERMS_NETWORK . " ) " ; + $sql = " where (( " . $col . " & " . PERMS_NETWORK . " ) or ( " . $col . " & " . PERMS_PUBLIC . ")) "; $r = q("select channel_hash as hash from channel " . $sql ); From 5fbe4c187695a02118039e3056ee471e93c858b1 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 10 Sep 2013 23:25:56 -0700 Subject: [PATCH 141/330] make comments work again --- include/items.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index 60a678d1b..304dab316 100755 --- a/include/items.php +++ b/include/items.php @@ -1624,11 +1624,12 @@ function item_store($arr,$allow_exec = false) { // find the item we just created - $r = q("SELECT `id` FROM `item` WHERE `mid` = '%s' AND `uid` = %d ORDER BY `id` ASC ", + $r = q("SELECT * FROM `item` WHERE `mid` = '%s' AND `uid` = %d ORDER BY `id` ASC ", $arr['mid'], // already dbesc'd intval($arr['uid']) ); + if($r && count($r)) { $current_post = $r[0]['id']; $arr = $r[0]; // This will gives us a fresh copy of what's now in the DB and undo the db escaping, which really messes up the notifications From d593b40d9a31d00ec4374c60d509812996ff32d9 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 11 Sep 2013 02:03:37 -0700 Subject: [PATCH 142/330] assuming this doesn't blow up the internet like the last fix - this is a very old bug that's been reported time and time again and nobody every bothered to debug or even report it somewhere where we could monitor it. It's buried somewhere in my stream, but basically is "things don't work right if you've got 'everybody in my address book' permissions" on "can send me their channel stream and posts". I think this is Michelle's problem and anybody else who has en empty matrix after making lots of connections. --- include/zot.php | 2 +- version.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/zot.php b/include/zot.php index dd6d1842c..9e8dd3dfa 100644 --- a/include/zot.php +++ b/include/zot.php @@ -955,7 +955,7 @@ function public_recips($msg) { $r = array(); $x = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id where abook_xchan = '%s' - and (( " . $col . " & " . PERMS_SPECIFIC . " ) OR ( " . $col . " & " . PERMS_CONTACTS . " )) and ( abook_my_perms & " . $field . " ) ", + and (( " . $col . " & " . PERMS_SPECIFIC . " ) and ( abook_my_perms & " . $field . " )) OR ( " . $col . " & " . PERMS_CONTACTS . " ) ", dbesc($msg['notify']['sender']['hash']) ); diff --git a/version.inc b/version.inc index 23045eee8..335f2639a 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-09-10.432 +2013-09-11.433 From 22282647720da3f84759130655a3095642d931fe Mon Sep 17 00:00:00 2001 From: Michael Meer Date: Wed, 11 Sep 2013 13:59:45 +0200 Subject: [PATCH 143/330] flag failed auth attempts in DB table hubloc --- include/zot.php | 4 +++- mod/post.php | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/include/zot.php b/include/zot.php index dd6d1842c..ee4fe940f 100644 --- a/include/zot.php +++ b/include/zot.php @@ -903,8 +903,10 @@ function zot_import($arr) { $result = process_channel_sync_delivery($i['notify']['sender'],$arr,$deliveries); } } - if($result) + if($result){ + logger('delivery result: ' . print_r($result,tue) ); $return = array_merge($return,$result); + } } } diff --git a/mod/post.php b/mod/post.php index 70dd4dc19..7510a028f 100644 --- a/mod/post.php +++ b/mod/post.php @@ -127,6 +127,12 @@ function post_init(&$a) { info(sprintf( t('Welcome %s. Remote authentication successful.'),$x[0]['xchan_name'])); logger('mod_zot: auth success from ' . $x[0]['xchan_addr'] . ' for ' . $webbie); + } else { + logger('mod_zot: still not authenticated: ' . $x[0]['xchan_addr']); + q("update hubloc set hubloc_status = ( hubloc_status ^ %d) where hubloc_addr = '%s'", + intval(HUBLOC_RECEIVE_ERROR), + $x[0][xchan_addr] + ); } // FIXME - we really want to save the return_url in the session before we visit rmagic. From 82f4b1767e5af692b25ca6cff9cec64ed6cb7ec6 Mon Sep 17 00:00:00 2001 From: Michael Meer Date: Wed, 11 Sep 2013 14:05:33 +0200 Subject: [PATCH 144/330] delete logger line; was the wrong place. --- include/zot.php | 1 - 1 file changed, 1 deletion(-) diff --git a/include/zot.php b/include/zot.php index ee4fe940f..248a1419b 100644 --- a/include/zot.php +++ b/include/zot.php @@ -904,7 +904,6 @@ function zot_import($arr) { } } if($result){ - logger('delivery result: ' . print_r($result,tue) ); $return = array_merge($return,$result); } } From 2c06a2c16321e8ae80ba04b920b20d378be6325d Mon Sep 17 00:00:00 2001 From: Michael Meer Date: Wed, 11 Sep 2013 15:24:26 +0200 Subject: [PATCH 145/330] implement tip from Mike, corrected the sql statement --- mod/post.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/post.php b/mod/post.php index 7510a028f..c4254b10a 100644 --- a/mod/post.php +++ b/mod/post.php @@ -129,7 +129,7 @@ function post_init(&$a) { } else { logger('mod_zot: still not authenticated: ' . $x[0]['xchan_addr']); - q("update hubloc set hubloc_status = ( hubloc_status ^ %d) where hubloc_addr = '%s'", + q("update hubloc set hubloc_status = (hubloc_status | %d ) where hubloc_addr = '%s'", intval(HUBLOC_RECEIVE_ERROR), $x[0][xchan_addr] ); From bf3e7f5e9f99207c380eebcc5fbd24d2eb483365 Mon Sep 17 00:00:00 2001 From: ndurchx Date: Thu, 12 Sep 2013 11:39:07 +0200 Subject: [PATCH 146/330] Fixed error in SQL Statement --- install/database.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/database.sql b/install/database.sql index 9ecbad5a6..41fb968c8 100644 --- a/install/database.sql +++ b/install/database.sql @@ -885,7 +885,7 @@ CREATE TABLE IF NOT EXISTS `tokens` ( ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `updates` ( - `ud_id` int(10) unsigned NOT NULL AUTO INCREMENT, + `ud_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `ud_hash` char(128) NOT NULL, `ud_guid` char(255) NOT NULL DEFAULT '', `ud_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', From 816d764aecbd6105c41d591e2d7c0160758f1779 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 12 Sep 2013 03:26:24 -0700 Subject: [PATCH 147/330] remove some debugging stuff now that the problem they were trying to locate down has been solved. --- include/items.php | 5 ----- version.inc | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/include/items.php b/include/items.php index 304dab316..e987a69b1 100755 --- a/include/items.php +++ b/include/items.php @@ -1446,15 +1446,10 @@ function item_store($arr,$allow_exec = false) { } - if($arr['object']) - logger('item_store: input object: ' . print_r($arr['object'],true), LOGGER_DATA); - if((x($arr,'object')) && is_array($arr['object'])) { activity_sanitise($arr['object']); - logger('item_store: sanitised object: ' . print_r($arr['object'],true), LOGGER_DATA); $arr['object'] = json_encode($arr['object']); - logger('item_store: encoded object: ' . print_r($arr['object'],true), LOGGER_DATA); } if((x($arr,'target')) && is_array($arr['target'])) { diff --git a/version.inc b/version.inc index 335f2639a..88e400a18 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-09-11.433 +2013-09-12.434 From 037fd43fbde829cf4911d7500043f3befa5e99b2 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 12 Sep 2013 16:52:58 -0700 Subject: [PATCH 148/330] more remote error reporting for zot --- boot.php | 1 + mod/post.php | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/boot.php b/boot.php index ed645f6ea..b30d9ae49 100755 --- a/boot.php +++ b/boot.php @@ -1,6 +1,7 @@ Date: Thu, 12 Sep 2013 20:11:56 -0700 Subject: [PATCH 149/330] so public_recips and allowed_public_recips is working so much better than before, but was still not quite right. We seem to be getting all the right results for top-level posts now, but comments aren't getting through on channels for which we've allowed them to send us their stream, but not comment on our posts. The reason is we were seeing if they could comment - and we only need to do that if we own the post. If they own the post, we only need to check if they can send us their stream. --- include/zot.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/include/zot.php b/include/zot.php index cdbfd2185..e395e88f6 100644 --- a/include/zot.php +++ b/include/zot.php @@ -926,14 +926,22 @@ function public_recips($msg) { $check_mentions = false; if($msg['message']['type'] === 'activity') { + $col = 'channel_w_stream'; + $field = PERMS_W_STREAM; if(array_key_exists('flags',$msg['message']) && in_array('thread_parent', $msg['message']['flags'])) { - $col = 'channel_w_stream'; - $field = PERMS_W_STREAM; + // check mention recipient permissions on top level posts only $check_mentions = true; } else { - $col = 'channel_w_comment'; - $field = PERMS_W_COMMENT; + // if this is a comment and it wasn't sent by the post owner, check to see who is allowing them to comment. + // We should have one specific recipient and this step shouldn't be needed unless somebody stuffed up their software. + // We may need this step to protect us from bad guys intentionally stuffing up their software. + // If it is sent by the post owner, we don't need to do this. We only need to see who is receiving the + // owner's stream (which was already set above) - as they control the comment permissions + if($msg['notify']['sender']['guid_sig'] != $msg['message']['owner']['guid_sig']) { + $col = 'channel_w_comment'; + $field = PERMS_W_COMMENT; + } } } elseif($msg['message']['type'] === 'mail') { From e9ea80f2f62a2ab53f5b6d74792de6b08fd98a03 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 12 Sep 2013 21:54:15 -0700 Subject: [PATCH 150/330] No point beating a dead horse --- include/poller.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/poller.php b/include/poller.php index bdb0388ac..f084005c7 100644 --- a/include/poller.php +++ b/include/poller.php @@ -158,7 +158,7 @@ function poller_run($argv, $argc){ ); - $contacts = q("SELECT abook_id, abook_updated, abook_connected, abook_closeness, abook_channel + $contacts = q("SELECT abook_id, abook_flags, abook_updated, abook_connected, abook_closeness, abook_channel FROM abook LEFT JOIN account on abook_account = account_id where 1 $sql_extra AND (( abook_flags = %d ) OR ( abook_flags = %d )) @@ -210,6 +210,11 @@ function poller_run($argv, $argc){ continue; } + if($contact['abook_flags'] & ABOOK_FLAG_ARCHIVED) { + $update = false; + continue; + } + // might be dead, so maybe don't poll quite so often // recently deceased, so keep up the regular schedule for 3 days @@ -223,6 +228,8 @@ function poller_run($argv, $argc){ if(strcmp(datetime_convert('UTC','UTC', 'now'),datetime_convert('UTC','UTC', $t . " + 2 day")) > 0) { $update = true; } + + } if((! $update) && (! $force)) From cf87653a922f3b7f6132a00bb77293ae9e7a66c1 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 12 Sep 2013 22:50:41 -0700 Subject: [PATCH 151/330] need to figure out what's causing this --- include/zot.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/zot.php b/include/zot.php index e395e88f6..f34344739 100644 --- a/include/zot.php +++ b/include/zot.php @@ -844,6 +844,12 @@ function zot_import($arr) { } else { + if((array_key_exists('flags',$i['message'])) && (in_array('private',$i['message']['flags']))) { + // This should not happen but until we can stop it... + logger('private message was delivered with no recipients.'); + continue; + } + logger('public post'); // Public post. look for any site members who are or may be accepting posts from this sender From b824552e13ab5a77e850178af7d0cc9868cad573 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Fri, 13 Sep 2013 12:06:08 +0200 Subject: [PATCH 152/330] modified: view/ru/messages.po --- view/ru/messages.po | 3220 ++++++++++++++++++++++++------------------- 1 file changed, 1764 insertions(+), 1456 deletions(-) diff --git a/view/ru/messages.po b/view/ru/messages.po index 267b799f4..375af7439 100644 --- a/view/ru/messages.po +++ b/view/ru/messages.po @@ -1,5 +1,5 @@ # Red Communications Project -# Copyright (C) 2013 the Friendica Project +# Copyright (C) 2013 the Red Matrix Project # This file is distributed under the same license as the Red package. # # Translators: @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Red Matrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-09 03:55-0700\n" -"PO-Revision-Date: 2013-08-12 13:40+0000\n" +"POT-Creation-Date: 2013-09-06 00:01-0700\n" +"PO-Revision-Date: 2013-09-13 09:56+0000\n" "Last-Translator: alexej \n" "Language-Team: Russian (http://www.transifex.com/projects/p/red-matrix/language/ru/)\n" "MIME-Version: 1.0\n" @@ -38,17 +38,17 @@ msgstr "и" msgid "public profile" msgstr "Публичный профиль" -#: ../../include/activities.php:48 +#: ../../include/activities.php:50 #, php-format msgid "%1$s changed %2$s to “%3$s”" msgstr "%1$s изменил %2$s на “%3$s”" -#: ../../include/activities.php:49 +#: ../../include/activities.php:51 #, php-format msgid "Visit %1$s's %2$s" msgstr "Посетить %1$s's %2$s" -#: ../../include/activities.php:52 +#: ../../include/activities.php:54 #, php-format msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" @@ -134,17 +134,17 @@ msgstr "Пожалуйста, посетите %s для просмотра и/ #: ../../include/enotify.php:165 #, php-format msgid "[Red:Notify] %s posted to your profile wall" -msgstr "" +msgstr "[Red:Уведомление] %s добавил сообщениe на стену вашего профиля" #: ../../include/enotify.php:167 #, php-format msgid "%1$s posted to your profile wall at %2$s" -msgstr "" +msgstr "%1$s добавил сообщениe на стену вашего профиля в %2$s" #: ../../include/enotify.php:169 #, php-format msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]" -msgstr "" +msgstr "%1$s добавил сообщениe на [zrl=%2$s]стену вашего профиля[/zrl]" #: ../../include/enotify.php:195 #, php-format @@ -243,47 +243,51 @@ msgstr "Фото:" msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: ../../include/Contact.php:55 ../../include/contact_widgets.php:9 -#: ../../mod/directory.php:163 ../../mod/match.php:58 ../../mod/suggest.php:56 -#: ../../boot.php:1622 -msgid "Connect" -msgstr "Добавить" +#: ../../include/comanche.php:33 +msgid "Default" +msgstr "" -#: ../../include/Contact.php:71 +#: ../../include/Contact.php:87 ../../include/contact_widgets.php:9 +#: ../../mod/directory.php:163 ../../mod/match.php:58 ../../mod/suggest.php:56 +#: ../../boot.php:1687 +msgid "Connect" +msgstr "Подключить" + +#: ../../include/Contact.php:103 msgid "New window" msgstr "Новое окно" -#: ../../include/Contact.php:72 +#: ../../include/Contact.php:104 msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/Contact.php:430 ../../include/conversation.php:887 +#: ../../include/Contact.php:462 ../../include/conversation.php:920 msgid "Poke" msgstr "Подпихнуть" -#: ../../include/Contact.php:431 ../../include/conversation.php:881 +#: ../../include/Contact.php:463 ../../include/conversation.php:914 msgid "View Status" msgstr "Просмотр состояния" -#: ../../include/Contact.php:432 ../../include/nav.php:75 -#: ../../include/conversation.php:882 ../../mod/connections.php:294 -#: ../../mod/connections.php:401 +#: ../../include/Contact.php:464 ../../include/nav.php:75 +#: ../../include/conversation.php:915 ../../mod/connections.php:304 +#: ../../mod/connections.php:411 msgid "View Profile" msgstr "Просмотр профиля" -#: ../../include/Contact.php:433 ../../include/conversation.php:883 +#: ../../include/Contact.php:465 ../../include/conversation.php:916 msgid "View Photos" msgstr "Просмотр фотографий" -#: ../../include/Contact.php:434 ../../include/conversation.php:884 +#: ../../include/Contact.php:466 ../../include/conversation.php:917 msgid "Network Posts" msgstr "Сообщения сети" -#: ../../include/Contact.php:435 ../../include/conversation.php:885 +#: ../../include/Contact.php:467 ../../include/conversation.php:918 msgid "Edit Contact" msgstr "Редактировать канал" -#: ../../include/Contact.php:436 ../../include/conversation.php:886 +#: ../../include/Contact.php:468 ../../include/conversation.php:919 msgid "Send PM" msgstr "Отправить личное сообщение" @@ -348,7 +352,7 @@ msgid "RSS/Atom" msgstr "RSS/Atom" #: ../../include/contact_selectors.php:77 ../../mod/admin.php:636 -#: ../../mod/admin.php:645 ../../boot.php:1364 +#: ../../mod/admin.php:645 ../../boot.php:1422 msgid "Email" msgstr "E-mail" @@ -378,7 +382,7 @@ msgstr "MySpace" #: ../../include/contact_widgets.php:6 msgid "Add New Connection" -msgstr "Добавить новый канал" +msgstr "Добавить новый контакт" #: ../../include/contact_widgets.php:7 msgid "Enter the channel address" @@ -392,9 +396,9 @@ msgstr "Пример: bob@example.com, http://example.com/barbara" #, php-format msgid "%d invitation available" msgid_plural "%d invitations available" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "имеется %d приглашение" +msgstr[1] "имеются %d приглашения" +msgstr[2] "имеется %d приглашений" #: ../../include/contact_widgets.php:29 msgid "Find Channels" @@ -406,20 +410,20 @@ msgstr "Впишите имя или интерес" #: ../../include/contact_widgets.php:31 msgid "Connect/Follow" -msgstr "Добавить/следовать" +msgstr "Подключить/следовать" #: ../../include/contact_widgets.php:32 msgid "Examples: Robert Morgenstein, Fishing" msgstr "Примеры: Владимир Ильич, Революционер" #: ../../include/contact_widgets.php:33 ../../mod/directory.php:182 -#: ../../mod/directory.php:187 ../../mod/connections.php:656 +#: ../../mod/directory.php:187 ../../mod/connections.php:666 msgid "Find" msgstr "Поиск" #: ../../include/contact_widgets.php:34 ../../mod/suggest.php:64 msgid "Channel Suggestions" -msgstr "Рекомендации каналов" +msgstr "Рекомендации контактов" #: ../../include/contact_widgets.php:35 msgid "Similar Interests" @@ -549,7 +553,7 @@ msgid "Finishes:" msgstr "\t\nКонец:" #: ../../include/event.php:40 ../../include/bb2diaspora.php:455 -#: ../../mod/events.php:450 ../../mod/directory.php:138 ../../boot.php:1676 +#: ../../mod/events.php:450 ../../mod/directory.php:138 ../../boot.php:1737 msgid "Location:" msgstr "Откуда:" @@ -557,54 +561,56 @@ msgstr "Откуда:" msgid "General Features" msgstr "Главные функции" -#: ../../include/features.php:22 -msgid "Content Expiration" -msgstr "" - -#: ../../include/features.php:22 -msgid "Remove old posts/comments after a period of time" -msgstr "" - -#: ../../include/features.php:23 +#: ../../include/features.php:24 msgid "Multiple Profiles" msgstr "Несколько профилей" -#: ../../include/features.php:23 -msgid "Ability to create multiple profiles" -msgstr "" - #: ../../include/features.php:24 +msgid "Ability to create multiple profiles" +msgstr "Возможность создания нескольких профилей" + +#: ../../include/features.php:25 msgid "Web Pages" msgstr "Веб-страницы" -#: ../../include/features.php:24 +#: ../../include/features.php:25 msgid "Provide managed web pages on your channel" msgstr "" -#: ../../include/features.php:25 +#: ../../include/features.php:26 msgid "Enhanced Photo Albums" msgstr "Расширенные фотоальбомы" -#: ../../include/features.php:25 +#: ../../include/features.php:26 msgid "Enable photo album with enhanced features" -msgstr "" +msgstr "Включить фотоальбом с расширенными функциями" -#: ../../include/features.php:27 +#: ../../include/features.php:28 msgid "Extended Identity Sharing" -msgstr "" +msgstr "Расширенный обмен идентичности" -#: ../../include/features.php:27 ../../include/js_strings.php:28 +#: ../../include/features.php:28 ../../include/js_strings.php:28 msgid " " msgstr " " -#: ../../include/features.php:28 +#: ../../include/features.php:29 msgid "Expert Mode" msgstr "Экспертный режим" -#: ../../include/features.php:28 +#: ../../include/features.php:29 msgid "Enable Expert Mode to provide advanced configuration options" msgstr "" +#: ../../include/features.php:30 +msgid "Premium Channel" +msgstr "" + +#: ../../include/features.php:30 +msgid "" +"Allows you to set restrictions and terms on those that connect with your " +"channel" +msgstr "" + #: ../../include/features.php:35 msgid "Post Composition Features" msgstr "" @@ -623,7 +629,7 @@ msgstr "Предварительный просмотр сообщения" #: ../../include/features.php:37 msgid "Allow previewing posts and comments before publishing them" -msgstr "" +msgstr "Разрешить предварительный просмотр сообщений и комментариев перед их публикацией" #: ../../include/features.php:42 msgid "Network and Stream Filtering" @@ -635,7 +641,7 @@ msgstr "Поиск по дате" #: ../../include/features.php:43 msgid "Ability to select posts by date ranges" -msgstr "" +msgstr "Возможность выбора сообщений по датам" #: ../../include/features.php:44 msgid "Collections Filter" @@ -645,14 +651,14 @@ msgstr "Фильтр коллекций" msgid "Enable widget to display Network posts only from selected collections" msgstr "" -#: ../../include/features.php:45 ../../mod/network.php:167 +#: ../../include/features.php:45 ../../mod/network.php:150 #: ../../mod/search.php:17 msgid "Saved Searches" msgstr "Запомненные поиски" #: ../../include/features.php:45 msgid "Save search terms for re-use" -msgstr "" +msgstr "Сохранять результаты поиска для повторного использования" #: ../../include/features.php:46 msgid "Network Personal Tab" @@ -680,7 +686,7 @@ msgstr "" #: ../../include/features.php:53 msgid "Post/Comment Tools" -msgstr "" +msgstr "Инструменты сообщений/комментарий " #: ../../include/features.php:54 msgid "Multiple Deletion" @@ -688,7 +694,7 @@ msgstr "Множественное удаление" #: ../../include/features.php:54 msgid "Select and delete multiple posts/comments at once" -msgstr "" +msgstr "Выбор и удаление нескольких сообщений/комментариев сразу" #: ../../include/features.php:55 msgid "Edit Sent Posts" @@ -696,7 +702,7 @@ msgstr "Редактировать отправленные сообщения" #: ../../include/features.php:55 msgid "Edit and correct posts and comments after sending" -msgstr "" +msgstr "Редактировать и исправлять сообщения и комментарии после отправки" #: ../../include/features.php:56 msgid "Tagging" @@ -712,7 +718,7 @@ msgstr "Категории сообщения" #: ../../include/features.php:57 msgid "Add categories to your posts" -msgstr "" +msgstr "Добавить категории для ваших сообщений" #: ../../include/features.php:58 msgid "Ability to file posts under folders" @@ -755,9 +761,9 @@ msgstr "" #: ../../include/group.php:242 msgid "All Channels" -msgstr "Все каналы" +msgstr "Все контакты" -#: ../../include/group.php:264 +#: ../../include/group.php:264 ../../include/page_widgets.php:8 msgid "edit" msgstr "редактировать" @@ -775,9 +781,9 @@ msgstr "Создать новую коллекцию" #: ../../include/group.php:288 msgid "Channels not in any collection" -msgstr "Каналы не в какой коллекции" +msgstr "Контакты не в какой коллекции" -#: ../../include/group.php:290 ../../mod/network.php:168 +#: ../../include/group.php:290 ../../mod/network.php:151 msgid "add" msgstr "добавить" @@ -786,8 +792,7 @@ msgid "Delete this item?" msgstr "Удалить этот элемент?" #: ../../include/js_strings.php:6 ../../include/ItemObject.php:504 -#: ../../mod/photos.php:1069 ../../mod/photos.php:1107 -#: ../../mod/photos.php:1134 +#: ../../mod/photos.php:1073 ../../mod/photos.php:1157 msgid "Comment" msgstr "Комментарий" @@ -821,7 +826,7 @@ msgstr "тому назад" #: ../../include/js_strings.php:16 msgid "from now" -msgstr "" +msgstr "с этого времени" #: ../../include/js_strings.php:17 msgid "less than a minute" @@ -876,19 +881,19 @@ msgstr "%d лет" msgid "timeago.numbers" msgstr "timeago.numbers" -#: ../../include/message.php:17 +#: ../../include/message.php:18 msgid "No recipient provided." msgstr "" -#: ../../include/message.php:22 +#: ../../include/message.php:23 msgid "[no subject]" msgstr "[без темы]" -#: ../../include/message.php:37 +#: ../../include/message.php:38 msgid "Unable to determine sender." -msgstr "" +msgstr "Невозможно определить отправителя." -#: ../../include/message.php:106 +#: ../../include/message.php:138 msgid "Stored post could not be verified." msgstr "" @@ -897,7 +902,7 @@ msgid "view full size" msgstr "посмотреть в полный размер" #: ../../include/photo/photo_driver.php:609 ../../include/photos.php:51 -#: ../../mod/photos.php:97 ../../mod/photos.php:754 ../../mod/photos.php:776 +#: ../../mod/photos.php:97 ../../mod/photos.php:755 ../../mod/photos.php:777 #: ../../mod/profile_photo.php:88 ../../mod/profile_photo.php:235 #: ../../mod/profile_photo.php:346 msgid "Profile Photos" @@ -908,12 +913,12 @@ msgstr "Фотографии профиля" msgid "Profile" msgstr "Профиль" -#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1018 +#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1031 msgid "Full Name:" msgstr "Полное имя:" #: ../../include/profile_advanced.php:17 ../../mod/directory.php:140 -#: ../../boot.php:1678 +#: ../../boot.php:1739 msgid "Gender:" msgstr "Пол:" @@ -934,7 +939,7 @@ msgid "Age:" msgstr "Возраст:" #: ../../include/profile_advanced.php:37 ../../mod/directory.php:142 -#: ../../boot.php:1679 +#: ../../boot.php:1740 msgid "Status:" msgstr "Статус:" @@ -948,7 +953,7 @@ msgid "Sexual Preference:" msgstr "Сексуальная ориентация:" #: ../../include/profile_advanced.php:48 ../../mod/directory.php:144 -#: ../../boot.php:1680 +#: ../../boot.php:1741 msgid "Homepage:" msgstr "Домашняя страница:" @@ -1016,25 +1021,7 @@ msgstr "Работа / Занятость:" msgid "School/education:" msgstr "Школа / образование:" -#: ../../include/security.php:48 -msgid "Welcome " -msgstr "Добро пожаловать" - -#: ../../include/security.php:49 -msgid "Please upload a profile photo." -msgstr "Загрузите пожалуйста фотографию профиля." - -#: ../../include/security.php:52 -msgid "Welcome back " -msgstr "Добро пожаловать" - -#: ../../include/security.php:355 -msgid "" -"The form security token was not correct. This probably happened because the " -"form has been opened for too long (>3 hours) before submitting it." -msgstr "" - -#: ../../include/nav.php:71 ../../include/nav.php:86 ../../boot.php:1361 +#: ../../include/nav.php:71 ../../include/nav.php:86 ../../boot.php:1419 msgid "Logout" msgstr "Выход" @@ -1063,7 +1050,7 @@ msgstr "Редактирование профилей" msgid "Manage/Edit Profiles" msgstr "Управление / Редактирование профилей" -#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2097 +#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2180 msgid "Photos" msgstr "Фотографии" @@ -1071,7 +1058,7 @@ msgstr "Фотографии" msgid "Your photos" msgstr "Ваши фотографии" -#: ../../include/nav.php:84 ../../boot.php:1362 +#: ../../include/nav.php:84 ../../boot.php:1420 msgid "Login" msgstr "Войти" @@ -1092,7 +1079,7 @@ msgstr "" msgid "Home Page" msgstr "Моя страница" -#: ../../include/nav.php:120 ../../mod/register.php:181 ../../boot.php:1337 +#: ../../include/nav.php:120 ../../mod/register.php:187 ../../boot.php:1395 msgid "Register" msgstr "Регистрация" @@ -1116,8 +1103,8 @@ msgstr "Приложения" msgid "Addon applications, utilities, games" msgstr "" -#: ../../include/nav.php:130 ../../include/text.php:701 -#: ../../include/text.php:702 ../../mod/search.php:96 +#: ../../include/nav.php:130 ../../include/text.php:729 +#: ../../include/text.php:730 ../../mod/search.php:96 msgid "Search" msgstr "Поиск" @@ -1159,11 +1146,11 @@ msgstr "Пометить все оповещения канала как про #: ../../include/nav.php:153 msgid "Intros" -msgstr "Каналы" +msgstr "Контакты" -#: ../../include/nav.php:153 ../../mod/connections.php:544 +#: ../../include/nav.php:153 ../../mod/connections.php:554 msgid "New Connections" -msgstr "Новые каналы" +msgstr "Новые контакты" #: ../../include/nav.php:154 msgid "See all channel introductions" @@ -1211,9 +1198,9 @@ msgstr "Исходящие" #: ../../include/nav.php:166 ../../mod/message.php:21 msgid "New Message" -msgstr "Новое сообщение" +msgstr "Новое личное сообщение" -#: ../../include/nav.php:169 ../../mod/events.php:348 ../../boot.php:2108 +#: ../../include/nav.php:169 ../../mod/events.php:348 ../../boot.php:2191 msgid "Events" msgstr "Мероприятия" @@ -1237,7 +1224,7 @@ msgstr "Выбор канала" msgid "Manage Your Channels" msgstr "Управление каналов" -#: ../../include/nav.php:175 ../../mod/settings.php:107 +#: ../../include/nav.php:175 ../../mod/settings.php:120 #: ../../mod/admin.php:728 ../../mod/admin.php:933 msgid "Settings" msgstr "Настройки" @@ -1246,13 +1233,13 @@ msgstr "Настройки" msgid "Account/Channel Settings" msgstr "Настройки аккаунта/канала" -#: ../../include/nav.php:177 ../../mod/connections.php:650 +#: ../../include/nav.php:177 ../../mod/connections.php:660 msgid "Connections" -msgstr "Связи" +msgstr "Контакты" #: ../../include/nav.php:177 msgid "Manage/Edit Friends and Connections" -msgstr "" +msgstr "Управление/Редактирование друзей и связей" #: ../../include/nav.php:184 ../../mod/admin.php:106 msgid "Admin" @@ -1277,7 +1264,7 @@ msgstr "создал новое сообщение" #: ../../include/notify.php:24 #, php-format msgid "commented on %s's post" -msgstr "" +msgstr "прокомментировал %s's сообщение" #: ../../include/oembed.php:148 msgid "Embedded content" @@ -1291,23 +1278,27 @@ msgstr "" #: ../../include/attach.php:133 ../../include/attach.php:189 #: ../../include/attach.php:204 ../../include/attach.php:237 #: ../../include/attach.php:251 ../../include/attach.php:272 -#: ../../include/attach.php:464 ../../include/items.php:3274 +#: ../../include/attach.php:464 ../../include/items.php:3336 #: ../../mod/common.php:43 ../../mod/events.php:134 ../../mod/invite.php:13 -#: ../../mod/invite.php:102 ../../mod/allfriends.php:10 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/lastpost.php:93 ../../mod/page.php:31 -#: ../../mod/setup.php:181 ../../mod/settings.php:585 -#: ../../mod/viewconnections.php:33 ../../mod/viewconnections.php:38 -#: ../../mod/delegate.php:6 ../../mod/group.php:15 ../../mod/photos.php:74 -#: ../../mod/photos.php:644 ../../mod/viewsrc.php:12 ../../mod/message.php:204 -#: ../../mod/item.php:151 ../../mod/network.php:7 ../../mod/intro.php:50 -#: ../../mod/connections.php:165 ../../mod/profiles.php:163 +#: ../../mod/invite.php:102 ../../mod/allfriends.php:10 +#: ../../mod/webpages.php:40 ../../mod/api.php:26 ../../mod/api.php:31 +#: ../../mod/lastpost.php:93 ../../mod/page.php:30 ../../mod/setup.php:181 +#: ../../mod/settings.php:598 ../../mod/viewconnections.php:33 +#: ../../mod/viewconnections.php:38 ../../mod/delegate.php:6 +#: ../../mod/mitem.php:92 ../../mod/group.php:15 ../../mod/photos.php:74 +#: ../../mod/photos.php:645 ../../mod/viewsrc.php:12 ../../mod/menu.php:40 +#: ../../mod/message.php:204 ../../mod/layouts.php:27 ../../mod/layouts.php:42 +#: ../../mod/item.php:152 ../../mod/network.php:7 ../../mod/intro.php:50 +#: ../../mod/connections.php:174 ../../mod/profiles.php:163 #: ../../mod/profiles.php:476 ../../mod/new_channel.php:66 #: ../../mod/new_channel.php:97 ../../mod/manage.php:6 -#: ../../mod/crepair.php:115 ../../mod/nogroup.php:25 -#: ../../mod/profile_photo.php:197 ../../mod/profile_photo.php:210 -#: ../../mod/editwebpage.php:48 ../../mod/notifications.php:66 -#: ../../mod/editpost.php:11 ../../mod/poke.php:128 ../../mod/channel.php:115 -#: ../../mod/fsuggest.php:78 ../../mod/suggest.php:32 +#: ../../mod/crepair.php:115 ../../mod/editlayout.php:49 +#: ../../mod/nogroup.php:25 ../../mod/profile_photo.php:197 +#: ../../mod/profile_photo.php:210 ../../mod/editwebpage.php:43 +#: ../../mod/editwebpage.php:65 ../../mod/notifications.php:66 +#: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/editpost.php:13 +#: ../../mod/poke.php:128 ../../mod/channel.php:115 ../../mod/fsuggest.php:78 +#: ../../mod/editblock.php:49 ../../mod/suggest.php:32 #: ../../mod/register.php:60 ../../mod/regmod.php:18 ../../mod/mood.php:112 #: ../../index.php:178 ../../index.php:340 msgid "Permission denied." @@ -1330,12 +1321,12 @@ msgstr "" msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:287 ../../boot.php:2100 +#: ../../include/photos.php:287 ../../boot.php:2183 msgid "Photo Albums" msgstr "Фотоальбомы" -#: ../../include/photos.php:291 ../../mod/photos.php:792 -#: ../../mod/photos.php:1287 +#: ../../include/photos.php:291 ../../mod/photos.php:793 +#: ../../mod/photos.php:1267 msgid "Upload New Photos" msgstr "Загрузить новые фотографии" @@ -1483,8 +1474,8 @@ msgstr "Неверный" msgid "Sex Addict" msgstr "Секс наркоман" -#: ../../include/profile_selectors.php:42 ../../include/identity.php:224 -#: ../../mod/network.php:381 ../../mod/connections.php:367 +#: ../../include/profile_selectors.php:42 ../../include/identity.php:236 +#: ../../mod/network.php:364 ../../mod/connections.php:377 msgid "Friends" msgstr "Друзья" @@ -1526,7 +1517,7 @@ msgstr "Счастливый" #: ../../include/profile_selectors.php:42 msgid "Not looking" -msgstr "" +msgstr "Не нуждаюсь" #: ../../include/profile_selectors.php:42 msgid "Swinger" @@ -1572,62 +1563,6 @@ msgstr "Не заботьтесь" msgid "Ask me" msgstr "Спроси меня" -#: ../../include/account.php:22 -msgid "Not a valid email address" -msgstr "Не действительный адрес электронной почты" - -#: ../../include/account.php:24 -msgid "Your email domain is not among those allowed on this site" -msgstr "Домен электронной почты не входит в число тех, которые разрешены на этом сайте" - -#: ../../include/account.php:30 -msgid "Your email address is already registered at this site." -msgstr "Ваш адрес электронной почты уже зарегистрирован на этом сайте." - -#: ../../include/account.php:63 -msgid "An invitation is required." -msgstr "Требуется приглашение." - -#: ../../include/account.php:67 -msgid "Invitation could not be verified." -msgstr "Не удалось проверить приглашение." - -#: ../../include/account.php:117 -msgid "Please enter the required information." -msgstr "Пожалуйста, введите необходимую информацию." - -#: ../../include/account.php:185 -msgid "Failed to store account information." -msgstr "Не удалось сохранить информацию аккаунта." - -#: ../../include/account.php:271 -#, php-format -msgid "Registration request at %s" -msgstr "Требуется регистрация на %s" - -#: ../../include/account.php:273 ../../include/account.php:300 -#: ../../include/account.php:357 ../../boot.php:1202 -msgid "Administrator" -msgstr "Администратор" - -#: ../../include/account.php:295 -msgid "your registration password" -msgstr "Ваш пароль регистрации" - -#: ../../include/account.php:298 ../../include/account.php:355 -#, php-format -msgid "Registration details for %s" -msgstr "Регистрационные данные для %s" - -#: ../../include/account.php:364 -msgid "Account approved." -msgstr "Аккаунт утвержден." - -#: ../../include/account.php:398 -#, php-format -msgid "Registration revoked for %s" -msgstr "Регистрация отозвана для %s" - #: ../../include/identity.php:14 msgid "Unable to obtain identity information from database" msgstr "Невозможно получить идентификационную информацию из базы данных" @@ -1649,11 +1584,11 @@ msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "Псевдоним имеет недопустимые символы или уже используется на этом сайте." -#: ../../include/identity.php:143 +#: ../../include/identity.php:154 msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/identity.php:199 +#: ../../include/identity.php:211 msgid "Default Profile" msgstr "Профиль по умолчанию" @@ -1677,40 +1612,118 @@ msgstr "" msgid "Unable to verify channel signature" msgstr "Невозможно проверить сигнатуру канала" -#: ../../include/zot.php:560 +#: ../../include/zot.php:572 #, php-format msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/text.php:281 +#: ../../include/account.php:23 +msgid "Not a valid email address" +msgstr "Не действительный адрес электронной почты" + +#: ../../include/account.php:25 +msgid "Your email domain is not among those allowed on this site" +msgstr "Домен электронной почты не входит в число тех, которые разрешены на этом сайте" + +#: ../../include/account.php:31 +msgid "Your email address is already registered at this site." +msgstr "Ваш адрес электронной почты уже зарегистрирован на этом сайте." + +#: ../../include/account.php:64 +msgid "An invitation is required." +msgstr "Требуется приглашение." + +#: ../../include/account.php:68 +msgid "Invitation could not be verified." +msgstr "Не удалось проверить приглашение." + +#: ../../include/account.php:118 +msgid "Please enter the required information." +msgstr "Пожалуйста, введите необходимую информацию." + +#: ../../include/account.php:186 +msgid "Failed to store account information." +msgstr "Не удалось сохранить информацию аккаунта." + +#: ../../include/account.php:272 +#, php-format +msgid "Registration request at %s" +msgstr "Требуется регистрация на %s" + +#: ../../include/account.php:274 ../../include/account.php:301 +#: ../../include/account.php:358 ../../boot.php:1240 +msgid "Administrator" +msgstr "Администратор" + +#: ../../include/account.php:296 +msgid "your registration password" +msgstr "Ваш пароль регистрации" + +#: ../../include/account.php:299 ../../include/account.php:356 +#, php-format +msgid "Registration details for %s" +msgstr "Регистрационные данные для %s" + +#: ../../include/account.php:365 +msgid "Account approved." +msgstr "Аккаунт утвержден." + +#: ../../include/account.php:399 +#, php-format +msgid "Registration revoked for %s" +msgstr "Регистрация отозвана для %s" + +#: ../../include/bbcode.php:94 ../../include/bbcode.php:443 +#: ../../include/bbcode.php:446 +msgid "Image/photo" +msgstr "Изображение / фото" + +#: ../../include/bbcode.php:161 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" +msgstr "%1$s написал следующее %2$s %3$s" + +#: ../../include/bbcode.php:163 +msgid "post" +msgstr "сообщение" + +#: ../../include/bbcode.php:403 ../../include/bbcode.php:423 +msgid "$1 wrote:" +msgstr "$1 писал:" + +#: ../../include/bbcode.php:450 ../../include/bbcode.php:451 +msgid "Encrypted content" +msgstr "Зашифрованное содержание" + +#: ../../include/text.php:309 msgid "prev" msgstr "предыдущий" -#: ../../include/text.php:283 +#: ../../include/text.php:311 msgid "first" msgstr "первый" -#: ../../include/text.php:312 +#: ../../include/text.php:340 msgid "last" msgstr "последний" -#: ../../include/text.php:315 +#: ../../include/text.php:343 msgid "next" msgstr "следующий" -#: ../../include/text.php:327 +#: ../../include/text.php:355 msgid "older" msgstr "старший" -#: ../../include/text.php:329 +#: ../../include/text.php:357 msgid "newer" msgstr "новее" -#: ../../include/text.php:620 +#: ../../include/text.php:648 msgid "No connections" msgstr "Нет каналов" -#: ../../include/text.php:631 +#: ../../include/text.php:659 #, php-format msgid "%d Connection" msgid_plural "%d Connections" @@ -1718,292 +1731,324 @@ msgstr[0] "%d канал" msgstr[1] "%d канала" msgstr[2] "%d каналов" -#: ../../include/text.php:643 +#: ../../include/text.php:671 msgid "View Connections" -msgstr "Просмотр открытых каналов" +msgstr "Просмотр контактов" -#: ../../include/text.php:704 ../../mod/filer.php:36 +#: ../../include/text.php:732 ../../mod/filer.php:36 msgid "Save" msgstr "Запомнить" -#: ../../include/text.php:742 +#: ../../include/text.php:770 msgid "poke" msgstr "подпихнуть" -#: ../../include/text.php:742 ../../include/conversation.php:227 +#: ../../include/text.php:770 ../../include/conversation.php:236 msgid "poked" msgstr "подпихнул" -#: ../../include/text.php:743 +#: ../../include/text.php:771 msgid "ping" msgstr "" -#: ../../include/text.php:743 +#: ../../include/text.php:771 msgid "pinged" msgstr "" -#: ../../include/text.php:744 +#: ../../include/text.php:772 msgid "prod" msgstr "" -#: ../../include/text.php:744 +#: ../../include/text.php:772 msgid "prodded" msgstr "" -#: ../../include/text.php:745 +#: ../../include/text.php:773 msgid "slap" msgstr "" -#: ../../include/text.php:745 +#: ../../include/text.php:773 msgid "slapped" msgstr "" -#: ../../include/text.php:746 +#: ../../include/text.php:774 msgid "finger" msgstr "" -#: ../../include/text.php:746 +#: ../../include/text.php:774 msgid "fingered" msgstr "" -#: ../../include/text.php:747 +#: ../../include/text.php:775 msgid "rebuff" msgstr "" -#: ../../include/text.php:747 +#: ../../include/text.php:775 msgid "rebuffed" msgstr "" -#: ../../include/text.php:759 +#: ../../include/text.php:787 msgid "happy" -msgstr "" +msgstr "счастливый" -#: ../../include/text.php:760 +#: ../../include/text.php:788 msgid "sad" msgstr "" -#: ../../include/text.php:761 +#: ../../include/text.php:789 msgid "mellow" msgstr "" -#: ../../include/text.php:762 +#: ../../include/text.php:790 msgid "tired" msgstr "" -#: ../../include/text.php:763 +#: ../../include/text.php:791 msgid "perky" msgstr "" -#: ../../include/text.php:764 +#: ../../include/text.php:792 msgid "angry" -msgstr "" +msgstr "сердитый" -#: ../../include/text.php:765 +#: ../../include/text.php:793 msgid "stupified" msgstr "" -#: ../../include/text.php:766 +#: ../../include/text.php:794 msgid "puzzled" msgstr "" -#: ../../include/text.php:767 +#: ../../include/text.php:795 msgid "interested" msgstr "" -#: ../../include/text.php:768 +#: ../../include/text.php:796 msgid "bitter" -msgstr "" +msgstr "озлобленный" -#: ../../include/text.php:769 +#: ../../include/text.php:797 msgid "cheerful" msgstr "" -#: ../../include/text.php:770 +#: ../../include/text.php:798 msgid "alive" msgstr "" -#: ../../include/text.php:771 +#: ../../include/text.php:799 msgid "annoyed" msgstr "" -#: ../../include/text.php:772 +#: ../../include/text.php:800 msgid "anxious" msgstr "" -#: ../../include/text.php:773 +#: ../../include/text.php:801 msgid "cranky" -msgstr "" +msgstr "капризный" -#: ../../include/text.php:774 +#: ../../include/text.php:802 msgid "disturbed" -msgstr "" +msgstr "встревоженный" -#: ../../include/text.php:775 +#: ../../include/text.php:803 msgid "frustrated" -msgstr "" +msgstr "разочарованный" -#: ../../include/text.php:776 +#: ../../include/text.php:804 msgid "motivated" -msgstr "" +msgstr "мотивированный" -#: ../../include/text.php:777 +#: ../../include/text.php:805 msgid "relaxed" -msgstr "" +msgstr "расслабленный" -#: ../../include/text.php:778 +#: ../../include/text.php:806 msgid "surprised" -msgstr "" +msgstr "удивленный" -#: ../../include/text.php:940 +#: ../../include/text.php:968 msgid "Monday" msgstr "Понедельник" -#: ../../include/text.php:940 +#: ../../include/text.php:968 msgid "Tuesday" msgstr "Вторник" -#: ../../include/text.php:940 +#: ../../include/text.php:968 msgid "Wednesday" msgstr "Среда" -#: ../../include/text.php:940 +#: ../../include/text.php:968 msgid "Thursday" msgstr "Четверг" -#: ../../include/text.php:940 +#: ../../include/text.php:968 msgid "Friday" msgstr "Пятница" -#: ../../include/text.php:940 +#: ../../include/text.php:968 msgid "Saturday" msgstr "Суббота" -#: ../../include/text.php:940 +#: ../../include/text.php:968 msgid "Sunday" msgstr "Воскресенье" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "January" msgstr "Январь" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "February" msgstr "Февраль" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "March" msgstr "Март" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "April" msgstr "Апрель" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "May" msgstr "Май" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "June" msgstr "Июнь" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "July" msgstr "Июль" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "August" msgstr "Август" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "September" msgstr "Сентябрь" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "October" msgstr "Октябрь" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "November" msgstr "Ноябрь" -#: ../../include/text.php:944 +#: ../../include/text.php:972 msgid "December" msgstr "Декабрь" -#: ../../include/text.php:1029 +#: ../../include/text.php:1057 ../../mod/message.php:400 msgid "unknown.???" msgstr "неизвестный.???" -#: ../../include/text.php:1030 +#: ../../include/text.php:1058 ../../mod/message.php:401 msgid "bytes" msgstr "байт" -#: ../../include/text.php:1066 ../../include/text.php:1081 -#: ../../include/conversation.php:787 +#: ../../include/text.php:1094 ../../include/text.php:1109 +#: ../../include/conversation.php:820 msgid "remove" msgstr "удалить" -#: ../../include/text.php:1066 ../../include/text.php:1081 +#: ../../include/text.php:1094 ../../include/text.php:1109 msgid "[remove]" msgstr "[удалить]" -#: ../../include/text.php:1069 ../../include/conversation.php:649 +#: ../../include/text.php:1097 ../../include/conversation.php:667 msgid "Categories:" msgstr "Категории:" -#: ../../include/text.php:1084 ../../include/conversation.php:650 +#: ../../include/text.php:1112 ../../include/conversation.php:668 msgid "Filed under:" msgstr "Хранить под:" -#: ../../include/text.php:1100 ../../include/text.php:1112 +#: ../../include/text.php:1128 ../../include/text.php:1140 msgid "Click to open/close" msgstr "Нажмите, чтобы открыть/закрыть" -#: ../../include/text.php:1264 ../../mod/events.php:326 +#: ../../include/text.php:1311 ../../mod/events.php:326 msgid "link to source" msgstr "ссылка на источник" -#: ../../include/text.php:1296 +#: ../../include/text.php:1330 +msgid "Select a page layout: " +msgstr "" + +#: ../../include/text.php:1333 ../../include/text.php:1398 msgid "default" msgstr "по умолчанию" -#: ../../include/text.php:1308 +#: ../../include/text.php:1369 +msgid "Page content type: " +msgstr "" + +#: ../../include/text.php:1410 msgid "Select an alternate language" msgstr "Выбор альтернативного языка" -#: ../../include/text.php:1460 ../../include/conversation.php:111 +#: ../../include/text.php:1562 ../../include/conversation.php:117 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45 msgid "photo" msgstr "фото" -#: ../../include/text.php:1463 ../../include/conversation.php:114 +#: ../../include/text.php:1565 ../../include/conversation.php:120 #: ../../mod/tagger.php:49 msgid "event" msgstr "мероприятие" -#: ../../include/text.php:1466 ../../include/conversation.php:139 +#: ../../include/text.php:1568 ../../include/conversation.php:145 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53 msgid "status" msgstr "статус" -#: ../../include/text.php:1468 ../../include/conversation.php:141 +#: ../../include/text.php:1570 ../../include/conversation.php:147 #: ../../mod/tagger.php:55 msgid "comment" msgstr "комментарий" -#: ../../include/text.php:1473 +#: ../../include/text.php:1575 msgid "activity" msgstr "активность" -#: ../../include/auth.php:65 +#: ../../include/text.php:1836 +msgid "Design" +msgstr "" + +#: ../../include/text.php:1837 +msgid "Blocks" +msgstr "" + +#: ../../include/text.php:1838 +msgid "Menus" +msgstr "" + +#: ../../include/text.php:1839 +msgid "Layouts" +msgstr "" + +#: ../../include/text.php:1840 +msgid "Pages" +msgstr "" + +#: ../../include/page_widgets.php:6 +msgid "New Page" +msgstr "" + +#: ../../include/auth.php:66 msgid "Logged out." msgstr "Вышел из системы." -#: ../../include/auth.php:177 +#: ../../include/auth.php:178 msgid "Failed authentication" msgstr "Ошибка аутентификации" -#: ../../include/auth.php:186 +#: ../../include/auth.php:187 msgid "Login failed." msgstr "Не удалось войти." @@ -2027,11 +2072,11 @@ msgstr "" msgid "Response from remote channel was incomplete." msgstr "" -#: ../../include/follow.php:124 +#: ../../include/follow.php:129 msgid "local account not found." msgstr "локальный аккаунт не найден." -#: ../../include/follow.php:133 +#: ../../include/follow.php:138 msgid "Cannot connect to yourself." msgstr "Нельзя подключиться к самому себе." @@ -2089,11 +2134,11 @@ msgstr "" #: ../../include/permissions.php:27 msgid "Can chat with me (when available)" -msgstr "" +msgstr "Можете общаться со мной в чате (при наличии)" #: ../../include/permissions.php:27 msgid "Requires compatible chat plugin" -msgstr "" +msgstr "Требуется совместимый чат-плагин" #: ../../include/permissions.php:28 msgid "Can write to my \"public\" file storage" @@ -2181,24 +2226,26 @@ msgstr "" msgid "Path not available." msgstr "Путь недоступен." -#: ../../include/ItemObject.php:87 ../../mod/photos.php:942 +#: ../../include/ItemObject.php:87 ../../mod/photos.php:943 msgid "Private Message" msgstr "Личное сообщение" -#: ../../include/ItemObject.php:92 ../../mod/webpages.php:68 -#: ../../mod/settings.php:670 ../../mod/editwebpage.php:103 -#: ../../mod/editpost.php:76 +#: ../../include/ItemObject.php:92 ../../mod/webpages.php:98 +#: ../../mod/settings.php:683 ../../mod/menu.php:55 ../../mod/layouts.php:89 +#: ../../mod/editlayout.php:101 ../../mod/editwebpage.php:117 +#: ../../mod/blocks.php:92 ../../mod/editpost.php:94 +#: ../../mod/editblock.php:101 msgid "Edit" msgstr "Редактировать" -#: ../../include/ItemObject.php:104 ../../include/conversation.php:613 -#: ../../mod/settings.php:671 ../../mod/group.php:182 -#: ../../mod/photos.php:1162 ../../mod/admin.php:640 -#: ../../mod/connections.php:334 +#: ../../include/ItemObject.php:104 ../../include/conversation.php:631 +#: ../../mod/settings.php:684 ../../mod/group.php:182 +#: ../../mod/photos.php:1123 ../../mod/connections.php:344 +#: ../../mod/admin.php:640 msgid "Delete" msgstr "Удалить" -#: ../../include/ItemObject.php:110 ../../include/conversation.php:612 +#: ../../include/ItemObject.php:110 ../../include/conversation.php:630 msgid "Select" msgstr "Выбрать" @@ -2226,11 +2273,11 @@ msgstr "помеченные" msgid "add tag" msgstr "добавить тег" -#: ../../include/ItemObject.php:165 ../../mod/photos.php:1049 +#: ../../include/ItemObject.php:165 ../../mod/photos.php:1053 msgid "I like this (toggle)" msgstr "мне это нравится (переключение)" -#: ../../include/ItemObject.php:166 ../../mod/photos.php:1050 +#: ../../include/ItemObject.php:166 ../../mod/photos.php:1054 msgid "I don't like this (toggle)" msgstr "мне это не нравится (переключение)" @@ -2245,7 +2292,7 @@ msgstr "поделиться" #: ../../include/ItemObject.php:192 ../../include/ItemObject.php:193 #, php-format msgid "View %s's profile - %s" -msgstr "" +msgstr "Просмотр %s's профиля - %s" #: ../../include/ItemObject.php:194 msgid "to" @@ -2259,15 +2306,16 @@ msgstr "Стена-к-Стене" msgid "via Wall-To-Wall:" msgstr "через Стена-к-Стене:" -#: ../../include/ItemObject.php:206 ../../include/conversation.php:659 +#: ../../include/ItemObject.php:206 ../../include/conversation.php:677 #, php-format msgid " from %s" msgstr " от %s" -#: ../../include/ItemObject.php:233 ../../include/conversation.php:678 -#: ../../include/conversation.php:1034 ../../mod/photos.php:1052 -#: ../../mod/message.php:297 ../../mod/message.php:430 -#: ../../mod/editwebpage.php:112 ../../mod/editpost.php:85 +#: ../../include/ItemObject.php:233 ../../include/conversation.php:696 +#: ../../include/conversation.php:1092 ../../mod/photos.php:1056 +#: ../../mod/message.php:298 ../../mod/message.php:461 +#: ../../mod/editlayout.php:110 ../../mod/editwebpage.php:126 +#: ../../mod/editpost.php:103 ../../mod/editblock.php:110 msgid "Please wait" msgstr "Подождите пожалуйста" @@ -2279,26 +2327,25 @@ msgstr[0] "%d комментарий" msgstr[1] "%d комментария" msgstr[2] "%d комментариев" -#: ../../include/ItemObject.php:502 ../../mod/photos.php:1067 -#: ../../mod/photos.php:1105 ../../mod/photos.php:1132 +#: ../../include/ItemObject.php:502 ../../mod/photos.php:1071 +#: ../../mod/photos.php:1155 msgid "This is you" msgstr "Это вы" #: ../../include/ItemObject.php:505 ../../mod/events.php:458 #: ../../mod/thing.php:190 ../../mod/invite.php:153 ../../mod/setup.php:283 -#: ../../mod/setup.php:326 ../../mod/settings.php:608 -#: ../../mod/settings.php:720 ../../mod/settings.php:748 -#: ../../mod/settings.php:772 ../../mod/settings.php:843 -#: ../../mod/settings.php:1010 ../../mod/group.php:87 ../../mod/photos.php:675 -#: ../../mod/photos.php:769 ../../mod/photos.php:1031 -#: ../../mod/photos.php:1070 ../../mod/photos.php:1108 -#: ../../mod/photos.php:1135 ../../mod/message.php:298 -#: ../../mod/message.php:429 ../../mod/admin.php:409 ../../mod/admin.php:633 -#: ../../mod/admin.php:769 ../../mod/admin.php:968 ../../mod/admin.php:1055 -#: ../../mod/connections.php:411 ../../mod/profiles.php:529 -#: ../../mod/import.php:356 ../../mod/crepair.php:166 ../../mod/poke.php:166 -#: ../../mod/fsuggest.php:108 ../../mod/mood.php:135 -#: ../../view/theme/redbasic/php/config.php:136 +#: ../../mod/setup.php:326 ../../mod/settings.php:621 +#: ../../mod/settings.php:733 ../../mod/settings.php:761 +#: ../../mod/settings.php:785 ../../mod/settings.php:856 +#: ../../mod/settings.php:1023 ../../mod/connect.php:96 ../../mod/group.php:87 +#: ../../mod/photos.php:676 ../../mod/photos.php:770 ../../mod/photos.php:1035 +#: ../../mod/photos.php:1074 ../../mod/photos.php:1158 +#: ../../mod/message.php:299 ../../mod/message.php:460 +#: ../../mod/connections.php:421 ../../mod/profiles.php:529 +#: ../../mod/admin.php:409 ../../mod/admin.php:633 ../../mod/admin.php:769 +#: ../../mod/admin.php:968 ../../mod/admin.php:1055 ../../mod/import.php:381 +#: ../../mod/crepair.php:166 ../../mod/poke.php:166 ../../mod/fsuggest.php:108 +#: ../../mod/mood.php:135 ../../view/theme/redbasic/php/config.php:136 #: ../../view/theme/redbasic/php/config.php:154 #: ../../view/theme/redstrap/php/config.php:131 msgid "Submit" @@ -2336,286 +2383,294 @@ msgstr "Ссылка" msgid "Video" msgstr "Видео" -#: ../../include/ItemObject.php:514 ../../include/conversation.php:1052 -#: ../../mod/photos.php:1071 ../../mod/editwebpage.php:132 -#: ../../mod/editpost.php:105 +#: ../../include/ItemObject.php:514 ../../include/conversation.php:1112 +#: ../../mod/photos.php:1075 ../../mod/editlayout.php:130 +#: ../../mod/editwebpage.php:148 ../../mod/editpost.php:123 +#: ../../mod/editblock.php:130 msgid "Preview" msgstr "Предварительный просмотр" -#: ../../include/conversation.php:117 +#: ../../include/conversation.php:123 msgid "channel" msgstr "канал" -#: ../../include/conversation.php:155 ../../mod/like.php:133 +#: ../../include/conversation.php:161 ../../mod/like.php:134 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "%1$s нравится %2$s's %3$s" -#: ../../include/conversation.php:158 ../../mod/like.php:135 +#: ../../include/conversation.php:164 ../../mod/like.php:136 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "%1$s не нравится %2$s's %3$s" -#: ../../include/conversation.php:192 +#: ../../include/conversation.php:201 #, php-format msgid "%1$s is now connected with %2$s" msgstr "%1$s теперь соединен с %2$s" -#: ../../include/conversation.php:223 +#: ../../include/conversation.php:232 #, php-format msgid "%1$s poked %2$s" msgstr "%1$s подпихнул %2$s" -#: ../../include/conversation.php:245 ../../mod/mood.php:63 +#: ../../include/conversation.php:254 ../../mod/mood.php:63 #, php-format msgid "%1$s is currently %2$s" msgstr "%1$s в настоящее время %2$s" -#: ../../include/conversation.php:637 +#: ../../include/conversation.php:655 #, php-format msgid "View %s's profile @ %s" msgstr "Просмотр %s's профиля @ %s" -#: ../../include/conversation.php:676 +#: ../../include/conversation.php:694 msgid "View in context" msgstr "Показать в контексте" -#: ../../include/conversation.php:791 +#: ../../include/conversation.php:824 msgid "Loading..." msgstr "Загрузка..." -#: ../../include/conversation.php:792 +#: ../../include/conversation.php:825 msgid "Delete Selected Items" msgstr "Удалить выбранные элементы" -#: ../../include/conversation.php:880 +#: ../../include/conversation.php:913 msgid "Follow Thread" msgstr "Следобать теме" -#: ../../include/conversation.php:949 +#: ../../include/conversation.php:982 #, php-format msgid "%s likes this." msgstr "%s нравится это." -#: ../../include/conversation.php:949 +#: ../../include/conversation.php:982 #, php-format msgid "%s doesn't like this." msgstr "%s не нравится это." -#: ../../include/conversation.php:953 +#: ../../include/conversation.php:986 #, php-format msgid "%2$d people like this." msgstr "%2$d чел. нравится это." -#: ../../include/conversation.php:955 +#: ../../include/conversation.php:988 #, php-format msgid "%2$d people don't like this." msgstr "%2$d чел. не нравится это." -#: ../../include/conversation.php:961 +#: ../../include/conversation.php:994 msgid "and" msgstr "и" -#: ../../include/conversation.php:964 +#: ../../include/conversation.php:997 #, php-format msgid ", and %d other people" msgstr ", и %d другие люди" -#: ../../include/conversation.php:965 +#: ../../include/conversation.php:998 #, php-format msgid "%s like this." msgstr "%s нравится это." -#: ../../include/conversation.php:965 +#: ../../include/conversation.php:998 #, php-format msgid "%s don't like this." msgstr "%s не нравится это." -#: ../../include/conversation.php:990 +#: ../../include/conversation.php:1048 msgid "Visible to everybody" msgstr "Видно для всех" -#: ../../include/conversation.php:991 ../../mod/message.php:253 -#: ../../mod/message.php:364 +#: ../../include/conversation.php:1049 ../../mod/message.php:253 +#: ../../mod/message.php:365 msgid "Please enter a link URL:" msgstr "Пожалуйста, введите URL ссылки:" -#: ../../include/conversation.php:992 +#: ../../include/conversation.php:1050 msgid "Please enter a video link/URL:" msgstr "Пожалуйста, введите URL видео-ссылки:" -#: ../../include/conversation.php:993 +#: ../../include/conversation.php:1051 msgid "Please enter an audio link/URL:" msgstr "Пожалуйста, введите URL аудио-ссылки:" -#: ../../include/conversation.php:994 +#: ../../include/conversation.php:1052 msgid "Tag term:" msgstr "Теги:" -#: ../../include/conversation.php:995 ../../mod/filer.php:35 +#: ../../include/conversation.php:1053 ../../mod/filer.php:35 msgid "Save to Folder:" msgstr "Сохранить в папку:" -#: ../../include/conversation.php:996 +#: ../../include/conversation.php:1054 msgid "Where are you right now?" msgstr "Где вы сейчас?" -#: ../../include/conversation.php:1011 ../../mod/photos.php:1051 +#: ../../include/conversation.php:1069 ../../mod/photos.php:1055 msgid "Share" msgstr "Поделиться" -#: ../../include/conversation.php:1013 +#: ../../include/conversation.php:1071 msgid "Page link title" msgstr "Ссылка заголовока страницы" -#: ../../include/conversation.php:1015 ../../mod/message.php:295 -#: ../../mod/message.php:427 ../../mod/editwebpage.php:104 -#: ../../mod/editpost.php:77 +#: ../../include/conversation.php:1073 ../../mod/message.php:295 +#: ../../mod/message.php:457 ../../mod/editlayout.php:102 +#: ../../mod/editwebpage.php:118 ../../mod/editpost.php:95 +#: ../../mod/editblock.php:102 msgid "Upload photo" msgstr "Загрузить фотографию" -#: ../../include/conversation.php:1016 +#: ../../include/conversation.php:1074 msgid "upload photo" msgstr "загрузить фотографию" -#: ../../include/conversation.php:1017 ../../mod/editwebpage.php:105 -#: ../../mod/editpost.php:78 +#: ../../include/conversation.php:1075 ../../mod/message.php:296 +#: ../../mod/message.php:458 ../../mod/editlayout.php:103 +#: ../../mod/editwebpage.php:119 ../../mod/editpost.php:96 +#: ../../mod/editblock.php:103 msgid "Attach file" msgstr "Прикрепить файл" -#: ../../include/conversation.php:1018 +#: ../../include/conversation.php:1076 msgid "attach file" msgstr "прикрепить файл" -#: ../../include/conversation.php:1019 ../../mod/message.php:296 -#: ../../mod/message.php:428 ../../mod/editwebpage.php:106 -#: ../../mod/editpost.php:79 +#: ../../include/conversation.php:1077 ../../mod/message.php:297 +#: ../../mod/message.php:459 ../../mod/editlayout.php:104 +#: ../../mod/editwebpage.php:120 ../../mod/editpost.php:97 +#: ../../mod/editblock.php:104 msgid "Insert web link" msgstr "Вставить веб-ссылку" -#: ../../include/conversation.php:1020 +#: ../../include/conversation.php:1078 msgid "web link" msgstr "веб-ссылка" -#: ../../include/conversation.php:1021 +#: ../../include/conversation.php:1079 msgid "Insert video link" msgstr "Вставить видео-ссылку" -#: ../../include/conversation.php:1022 +#: ../../include/conversation.php:1080 msgid "video link" msgstr "видео-ссылка" -#: ../../include/conversation.php:1023 +#: ../../include/conversation.php:1081 msgid "Insert audio link" msgstr "Вставить аудио-ссылку" -#: ../../include/conversation.php:1024 +#: ../../include/conversation.php:1082 msgid "audio link" msgstr "аудио-ссылка" -#: ../../include/conversation.php:1025 ../../mod/editwebpage.php:110 -#: ../../mod/editpost.php:83 +#: ../../include/conversation.php:1083 ../../mod/editlayout.php:108 +#: ../../mod/editwebpage.php:124 ../../mod/editpost.php:101 +#: ../../mod/editblock.php:108 msgid "Set your location" msgstr "Указание своего расположения" -#: ../../include/conversation.php:1026 +#: ../../include/conversation.php:1084 msgid "set location" msgstr "указание расположения" -#: ../../include/conversation.php:1027 ../../mod/editwebpage.php:111 -#: ../../mod/editpost.php:84 +#: ../../include/conversation.php:1085 ../../mod/editlayout.php:109 +#: ../../mod/editwebpage.php:125 ../../mod/editpost.php:102 +#: ../../mod/editblock.php:109 msgid "Clear browser location" msgstr "Стереть указание расположения" -#: ../../include/conversation.php:1028 +#: ../../include/conversation.php:1086 msgid "clear location" msgstr "стереть указание расположения" -#: ../../include/conversation.php:1030 ../../mod/editwebpage.php:124 -#: ../../mod/editpost.php:97 +#: ../../include/conversation.php:1088 ../../mod/editlayout.php:122 +#: ../../mod/editwebpage.php:140 ../../mod/editpost.php:115 +#: ../../mod/editblock.php:122 msgid "Set title" msgstr "Заголовок" -#: ../../include/conversation.php:1033 ../../mod/editwebpage.php:126 -#: ../../mod/editpost.php:99 +#: ../../include/conversation.php:1091 ../../mod/editlayout.php:124 +#: ../../mod/editwebpage.php:142 ../../mod/editpost.php:117 +#: ../../mod/editblock.php:124 msgid "Categories (comma-separated list)" msgstr "Категории (список через запятую)" -#: ../../include/conversation.php:1035 ../../mod/editwebpage.php:113 -#: ../../mod/editpost.php:86 +#: ../../include/conversation.php:1093 ../../mod/editlayout.php:111 +#: ../../mod/editwebpage.php:127 ../../mod/editpost.php:104 +#: ../../mod/editblock.php:111 msgid "Permission settings" msgstr "Настройки разрешений" -#: ../../include/conversation.php:1036 +#: ../../include/conversation.php:1094 msgid "permissions" msgstr "разрешения" -#: ../../include/conversation.php:1044 ../../mod/editwebpage.php:121 -#: ../../mod/editpost.php:94 +#: ../../include/conversation.php:1102 ../../mod/editlayout.php:119 +#: ../../mod/editwebpage.php:135 ../../mod/editpost.php:112 +#: ../../mod/editblock.php:119 msgid "Public post" msgstr "Публичное сообщение" -#: ../../include/conversation.php:1046 ../../mod/editwebpage.php:127 -#: ../../mod/editpost.php:100 +#: ../../include/conversation.php:1104 ../../mod/editlayout.php:125 +#: ../../mod/editwebpage.php:143 ../../mod/editpost.php:118 +#: ../../mod/editblock.php:125 msgid "Example: bob@example.com, mary@example.com" msgstr "Пример: bob@example.com, mary@example.com" -#: ../../include/items.php:156 ../../mod/like.php:55 ../../mod/group.php:74 +#: ../../include/items.php:157 ../../mod/like.php:55 ../../mod/group.php:74 #: ../../mod/profperm.php:28 ../../index.php:339 msgid "Permission denied" msgstr "Доступ запрещен" -#: ../../include/items.php:3223 ../../mod/page.php:62 ../../mod/viewsrc.php:18 +#: ../../include/items.php:3285 ../../mod/page.php:60 ../../mod/viewsrc.php:18 #: ../../mod/home.php:64 ../../mod/admin.php:142 ../../mod/admin.php:677 #: ../../mod/admin.php:876 ../../mod/display.php:33 msgid "Item not found." msgstr "Элемент не найден." -#: ../../include/items.php:3395 +#: ../../include/items.php:3457 msgid "Archives" msgstr "Архивы" -#: ../../include/items.php:3556 ../../mod/group.php:44 ../../mod/group.php:146 +#: ../../include/items.php:3618 ../../mod/group.php:44 ../../mod/group.php:146 msgid "Collection not found." msgstr "Коллекция не найдена." -#: ../../include/items.php:3566 +#: ../../include/items.php:3628 msgid "Collection has no members." msgstr "В коллекции нет ни одного пользователя." -#: ../../include/items.php:3582 +#: ../../include/items.php:3644 msgid "Connection not found." msgstr "Канал не найден." -#: ../../include/bbcode.php:94 ../../include/bbcode.php:442 -#: ../../include/bbcode.php:445 -msgid "Image/photo" -msgstr "Изображение / фото" +#: ../../include/security.php:49 +msgid "Welcome " +msgstr "Добро пожаловать" -#: ../../include/bbcode.php:161 -#, php-format -msgid "%1$s wrote the following %2$s %3$s" +#: ../../include/security.php:50 +msgid "Please upload a profile photo." +msgstr "Загрузите пожалуйста фотографию профиля." + +#: ../../include/security.php:53 +msgid "Welcome back " +msgstr "Добро пожаловать" + +#: ../../include/security.php:357 +msgid "" +"The form security token was not correct. This probably happened because the " +"form has been opened for too long (>3 hours) before submitting it." msgstr "" -#: ../../include/bbcode.php:163 -msgid "post" -msgstr "сообщение" - -#: ../../include/bbcode.php:402 ../../include/bbcode.php:422 -msgid "$1 wrote:" -msgstr "$1 писал:" - -#: ../../include/bbcode.php:449 ../../include/bbcode.php:450 -msgid "Encrypted content" -msgstr "Зашифрованное содержание" - #: ../../mod/common.php:10 msgid "No channel." msgstr "Не канал." #: ../../mod/common.php:47 msgid "Common connections" -msgstr "Общие каналы" +msgstr "Общие контакты" #: ../../mod/common.php:52 msgid "No connections in common." @@ -2774,7 +2829,7 @@ msgid "Enter email addresses, one per line:" msgstr "Введите адреса электронной почты, по одному на строку:" #: ../../mod/invite.php:141 ../../mod/message.php:292 -#: ../../mod/message.php:423 +#: ../../mod/message.php:453 msgid "Your message:" msgstr "Ваше сообщение:" @@ -2813,11 +2868,12 @@ msgstr "Друзья %s" msgid "No friends to display." msgstr "Нет друзей для показа." -#: ../../mod/webpages.php:8 ../../mod/profile.php:8 ../../boot.php:1535 +#: ../../mod/webpages.php:8 ../../mod/connect.php:13 ../../mod/layouts.php:8 +#: ../../mod/blocks.php:10 ../../mod/profile.php:8 ../../boot.php:1593 msgid "Requested profile is not available." msgstr "Запрашиваемый профиль не доступен." -#: ../../mod/webpages.php:71 +#: ../../mod/webpages.php:101 ../../mod/layouts.php:92 ../../mod/blocks.php:95 msgid "View" msgstr "Просмотр" @@ -2839,16 +2895,16 @@ msgid "" " and/or create new posts for you?" msgstr "" -#: ../../mod/api.php:105 ../../mod/settings.php:965 ../../mod/settings.php:970 -#: ../../mod/settings.php:993 ../../mod/settings.php:995 -#: ../../mod/settings.php:996 ../../mod/settings.php:997 +#: ../../mod/api.php:105 ../../mod/settings.php:978 ../../mod/settings.php:983 +#: ../../mod/settings.php:1006 ../../mod/settings.php:1008 +#: ../../mod/settings.php:1009 ../../mod/settings.php:1010 #: ../../mod/profiles.php:506 msgid "Yes" msgstr "Да" -#: ../../mod/api.php:106 ../../mod/settings.php:965 ../../mod/settings.php:970 -#: ../../mod/settings.php:993 ../../mod/settings.php:995 -#: ../../mod/settings.php:996 ../../mod/settings.php:997 +#: ../../mod/api.php:106 ../../mod/settings.php:978 ../../mod/settings.php:983 +#: ../../mod/settings.php:1006 ../../mod/settings.php:1008 +#: ../../mod/settings.php:1009 ../../mod/settings.php:1010 #: ../../mod/profiles.php:507 msgid "No" msgstr "Нет" @@ -2865,11 +2921,11 @@ msgstr "Нет установленных приложений." msgid "Applications" msgstr "Приложения" -#: ../../mod/page.php:37 +#: ../../mod/page.php:35 msgid "Invalid item." msgstr "Недействительный элемент." -#: ../../mod/page.php:49 ../../mod/chanview.php:78 ../../mod/home.php:51 +#: ../../mod/page.php:47 ../../mod/chanview.php:78 ../../mod/home.php:51 #: ../../mod/magic.php:63 ../../mod/wall_upload.php:35 msgid "Channel not found." msgstr "Канал не найден." @@ -3216,7 +3272,7 @@ msgstr "" #: ../../mod/subthread.php:105 #, php-format msgid "%1$s is following %2$s's %3$s" -msgstr "" +msgstr "%1$s следит %2$s's %3$s" #: ../../mod/update_network.php:23 ../../mod/update_channel.php:43 #: ../../mod/update_search.php:46 ../../mod/update_display.php:25 @@ -3233,428 +3289,432 @@ msgstr "переключение полноэкранного режима" msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" -#: ../../mod/settings.php:49 +#: ../../mod/settings.php:51 msgid "Account settings" msgstr "Настройки аккаунта" -#: ../../mod/settings.php:55 +#: ../../mod/settings.php:57 msgid "Channel settings" msgstr "Настройки канала" -#: ../../mod/settings.php:61 +#: ../../mod/settings.php:63 msgid "Additional features" msgstr "Дополнительные функции" -#: ../../mod/settings.php:67 +#: ../../mod/settings.php:69 msgid "Feature settings" msgstr "Настройки компонентов" -#: ../../mod/settings.php:73 +#: ../../mod/settings.php:75 msgid "Display settings" msgstr "Настройки отображения" -#: ../../mod/settings.php:79 +#: ../../mod/settings.php:81 msgid "Connected apps" msgstr "Подключенные приложения" -#: ../../mod/settings.php:85 +#: ../../mod/settings.php:87 msgid "Export channel" msgstr "Экспорт канала" -#: ../../mod/settings.php:97 +#: ../../mod/settings.php:99 msgid "Automatic Permissions (Advanced)" msgstr "Автоматические разрешения (дополнительно)" -#: ../../mod/settings.php:145 +#: ../../mod/settings.php:109 +msgid "Premium Channel Settings" +msgstr "" + +#: ../../mod/settings.php:158 msgid "Missing some important data!" msgstr "Отсутствуют некоторые важные данные!" -#: ../../mod/settings.php:148 ../../mod/settings.php:634 +#: ../../mod/settings.php:161 ../../mod/settings.php:647 msgid "Update" msgstr "Обновление" -#: ../../mod/settings.php:261 +#: ../../mod/settings.php:274 msgid "Passwords do not match. Password unchanged." msgstr "Пароли не совпадают. Пароль не изменён." -#: ../../mod/settings.php:265 +#: ../../mod/settings.php:278 msgid "Empty passwords are not allowed. Password unchanged." msgstr "Пустые пароли не допускаются. Пароль не изменён." -#: ../../mod/settings.php:278 +#: ../../mod/settings.php:291 msgid "Password changed." msgstr "Пароль изменен." -#: ../../mod/settings.php:280 +#: ../../mod/settings.php:293 msgid "Password update failed. Please try again." msgstr "Изменение пароля закончилось неуспешно. Пожалуйста, попробуйте еще раз." -#: ../../mod/settings.php:294 +#: ../../mod/settings.php:307 msgid "Not valid email." msgstr "Не действительный адрес электронной почты." -#: ../../mod/settings.php:297 +#: ../../mod/settings.php:310 msgid "Protected email address. Cannot change to that email." msgstr "" -#: ../../mod/settings.php:306 +#: ../../mod/settings.php:319 msgid "System failure storing new email. Please try again." msgstr "" -#: ../../mod/settings.php:536 +#: ../../mod/settings.php:549 msgid "Settings updated." msgstr "Настройки обновленны." -#: ../../mod/settings.php:607 ../../mod/settings.php:633 -#: ../../mod/settings.php:669 +#: ../../mod/settings.php:620 ../../mod/settings.php:646 +#: ../../mod/settings.php:682 msgid "Add application" msgstr "Добавить приложения" -#: ../../mod/settings.php:609 ../../mod/settings.php:635 +#: ../../mod/settings.php:622 ../../mod/settings.php:648 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/fbrowser.php:81 #: ../../mod/fbrowser.php:116 msgid "Cancel" msgstr "Отменить" -#: ../../mod/settings.php:610 ../../mod/settings.php:636 +#: ../../mod/settings.php:623 ../../mod/settings.php:649 #: ../../mod/admin.php:636 ../../mod/crepair.php:148 msgid "Name" msgstr "Имя" -#: ../../mod/settings.php:611 ../../mod/settings.php:637 +#: ../../mod/settings.php:624 ../../mod/settings.php:650 msgid "Consumer Key" msgstr "Ключ клиента" -#: ../../mod/settings.php:612 ../../mod/settings.php:638 +#: ../../mod/settings.php:625 ../../mod/settings.php:651 msgid "Consumer Secret" msgstr "Секрет клиента" -#: ../../mod/settings.php:613 ../../mod/settings.php:639 +#: ../../mod/settings.php:626 ../../mod/settings.php:652 msgid "Redirect" msgstr "Перенаправление" -#: ../../mod/settings.php:614 ../../mod/settings.php:640 +#: ../../mod/settings.php:627 ../../mod/settings.php:653 msgid "Icon url" msgstr "URL-адрес значка" -#: ../../mod/settings.php:625 +#: ../../mod/settings.php:638 msgid "You can't edit this application." msgstr "Вы не можете редактировать это приложение." -#: ../../mod/settings.php:668 +#: ../../mod/settings.php:681 msgid "Connected Apps" msgstr "Подключенные приложения" -#: ../../mod/settings.php:672 +#: ../../mod/settings.php:685 msgid "Client key starts with" msgstr "" -#: ../../mod/settings.php:673 +#: ../../mod/settings.php:686 msgid "No name" msgstr "Без названия" -#: ../../mod/settings.php:674 +#: ../../mod/settings.php:687 msgid "Remove authorization" msgstr "Удалить разрешение" -#: ../../mod/settings.php:685 +#: ../../mod/settings.php:698 msgid "No feature settings configured" msgstr "Параметры функций не настроены" -#: ../../mod/settings.php:693 +#: ../../mod/settings.php:706 msgid "Feature Settings" msgstr "Настройки функции" -#: ../../mod/settings.php:716 +#: ../../mod/settings.php:729 msgid "Account Settings" msgstr "Настройки аккаунта" -#: ../../mod/settings.php:717 +#: ../../mod/settings.php:730 msgid "Password Settings" msgstr "Настройки пароля" -#: ../../mod/settings.php:718 +#: ../../mod/settings.php:731 msgid "New Password:" msgstr "Новый пароль:" -#: ../../mod/settings.php:719 +#: ../../mod/settings.php:732 msgid "Confirm:" msgstr "Подтверждение:" -#: ../../mod/settings.php:719 +#: ../../mod/settings.php:732 msgid "Leave password fields blank unless changing" msgstr "Оставьте поля пустыми, если не меняется" -#: ../../mod/settings.php:721 ../../mod/settings.php:1019 +#: ../../mod/settings.php:734 ../../mod/settings.php:1032 msgid "Email Address:" msgstr "Адрес электронной почты:" -#: ../../mod/settings.php:722 +#: ../../mod/settings.php:735 msgid "Remove Account" msgstr "Удалить аккаунт" -#: ../../mod/settings.php:723 +#: ../../mod/settings.php:736 msgid "Warning: This action is permanent and cannot be reversed." msgstr "" -#: ../../mod/settings.php:739 +#: ../../mod/settings.php:752 msgid "Off" msgstr "Выкл." -#: ../../mod/settings.php:739 +#: ../../mod/settings.php:752 msgid "On" msgstr "Вкл." -#: ../../mod/settings.php:746 +#: ../../mod/settings.php:759 msgid "Additional Features" msgstr "Дополнительные функции" -#: ../../mod/settings.php:771 +#: ../../mod/settings.php:784 msgid "Connector Settings" msgstr "Настройки соединителя" -#: ../../mod/settings.php:801 ../../mod/admin.php:361 +#: ../../mod/settings.php:814 ../../mod/admin.php:361 msgid "No special theme for mobile devices" msgstr "Нет специальной темы для мобильных устройств" -#: ../../mod/settings.php:841 +#: ../../mod/settings.php:854 msgid "Display Settings" msgstr "Настройки отображения" -#: ../../mod/settings.php:847 +#: ../../mod/settings.php:860 msgid "Display Theme:" msgstr "Тема отображения:" -#: ../../mod/settings.php:848 +#: ../../mod/settings.php:861 msgid "Mobile Theme:" msgstr "Мобильная тема отображения:" -#: ../../mod/settings.php:849 +#: ../../mod/settings.php:862 msgid "Update browser every xx seconds" msgstr "Обновление браузера каждые ХХ секунд" -#: ../../mod/settings.php:849 +#: ../../mod/settings.php:862 msgid "Minimum of 10 seconds, no maximum" msgstr "Минимум 10 секунд, без максимума" -#: ../../mod/settings.php:850 +#: ../../mod/settings.php:863 msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../mod/settings.php:850 +#: ../../mod/settings.php:863 msgid "Maximum of 100 items" msgstr "Максимум 100 элементов" -#: ../../mod/settings.php:851 +#: ../../mod/settings.php:864 msgid "Don't show emoticons" msgstr "Не показывать emoticons" -#: ../../mod/settings.php:887 +#: ../../mod/settings.php:900 msgid "Nobody except yourself" msgstr "Никто, кроме вас" -#: ../../mod/settings.php:888 +#: ../../mod/settings.php:901 msgid "Only those you specifically allow" msgstr "Только комы вы разрешили" -#: ../../mod/settings.php:889 +#: ../../mod/settings.php:902 msgid "Anybody in your address book" msgstr "Любой в вашей адресной книге" -#: ../../mod/settings.php:890 +#: ../../mod/settings.php:903 msgid "Anybody on this website" msgstr "Любой на этом веб-сайте" -#: ../../mod/settings.php:891 +#: ../../mod/settings.php:904 msgid "Anybody in this network" msgstr "Любой в этой сети" -#: ../../mod/settings.php:892 +#: ../../mod/settings.php:905 msgid "Anybody on the internet" msgstr "Любой в интернете" -#: ../../mod/settings.php:965 +#: ../../mod/settings.php:978 msgid "Publish your default profile in the network directory" msgstr "Публикация вашего профиля по умолчанию в каталоге сети" -#: ../../mod/settings.php:970 +#: ../../mod/settings.php:983 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/settings.php:974 ../../mod/profile_photo.php:298 +#: ../../mod/settings.php:987 ../../mod/profile_photo.php:298 msgid "or" msgstr "или" -#: ../../mod/settings.php:979 +#: ../../mod/settings.php:992 msgid "Your channel address is" msgstr "Адрес вашего канала:" -#: ../../mod/settings.php:990 +#: ../../mod/settings.php:1003 msgid "Automatically expire posts after this many days:" msgstr "" -#: ../../mod/settings.php:990 +#: ../../mod/settings.php:1003 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: ../../mod/settings.php:991 +#: ../../mod/settings.php:1004 msgid "Advanced expiration settings" msgstr "" -#: ../../mod/settings.php:992 +#: ../../mod/settings.php:1005 msgid "Advanced Expiration" -msgstr "" +msgstr "Дополнительное истечение срока давности" -#: ../../mod/settings.php:993 +#: ../../mod/settings.php:1006 msgid "Expire posts:" msgstr "" -#: ../../mod/settings.php:995 +#: ../../mod/settings.php:1008 msgid "Expire starred posts:" msgstr "" -#: ../../mod/settings.php:996 +#: ../../mod/settings.php:1009 msgid "Expire photos:" msgstr "" -#: ../../mod/settings.php:997 +#: ../../mod/settings.php:1010 msgid "Only expire posts by others:" msgstr "" -#: ../../mod/settings.php:1008 +#: ../../mod/settings.php:1021 msgid "Channel Settings" msgstr "Настройки канала" -#: ../../mod/settings.php:1017 +#: ../../mod/settings.php:1030 msgid "Basic Settings" msgstr "Основные настройки" -#: ../../mod/settings.php:1020 +#: ../../mod/settings.php:1033 msgid "Your Timezone:" msgstr "Ваш часовой пояс:" -#: ../../mod/settings.php:1021 +#: ../../mod/settings.php:1034 msgid "Default Post Location:" msgstr "Откуда по умолчанию:" -#: ../../mod/settings.php:1022 +#: ../../mod/settings.php:1035 msgid "Use Browser Location:" msgstr "Используйте указание браузерa:" -#: ../../mod/settings.php:1025 +#: ../../mod/settings.php:1038 msgid "Security and Privacy Settings" msgstr "Параметры безопасности и конфиденциальности" -#: ../../mod/settings.php:1027 +#: ../../mod/settings.php:1040 msgid "Quick Privacy Settings:" msgstr "Быстрые параметры безопасности и конфиденциальности:" -#: ../../mod/settings.php:1028 +#: ../../mod/settings.php:1041 msgid "Very Public - extremely permissive" msgstr "Очень публично - чрезвычайно разрешающе" -#: ../../mod/settings.php:1029 +#: ../../mod/settings.php:1042 msgid "Typical - default public, privacy when desired" msgstr "Типично - по умолчанию публично, конфиденциальность, только если настроена" -#: ../../mod/settings.php:1030 +#: ../../mod/settings.php:1043 msgid "Private - default private, rarely open or public" msgstr "Частно - по умолчанию частно, редко открыто или публично" -#: ../../mod/settings.php:1031 +#: ../../mod/settings.php:1044 msgid "Blocked - default blocked to/from everybody" msgstr "Заблокированно - по умолчанию заблокировано для/от всех" -#: ../../mod/settings.php:1034 +#: ../../mod/settings.php:1047 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/settings.php:1034 +#: ../../mod/settings.php:1047 msgid "May reduce spam activity" msgstr "" -#: ../../mod/settings.php:1035 +#: ../../mod/settings.php:1048 msgid "Default Post Permissions" msgstr "" -#: ../../mod/settings.php:1036 +#: ../../mod/settings.php:1049 msgid "(click to open/close)" msgstr "(нажмите, чтобы открыть / закрыть)" -#: ../../mod/settings.php:1049 +#: ../../mod/settings.php:1062 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../mod/settings.php:1049 +#: ../../mod/settings.php:1062 msgid "Useful to reduce spamming" msgstr "" -#: ../../mod/settings.php:1052 +#: ../../mod/settings.php:1065 msgid "Notification Settings" msgstr "Настройки уведомлений" -#: ../../mod/settings.php:1053 +#: ../../mod/settings.php:1066 msgid "By default post a status message when:" msgstr "" -#: ../../mod/settings.php:1054 +#: ../../mod/settings.php:1067 msgid "accepting a friend request" msgstr "" -#: ../../mod/settings.php:1055 +#: ../../mod/settings.php:1068 msgid "joining a forum/community" msgstr "" -#: ../../mod/settings.php:1056 +#: ../../mod/settings.php:1069 msgid "making an interesting profile change" msgstr "" -#: ../../mod/settings.php:1057 +#: ../../mod/settings.php:1070 msgid "Send a notification email when:" msgstr "Отправить уведомление по электронной почте, если:" -#: ../../mod/settings.php:1058 +#: ../../mod/settings.php:1071 msgid "You receive an introduction" msgstr "Вы получили введение" -#: ../../mod/settings.php:1059 +#: ../../mod/settings.php:1072 msgid "Your introductions are confirmed" msgstr "" -#: ../../mod/settings.php:1060 +#: ../../mod/settings.php:1073 msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/settings.php:1061 +#: ../../mod/settings.php:1074 msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/settings.php:1062 +#: ../../mod/settings.php:1075 msgid "You receive a private message" msgstr "" -#: ../../mod/settings.php:1063 +#: ../../mod/settings.php:1076 msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/settings.php:1064 +#: ../../mod/settings.php:1077 msgid "You are tagged in a post" msgstr "" -#: ../../mod/settings.php:1065 +#: ../../mod/settings.php:1078 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../mod/settings.php:1068 +#: ../../mod/settings.php:1081 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../mod/settings.php:1069 +#: ../../mod/settings.php:1082 msgid "Change the behaviour of this account for special situations" msgstr "" #: ../../mod/viewconnections.php:28 ../../mod/directory.php:23 -#: ../../mod/photos.php:558 ../../mod/display.php:9 ../../mod/search.php:80 +#: ../../mod/photos.php:559 ../../mod/display.php:9 ../../mod/search.php:80 #: ../../mod/community.php:18 msgid "Public access denied." msgstr "Общественный доступ запрещен." @@ -3666,7 +3726,7 @@ msgstr "Никаких каналов." #: ../../mod/viewconnections.php:69 ../../mod/nogroup.php:40 #, php-format msgid "Visit %s's profile [%s]" -msgstr "" +msgstr "Посетить %s's ​​профиль [%s]" #: ../../mod/viewconnections.php:84 msgid "View Connnections" @@ -3688,6 +3748,49 @@ msgstr "Выбрать тег для удаления: " msgid "Remove" msgstr "Удалить" +#: ../../mod/connect.php:59 ../../mod/connect.php:107 +msgid "Continue" +msgstr "" + +#: ../../mod/connect.php:88 +msgid "Premium Channel Setup" +msgstr "" + +#: ../../mod/connect.php:90 +msgid "Enable premium channel connection restrictions" +msgstr "" + +#: ../../mod/connect.php:91 +msgid "" +"Please enter your restrictions or conditions, such as paypal receipt, usage " +"guidelines, etc." +msgstr "" + +#: ../../mod/connect.php:93 ../../mod/connect.php:113 +msgid "" +"This channel may require additional steps or acknowledgement of the " +"following conditions prior to connecting:" +msgstr "" + +#: ../../mod/connect.php:94 +msgid "" +"Potential connections will then see the following text before proceeding:" +msgstr "" + +#: ../../mod/connect.php:95 ../../mod/connect.php:116 +msgid "" +"By continuing, I certify that I have complied with any instructions provided" +" on this page." +msgstr "" + +#: ../../mod/connect.php:104 +msgid "(No specific instructions have been provided by the channel owner.)" +msgstr "" + +#: ../../mod/connect.php:112 +msgid "Restricted or Premium Channel" +msgstr "" + #: ../../mod/delegate.php:95 msgid "No potential page delegates located." msgstr "" @@ -3755,6 +3858,118 @@ msgstr "Поиск людей" msgid "No matches" msgstr "Нет соответствий" +#: ../../mod/mitem.php:13 ../../mod/menu.php:87 +msgid "Menu not found." +msgstr "" + +#: ../../mod/mitem.php:66 +msgid "Menu element updated." +msgstr "" + +#: ../../mod/mitem.php:70 +msgid "Unable to update menu element." +msgstr "" + +#: ../../mod/mitem.php:76 +msgid "Menu element added." +msgstr "" + +#: ../../mod/mitem.php:80 +msgid "Unable to add menu element." +msgstr "" + +#: ../../mod/mitem.php:97 ../../mod/xchan.php:25 ../../mod/menu.php:113 +msgid "Not found." +msgstr "Не найдено." + +#: ../../mod/mitem.php:116 +msgid "Manage Menu Elements" +msgstr "" + +#: ../../mod/mitem.php:119 +msgid "Edit menu" +msgstr "" + +#: ../../mod/mitem.php:122 +msgid "Edit element" +msgstr "" + +#: ../../mod/mitem.php:123 +msgid "Drop element" +msgstr "" + +#: ../../mod/mitem.php:124 +msgid "New element" +msgstr "" + +#: ../../mod/mitem.php:125 +msgid "Edit this menu container" +msgstr "" + +#: ../../mod/mitem.php:126 +msgid "Add menu element" +msgstr "" + +#: ../../mod/mitem.php:127 +msgid "Delete this menu item" +msgstr "" + +#: ../../mod/mitem.php:128 +msgid "Edit this menu item" +msgstr "" + +#: ../../mod/mitem.php:142 +msgid "New Menu Element" +msgstr "" + +#: ../../mod/mitem.php:144 ../../mod/mitem.php:185 +msgid "Link text" +msgstr "" + +#: ../../mod/mitem.php:145 ../../mod/mitem.php:186 +msgid "URL of link" +msgstr "" + +#: ../../mod/mitem.php:146 ../../mod/mitem.php:187 +msgid "Use Red magic-auth if available" +msgstr "" + +#: ../../mod/mitem.php:147 ../../mod/mitem.php:188 +msgid "Open link in new window" +msgstr "" + +#: ../../mod/mitem.php:149 ../../mod/mitem.php:190 +msgid "Order in list" +msgstr "" + +#: ../../mod/mitem.php:149 ../../mod/mitem.php:190 +msgid "Higher numbers will sink to bottom of listing" +msgstr "" + +#: ../../mod/mitem.php:150 ../../mod/menu.php:79 ../../mod/new_channel.php:117 +msgid "Create" +msgstr "Создать" + +#: ../../mod/mitem.php:162 +msgid "Menu item not found." +msgstr "" + +#: ../../mod/mitem.php:171 +msgid "Menu item deleted." +msgstr "" + +#: ../../mod/mitem.php:173 +msgid "Menu item could not be deleted." +msgstr "" + +#: ../../mod/mitem.php:182 +msgid "Edit Menu Element" +msgstr "" + +#: ../../mod/mitem.php:191 ../../mod/menu.php:107 +msgid "Modify" +msgstr "" + #: ../../mod/group.php:26 msgid "Collection created." msgstr "Коллекция создана." @@ -3769,7 +3984,7 @@ msgstr "Имя коллекции изменено." #: ../../mod/group.php:92 msgid "Create a collection of channels." -msgstr "" +msgstr "Создать коллекцию каналов" #: ../../mod/group.php:93 ../../mod/group.php:189 msgid "Collection Name: " @@ -3797,7 +4012,7 @@ msgstr "Участники" #: ../../mod/group.php:204 msgid "All Connected Channels" -msgstr "Все подключенные каналы" +msgstr "Все подключенные контакы" #: ../../mod/group.php:237 msgid "Click on a channel to add or remove." @@ -3811,132 +4026,132 @@ msgstr "" msgid "Album not found." msgstr "Альбом не найден." -#: ../../mod/photos.php:125 ../../mod/photos.php:770 +#: ../../mod/photos.php:125 ../../mod/photos.php:771 msgid "Delete Album" msgstr "Удалить альбом" -#: ../../mod/photos.php:165 ../../mod/photos.php:1032 +#: ../../mod/photos.php:165 ../../mod/photos.php:1036 msgid "Delete Photo" msgstr "Удалить фотографию" -#: ../../mod/photos.php:494 +#: ../../mod/photos.php:495 #, php-format msgid "%1$s was tagged in %2$s by %3$s" -msgstr "" +msgstr "%1$s добавил тег в %2$s на %3$s" -#: ../../mod/photos.php:494 +#: ../../mod/photos.php:495 msgid "a photo" msgstr "фотография" -#: ../../mod/photos.php:568 +#: ../../mod/photos.php:569 msgid "No photos selected" msgstr "Никакие фотографии не выбраны" -#: ../../mod/photos.php:622 +#: ../../mod/photos.php:623 msgid "Access to this item is restricted." msgstr "Доступ к этому элементу ограничен." -#: ../../mod/photos.php:686 +#: ../../mod/photos.php:687 #, php-format msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "" -#: ../../mod/photos.php:689 +#: ../../mod/photos.php:690 #, php-format msgid "You have used %1$.2f Mbytes of photo storage." msgstr "" -#: ../../mod/photos.php:697 +#: ../../mod/photos.php:698 msgid "Upload Photos" msgstr "Загрузить фотографии" -#: ../../mod/photos.php:701 ../../mod/photos.php:765 +#: ../../mod/photos.php:702 ../../mod/photos.php:766 msgid "New album name: " msgstr "Название нового альбома:" -#: ../../mod/photos.php:702 +#: ../../mod/photos.php:703 msgid "or existing album name: " msgstr "или существующий альбом:" -#: ../../mod/photos.php:703 +#: ../../mod/photos.php:704 msgid "Do not show a status post for this upload" msgstr "" -#: ../../mod/photos.php:705 ../../mod/photos.php:1027 +#: ../../mod/photos.php:706 ../../mod/photos.php:1031 msgid "Permissions" msgstr "Разрешения" -#: ../../mod/photos.php:754 ../../mod/photos.php:776 ../../mod/photos.php:1223 -#: ../../mod/photos.php:1238 +#: ../../mod/photos.php:755 ../../mod/photos.php:777 ../../mod/photos.php:1203 +#: ../../mod/photos.php:1218 msgid "Contact Photos" msgstr "Фотографии канала" -#: ../../mod/photos.php:780 +#: ../../mod/photos.php:781 msgid "Edit Album" msgstr "Редактировать Фотоальбом" -#: ../../mod/photos.php:786 +#: ../../mod/photos.php:787 msgid "Show Newest First" msgstr "Показать новые первыми" -#: ../../mod/photos.php:788 +#: ../../mod/photos.php:789 msgid "Show Oldest First" msgstr "Показать старые первыми" -#: ../../mod/photos.php:832 ../../mod/photos.php:1270 +#: ../../mod/photos.php:833 ../../mod/photos.php:1250 msgid "View Photo" msgstr "Посмотреть фотографию" -#: ../../mod/photos.php:876 +#: ../../mod/photos.php:877 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:878 +#: ../../mod/photos.php:879 msgid "Photo not available" msgstr "Фотография не доступна" -#: ../../mod/photos.php:936 +#: ../../mod/photos.php:937 msgid "Use as profile photo" msgstr "Использовать в качестве фотографии профиля" -#: ../../mod/photos.php:964 +#: ../../mod/photos.php:965 msgid "View Full Size" msgstr "Посмотреть в полный размер" -#: ../../mod/photos.php:1015 +#: ../../mod/photos.php:1019 msgid "Edit photo" msgstr "Редактировать фотографию" -#: ../../mod/photos.php:1017 +#: ../../mod/photos.php:1021 msgid "Rotate CW (right)" msgstr "Повернуть CW (направо)" -#: ../../mod/photos.php:1018 +#: ../../mod/photos.php:1022 msgid "Rotate CCW (left)" msgstr "Повернуть CCW (налево)" -#: ../../mod/photos.php:1020 +#: ../../mod/photos.php:1024 msgid "New album name" msgstr "Новое название альбома:" -#: ../../mod/photos.php:1023 +#: ../../mod/photos.php:1027 msgid "Caption" msgstr "Подпись" -#: ../../mod/photos.php:1025 +#: ../../mod/photos.php:1029 msgid "Add a Tag" msgstr "Добавить тег" -#: ../../mod/photos.php:1029 +#: ../../mod/photos.php:1033 msgid "" "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Например: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -#: ../../mod/photos.php:1276 +#: ../../mod/photos.php:1256 msgid "View Album" msgstr "Посмотреть фотоальбом" -#: ../../mod/photos.php:1285 +#: ../../mod/photos.php:1265 msgid "Recent Photos" msgstr "Последние фотографии" @@ -3948,11 +4163,11 @@ msgstr "отправил вам личное сообщение" msgid "added your channel" msgstr "добавил ваш канал" -#: ../../mod/ping.php:230 ../../boot.php:1727 ../../boot.php:1807 +#: ../../mod/ping.php:230 ../../boot.php:1799 ../../boot.php:1879 msgid "g A l F d" msgstr "g A l F d" -#: ../../mod/ping.php:252 ../../boot.php:1773 ../../boot.php:1848 +#: ../../mod/ping.php:252 ../../boot.php:1845 ../../boot.php:1920 msgid "[today]" msgstr "[сегодня]" @@ -3960,14 +4175,91 @@ msgstr "[сегодня]" msgid "posted an event" msgstr "" -#: ../../mod/xchan.php:25 -msgid "Not found." -msgstr "Не найдено." - #: ../../mod/filer.php:35 msgid "- select -" msgstr "- выбрать -" +#: ../../mod/menu.php:17 +msgid "Menu updated." +msgstr "" + +#: ../../mod/menu.php:21 +msgid "Unable to update menu." +msgstr "" + +#: ../../mod/menu.php:26 +msgid "Menu created." +msgstr "" + +#: ../../mod/menu.php:30 +msgid "Unable to create menu." +msgstr "" + +#: ../../mod/menu.php:53 +msgid "Manage Menus" +msgstr "" + +#: ../../mod/menu.php:56 +msgid "Drop" +msgstr "" + +#: ../../mod/menu.php:57 ../../mod/network.php:298 +#: ../../mod/connections.php:521 +msgid "New" +msgstr "Новые" + +#: ../../mod/menu.php:58 +msgid "Create a new menu" +msgstr "" + +#: ../../mod/menu.php:59 +msgid "Delete this menu" +msgstr "" + +#: ../../mod/menu.php:60 ../../mod/menu.php:104 +msgid "Edit menu contents" +msgstr "" + +#: ../../mod/menu.php:61 +msgid "Edit this menu" +msgstr "" + +#: ../../mod/menu.php:76 +msgid "New Menu" +msgstr "" + +#: ../../mod/menu.php:77 ../../mod/menu.php:105 +msgid "Menu name" +msgstr "" + +#: ../../mod/menu.php:77 ../../mod/menu.php:105 +msgid "Must be unique, only seen by you" +msgstr "" + +#: ../../mod/menu.php:78 ../../mod/menu.php:106 +msgid "Menu title" +msgstr "" + +#: ../../mod/menu.php:78 ../../mod/menu.php:106 +msgid "Menu title as seen by others" +msgstr "" + +#: ../../mod/menu.php:93 +msgid "Menu deleted." +msgstr "" + +#: ../../mod/menu.php:95 +msgid "Menu could not be deleted." +msgstr "" + +#: ../../mod/menu.php:101 +msgid "Edit Menu" +msgstr "" + +#: ../../mod/menu.php:103 +msgid "Add or remove entries to this menu" +msgstr "" + #: ../../mod/home.php:76 #, php-format msgid "Welcome to %s" @@ -3995,7 +4287,7 @@ msgstr "" #: ../../mod/message.php:213 ../../mod/notifications.php:101 msgid "Messages" -msgstr "Сообщения" +msgstr "Переписка" #: ../../mod/message.php:224 msgid "Message deleted." @@ -4009,41 +4301,41 @@ msgstr "Разговор удален." msgid "Send Private Message" msgstr "Отправить личное сообщение" -#: ../../mod/message.php:283 ../../mod/message.php:418 +#: ../../mod/message.php:283 ../../mod/message.php:448 msgid "To:" msgstr "Кому:" -#: ../../mod/message.php:288 ../../mod/message.php:420 +#: ../../mod/message.php:288 ../../mod/message.php:450 msgid "Subject:" msgstr "Тема:" -#: ../../mod/message.php:316 +#: ../../mod/message.php:317 msgid "No messages." msgstr "Нет сообщений." -#: ../../mod/message.php:332 ../../mod/message.php:389 +#: ../../mod/message.php:333 ../../mod/message.php:419 msgid "Delete message" msgstr "Удалить сообщение" -#: ../../mod/message.php:334 +#: ../../mod/message.php:335 msgid "D, d M Y - g:i A" msgstr "D, d M Y - g:i A" -#: ../../mod/message.php:353 +#: ../../mod/message.php:354 msgid "Message not found." msgstr "Сообщение не найдено." -#: ../../mod/message.php:411 +#: ../../mod/message.php:441 msgid "Delete conversation" msgstr "Удалить разговор" -#: ../../mod/message.php:413 +#: ../../mod/message.php:443 msgid "" "No secure communications available. You may be able to " "respond from the sender's profile page." msgstr "" -#: ../../mod/message.php:417 +#: ../../mod/message.php:447 msgid "Send Reply" msgstr "Отправить снова" @@ -4075,122 +4367,871 @@ msgstr "Введите адрес вашего канала (например: c msgid "Authenticate" msgstr "Проверка подлинности" -#: ../../mod/item.php:121 +#: ../../mod/item.php:122 msgid "Unable to locate original post." msgstr "Не удалось найти оригинал." -#: ../../mod/item.php:289 +#: ../../mod/item.php:290 msgid "Empty post discarded." msgstr "Отказаться от пустой почты." -#: ../../mod/item.php:751 +#: ../../mod/item.php:334 +msgid "Executable content type not permitted to this channel." +msgstr "" + +#: ../../mod/item.php:779 msgid "System error. Post not saved." msgstr "Системная ошибка. Сообщение не сохранено." -#: ../../mod/item.php:1028 ../../mod/wall_upload.php:41 +#: ../../mod/item.php:1064 ../../mod/wall_upload.php:41 msgid "Wall Photos" msgstr "Стена фотографий" -#: ../../mod/network.php:158 ../../mod/search.php:20 +#: ../../mod/network.php:141 ../../mod/search.php:20 msgid "Remove term" msgstr "Удалить термин" -#: ../../mod/network.php:296 +#: ../../mod/network.php:279 msgid "Commented Order" msgstr "По комментириям" -#: ../../mod/network.php:299 +#: ../../mod/network.php:282 msgid "Sort by Comment Date" msgstr "Сортировка по дате создания комментариев" -#: ../../mod/network.php:302 +#: ../../mod/network.php:285 msgid "Posted Order" msgstr "По добавлениям" -#: ../../mod/network.php:305 +#: ../../mod/network.php:288 msgid "Sort by Post Date" msgstr "Сортировка по дате создания сообщения" -#: ../../mod/network.php:309 ../../mod/notifications.php:86 +#: ../../mod/network.php:292 ../../mod/notifications.php:86 msgid "Personal" msgstr "Личные" -#: ../../mod/network.php:312 +#: ../../mod/network.php:295 msgid "Posts that mention or involve you" msgstr "Сообщения, в которых упоминули или вовлекли вас" -#: ../../mod/network.php:315 ../../mod/connections.php:511 -msgid "New" -msgstr "Новые" - -#: ../../mod/network.php:318 +#: ../../mod/network.php:301 msgid "Activity Stream - by date" msgstr "Лента активности - по дате" -#: ../../mod/network.php:325 +#: ../../mod/network.php:308 msgid "Starred" msgstr "Помеченные" -#: ../../mod/network.php:328 +#: ../../mod/network.php:311 msgid "Favourite Posts" msgstr "Фаворит-сообщения" -#: ../../mod/network.php:335 +#: ../../mod/network.php:318 msgid "Spam" msgstr "Спам" -#: ../../mod/network.php:338 +#: ../../mod/network.php:321 msgid "Posts flagged as SPAM" msgstr "Как СПАМ помеченные сообщения" -#: ../../mod/network.php:378 +#: ../../mod/network.php:361 msgid "Refresh" msgstr "Обновить" -#: ../../mod/network.php:379 ../../mod/connections.php:364 +#: ../../mod/network.php:362 ../../mod/connections.php:374 msgid "Me" msgstr "Я" -#: ../../mod/network.php:380 ../../mod/connections.php:366 +#: ../../mod/network.php:363 ../../mod/connections.php:376 msgid "Best Friends" msgstr "Лучшие друзья" -#: ../../mod/network.php:382 +#: ../../mod/network.php:365 msgid "Co-workers" msgstr "Сотрудники" -#: ../../mod/network.php:383 ../../mod/connections.php:368 +#: ../../mod/network.php:366 ../../mod/connections.php:378 msgid "Former Friends" msgstr "Приятели" -#: ../../mod/network.php:384 ../../mod/connections.php:369 +#: ../../mod/network.php:367 ../../mod/connections.php:379 msgid "Acquaintances" msgstr "Знакомые" -#: ../../mod/network.php:385 +#: ../../mod/network.php:368 msgid "Everybody" msgstr "Все" -#: ../../mod/network.php:402 +#: ../../mod/network.php:385 msgid "Search Results For:" msgstr "Результаты поиска для:" -#: ../../mod/network.php:447 +#: ../../mod/network.php:430 msgid "No such group" msgstr "Нет такой группы" -#: ../../mod/network.php:458 +#: ../../mod/network.php:441 msgid "Group is empty" msgstr "Группа пуста" -#: ../../mod/network.php:473 +#: ../../mod/network.php:456 msgid "Contact: " msgstr "Канал: " -#: ../../mod/network.php:476 +#: ../../mod/network.php:459 msgid "Invalid contact." msgstr "Недействительный канал." +#: ../../mod/intro.php:11 ../../mod/intro.php:98 ../../mod/admin.php:638 +#: ../../mod/notifications.php:159 ../../mod/notifications.php:206 +msgid "Approve" +msgstr "Утвердить" + +#: ../../mod/intro.php:14 ../../mod/intro.php:99 ../../mod/connections.php:318 +#: ../../mod/connections.php:459 ../../mod/admin.php:641 +msgid "Block" +msgstr "Заблокировать" + +#: ../../mod/intro.php:17 ../../mod/intro.php:100 +#: ../../mod/connections.php:325 ../../mod/connections.php:460 +#: ../../mod/notifications.php:51 ../../mod/notifications.php:162 +#: ../../mod/notifications.php:208 +msgid "Ignore" +msgstr "Игнорировать" + +#: ../../mod/intro.php:29 ../../mod/connections.php:119 +msgid "Connection updated." +msgstr "Канал обновлен." + +#: ../../mod/intro.php:31 +msgid "Connection update failed." +msgstr "Ошибка обновления канала." + +#: ../../mod/intro.php:56 +msgid "Introductions and Connection Requests" +msgstr "" + +#: ../../mod/intro.php:67 +msgid "No pending introductions." +msgstr "Введений в ожидании нет." + +#: ../../mod/intro.php:72 +msgid "System error. Please try again later." +msgstr "Системная ошибка. Пожалуйста, повторите попытку позже." + +#: ../../mod/intro.php:95 ../../mod/connections.php:465 +#: ../../mod/notifications.php:155 ../../mod/notifications.php:202 +msgid "Hide this contact from others" +msgstr "Скрыть этот канал от других" + +#: ../../mod/intro.php:96 ../../mod/notifications.php:156 +#: ../../mod/notifications.php:203 +msgid "Post a new friend activity" +msgstr "" + +#: ../../mod/intro.php:96 ../../mod/notifications.php:156 +#: ../../mod/notifications.php:203 +msgid "if applicable" +msgstr "если это применимо" + +#: ../../mod/intro.php:101 ../../mod/notifications.php:35 +#: ../../mod/notifications.php:163 ../../mod/notifications.php:209 +msgid "Discard" +msgstr "Отменить" + +#: ../../mod/connections.php:64 +msgid "Could not access contact record." +msgstr "" + +#: ../../mod/connections.php:78 +msgid "Could not locate selected profile." +msgstr "" + +#: ../../mod/connections.php:121 +msgid "Failed to update connection record." +msgstr "" + +#: ../../mod/connections.php:196 +msgid "Could not access address book record." +msgstr "" + +#: ../../mod/connections.php:210 +msgid "Refresh failed - channel is currently unavailable." +msgstr "" + +#: ../../mod/connections.php:217 +msgid "Channel has been unblocked" +msgstr "Канал разблокирован" + +#: ../../mod/connections.php:218 +msgid "Channel has been blocked" +msgstr "Канал заблокирован" + +#: ../../mod/connections.php:222 ../../mod/connections.php:234 +#: ../../mod/connections.php:246 ../../mod/connections.php:258 +#: ../../mod/connections.php:273 +msgid "Unable to set address book parameters." +msgstr "" + +#: ../../mod/connections.php:229 +msgid "Channel has been unignored" +msgstr "Канал не проигнорирован" + +#: ../../mod/connections.php:230 +msgid "Channel has been ignored" +msgstr "Канал проигнорирован" + +#: ../../mod/connections.php:241 +msgid "Channel has been unarchived" +msgstr "Канал разархивирован" + +#: ../../mod/connections.php:242 +msgid "Channel has been archived" +msgstr "Канал заархивирован" + +#: ../../mod/connections.php:253 +msgid "Channel has been unhidden" +msgstr "Канал открыт" + +#: ../../mod/connections.php:254 +msgid "Channel has been hidden" +msgstr "Канал скрыт" + +#: ../../mod/connections.php:268 +msgid "Channel has been approved" +msgstr "Канал одобрен" + +#: ../../mod/connections.php:269 +msgid "Channel has been unapproved" +msgstr "Канал не одобрен" + +#: ../../mod/connections.php:287 +msgid "Contact has been removed." +msgstr "Канал удален." + +#: ../../mod/connections.php:307 +#, php-format +msgid "View %s's profile" +msgstr "Просмотр %s's профиля" + +#: ../../mod/connections.php:311 +msgid "Refresh Permissions" +msgstr "Обновить разрешения" + +#: ../../mod/connections.php:314 +msgid "Fetch updated permissions" +msgstr "" + +#: ../../mod/connections.php:318 ../../mod/connections.php:459 +#: ../../mod/admin.php:642 +msgid "Unblock" +msgstr "Разрешить" + +#: ../../mod/connections.php:321 +msgid "Block or Unblock this connection" +msgstr "Запретить или разрешить этот канал" + +#: ../../mod/connections.php:325 ../../mod/connections.php:460 +msgid "Unignore" +msgstr "Не игнорировать" + +#: ../../mod/connections.php:328 +msgid "Ignore or Unignore this connection" +msgstr "Игнорировать или не игнорировать этот канал" + +#: ../../mod/connections.php:331 +msgid "Unarchive" +msgstr "Разархивировать" + +#: ../../mod/connections.php:331 +msgid "Archive" +msgstr "Заархивировать" + +#: ../../mod/connections.php:334 +msgid "Archive or Unarchive this connection" +msgstr " Заархивировать или разархивировать этот канал" + +#: ../../mod/connections.php:337 +msgid "Unhide" +msgstr "Показать" + +#: ../../mod/connections.php:337 +msgid "Hide" +msgstr "Скрыть" + +#: ../../mod/connections.php:340 +msgid "Hide or Unhide this connection" +msgstr "Скрыть или показывать этот канал" + +#: ../../mod/connections.php:347 +msgid "Delete this connection" +msgstr "Удалить этот канал" + +#: ../../mod/connections.php:380 +msgid "Unknown" +msgstr "Неизвестный" + +#: ../../mod/connections.php:390 ../../mod/connections.php:418 +msgid "Approve this connection" +msgstr "Утвердить этот канал" + +#: ../../mod/connections.php:390 +msgid "Accept connection to allow communication" +msgstr "" + +#: ../../mod/connections.php:406 +msgid "Automatic Permissions Settings" +msgstr "Настройки автоматических разрешений" + +#: ../../mod/connections.php:406 +#, php-format +msgid "Connections: settings for %s" +msgstr "" + +#: ../../mod/connections.php:410 +msgid "" +"When receiving a channel introduction, any permissions provided here will be" +" applied to the new connection automatically and the introduction approved. " +"Leave this page if you do not wish to use this feature." +msgstr "" + +#: ../../mod/connections.php:412 +msgid "Slide to adjust your degree of friendship" +msgstr "" + +#: ../../mod/connections.php:419 +msgid "Connection has no individual permissions!" +msgstr "" + +#: ../../mod/connections.php:420 +msgid "" +"This may be appropriate based on your privacy " +"settings, though you may wish to review the \"Advanced Permissions\"." +msgstr "" + +#: ../../mod/connections.php:422 +msgid "Profile Visibility" +msgstr "Видимость профиля" + +#: ../../mod/connections.php:423 +#, php-format +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." +msgstr "" + +#: ../../mod/connections.php:424 +msgid "Contact Information / Notes" +msgstr "Информация / Примечания о канале" + +#: ../../mod/connections.php:425 +msgid "Edit contact notes" +msgstr "Редактировать примечания канала" + +#: ../../mod/connections.php:427 +msgid "Their Settings" +msgstr "Их настройки" + +#: ../../mod/connections.php:428 +msgid "My Settings" +msgstr "Мои настройки" + +#: ../../mod/connections.php:430 +msgid "Forum Members" +msgstr "Участники форума" + +#: ../../mod/connections.php:431 +msgid "Soapbox" +msgstr "Soapbox" + +#: ../../mod/connections.php:432 +msgid "Full Sharing" +msgstr "Полный обмен" + +#: ../../mod/connections.php:433 +msgid "Cautious Sharing" +msgstr "" + +#: ../../mod/connections.php:434 +msgid "Follow Only" +msgstr "Только следовать" + +#: ../../mod/connections.php:435 +msgid "Individual Permissions" +msgstr "Индивидуальные разрешения" + +#: ../../mod/connections.php:436 +msgid "" +"Individual permissions are only enabled for privacy " +"settings which are set to \"Only those you specifically allow\". " +"Otherwise they are controlled by your privacy settings." +msgstr "" + +#: ../../mod/connections.php:437 +msgid "Advanced Permissions" +msgstr "Дополнительные разрешения" + +#: ../../mod/connections.php:438 +msgid "Quick Links" +msgstr "Быстрые ссылки" + +#: ../../mod/connections.php:442 +#, php-format +msgid "Visit %s's profile - %s" +msgstr "Посетить %s's ​​профиль - %s" + +#: ../../mod/connections.php:443 +msgid "Block/Unblock contact" +msgstr "Запретить/разрешить канал" + +#: ../../mod/connections.php:444 +msgid "Ignore contact" +msgstr "Игнорировать канал" + +#: ../../mod/connections.php:445 +msgid "Repair URL settings" +msgstr "Ремонт настройки URL" + +#: ../../mod/connections.php:446 +msgid "View conversations" +msgstr "Просмотр разговоров" + +#: ../../mod/connections.php:448 +msgid "Delete contact" +msgstr "Удалить канал" + +#: ../../mod/connections.php:451 +msgid "Last update:" +msgstr "Последнее обновление:" + +#: ../../mod/connections.php:453 +msgid "Update public posts" +msgstr "Обновить публичные сообщения" + +#: ../../mod/connections.php:455 +msgid "Update now" +msgstr "Обновить сейчас" + +#: ../../mod/connections.php:461 +msgid "Currently blocked" +msgstr "В настоящее время заблокирован" + +#: ../../mod/connections.php:462 +msgid "Currently ignored" +msgstr "В настоящее время игнорируются" + +#: ../../mod/connections.php:463 +msgid "Currently archived" +msgstr "В настоящее время зархивированны" + +#: ../../mod/connections.php:464 +msgid "Currently pending" +msgstr "В настоящее время в ожидании" + +#: ../../mod/connections.php:465 +msgid "" +"Replies/likes to your public posts may still be visible" +msgstr "" + +#: ../../mod/connections.php:501 ../../mod/connections.php:573 +msgid "Blocked" +msgstr "Заблокированные" + +#: ../../mod/connections.php:506 ../../mod/connections.php:580 +msgid "Ignored" +msgstr "Игнорируемые" + +#: ../../mod/connections.php:511 ../../mod/connections.php:594 +msgid "Hidden" +msgstr "Скрытые" + +#: ../../mod/connections.php:516 ../../mod/connections.php:587 +msgid "Archived" +msgstr "Зархивированные" + +#: ../../mod/connections.php:527 +msgid "All" +msgstr "Все" + +#: ../../mod/connections.php:548 +msgid "Suggestions" +msgstr "Рекомендации" + +#: ../../mod/connections.php:551 +msgid "Suggest new connections" +msgstr "Предлагать новые контакты" + +#: ../../mod/connections.php:557 +msgid "Show pending (new) connections" +msgstr "Просмотр (новых) ждущих каналов" + +#: ../../mod/connections.php:560 +msgid "All Connections" +msgstr "Все контакты" + +#: ../../mod/connections.php:563 +msgid "Show all connections" +msgstr "Просмотр всех каналов" + +#: ../../mod/connections.php:566 +msgid "Unblocked" +msgstr "Разрешенные" + +#: ../../mod/connections.php:569 +msgid "Only show unblocked connections" +msgstr "Показать только разрешенные контакты" + +#: ../../mod/connections.php:576 +msgid "Only show blocked connections" +msgstr "Показать только заблокированные контакты" + +#: ../../mod/connections.php:583 +msgid "Only show ignored connections" +msgstr "Показать только проигнорированные контакты" + +#: ../../mod/connections.php:590 +msgid "Only show archived connections" +msgstr "Показать только архивированные контакты" + +#: ../../mod/connections.php:597 +msgid "Only show hidden connections" +msgstr "Показать только скрытые контакты" + +#: ../../mod/connections.php:639 +#, php-format +msgid "%1$s [%2$s]" +msgstr "%1$s [%2$s]" + +#: ../../mod/connections.php:640 ../../mod/nogroup.php:41 +msgid "Edit contact" +msgstr "Редактировать канал" + +#: ../../mod/connections.php:664 +msgid "Search your connections" +msgstr "Поиск каналов" + +#: ../../mod/connections.php:665 +msgid "Finding: " +msgstr "Поиск:" + +#: ../../mod/dirsearch.php:21 +msgid "This site is not a directory server" +msgstr "Этот сайт не является сервером каталога" + +#: ../../mod/lockview.php:34 +msgid "Remote privacy information not available." +msgstr "" + +#: ../../mod/lockview.php:43 +msgid "Visible to:" +msgstr "Кому видно:" + +#: ../../mod/post.php:114 +msgid "" +"Remote authentication blocked. You are logged into this site locally. Please" +" logout and retry." +msgstr "" + +#: ../../mod/post.php:127 +#, php-format +msgid "Welcome %s. Remote authentication successful." +msgstr "" + +#: ../../mod/profiles.php:18 ../../mod/profiles.php:138 +#: ../../mod/profiles.php:179 ../../mod/profiles.php:486 +msgid "Profile not found." +msgstr "Профиль не найден." + +#: ../../mod/profiles.php:38 +msgid "Profile deleted." +msgstr "Профиль удален." + +#: ../../mod/profiles.php:56 ../../mod/profiles.php:92 +msgid "Profile-" +msgstr "Профиль-" + +#: ../../mod/profiles.php:77 ../../mod/profiles.php:120 +msgid "New profile created." +msgstr "Новый профиль создан." + +#: ../../mod/profiles.php:98 +msgid "Profile unavailable to clone." +msgstr "Профиль недоступен для клонирования." + +#: ../../mod/profiles.php:189 +msgid "Profile Name is required." +msgstr "Имя профиля требуется." + +#: ../../mod/profiles.php:317 +msgid "Marital Status" +msgstr "Семейное положение" + +#: ../../mod/profiles.php:321 +msgid "Romantic Partner" +msgstr "Романтический партнер" + +#: ../../mod/profiles.php:325 +msgid "Likes" +msgstr "мне нравиться" + +#: ../../mod/profiles.php:329 +msgid "Dislikes" +msgstr "мне не-нравиться" + +#: ../../mod/profiles.php:333 +msgid "Work/Employment" +msgstr "Работа / Занятость" + +#: ../../mod/profiles.php:336 +msgid "Religion" +msgstr "Религия" + +#: ../../mod/profiles.php:340 +msgid "Political Views" +msgstr "Политические взгляды" + +#: ../../mod/profiles.php:344 +msgid "Gender" +msgstr "Пол" + +#: ../../mod/profiles.php:348 +msgid "Sexual Preference" +msgstr "Сексуальная ориентация" + +#: ../../mod/profiles.php:352 +msgid "Homepage" +msgstr "Домашняя страница" + +#: ../../mod/profiles.php:356 +msgid "Interests" +msgstr "Интересы" + +#: ../../mod/profiles.php:360 +msgid "Address" +msgstr "Адрес" + +#: ../../mod/profiles.php:367 +msgid "Location" +msgstr "Место" + +#: ../../mod/profiles.php:450 +msgid "Profile updated." +msgstr "Профиль обновлен." + +#: ../../mod/profiles.php:505 +msgid "Hide your contact/friend list from viewers of this profile?" +msgstr "" + +#: ../../mod/profiles.php:528 +msgid "Edit Profile Details" +msgstr "Редактирование профиля" + +#: ../../mod/profiles.php:530 +msgid "View this profile" +msgstr "Посмотреть этот профиль" + +#: ../../mod/profiles.php:531 +msgid "Change Profile Photo" +msgstr "Изменить фотографию профиля" + +#: ../../mod/profiles.php:532 +msgid "Create a new profile using these settings" +msgstr "Создайте новый профиль со следующими настройками" + +#: ../../mod/profiles.php:533 +msgid "Clone this profile" +msgstr "Клонировать этот профиль" + +#: ../../mod/profiles.php:534 +msgid "Delete this profile" +msgstr "Удалить этот профиль" + +#: ../../mod/profiles.php:535 +msgid "Profile Name:" +msgstr "Имя профиля:" + +#: ../../mod/profiles.php:536 +msgid "Your Full Name:" +msgstr "Ваше полное имя:" + +#: ../../mod/profiles.php:537 +msgid "Title/Description:" +msgstr "Название / Описание:" + +#: ../../mod/profiles.php:538 +msgid "Your Gender:" +msgstr "Ваш пол:" + +#: ../../mod/profiles.php:539 +#, php-format +msgid "Birthday (%s):" +msgstr "Ваш День Рождения (%s):" + +#: ../../mod/profiles.php:540 +msgid "Street Address:" +msgstr "Улица:" + +#: ../../mod/profiles.php:541 +msgid "Locality/City:" +msgstr "Населенный пункт / город:" + +#: ../../mod/profiles.php:542 +msgid "Postal/Zip Code:" +msgstr "Почтовый индекс:" + +#: ../../mod/profiles.php:543 +msgid "Country:" +msgstr "Страна:" + +#: ../../mod/profiles.php:544 +msgid "Region/State:" +msgstr "Регион / Область:" + +#: ../../mod/profiles.php:545 +msgid " Marital Status:" +msgstr "" + +#: ../../mod/profiles.php:546 +msgid "Who: (if applicable)" +msgstr "Кто: (если это применимо)" + +#: ../../mod/profiles.php:547 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "" + +#: ../../mod/profiles.php:548 +msgid "Since [date]:" +msgstr "С тех пор [date]:" + +#: ../../mod/profiles.php:550 +msgid "Homepage URL:" +msgstr "URL-адрес домашней страницы:" + +#: ../../mod/profiles.php:553 +msgid "Religious Views:" +msgstr "Религиозные взгляды:" + +#: ../../mod/profiles.php:554 +msgid "Keywords:" +msgstr "Ключевые слова:" + +#: ../../mod/profiles.php:557 +msgid "Example: fishing photography software" +msgstr "Пример: fishing photography software" + +#: ../../mod/profiles.php:558 +msgid "Used in directory listings" +msgstr "" + +#: ../../mod/profiles.php:559 +msgid "Tell us about yourself..." +msgstr "Расскажите нам о себе ..." + +#: ../../mod/profiles.php:560 +msgid "Hobbies/Interests" +msgstr "Хобби / интересы" + +#: ../../mod/profiles.php:561 +msgid "Contact information and Social Networks" +msgstr "Информация и социальные сети канала" + +#: ../../mod/profiles.php:562 +msgid "My other channels" +msgstr "Мои другие контакты" + +#: ../../mod/profiles.php:563 +msgid "Musical interests" +msgstr "Музыкальные интересы" + +#: ../../mod/profiles.php:564 +msgid "Books, literature" +msgstr "Книги, литература" + +#: ../../mod/profiles.php:565 +msgid "Television" +msgstr "Телевидение" + +#: ../../mod/profiles.php:566 +msgid "Film/dance/culture/entertainment" +msgstr "Кино / танцы / культура / развлечения" + +#: ../../mod/profiles.php:567 +msgid "Love/romance" +msgstr "Любовь / Романс" + +#: ../../mod/profiles.php:568 +msgid "Work/employment" +msgstr "Работа / Занятость" + +#: ../../mod/profiles.php:569 +msgid "School/education" +msgstr "Школа / образование" + +#: ../../mod/profiles.php:574 +msgid "" +"This is your public profile.
      It may " +"be visible to anybody using the internet." +msgstr "" + +#: ../../mod/profiles.php:623 +msgid "Edit/Manage Profiles" +msgstr "Редактирование / Управление профилей" + +#: ../../mod/profiles.php:624 ../../boot.php:1701 +msgid "Change profile photo" +msgstr "Изменить фотографию профиля" + +#: ../../mod/profiles.php:625 ../../boot.php:1708 +msgid "Create New Profile" +msgstr "Создать новый профиль" + +#: ../../mod/profiles.php:636 ../../boot.php:1722 +msgid "Profile Image" +msgstr "Изображение профиля" + +#: ../../mod/profiles.php:639 ../../boot.php:1725 +msgid "visible to everybody" +msgstr "видно всем" + +#: ../../mod/profiles.php:640 ../../boot.php:1726 +msgid "Edit visibility" +msgstr "Редактировать видимость" + +#: ../../mod/new_channel.php:107 +msgid "Add a Channel" +msgstr "Добавить канал" + +#: ../../mod/new_channel.php:108 +msgid "" +"A channel is your own collection of related web pages. A channel can be used" +" to hold social network profiles, blogs, conversation groups and forums, " +"celebrity pages, and much more. You may create as many channels as your " +"service provider allows." +msgstr "" + +#: ../../mod/new_channel.php:110 +msgid "Channel Name" +msgstr "Имя канала" + +#: ../../mod/new_channel.php:111 +msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" " +msgstr "" + +#: ../../mod/new_channel.php:112 +msgid "Choose a short nickname" +msgstr "Выберите короткий псевдоним" + +#: ../../mod/new_channel.php:113 +msgid "" +"Your nickname will be used to create an easily remembered channel address " +"(like an email address) which you can share with others." +msgstr "" + +#: ../../mod/new_channel.php:114 +msgid "Or import an existing channel from another location" +msgstr "" + #: ../../mod/admin.php:48 msgid "Theme settings updated." msgstr "Настройки темы обновленны." @@ -4289,15 +5330,7 @@ msgstr "Платный доступ" msgid "Free Access" msgstr "Свободный доступ" -#: ../../mod/admin.php:401 -msgid "No SSL policy, links will track page SSL state" -msgstr "" - -#: ../../mod/admin.php:402 -msgid "Force all links to use SSL" -msgstr "Заставить все ссылки использовать SSL" - -#: ../../mod/admin.php:410 ../../mod/register.php:166 +#: ../../mod/admin.php:410 ../../mod/register.php:172 msgid "Registration" msgstr "Регистрация" @@ -4359,14 +5392,6 @@ msgstr "" msgid "Site Channel" msgstr "Канал сайта" -#: ../../mod/admin.php:424 -msgid "SSL link policy" -msgstr "Правила SSL-ссылки" - -#: ../../mod/admin.php:424 -msgid "Determines whether generated links should be forced to use SSL" -msgstr "" - #: ../../mod/admin.php:425 msgid "Maximum image size" msgstr "Максимальный размер" @@ -4597,25 +5622,10 @@ msgstr "Дата запроса" msgid "No registrations." msgstr "Новых регистраций пока нет." -#: ../../mod/admin.php:638 ../../mod/intro.php:11 ../../mod/intro.php:98 -#: ../../mod/notifications.php:159 ../../mod/notifications.php:206 -msgid "Approve" -msgstr "Утвердить" - #: ../../mod/admin.php:639 msgid "Deny" msgstr "Запретить" -#: ../../mod/admin.php:641 ../../mod/intro.php:14 ../../mod/intro.php:99 -#: ../../mod/connections.php:308 ../../mod/connections.php:449 -msgid "Block" -msgstr "Заблокировать" - -#: ../../mod/admin.php:642 ../../mod/connections.php:308 -#: ../../mod/connections.php:449 -msgid "Unblock" -msgstr "Разрешить" - #: ../../mod/admin.php:645 msgid "Register date" msgstr "Дата регистрации" @@ -4711,744 +5721,6 @@ msgstr "Должна быть доступна для записи веб-сер msgid "Log level" msgstr "Уровень журнала" -#: ../../mod/intro.php:17 ../../mod/intro.php:100 -#: ../../mod/connections.php:315 ../../mod/connections.php:450 -#: ../../mod/notifications.php:51 ../../mod/notifications.php:162 -#: ../../mod/notifications.php:208 -msgid "Ignore" -msgstr "Игнорировать" - -#: ../../mod/intro.php:29 ../../mod/connections.php:117 -msgid "Connection updated." -msgstr "Канал обновлен." - -#: ../../mod/intro.php:31 -msgid "Connection update failed." -msgstr "Ошибка обновления канала." - -#: ../../mod/intro.php:56 -msgid "Introductions and Connection Requests" -msgstr "" - -#: ../../mod/intro.php:67 -msgid "No pending introductions." -msgstr "Введений в ожидании нет." - -#: ../../mod/intro.php:72 -msgid "System error. Please try again later." -msgstr "Системная ошибка. Пожалуйста, повторите попытку позже." - -#: ../../mod/intro.php:95 ../../mod/connections.php:455 -#: ../../mod/notifications.php:155 ../../mod/notifications.php:202 -msgid "Hide this contact from others" -msgstr "Скрыть этот канал от других" - -#: ../../mod/intro.php:96 ../../mod/notifications.php:156 -#: ../../mod/notifications.php:203 -msgid "Post a new friend activity" -msgstr "" - -#: ../../mod/intro.php:96 ../../mod/notifications.php:156 -#: ../../mod/notifications.php:203 -msgid "if applicable" -msgstr "если это применимо" - -#: ../../mod/intro.php:101 ../../mod/notifications.php:35 -#: ../../mod/notifications.php:163 ../../mod/notifications.php:209 -msgid "Discard" -msgstr "Отменить" - -#: ../../mod/connections.php:64 -msgid "Could not access contact record." -msgstr "" - -#: ../../mod/connections.php:78 -msgid "Could not locate selected profile." -msgstr "" - -#: ../../mod/connections.php:119 -msgid "Failed to update connection record." -msgstr "" - -#: ../../mod/connections.php:186 -msgid "Could not access address book record." -msgstr "" - -#: ../../mod/connections.php:200 -msgid "Refresh failed - channel is currently unavailable." -msgstr "" - -#: ../../mod/connections.php:207 -msgid "Channel has been unblocked" -msgstr "Канал разблокирован" - -#: ../../mod/connections.php:208 -msgid "Channel has been blocked" -msgstr "Канал заблокирован" - -#: ../../mod/connections.php:212 ../../mod/connections.php:224 -#: ../../mod/connections.php:236 ../../mod/connections.php:248 -#: ../../mod/connections.php:263 -msgid "Unable to set address book parameters." -msgstr "" - -#: ../../mod/connections.php:219 -msgid "Channel has been unignored" -msgstr "Канал не проигнорирован" - -#: ../../mod/connections.php:220 -msgid "Channel has been ignored" -msgstr "Канал проигнорирован" - -#: ../../mod/connections.php:231 -msgid "Channel has been unarchived" -msgstr "Канал разархивирован" - -#: ../../mod/connections.php:232 -msgid "Channel has been archived" -msgstr "Канал заархивирован" - -#: ../../mod/connections.php:243 -msgid "Channel has been unhidden" -msgstr "Канал открыт" - -#: ../../mod/connections.php:244 -msgid "Channel has been hidden" -msgstr "Канал скрыт" - -#: ../../mod/connections.php:258 -msgid "Channel has been approved" -msgstr "Канал одобрен" - -#: ../../mod/connections.php:259 -msgid "Channel has been unapproved" -msgstr "Канал не одобрен" - -#: ../../mod/connections.php:277 -msgid "Contact has been removed." -msgstr "Канал удален." - -#: ../../mod/connections.php:297 -#, php-format -msgid "View %s's profile" -msgstr "Просмотр %s's профиля" - -#: ../../mod/connections.php:301 -msgid "Refresh Permissions" -msgstr "Обновить разрешения" - -#: ../../mod/connections.php:304 -msgid "Fetch updated permissions" -msgstr "" - -#: ../../mod/connections.php:311 -msgid "Block or Unblock this connection" -msgstr "Запретить или разрешить этот канал" - -#: ../../mod/connections.php:315 ../../mod/connections.php:450 -msgid "Unignore" -msgstr "Не игнорировать" - -#: ../../mod/connections.php:318 -msgid "Ignore or Unignore this connection" -msgstr "Игнорировать или не игнорировать этот канал" - -#: ../../mod/connections.php:321 -msgid "Unarchive" -msgstr "Разархивировать" - -#: ../../mod/connections.php:321 -msgid "Archive" -msgstr "Заархивировать" - -#: ../../mod/connections.php:324 -msgid "Archive or Unarchive this connection" -msgstr " Заархивировать или разархивировать этот канал" - -#: ../../mod/connections.php:327 -msgid "Unhide" -msgstr "Показать" - -#: ../../mod/connections.php:327 -msgid "Hide" -msgstr "Скрыть" - -#: ../../mod/connections.php:330 -msgid "Hide or Unhide this connection" -msgstr "Скрыть или показывать этот канал" - -#: ../../mod/connections.php:337 -msgid "Delete this connection" -msgstr "Удалить этот канал" - -#: ../../mod/connections.php:370 -msgid "Unknown" -msgstr "Неизвестный" - -#: ../../mod/connections.php:380 ../../mod/connections.php:408 -msgid "Approve this connection" -msgstr "Утвердить этот канал" - -#: ../../mod/connections.php:380 -msgid "Accept connection to allow communication" -msgstr "" - -#: ../../mod/connections.php:396 -msgid "Automatic Permissions Settings" -msgstr "Настройки автоматических разрешений" - -#: ../../mod/connections.php:396 -#, php-format -msgid "Connections: settings for %s" -msgstr "" - -#: ../../mod/connections.php:400 -msgid "" -"When receiving a channel introduction, any permissions provided here will be" -" applied to the new connection automatically and the introduction approved. " -"Leave this page if you do not wish to use this feature." -msgstr "" - -#: ../../mod/connections.php:402 -msgid "Slide to adjust your degree of friendship" -msgstr "" - -#: ../../mod/connections.php:409 -msgid "Connection has no individual permissions!" -msgstr "" - -#: ../../mod/connections.php:410 -msgid "" -"This may be appropriate based on your privacy " -"settings, though you may wish to review the \"Advanced Permissions\"." -msgstr "" - -#: ../../mod/connections.php:412 -msgid "Profile Visibility" -msgstr "Видимость профиля" - -#: ../../mod/connections.php:413 -#, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." -msgstr "" - -#: ../../mod/connections.php:414 -msgid "Contact Information / Notes" -msgstr "Информация / Примечания о канале" - -#: ../../mod/connections.php:415 -msgid "Edit contact notes" -msgstr "Редактировать примечания канала" - -#: ../../mod/connections.php:417 -msgid "Their Settings" -msgstr "Их настройки" - -#: ../../mod/connections.php:418 -msgid "My Settings" -msgstr "Мои настройки" - -#: ../../mod/connections.php:420 -msgid "Forum Members" -msgstr "Участники форума" - -#: ../../mod/connections.php:421 -msgid "Soapbox" -msgstr "Soapbox" - -#: ../../mod/connections.php:422 -msgid "Full Sharing" -msgstr "Полный обмен" - -#: ../../mod/connections.php:423 -msgid "Cautious Sharing" -msgstr "" - -#: ../../mod/connections.php:424 -msgid "Follow Only" -msgstr "Только следовать" - -#: ../../mod/connections.php:425 -msgid "Individual Permissions" -msgstr "Индивидуальные разрешения" - -#: ../../mod/connections.php:426 -msgid "" -"Individual permissions are only enabled for privacy " -"settings which are set to \"Only those you specifically allow\". " -"Otherwise they are controlled by your privacy settings." -msgstr "" - -#: ../../mod/connections.php:427 -msgid "Advanced Permissions" -msgstr "Дополнительные разрешения" - -#: ../../mod/connections.php:428 -msgid "Quick Links" -msgstr "Быстрые ссылки" - -#: ../../mod/connections.php:432 -#, php-format -msgid "Visit %s's profile - %s" -msgstr "Посетить %s's ​​профиль - %s" - -#: ../../mod/connections.php:433 -msgid "Block/Unblock contact" -msgstr "Запретить/разрешить канал" - -#: ../../mod/connections.php:434 -msgid "Ignore contact" -msgstr "Игнорировать канал" - -#: ../../mod/connections.php:435 -msgid "Repair URL settings" -msgstr "Ремонт настройки URL" - -#: ../../mod/connections.php:436 -msgid "View conversations" -msgstr "Просмотр разговоров" - -#: ../../mod/connections.php:438 -msgid "Delete contact" -msgstr "Удалить канал" - -#: ../../mod/connections.php:441 -msgid "Last update:" -msgstr "Последнее обновление:" - -#: ../../mod/connections.php:443 -msgid "Update public posts" -msgstr "Обновить публичные сообщения" - -#: ../../mod/connections.php:445 -msgid "Update now" -msgstr "Обновить сейчас" - -#: ../../mod/connections.php:451 -msgid "Currently blocked" -msgstr "В настоящее время заблокирован" - -#: ../../mod/connections.php:452 -msgid "Currently ignored" -msgstr "В настоящее время игнорируются" - -#: ../../mod/connections.php:453 -msgid "Currently archived" -msgstr "В настоящее время зархивированны" - -#: ../../mod/connections.php:454 -msgid "Currently pending" -msgstr "В настоящее время в ожидании" - -#: ../../mod/connections.php:455 -msgid "" -"Replies/likes to your public posts may still be visible" -msgstr "" - -#: ../../mod/connections.php:491 ../../mod/connections.php:563 -msgid "Blocked" -msgstr "Заблокированные" - -#: ../../mod/connections.php:496 ../../mod/connections.php:570 -msgid "Ignored" -msgstr "Игнорируемые" - -#: ../../mod/connections.php:501 ../../mod/connections.php:584 -msgid "Hidden" -msgstr "Скрытые" - -#: ../../mod/connections.php:506 ../../mod/connections.php:577 -msgid "Archived" -msgstr "Зархивированные" - -#: ../../mod/connections.php:517 -msgid "All" -msgstr "Все" - -#: ../../mod/connections.php:538 -msgid "Suggestions" -msgstr "Рекомендации" - -#: ../../mod/connections.php:541 -msgid "Suggest new connections" -msgstr "Предлагать новые каналы" - -#: ../../mod/connections.php:547 -msgid "Show pending (new) connections" -msgstr "Просмотр (новых) ждущих каналов" - -#: ../../mod/connections.php:550 -msgid "All Connections" -msgstr "Все каналы" - -#: ../../mod/connections.php:553 -msgid "Show all connections" -msgstr "Просмотр всех каналов" - -#: ../../mod/connections.php:556 -msgid "Unblocked" -msgstr "Разрешенные" - -#: ../../mod/connections.php:559 -msgid "Only show unblocked connections" -msgstr "Показать только разрешенные каналы" - -#: ../../mod/connections.php:566 -msgid "Only show blocked connections" -msgstr "Показать только заблокированные каналы" - -#: ../../mod/connections.php:573 -msgid "Only show ignored connections" -msgstr "Показать только проигнорированные каналы" - -#: ../../mod/connections.php:580 -msgid "Only show archived connections" -msgstr "Показать только архивированные каналы" - -#: ../../mod/connections.php:587 -msgid "Only show hidden connections" -msgstr "Показать только скрытые каналы" - -#: ../../mod/connections.php:629 -#, php-format -msgid "%1$s [%2$s]" -msgstr "%1$s [%2$s]" - -#: ../../mod/connections.php:630 ../../mod/nogroup.php:41 -msgid "Edit contact" -msgstr "Редактировать канал" - -#: ../../mod/connections.php:654 -msgid "Search your connections" -msgstr "Поиск каналов" - -#: ../../mod/connections.php:655 -msgid "Finding: " -msgstr "Поиск:" - -#: ../../mod/dirsearch.php:21 -msgid "This site is not a directory server" -msgstr "Этот сайт не является сервером каталога" - -#: ../../mod/lockview.php:34 -msgid "Remote privacy information not available." -msgstr "" - -#: ../../mod/lockview.php:43 -msgid "Visible to:" -msgstr "Кому видно:" - -#: ../../mod/post.php:114 -msgid "" -"Remote authentication blocked. You are logged into this site locally. Please" -" logout and retry." -msgstr "" - -#: ../../mod/post.php:127 -#, php-format -msgid "Welcome %s. Remote authentication successful." -msgstr "" - -#: ../../mod/profiles.php:18 ../../mod/profiles.php:138 -#: ../../mod/profiles.php:179 ../../mod/profiles.php:486 -msgid "Profile not found." -msgstr "Профиль не найден." - -#: ../../mod/profiles.php:38 -msgid "Profile deleted." -msgstr "Профиль удален." - -#: ../../mod/profiles.php:56 ../../mod/profiles.php:92 -msgid "Profile-" -msgstr "Профиль-" - -#: ../../mod/profiles.php:77 ../../mod/profiles.php:120 -msgid "New profile created." -msgstr "Новый профиль создан." - -#: ../../mod/profiles.php:98 -msgid "Profile unavailable to clone." -msgstr "Профиль недоступен для клонирования." - -#: ../../mod/profiles.php:189 -msgid "Profile Name is required." -msgstr "Имя профиля требуется." - -#: ../../mod/profiles.php:317 -msgid "Marital Status" -msgstr "Семейное положение" - -#: ../../mod/profiles.php:321 -msgid "Romantic Partner" -msgstr "Романтический партнер" - -#: ../../mod/profiles.php:325 -msgid "Likes" -msgstr "мне нравиться" - -#: ../../mod/profiles.php:329 -msgid "Dislikes" -msgstr "мне не-нравиться" - -#: ../../mod/profiles.php:333 -msgid "Work/Employment" -msgstr "Работа / Занятость" - -#: ../../mod/profiles.php:336 -msgid "Religion" -msgstr "Религия" - -#: ../../mod/profiles.php:340 -msgid "Political Views" -msgstr "Политические взгляды" - -#: ../../mod/profiles.php:344 -msgid "Gender" -msgstr "Пол" - -#: ../../mod/profiles.php:348 -msgid "Sexual Preference" -msgstr "Сексуальная ориентация" - -#: ../../mod/profiles.php:352 -msgid "Homepage" -msgstr "Домашняя страница" - -#: ../../mod/profiles.php:356 -msgid "Interests" -msgstr "Интересы" - -#: ../../mod/profiles.php:360 -msgid "Address" -msgstr "Адрес" - -#: ../../mod/profiles.php:367 -msgid "Location" -msgstr "Место" - -#: ../../mod/profiles.php:450 -msgid "Profile updated." -msgstr "Профиль обновлен." - -#: ../../mod/profiles.php:505 -msgid "Hide your contact/friend list from viewers of this profile?" -msgstr "" - -#: ../../mod/profiles.php:528 -msgid "Edit Profile Details" -msgstr "Редактирование профиля" - -#: ../../mod/profiles.php:530 -msgid "View this profile" -msgstr "Посмотреть этот профиль" - -#: ../../mod/profiles.php:531 -msgid "Change Profile Photo" -msgstr "Изменить фотографию профиля" - -#: ../../mod/profiles.php:532 -msgid "Create a new profile using these settings" -msgstr "" - -#: ../../mod/profiles.php:533 -msgid "Clone this profile" -msgstr "Клонировать этот профиль" - -#: ../../mod/profiles.php:534 -msgid "Delete this profile" -msgstr "Удалить этот профиль" - -#: ../../mod/profiles.php:535 -msgid "Profile Name:" -msgstr "Имя профиля:" - -#: ../../mod/profiles.php:536 -msgid "Your Full Name:" -msgstr "Ваше полное имя:" - -#: ../../mod/profiles.php:537 -msgid "Title/Description:" -msgstr "Название / Описание:" - -#: ../../mod/profiles.php:538 -msgid "Your Gender:" -msgstr "Ваш пол:" - -#: ../../mod/profiles.php:539 -#, php-format -msgid "Birthday (%s):" -msgstr "Ваш День Рождения (%s):" - -#: ../../mod/profiles.php:540 -msgid "Street Address:" -msgstr "Улица:" - -#: ../../mod/profiles.php:541 -msgid "Locality/City:" -msgstr "Населенный пункт / город:" - -#: ../../mod/profiles.php:542 -msgid "Postal/Zip Code:" -msgstr "Почтовый индекс:" - -#: ../../mod/profiles.php:543 -msgid "Country:" -msgstr "Страна:" - -#: ../../mod/profiles.php:544 -msgid "Region/State:" -msgstr "Регион / Область:" - -#: ../../mod/profiles.php:545 -msgid " Marital Status:" -msgstr "" - -#: ../../mod/profiles.php:546 -msgid "Who: (if applicable)" -msgstr "Кто: (если это применимо)" - -#: ../../mod/profiles.php:547 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" -msgstr "" - -#: ../../mod/profiles.php:548 -msgid "Since [date]:" -msgstr "С тех пор [date]:" - -#: ../../mod/profiles.php:550 -msgid "Homepage URL:" -msgstr "URL-адрес домашней страницы:" - -#: ../../mod/profiles.php:553 -msgid "Religious Views:" -msgstr "Религиозные взгляды:" - -#: ../../mod/profiles.php:554 -msgid "Keywords:" -msgstr "Ключевые слова:" - -#: ../../mod/profiles.php:557 -msgid "Example: fishing photography software" -msgstr "Пример: fishing photography software" - -#: ../../mod/profiles.php:558 -msgid "Used in directory listings" -msgstr "" - -#: ../../mod/profiles.php:559 -msgid "Tell us about yourself..." -msgstr "Расскажите нам о себе ..." - -#: ../../mod/profiles.php:560 -msgid "Hobbies/Interests" -msgstr "Хобби / интересы" - -#: ../../mod/profiles.php:561 -msgid "Contact information and Social Networks" -msgstr "Информация и социальные сети канала" - -#: ../../mod/profiles.php:562 -msgid "My other channels" -msgstr "Мои другие каналы" - -#: ../../mod/profiles.php:563 -msgid "Musical interests" -msgstr "Музыкальные интересы" - -#: ../../mod/profiles.php:564 -msgid "Books, literature" -msgstr "Книги, литература" - -#: ../../mod/profiles.php:565 -msgid "Television" -msgstr "Телевидение" - -#: ../../mod/profiles.php:566 -msgid "Film/dance/culture/entertainment" -msgstr "Кино / танцы / культура / развлечения" - -#: ../../mod/profiles.php:567 -msgid "Love/romance" -msgstr "Любовь / Романс" - -#: ../../mod/profiles.php:568 -msgid "Work/employment" -msgstr "Работа / Занятость" - -#: ../../mod/profiles.php:569 -msgid "School/education" -msgstr "Школа / образование" - -#: ../../mod/profiles.php:574 -msgid "" -"This is your public profile.
      It may " -"be visible to anybody using the internet." -msgstr "" - -#: ../../mod/profiles.php:623 -msgid "Edit/Manage Profiles" -msgstr "Редактирование / Управление профилей" - -#: ../../mod/profiles.php:624 ../../boot.php:1640 -msgid "Change profile photo" -msgstr "Изменить фотографию профиля" - -#: ../../mod/profiles.php:625 ../../boot.php:1647 -msgid "Create New Profile" -msgstr "Создать новый профиль" - -#: ../../mod/profiles.php:636 ../../boot.php:1661 -msgid "Profile Image" -msgstr "Изображение профиля" - -#: ../../mod/profiles.php:639 ../../boot.php:1664 -msgid "visible to everybody" -msgstr "видно всем" - -#: ../../mod/profiles.php:640 ../../boot.php:1665 -msgid "Edit visibility" -msgstr "Редактировать видимость" - -#: ../../mod/new_channel.php:107 -msgid "Add a Channel" -msgstr "Добавить канал" - -#: ../../mod/new_channel.php:108 -msgid "" -"A channel is your own collection of related web pages. A channel can be used" -" to hold social network profiles, blogs, conversation groups and forums, " -"celebrity pages, and much more. You may create as many channels as your " -"service provider allows." -msgstr "" - -#: ../../mod/new_channel.php:110 -msgid "Channel Name" -msgstr "Имя канала" - -#: ../../mod/new_channel.php:111 -msgid "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" " -msgstr "" - -#: ../../mod/new_channel.php:112 -msgid "Choose a short nickname" -msgstr "Выберите короткий псевдоним" - -#: ../../mod/new_channel.php:113 -msgid "" -"Your nickname will be used to create an easily remembered channel address " -"(like an email address) which you can share with others." -msgstr "" - -#: ../../mod/new_channel.php:114 -msgid "Or import an existing channel from another location" -msgstr "" - -#: ../../mod/new_channel.php:117 -msgid "Create" -msgstr "Создать" - #: ../../mod/lostpass.php:15 msgid "No valid account found." msgstr "Действительный аккаунт не найден." @@ -5473,7 +5745,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1372 +#: ../../mod/lostpass.php:85 ../../boot.php:1430 msgid "Password Reset" msgstr "Сбросить пароль" @@ -5547,19 +5819,19 @@ msgstr "" msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../mod/import.php:327 +#: ../../mod/import.php:352 msgid "Import completed." msgstr "Импорт завершен." -#: ../../mod/import.php:340 +#: ../../mod/import.php:365 msgid "You must be logged in to use this feature." msgstr "Вы должны войти в систему, чтобы использовать эту функцию." -#: ../../mod/import.php:345 +#: ../../mod/import.php:370 msgid "Import Channel" msgstr "Импорт канала" -#: ../../mod/import.php:346 +#: ../../mod/import.php:371 msgid "" "Use this form to import an existing channel from a different server/hub. You" " may retrieve the channel identity from the old server/hub via the network " @@ -5567,27 +5839,27 @@ msgid "" "be imported. Importation of content is not yet available." msgstr "" -#: ../../mod/import.php:347 +#: ../../mod/import.php:372 msgid "File to Upload" msgstr "Файл для загрузки" -#: ../../mod/import.php:348 +#: ../../mod/import.php:373 msgid "Or provide the old server/hub details" msgstr "" -#: ../../mod/import.php:349 +#: ../../mod/import.php:374 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../mod/import.php:350 +#: ../../mod/import.php:375 msgid "Your old login email address" -msgstr "" +msgstr "Ваш старый адрес электронной почты" -#: ../../mod/import.php:351 +#: ../../mod/import.php:376 msgid "Your old login password" -msgstr "" +msgstr "Ваш старый пароль" -#: ../../mod/import.php:352 +#: ../../mod/import.php:377 msgid "" "For either option, please choose whether to make this hub your new primary " "address, or whether your old location should continue this role. You will be" @@ -5595,7 +5867,7 @@ msgid "" "primary location for files, photos, and media." msgstr "" -#: ../../mod/import.php:353 +#: ../../mod/import.php:378 msgid "Make this hub my primary location" msgstr "" @@ -5623,6 +5895,14 @@ msgstr "Канал по умолчанию" msgid "Make Default" msgstr "Сделать стандартным" +#: ../../mod/vote.php:97 +msgid "Total votes" +msgstr "" + +#: ../../mod/vote.php:98 +msgid "Average Rating" +msgstr "" + #: ../../mod/match.php:12 msgid "Profile Match" msgstr "" @@ -5704,10 +5984,34 @@ msgstr "Новое фото из этого URL" msgid "invalid target signature" msgstr "" -#: ../../mod/follow.php:24 +#: ../../mod/follow.php:25 msgid "Channel added." msgstr "Канал добавлен." +#: ../../mod/editlayout.php:37 ../../mod/editwebpage.php:31 +#: ../../mod/editpost.php:20 ../../mod/editblock.php:37 +msgid "Item not found" +msgstr "Элемент не найден" + +#: ../../mod/editlayout.php:69 ../../mod/editblock.php:69 +msgid "Edit block" +msgstr "" + +#: ../../mod/editlayout.php:105 ../../mod/editwebpage.php:121 +#: ../../mod/editpost.php:98 ../../mod/editblock.php:105 +msgid "Insert YouTube video" +msgstr "Вставить YouTube видео" + +#: ../../mod/editlayout.php:106 ../../mod/editwebpage.php:122 +#: ../../mod/editpost.php:99 ../../mod/editblock.php:106 +msgid "Insert Vorbis [.ogg] video" +msgstr "Вставить Vorbis [.ogg] видео" + +#: ../../mod/editlayout.php:107 ../../mod/editwebpage.php:123 +#: ../../mod/editpost.php:100 ../../mod/editblock.php:107 +msgid "Insert Vorbis [.ogg] audio" +msgstr "Вставить Vorbis [.ogg] музыку" + #: ../../mod/nogroup.php:58 msgid "Contacts who are not members of a group" msgstr "" @@ -5788,26 +6092,10 @@ msgstr "Загрузка изображениея прошла безуспеш msgid "Image size reduction [%s] failed." msgstr "" -#: ../../mod/editwebpage.php:36 ../../mod/editpost.php:18 -msgid "Item not found" -msgstr "Элемент не найден" - -#: ../../mod/editwebpage.php:69 ../../mod/editpost.php:38 +#: ../../mod/editwebpage.php:85 ../../mod/editpost.php:40 msgid "Edit post" msgstr "Редактировать сообщение" -#: ../../mod/editwebpage.php:107 ../../mod/editpost.php:80 -msgid "Insert YouTube video" -msgstr "Вставить YouTube видео" - -#: ../../mod/editwebpage.php:108 ../../mod/editpost.php:81 -msgid "Insert Vorbis [.ogg] video" -msgstr "Вставить Vorbis [.ogg] видео" - -#: ../../mod/editwebpage.php:109 ../../mod/editpost.php:82 -msgid "Insert Vorbis [.ogg] audio" -msgstr "Вставить Vorbis [.ogg] музыку" - #: ../../mod/notifications.php:26 msgid "Invalid request identifier." msgstr "" @@ -5946,7 +6234,7 @@ msgstr "Домашние оповещения" msgid "Post successful." msgstr "Публикация прошла успешно." -#: ../../mod/editpost.php:29 +#: ../../mod/editpost.php:31 msgid "Item is not editable" msgstr "Элемент нельзя редактировать" @@ -6021,7 +6309,7 @@ msgstr "Видно" #: ../../mod/profperm.php:139 msgid "All Contacts (with secure profile access)" -msgstr "Все каналы (с доступом защищенному профилю)" +msgstr "Все контакты (с доступом защищенному профилю)" #: ../../mod/siteinfo.php:51 #, php-format @@ -6076,6 +6364,22 @@ msgstr "" msgid "Ignore/Hide" msgstr "Игнорировать / Скрыть" +#: ../../mod/pubsites.php:22 +msgid "Public Sites" +msgstr "" + +#: ../../mod/pubsites.php:28 +msgid "Site URL" +msgstr "" + +#: ../../mod/pubsites.php:28 +msgid "Access Type" +msgstr "" + +#: ../../mod/pubsites.php:28 +msgid "Registration Policy" +msgstr "" + #: ../../mod/register.php:35 msgid "Maximum daily site registrations exceeded. Please try again tomorrow." msgstr "" @@ -6085,57 +6389,61 @@ msgid "" "Please indicate acceptance of the Terms of Service. Registration failed." msgstr "" -#: ../../mod/register.php:91 +#: ../../mod/register.php:69 +msgid "Passwords do not match." +msgstr "" + +#: ../../mod/register.php:97 msgid "" "Registration successful. Please check your email for validation " "instructions." msgstr "" -#: ../../mod/register.php:97 +#: ../../mod/register.php:103 msgid "Your registration is pending approval by the site owner." msgstr "" -#: ../../mod/register.php:100 +#: ../../mod/register.php:106 msgid "Your registration can not be processed." msgstr "" -#: ../../mod/register.php:135 +#: ../../mod/register.php:141 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." msgstr "" -#: ../../mod/register.php:146 +#: ../../mod/register.php:152 msgid "Terms of Service" msgstr "" -#: ../../mod/register.php:152 +#: ../../mod/register.php:158 #, php-format msgid "I accept the %s for this website" msgstr "" -#: ../../mod/register.php:154 +#: ../../mod/register.php:160 #, php-format msgid "I am over 13 years of age and accept the %s for this website" msgstr "" -#: ../../mod/register.php:169 +#: ../../mod/register.php:175 msgid "Membership on this site is by invitation only." msgstr "" -#: ../../mod/register.php:170 +#: ../../mod/register.php:176 msgid "Please enter your invitation code" msgstr "" -#: ../../mod/register.php:173 +#: ../../mod/register.php:179 msgid "Your email address" msgstr "Ваш адрес электронной почты" -#: ../../mod/register.php:174 +#: ../../mod/register.php:180 msgid "Choose a password" msgstr "Выберите пароль" -#: ../../mod/register.php:175 +#: ../../mod/register.php:181 msgid "Please re-enter your password" msgstr "" @@ -6175,7 +6483,7 @@ msgstr "Настройки темы" #: ../../view/theme/redbasic/php/config.php:157 #: ../../view/theme/redstrap/php/config.php:134 msgid "Set font-size for posts and comments" -msgstr "" +msgstr "Установить размер шрифта для сообщений и комментариев" #: ../../view/theme/redbasic/php/config.php:140 #: ../../view/theme/redbasic/php/config.php:158 @@ -6227,104 +6535,104 @@ msgstr "Угловой радиус" msgid "0-99 default: 5" msgstr "0-99 по умолчанию: 5" -#: ../../boot.php:1196 +#: ../../boot.php:1234 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1199 +#: ../../boot.php:1237 #, php-format msgid "Update Error at %s" msgstr "Ошибка обновления на %s" -#: ../../boot.php:1336 +#: ../../boot.php:1394 msgid "Create a New Account" msgstr "Создать новый аккаунт" -#: ../../boot.php:1365 +#: ../../boot.php:1423 msgid "Password" msgstr "Пароль" -#: ../../boot.php:1366 +#: ../../boot.php:1424 msgid "Remember me" msgstr "Запомнить" -#: ../../boot.php:1371 +#: ../../boot.php:1429 msgid "Forgot your password?" msgstr "Забыли пароль или логин?" -#: ../../boot.php:1490 +#: ../../boot.php:1548 msgid "Requested channel is not available." msgstr "Запрашиваемый канал не доступен." -#: ../../boot.php:1502 +#: ../../boot.php:1560 msgid " Sorry, you don't have the permission to view this profile. " msgstr "" -#: ../../boot.php:1646 +#: ../../boot.php:1707 msgid "Profiles" msgstr "Профили" -#: ../../boot.php:1646 +#: ../../boot.php:1707 msgid "Manage/edit profiles" msgstr "Управление / Редактирование профилей" -#: ../../boot.php:1650 +#: ../../boot.php:1711 msgid "Edit Profile" msgstr "Редактировать профиль" -#: ../../boot.php:1728 ../../boot.php:1808 +#: ../../boot.php:1800 ../../boot.php:1880 msgid "F d" msgstr "F d" -#: ../../boot.php:1785 +#: ../../boot.php:1857 msgid "Birthday Reminders" msgstr "Напоминания о Днях Рождения" -#: ../../boot.php:1786 +#: ../../boot.php:1858 msgid "Birthdays this week:" msgstr "Дни Рождения на этой неделе:" -#: ../../boot.php:1841 +#: ../../boot.php:1913 msgid "[No description]" msgstr "[без описания]" -#: ../../boot.php:1859 +#: ../../boot.php:1931 msgid "Event Reminders" msgstr "Напоминания мероприятий" -#: ../../boot.php:1860 +#: ../../boot.php:1932 msgid "Events this week:" msgstr "Мероприятия на этой неделе:" -#: ../../boot.php:2083 +#: ../../boot.php:2166 msgid "Channel" msgstr "Канал" -#: ../../boot.php:2086 +#: ../../boot.php:2169 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:2090 +#: ../../boot.php:2173 msgid "About" msgstr "О себе" -#: ../../boot.php:2093 +#: ../../boot.php:2176 msgid "Profile Details" msgstr "Сведения о профиле" -#: ../../boot.php:2111 +#: ../../boot.php:2194 msgid "Events and Calendar" msgstr "Мероприятия и календарь" -#: ../../boot.php:2116 +#: ../../boot.php:2199 msgid "Webpages" msgstr "Веб-страницы" -#: ../../boot.php:2119 +#: ../../boot.php:2202 msgid "Manage Webpages" -msgstr "" +msgstr "Управление веб-страниц" -#: ../../boot.php:2346 +#: ../../boot.php:2484 msgid "toggle mobile" msgstr "мобильное подключение" From 83e086edcd4d13b2e8508eb17a24a849c8e3aa06 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 13 Sep 2013 04:51:55 -0700 Subject: [PATCH 153/330] doc update, put more telemetry on notifier and try to ensure that private posts have recipients. --- doc/html/boot_8php.html | 106 ++- doc/html/boot_8php.js | 5 + doc/html/chanman_8php.html | 112 +++ doc/html/datetime_8php.html | 2 +- doc/html/dba__driver_8php.html | 4 +- .../dir_d41ce877eb409a4791b288730010abe2.html | 4 + .../dir_d41ce877eb409a4791b288730010abe2.js | 2 + doc/html/docblox__errorchecker_8php.html | 2 +- doc/html/extract_8php.html | 2 +- doc/html/files.html | 230 ++--- doc/html/filestorage_8php.html | 137 +++ doc/html/filestorage_8php.js | 4 + doc/html/globals_0x66.html | 3 + doc/html/globals_0x68.html | 15 + doc/html/globals_0x69.html | 3 + doc/html/globals_0x75.html | 2 +- doc/html/globals_func_0x66.html | 3 + doc/html/globals_func_0x69.html | 3 + doc/html/globals_func_0x75.html | 2 +- doc/html/globals_vars_0x68.html | 15 + doc/html/identity_8php.html | 2 + doc/html/include_2config_8php.html | 2 +- doc/html/include_2network_8php.html | 2 +- doc/html/item_8php.html | 30 + doc/html/item_8php.js | 1 + doc/html/language_8php.html | 2 +- doc/html/navtree.js | 14 +- doc/html/navtreeindex0.js | 186 ++-- doc/html/navtreeindex1.js | 136 +-- doc/html/navtreeindex2.js | 60 +- doc/html/navtreeindex3.js | 102 +-- doc/html/navtreeindex4.js | 52 +- doc/html/navtreeindex5.js | 266 +++--- doc/html/navtreeindex6.js | 166 ++-- doc/html/navtreeindex7.js | 99 ++- doc/html/plugin_8php.html | 8 +- doc/html/redbasic_2php_2style_8php.html | 4 +- doc/html/search/all_63.js | 1 + doc/html/search/all_66.js | 2 + doc/html/search/all_68.js | 7 +- doc/html/search/all_69.js | 1 + doc/html/search/all_75.js | 2 +- doc/html/search/files_63.js | 1 + doc/html/search/files_66.js | 3 +- doc/html/search/functions_66.js | 1 + doc/html/search/functions_69.js | 1 + doc/html/search/functions_75.js | 2 +- doc/html/search/variables_68.js | 7 +- doc/html/taxonomy_8php.html | 4 +- doc/html/text_8php.html | 8 +- doc/html/typo_8php.html | 2 +- doc/html/zot_8php.html | 18 +- doc/html/zot_8php.js | 2 +- include/items.php | 3 + include/notifier.php | 4 + util/messages.po | 806 ++++++++++-------- version.inc | 2 +- 57 files changed, 1593 insertions(+), 1072 deletions(-) create mode 100644 doc/html/chanman_8php.html create mode 100644 doc/html/filestorage_8php.html create mode 100644 doc/html/filestorage_8php.js diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index 08eb2a98f..d9d754e9b 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -224,7 +224,7 @@ Variables   const ZOT_REVISION 1   -const DB_UPDATE_VERSION 1067 +const DB_UPDATE_VERSION 1069   const EOL '<br />' . "\r\n"   @@ -462,6 +462,16 @@ Variables   const XCHAN_FLAGS_ORPHAN 0x0002   +const HUBLOC_NOTUSED 0x0000 +  +const HUBLOC_SEND_ERROR 0x0001 +  +const HUBLOC_RECEIVE_ERROR 0x0002 +  +const HUBLOC_WORKS 0x0004 +  +const HUBLOC_OFFLINE 0x0008 +  const TERM_UNKNOWN 0   const TERM_HASHTAG 1 @@ -690,7 +700,7 @@ Variables
      -

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

      +

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

      @@ -708,7 +718,7 @@ Variables
      -

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

      +

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

      @@ -930,7 +940,7 @@ Variables
      -

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

      +

      Referenced by FriendicaSmarty\__construct(), FriendicaSmartyEngine\__construct(), abook_toggle_flag(), allowed_public_recips(), api_apply_template(), api_format_items(), api_get_user(), api_statuses_home_timeline(), api_statuses_repeat(), api_user(), argc(), argv(), atom_entry(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), 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_menu(), comanche_replace_region(), comanche_widget(), common_friends_visitor_widget(), connections_content(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), dfrn_deliver(), drop_item(), event_store(), fetch_url(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), follow_widget(), format_event_diaspora(), get_account_id(), get_best_language(), get_birthdays(), get_events(), get_feed_for(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_observer_hash(), get_plink(), get_theme_config_file(), get_theme_screenshot(), gprobe_run(), group_select(), guess_image_type(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), info(), is_site_admin(), item_message_id(), item_photo_menu(), item_redir_and_replace_images(), items_fetch(), load_contact_links(), load_hooks(), login(), FKOAuth1\loginUser(), lrdd(), manage_content(), map_scope(), nav_set_selected(), new_contact(), notice(), notification(), notifier_run(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), onepoll_run(), page_content(), ping_init(), poco_load(), poller_run(), post_activity_item(), post_url(), preg_heart(), prepare_body(), proc_run(), process_delivery(), profile_activity(), profile_sidebar(), public_permissions_sql(), replace_macros(), rmagic_init(), saved_searches(), scale_external_images(), search(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), service_class_allows(), service_class_fetch(), smilies(), tag_deliver(), terminate_friendship(), tgroup_check(), theme_include(), tt(), update_suggestions(), user_allow(), vcard_from_xchan(), what_next(), widget_profile(), z_fetch_url(), and zot_finger().

      @@ -1056,7 +1066,7 @@ Variables
      @@ -1140,7 +1150,7 @@ Variables
    -

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

    +

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

    @@ -1226,7 +1236,7 @@ Variables
    -

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

    +

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

    @@ -1278,7 +1288,7 @@ Variables
    -

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

    +

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

    @@ -1300,7 +1310,7 @@ Variables

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

    $cmd and string args are surrounded with ""

    -

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

    +

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

    @@ -1585,7 +1595,7 @@ Variables
    -

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

    +

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

    @@ -1726,7 +1736,7 @@ Variables @@ -2366,7 +2376,7 @@ Variables
    - +
    const DB_UPDATE_VERSION 1067const DB_UPDATE_VERSION 1069
    @@ -2480,7 +2490,7 @@ Variables
    -

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

    +

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

    @@ -2549,6 +2559,68 @@ Variables

    Referenced by zfinger_init().

    + + + +
    +
    + + + + +
    const HUBLOC_NOTUSED 0x0000
    +
    + +
    +
    + +
    +
    + + + + +
    const HUBLOC_OFFLINE 0x0008
    +
    + +
    +
    + +
    +
    + + + + +
    const HUBLOC_RECEIVE_ERROR 0x0002
    +
    + +

    Referenced by post_init().

    + +
    +
    + +
    +
    + + + + +
    const HUBLOC_SEND_ERROR 0x0001
    +
    + +
    +
    + +
    +
    + + + + +
    const HUBLOC_WORKS 0x0004
    +
    +
    @@ -2875,7 +2947,7 @@ Variables @@ -2947,7 +3019,7 @@ Variables @@ -3810,7 +3882,7 @@ Variables @@ -4302,7 +4374,7 @@ Variables diff --git a/doc/html/boot_8php.js b/doc/html/boot_8php.js index 2730739d6..950cd4ea7 100644 --- a/doc/html/boot_8php.js +++ b/doc/html/boot_8php.js @@ -115,6 +115,11 @@ var boot_8php = [ "GRAVITY_PARENT", "boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3", null ], [ "HUBLOC_FLAGS_PRIMARY", "boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955", null ], [ "HUBLOC_FLAGS_UNVERIFIED", "boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764", null ], + [ "HUBLOC_NOTUSED", "boot_8php.html#aa589421267f0c2f0d643f727792cce35", null ], + [ "HUBLOC_OFFLINE", "boot_8php.html#a845891f82bf6edd7fa2d578b66703112", null ], + [ "HUBLOC_RECEIVE_ERROR", "boot_8php.html#abeb4d86e17cefa8584f1244e2183b0e1", null ], + [ "HUBLOC_SEND_ERROR", "boot_8php.html#a3b56bfc6a0dd159070e316ddac3b7456", null ], + [ "HUBLOC_WORKS", "boot_8php.html#a7a8ba64d089cc0412c59a2eefc6d655c", null ], [ "ITEM_BLOCKED", "boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f", null ], [ "ITEM_BUILDBLOCK", "boot_8php.html#a7fc4b291a7cdaa48b38e27344ea183cf", null ], [ "ITEM_DELAYED_PUBLISH", "boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20", null ], diff --git a/doc/html/chanman_8php.html b/doc/html/chanman_8php.html new file mode 100644 index 000000000..4d829d819 --- /dev/null +++ b/doc/html/chanman_8php.html @@ -0,0 +1,112 @@ + + + + + + +The Red Matrix: mod/chanman.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    +
    +
    chanman.php File Reference
    +
    +
    +
    +
    + diff --git a/doc/html/datetime_8php.html b/doc/html/datetime_8php.html index bb2ebb4ec..b3fc3d84f 100644 --- a/doc/html/datetime_8php.html +++ b/doc/html/datetime_8php.html @@ -332,7 +332,7 @@ Functions
    -

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

    +

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

    diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html index 1dd06e1a4..0cf704be4 100644 --- a/doc/html/dba__driver_8php.html +++ b/doc/html/dba__driver_8php.html @@ -202,7 +202,7 @@ Functions
    -

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

    +

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

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

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

    -

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

    +

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

    diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html index 60a238cee..21dfadab0 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html @@ -120,6 +120,8 @@ Files   file  blocks.php   +file  chanman.php +  file  channel.php   file  chanview.php @@ -164,6 +166,8 @@ Files   file  filerm.php   +file  filestorage.php +  file  follow.php   file  fsuggest.php diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js index a5c045f90..53154e4b6 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js @@ -8,6 +8,7 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "apps.php", "apps_8php.html", "apps_8php" ], [ "attach.php", "mod_2attach_8php.html", "mod_2attach_8php" ], [ "blocks.php", "blocks_8php.html", "blocks_8php" ], + [ "chanman.php", "chanman_8php.html", null ], [ "channel.php", "channel_8php.html", "channel_8php" ], [ "chanview.php", "chanview_8php.html", "chanview_8php" ], [ "common.php", "common_8php.html", "common_8php" ], @@ -30,6 +31,7 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "feed.php", "feed_8php.html", "feed_8php" ], [ "filer.php", "filer_8php.html", "filer_8php" ], [ "filerm.php", "filerm_8php.html", "filerm_8php" ], + [ "filestorage.php", "filestorage_8php.html", "filestorage_8php" ], [ "follow.php", "mod_2follow_8php.html", "mod_2follow_8php" ], [ "fsuggest.php", "fsuggest_8php.html", "fsuggest_8php" ], [ "group.php", "mod_2group_8php.html", "mod_2group_8php" ], diff --git a/doc/html/docblox__errorchecker_8php.html b/doc/html/docblox__errorchecker_8php.html index 0e1bff362..f39c5a5e9 100644 --- a/doc/html/docblox__errorchecker_8php.html +++ b/doc/html/docblox__errorchecker_8php.html @@ -279,7 +279,7 @@ Variables diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html index 8c8acbf0c..c4a4c3565 100644 --- a/doc/html/extract_8php.html +++ b/doc/html/extract_8php.html @@ -146,7 +146,7 @@ Variables diff --git a/doc/html/files.html b/doc/html/files.html index 703404553..deb426527 100644 --- a/doc/html/files.html +++ b/doc/html/files.html @@ -194,120 +194,122 @@ $(document).ready(function(){initNavTree('files.html','');}); |o*apps.php |o*attach.php |o*blocks.php -|o*channel.php -|o*chanview.php -|o*common.php -|o*community.php -|o*connect.php -|o*connections.php -|o*contactgroup.php -|o*crepair.php -|o*delegate.php -|o*directory.php -|o*dirfind.php -|o*dirsearch.php -|o*display.php -|o*editblock.php -|o*editlayout.php -|o*editpost.php -|o*editwebpage.php -|o*events.php -|o*fbrowser.php -|o*feed.php -|o*filer.php -|o*filerm.php -|o*follow.php -|o*fsuggest.php -|o*group.php -|o*hcard.php -|o*help.php -|o*home.php -|o*hostxrd.php -|o*import.php -|o*intro.php -|o*invite.php -|o*item.php -|o*lastpost.php -|o*layouts.php -|o*like.php -|o*lockview.php -|o*login.php -|o*lostpass.php -|o*magic.php -|o*manage.php -|o*match.php -|o*menu.php -|o*message.php -|o*mitem.php -|o*mood.php -|o*msearch.php -|o*network.php -|o*new_channel.php -|o*nogroup.php -|o*notifications.php -|o*notify.php -|o*oembed.php -|o*oexchange.php -|o*opensearch.php -|o*page.php -|o*parse_url.php -|o*photo.php -|o*photos.php -|o*php.php -|o*ping.php -|o*poco.php -|o*poke.php -|o*post.php -|o*pretheme.php -|o*probe.php -|o*profile.php -|o*profile_photo.php -|o*profiles.php -|o*profperm.php -|o*pubsites.php -|o*qsearch.php -|o*randprof.php -|o*redir.php -|o*register.php -|o*regmod.php -|o*removeme.php -|o*rmagic.php -|o*rsd_xml.php -|o*search.php -|o*search_ac.php -|o*settings.php -|o*setup.php -|o*share.php -|o*siteinfo.php -|o*sitelist.php -|o*smilies.php -|o*starred.php -|o*subthread.php -|o*suggest.php -|o*tagger.php -|o*tagrm.php -|o*thing.php -|o*toggle_mobile.php -|o*uexport.php -|o*update_channel.php -|o*update_community.php -|o*update_display.php -|o*update_network.php -|o*update_search.php -|o*view.php -|o*viewconnections.php -|o*viewsrc.php -|o*vote.php -|o*wall_attach.php -|o*wall_upload.php -|o*webfinger.php -|o*webpages.php -|o*wfinger.php -|o*xchan.php -|o*xrd.php -|o*zfinger.php -|o*zotfeed.php -|\*zping.php +|o*chanman.php +|o*channel.php +|o*chanview.php +|o*common.php +|o*community.php +|o*connect.php +|o*connections.php +|o*contactgroup.php +|o*crepair.php +|o*delegate.php +|o*directory.php +|o*dirfind.php +|o*dirsearch.php +|o*display.php +|o*editblock.php +|o*editlayout.php +|o*editpost.php +|o*editwebpage.php +|o*events.php +|o*fbrowser.php +|o*feed.php +|o*filer.php +|o*filerm.php +|o*filestorage.php +|o*follow.php +|o*fsuggest.php +|o*group.php +|o*hcard.php +|o*help.php +|o*home.php +|o*hostxrd.php +|o*import.php +|o*intro.php +|o*invite.php +|o*item.php +|o*lastpost.php +|o*layouts.php +|o*like.php +|o*lockview.php +|o*login.php +|o*lostpass.php +|o*magic.php +|o*manage.php +|o*match.php +|o*menu.php +|o*message.php +|o*mitem.php +|o*mood.php +|o*msearch.php +|o*network.php +|o*new_channel.php +|o*nogroup.php +|o*notifications.php +|o*notify.php +|o*oembed.php +|o*oexchange.php +|o*opensearch.php +|o*page.php +|o*parse_url.php +|o*photo.php +|o*photos.php +|o*php.php +|o*ping.php +|o*poco.php +|o*poke.php +|o*post.php +|o*pretheme.php +|o*probe.php +|o*profile.php +|o*profile_photo.php +|o*profiles.php +|o*profperm.php +|o*pubsites.php +|o*qsearch.php +|o*randprof.php +|o*redir.php +|o*register.php +|o*regmod.php +|o*removeme.php +|o*rmagic.php +|o*rsd_xml.php +|o*search.php +|o*search_ac.php +|o*settings.php +|o*setup.php +|o*share.php +|o*siteinfo.php +|o*sitelist.php +|o*smilies.php +|o*starred.php +|o*subthread.php +|o*suggest.php +|o*tagger.php +|o*tagrm.php +|o*thing.php +|o*toggle_mobile.php +|o*uexport.php +|o*update_channel.php +|o*update_community.php +|o*update_display.php +|o*update_network.php +|o*update_search.php +|o*view.php +|o*viewconnections.php +|o*viewsrc.php +|o*vote.php +|o*wall_attach.php +|o*wall_upload.php +|o*webfinger.php +|o*webpages.php +|o*wfinger.php +|o*xchan.php +|o*xrd.php +|o*zfinger.php +|o*zotfeed.php +|\*zping.php o+util |o+fpostit ||\*fpostit.php diff --git a/doc/html/filestorage_8php.html b/doc/html/filestorage_8php.html new file mode 100644 index 000000000..9b886f8bc --- /dev/null +++ b/doc/html/filestorage_8php.html @@ -0,0 +1,137 @@ + + + + + + +The Red Matrix: mod/filestorage.php File Reference + + + + + + + + + + + + + +
    +
    + + + + + + + +
    +
    The Red Matrix +
    +
    +
    + + + + + +
    +
    + +
    +
    +
    + +
    + + + + +
    + +
    + +
    + +
    +
    filestorage.php File Reference
    +
    +
    + + + + +

    +Functions

     filestorage_content (&$a)
     
    +

    Function Documentation

    + +
    +
    + + + + + + + + +
    filestorage_content ($a)
    +
    + +
    +
    +
    +
    + diff --git a/doc/html/filestorage_8php.js b/doc/html/filestorage_8php.js new file mode 100644 index 000000000..347b67626 --- /dev/null +++ b/doc/html/filestorage_8php.js @@ -0,0 +1,4 @@ +var filestorage_8php = +[ + [ "filestorage_content", "filestorage_8php.html#a61bb1be78472555df4ce619f51014040", null ] +]; \ No newline at end of file diff --git a/doc/html/globals_0x66.html b/doc/html/globals_0x66.html index aa8c48510..87118be5c 100644 --- a/doc/html/globals_0x66.html +++ b/doc/html/globals_0x66.html @@ -192,6 +192,9 @@ $(document).ready(function(){initNavTree('globals_0x66.html','');});
  • filerm_content() : filerm.php
  • +
  • filestorage_content() +: filestorage.php +
  • find_thread_parent_index() : conversation.php
  • diff --git a/doc/html/globals_0x68.html b/doc/html/globals_0x68.html index e90a90e3b..987b252fc 100644 --- a/doc/html/globals_0x68.html +++ b/doc/html/globals_0x68.html @@ -198,6 +198,21 @@ $(document).ready(function(){initNavTree('globals_0x68.html','');});
  • HUBLOC_FLAGS_UNVERIFIED : boot.php
  • +
  • HUBLOC_NOTUSED +: boot.php +
  • +
  • HUBLOC_OFFLINE +: boot.php +
  • +
  • HUBLOC_RECEIVE_ERROR +: boot.php +
  • +
  • HUBLOC_SEND_ERROR +: boot.php +
  • +
  • HUBLOC_WORKS +: boot.php +
  • diff --git a/doc/html/globals_0x69.html b/doc/html/globals_0x69.html index 19b1d830d..85714b02b 100644 --- a/doc/html/globals_0x69.html +++ b/doc/html/globals_0x69.html @@ -227,6 +227,9 @@ $(document).ready(function(){initNavTree('globals_0x69.html','');});
  • ITEM_BUILDBLOCK : boot.php
  • +
  • item_check_service_class() +: item.php +
  • item_content() : item.php
  • diff --git a/doc/html/globals_0x75.html b/doc/html/globals_0x75.html index 72c3b2372..ff65b2afd 100644 --- a/doc/html/globals_0x75.html +++ b/doc/html/globals_0x75.html @@ -184,7 +184,7 @@ $(document).ready(function(){initNavTree('globals_0x75.html','');}); : zot.php
  • update_modtime() -: zot.php +: zot.php
  • update_network_content() : update_network.php diff --git a/doc/html/globals_func_0x66.html b/doc/html/globals_func_0x66.html index 3295b9919..9d3d0d3a0 100644 --- a/doc/html/globals_func_0x66.html +++ b/doc/html/globals_func_0x66.html @@ -191,6 +191,9 @@ $(document).ready(function(){initNavTree('globals_func_0x66.html','');});
  • filerm_content() : filerm.php
  • +
  • filestorage_content() +: filestorage.php +
  • find_thread_parent_index() : conversation.php
  • diff --git a/doc/html/globals_func_0x69.html b/doc/html/globals_func_0x69.html index 4209bd444..1733078c3 100644 --- a/doc/html/globals_func_0x69.html +++ b/doc/html/globals_func_0x69.html @@ -212,6 +212,9 @@ $(document).ready(function(){initNavTree('globals_func_0x69.html','');});
  • is_site_admin() : boot.php
  • +
  • item_check_service_class() +: item.php +
  • item_content() : item.php
  • diff --git a/doc/html/globals_func_0x75.html b/doc/html/globals_func_0x75.html index 12d70ec9b..9b5bc1607 100644 --- a/doc/html/globals_func_0x75.html +++ b/doc/html/globals_func_0x75.html @@ -180,7 +180,7 @@ $(document).ready(function(){initNavTree('globals_func_0x75.html','');}); : zot.php
  • update_modtime() -: zot.php +: zot.php
  • update_network_content() : update_network.php diff --git a/doc/html/globals_vars_0x68.html b/doc/html/globals_vars_0x68.html index 8551c60de..223c815d5 100644 --- a/doc/html/globals_vars_0x68.html +++ b/doc/html/globals_vars_0x68.html @@ -145,6 +145,21 @@ $(document).ready(function(){initNavTree('globals_vars_0x68.html','');});
  • HUBLOC_FLAGS_UNVERIFIED : boot.php
  • +
  • HUBLOC_NOTUSED +: boot.php +
  • +
  • HUBLOC_OFFLINE +: boot.php +
  • +
  • HUBLOC_RECEIVE_ERROR +: boot.php +
  • +
  • HUBLOC_SEND_ERROR +: boot.php +
  • +
  • HUBLOC_WORKS +: boot.php +
  • diff --git a/doc/html/identity_8php.html b/doc/html/identity_8php.html index db7870dea..891e0aa4e 100644 --- a/doc/html/identity_8php.html +++ b/doc/html/identity_8php.html @@ -238,6 +238,8 @@ Functions
    +

    Referenced by create_identity().

    +
    diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html index 207e268e9..f18561a81 100644 --- a/doc/html/include_2config_8php.html +++ b/doc/html/include_2config_8php.html @@ -256,7 +256,7 @@ Functions
    -

    Referenced by admin_page_dbsync(), admin_page_logs(), admin_page_site(), admin_page_summary(), admin_page_themes(), allowed_email(), allowed_url(), api_statuses_mentions(), api_statusnet_config(), attach_store(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), community_content(), create_account(), create_identity(), detect_language(), dfrn_deliver(), directory_content(), directory_run(), dirfind_content(), dirsearch_content(), display_content(), dlogger(), dob(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), events_content(), expire_run(), feed_init(), fetch_url(), fetch_xrd_links(), findpeople_widget(), Item\get_comment_box(), get_item_elements(), get_mail_elements(), group_content(), hcard_init(), hostxrd_init(), photo_gd\imageString(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), item_store(), lastpost_content(), photo_imagick\load(), logger(), login(), lostpass_content(), lostpass_post(), match_content(), nav(), navbar_complete(), FKOAuthDataStore\new_access_token(), new_channel_post(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), parse_url_content(), photo_upload(), photos_content(), photos_init(), poco_init(), poller_run(), post_post(), post_url(), prepare_body(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), proc_run(), profile_content(), profile_create_sidebar(), profile_photo_post(), profiles_content(), profperm_content(), pubsites_content(), qsearch_init(), register_content(), register_post(), reload_plugins(), 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(), update_suggestions(), upgrade_link(), user_allow(), valid_email(), validate_email(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), webpages_content(), widget_profile(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_import(), and zotfeed_init().

    +

    Referenced by admin_page_dbsync(), admin_page_logs(), admin_page_site(), admin_page_summary(), admin_page_themes(), allowed_email(), allowed_url(), api_statuses_mentions(), api_statusnet_config(), attach_store(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), community_content(), create_account(), create_identity(), detect_language(), dfrn_deliver(), directory_content(), directory_run(), dirfind_content(), dirsearch_content(), display_content(), dlogger(), dob(), editblock_content(), editpost_content(), editwebpage_content(), encode_item(), encode_mail(), events_content(), expire_run(), feed_init(), fetch_url(), fetch_xrd_links(), findpeople_widget(), Item\get_comment_box(), get_item_elements(), get_mail_elements(), group_content(), hcard_init(), hostxrd_init(), photo_gd\imageString(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), item_store(), lastpost_content(), photo_imagick\load(), logger(), login(), lostpass_content(), lostpass_post(), match_content(), nav(), navbar_complete(), FKOAuthDataStore\new_access_token(), new_channel_post(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), parse_url_content(), photo_upload(), photos_content(), photos_init(), poco_init(), poller_run(), post_post(), post_url(), prepare_body(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), proc_run(), profile_content(), profile_create_sidebar(), profile_photo_post(), profiles_content(), profperm_content(), pubsites_content(), qsearch_init(), register_content(), register_post(), reload_plugins(), 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(), update_suggestions(), upgrade_link(), user_allow(), valid_email(), validate_email(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), webpages_content(), widget_profile(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_import(), and zotfeed_init().

    diff --git a/doc/html/include_2network_8php.html b/doc/html/include_2network_8php.html index 1029f90a0..cec2045db 100644 --- a/doc/html/include_2network_8php.html +++ b/doc/html/include_2network_8php.html @@ -296,7 +296,7 @@ Functions diff --git a/doc/html/item_8php.html b/doc/html/item_8php.html index 5ace8bb7b..48f42f777 100644 --- a/doc/html/item_8php.html +++ b/doc/html/item_8php.html @@ -122,6 +122,8 @@ Functions    fix_attached_file_permissions ($channel, $observer_hash, $body, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny)   + item_check_service_class ($channel_id, $iswebpage) + 

    Function Documentation

    @@ -302,6 +304,34 @@ Functions

    Referenced by item_post().

    + + + +
    +
    + + + + + + + + + + + + + + + + + + +
    item_check_service_class ( $channel_id,
     $iswebpage 
    )
    +
    + +

    Referenced by item_post().

    +
    diff --git a/doc/html/item_8php.js b/doc/html/item_8php.js index 39c3eba5f..07e890b13 100644 --- a/doc/html/item_8php.js +++ b/doc/html/item_8php.js @@ -3,6 +3,7 @@ var item_8php = [ "fix_attached_file_permissions", "item_8php.html#a3daae7944f737bd30412a0d042207c0f", null ], [ "fix_attached_photo_permissions", "item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10", null ], [ "handle_tag", "item_8php.html#abd0e603a6696051af16476eb968d52e7", null ], + [ "item_check_service_class", "item_8php.html#a5b1b36cb301a94b38150074f0d424e74", null ], [ "item_content", "item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221", null ], [ "item_post", "item_8php.html#a693cd09805755ab85bbb5ecae69a48c3", null ] ]; \ No newline at end of file diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html index a9f2ba05b..3f6609dc4 100644 --- a/doc/html/language_8php.html +++ b/doc/html/language_8php.html @@ -280,7 +280,7 @@ Functions
    -

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

    +

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

    diff --git a/doc/html/navtree.js b/doc/html/navtree.js index 0a845a8c2..899b30aed 100644 --- a/doc/html/navtree.js +++ b/doc/html/navtree.js @@ -36,13 +36,13 @@ var NAVTREE = var NAVTREEINDEX = [ "BaseObject_8php.html", -"boot_8php.html#a9eeb8989272d5ff804a616898bb13659", -"classItem.html#a248f45871ecfe82a08d1d4c0769b2eb2", -"datetime_8php.html#abc1652f96799cec6fce8797ba2ebc2df", -"identity_8php.html#a78151baf4407a8482d2681a91a9c486b", -"layouts_8php.html", -"redbasic_2php_2style_8php.html#adcfa918e05b5a98cbddc84bc3f1c15cc", -"typohelper_8php.html#ab6fd357fb5b2a3ba8aab9e8b98c6a805" +"boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e", +"classItem.html", +"datetime_8php.html#a5f29553799005b1fd4e9ce9d98ce05aa", +"html2plain_8php.html#a56d29b254333d29abb9d96a9a903a4b0", +"language_8php.html#a980dee1d8715a98ab02e36b59facf8ed", +"redbasic_2php_2style_8php.html#a45e6fafa363bc4586fa91dce1786be4f", +"tpldebug_8php.html#afbc7aadb3f7ff1edf0aaaa326a42179c" ]; var SYNCONMSG = 'click to disable panel synchronisation'; diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js index e5e6ff123..e8bddf345 100644 --- a/doc/html/navtreeindex0.js +++ b/doc/html/navtreeindex0.js @@ -90,164 +90,164 @@ var NAVTREEINDEX0 = "blocks_8php.html":[5,0,1,7], "blocks_8php.html#a2531a8fd51db3cecb2eb20c002c66e12":[5,0,1,7,0], "boot_8php.html":[5,0,4], -"boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[5,0,4,133], +"boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[5,0,4,138], "boot_8php.html#a01353c9abebc3544ea080ac161729632":[5,0,4,43], -"boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[5,0,4,146], -"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[5,0,4,238], +"boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[5,0,4,151], +"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[5,0,4,243], "boot_8php.html#a032bbd6d0321e99e9117332c9ed2b1b8":[5,0,4,61], -"boot_8php.html#a03d19251c245587de7ed959300b87bdf":[5,0,4,162], +"boot_8php.html#a03d19251c245587de7ed959300b87bdf":[5,0,4,167], "boot_8php.html#a0450389f24c632906fbc24347700a543":[5,0,4,54], "boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b":[5,0,4,109], "boot_8php.html#a081307d681d7d04f17b9ced2076e7c85":[5,0,4,1], -"boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[5,0,4,200], +"boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[5,0,4,205], "boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[5,0,4,74], -"boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[5,0,4,166], -"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[5,0,4,254], -"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[5,0,4,250], -"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[5,0,4,253], +"boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[5,0,4,171], +"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[5,0,4,259], +"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[5,0,4,255], +"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[5,0,4,258], "boot_8php.html#a0e4701c9742c3ef88f02ac450a042a84":[5,0,4,26], "boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[5,0,4,66], "boot_8php.html#a0e6db7e365f2b041a828b93786f694bc":[5,0,4,15], "boot_8php.html#a0fb63e51c2a9814941842ae8f2f4dff8":[5,0,4,84], "boot_8php.html#a12c781cefc20167231e2e3fd5866b1b5":[5,0,4,88], "boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd":[5,0,4,85], -"boot_8php.html#a14d44d4a00223dc3db4ea962325db192":[5,0,4,192], +"boot_8php.html#a14d44d4a00223dc3db4ea962325db192":[5,0,4,197], "boot_8php.html#a176664e78dcb9132e16be69418223eb2":[5,0,4,69], -"boot_8php.html#a17b4ea23d9ecf628d9c8f53b7abcb805":[5,0,4,145], -"boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[5,0,4,141], -"boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[5,0,4,165], -"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[5,0,4,257], -"boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc":[5,0,4,232], -"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[5,0,4,258], -"boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[5,0,4,169], +"boot_8php.html#a17b4ea23d9ecf628d9c8f53b7abcb805":[5,0,4,150], +"boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[5,0,4,146], +"boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[5,0,4,170], +"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[5,0,4,262], +"boot_8php.html#a1ba00027b718db732f30fc0e2c3e0abc":[5,0,4,237], +"boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f":[5,0,4,263], +"boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[5,0,4,174], "boot_8php.html#a1da180f961f49a11573cac4ff6c62c05":[5,0,4,83], -"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[5,0,4,211], +"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[5,0,4,216], "boot_8php.html#a1dfcb5146e9d1eca4528bc580ad5d273":[5,0,4,39], "boot_8php.html#a1f5906598e90b5ea2b4245f682be4348":[5,0,4,111], -"boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[5,0,4,152], -"boot_8php.html#a20f0eed431d25870b624b8937a07a59f":[5,0,4,185], -"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[5,0,4,234], +"boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[5,0,4,157], +"boot_8php.html#a20f0eed431d25870b624b8937a07a59f":[5,0,4,190], +"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[5,0,4,239], "boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5":[5,0,4,49], "boot_8php.html#a24a7a70afedd5d85fe0eadc85afa9f77":[5,0,4,25], "boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8":[5,0,4,107], "boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f":[5,0,4,99], -"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[5,0,4,243], -"boot_8php.html#a285732e7889fa7f333cbe431111e1029":[5,0,4,188], +"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[5,0,4,248], +"boot_8php.html#a285732e7889fa7f333cbe431111e1029":[5,0,4,193], "boot_8php.html#a29528a2544373cc19a378f350040c6a1":[5,0,4,90], -"boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[5,0,4,128], -"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[5,0,4,209], +"boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[5,0,4,133], +"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[5,0,4,214], "boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3":[5,0,4,112], -"boot_8php.html#a2b525996e4426bdddbcec277778bde08":[5,0,4,230], -"boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[5,0,4,184], -"boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d":[5,0,4,125], +"boot_8php.html#a2b525996e4426bdddbcec277778bde08":[5,0,4,235], +"boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[5,0,4,189], +"boot_8php.html#a2c8906f1af94a3559a5b4661067bb79d":[5,0,4,130], "boot_8php.html#a2e90096fede6acce16abf0da8cb2febe":[5,0,4,75], "boot_8php.html#a2f8f25b13480c37a5f22511f53da8bab":[5,0,4,80], -"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[5,0,4,216], -"boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[5,0,4,139], +"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[5,0,4,221], +"boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[5,0,4,144], "boot_8php.html#a34c756469ebed32e2fc987bcde62d382":[5,0,4,51], -"boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[5,0,4,118], -"boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[5,0,4,154], -"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[5,0,4,260], -"boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[5,0,4,173], +"boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[5,0,4,123], +"boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[5,0,4,159], +"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[5,0,4,265], +"boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[5,0,4,178], "boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[5,0,4,113], -"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[5,0,4,259], -"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[5,0,4,207], +"boot_8php.html#a3b56bfc6a0dd159070e316ddac3b7456":[5,0,4,118], +"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[5,0,4,264], +"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[5,0,4,212], "boot_8php.html#a3e0930933fb2c0bf8211cc7ab4e1c3b4":[5,0,4,12], "boot_8php.html#a3e2ea123d29a72012db1241f96280b0e":[5,0,4,67], "boot_8php.html#a3f40aa5bafff8c4eebdc62e5121daf77":[5,0,4,97], "boot_8php.html#a400519fa181591cd6fdbb8f25fbcba0a":[5,0,4,59], -"boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb":[5,0,4,129], -"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[5,0,4,203], +"boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb":[5,0,4,134], +"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[5,0,4,208], "boot_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc":[5,0,4,38], -"boot_8php.html#a43296b1b4398aacbf92a4b2d56bab91e":[5,0,4,183], +"boot_8php.html#a43296b1b4398aacbf92a4b2d56bab91e":[5,0,4,188], "boot_8php.html#a43c6c7d84d880e9500bd4f8f8ecc5731":[5,0,4,96], -"boot_8php.html#a444ce608ce34efb82ee11852f36e825f":[5,0,4,159], -"boot_8php.html#a44ae1542a805ffd7f826fb511db07374":[5,0,4,149], +"boot_8php.html#a444ce608ce34efb82ee11852f36e825f":[5,0,4,164], +"boot_8php.html#a44ae1542a805ffd7f826fb511db07374":[5,0,4,154], "boot_8php.html#a44d069c8a1cfcc6d2007c506a17ff28f":[5,0,4,78], -"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[5,0,4,251], +"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[5,0,4,256], "boot_8php.html#a4751b522ea913d0e7ed43e03d22e9e68":[5,0,4,37], "boot_8php.html#a490972c02fdb638c52ec0e012a30bfd2":[5,0,4,20], -"boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[5,0,4,171], +"boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[5,0,4,176], "boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[5,0,4,110], -"boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4":[5,0,4,224], -"boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[5,0,4,170], +"boot_8php.html#a4a49b29838ef2c45ab3556b52baec6a4":[5,0,4,229], +"boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[5,0,4,175], "boot_8php.html#a4c02d88e66852a01bd5a1feecb7c3ce3":[5,0,4,6], -"boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[5,0,4,202], -"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[5,0,4,220], -"boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[5,0,4,195], -"boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[5,0,4,153], +"boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[5,0,4,207], +"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[5,0,4,225], +"boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[5,0,4,200], +"boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[5,0,4,158], "boot_8php.html#a52b599cd13e152ebc80d7e4413683195":[5,0,4,50], "boot_8php.html#a53e4bdb6f225da55115acb9277f75e53":[5,0,4,89], "boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209":[5,0,4,40], -"boot_8php.html#a56fd673eaa7014150297ce1162502db5":[5,0,4,187], -"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[5,0,4,219], +"boot_8php.html#a56fd673eaa7014150297ce1162502db5":[5,0,4,192], +"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[5,0,4,224], "boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1":[5,0,4,24], "boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[5,0,4,68], -"boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[5,0,4,177], +"boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[5,0,4,182], "boot_8php.html#a5b815330f3d177ab383af37a6c12e532":[5,0,4,47], -"boot_8php.html#a5b8484922918946d041e5e0515dbe718":[5,0,4,198], +"boot_8php.html#a5b8484922918946d041e5e0515dbe718":[5,0,4,203], "boot_8php.html#a5c3747e0f505f0d5271dc4c54e3feaf4":[5,0,4,86], -"boot_8php.html#a5df5359090d1f8e898c36d7cf8878ad2":[5,0,4,157], -"boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640":[5,0,4,199], +"boot_8php.html#a5df5359090d1f8e898c36d7cf8878ad2":[5,0,4,162], +"boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640":[5,0,4,204], "boot_8php.html#a623e49c79943f3e7bdb770d021683cf7":[5,0,4,22], "boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5":[5,0,4,82], -"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[5,0,4,247], -"boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[5,0,4,163], -"boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[5,0,4,137], +"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[5,0,4,252], +"boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[5,0,4,168], +"boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[5,0,4,142], "boot_8php.html#a680fbafc2db023c5b1309e0180e81315":[5,0,4,48], -"boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11":[5,0,4,140], +"boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11":[5,0,4,145], "boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155":[5,0,4,53], -"boot_8php.html#a6969947145a139ec374ce098224d8e81":[5,0,4,143], -"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[5,0,4,236], -"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[5,0,4,223], -"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[5,0,4,217], +"boot_8php.html#a6969947145a139ec374ce098224d8e81":[5,0,4,148], +"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[5,0,4,241], +"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[5,0,4,228], +"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[5,0,4,222], "boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd":[5,0,4,108], "boot_8php.html#a6c5e9e293c8242dcb9bc2c3ea2fee2c9":[5,0,4,100], -"boot_8php.html#a6df1102664f64b274810db85197c2755":[5,0,4,205], -"boot_8php.html#a6e57d913634d033b4d5ad72d99fd3e9d":[5,0,4,127], -"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[5,0,4,235], +"boot_8php.html#a6df1102664f64b274810db85197c2755":[5,0,4,210], +"boot_8php.html#a6e57d913634d033b4d5ad72d99fd3e9d":[5,0,4,132], +"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[5,0,4,240], "boot_8php.html#a719c7f3972d5f9268f37a41c76cd4ef6":[5,0,4,31], -"boot_8php.html#a7236b2cdcf59f02a42302e893a99013b":[5,0,4,178], -"boot_8php.html#a749144d8dd9c1366596a0213c277d050":[5,0,4,131], +"boot_8php.html#a7236b2cdcf59f02a42302e893a99013b":[5,0,4,183], +"boot_8php.html#a749144d8dd9c1366596a0213c277d050":[5,0,4,136], "boot_8php.html#a74bf27f7564c9a37975e7b37d973dcab":[5,0,4,79], "boot_8php.html#a75a90b0eadd0df510f7e63210733634d":[5,0,4,2], -"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[5,0,4,255], +"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[5,0,4,260], "boot_8php.html#a768f00b7d66be0daf7ef4eea2e862006":[5,0,4,4], "boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966":[5,0,4,81], "boot_8php.html#a781916f83fcc8ff1035649afa45f0292":[5,0,4,94], -"boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383":[5,0,4,226], +"boot_8php.html#a78849a1bf8ce8d9804b4cbb502e8f383":[5,0,4,231], +"boot_8php.html#a7a8ba64d089cc0412c59a2eefc6d655c":[5,0,4,119], "boot_8php.html#a7aa57438db03834aaa0b468bdce773a6":[5,0,4,72], -"boot_8php.html#a7af107fab8d62b9a73801713b774ed30":[5,0,4,130], -"boot_8php.html#a7b8f8ad9dbe82711257d23891ef6b133":[5,0,4,158], +"boot_8php.html#a7af107fab8d62b9a73801713b774ed30":[5,0,4,135], +"boot_8php.html#a7b8f8ad9dbe82711257d23891ef6b133":[5,0,4,163], "boot_8php.html#a7bff2278e68a71e524afd1c7c951e1e3":[5,0,4,76], -"boot_8php.html#a7ed4581ab66ebcde97f6b3730856b028":[5,0,4,160], +"boot_8php.html#a7ed4581ab66ebcde97f6b3730856b028":[5,0,4,165], "boot_8php.html#a7f3474fec541e261fc8dff47313c4017":[5,0,4,57], "boot_8php.html#a7f4264232dbb6c3b41f2617deecb1866":[5,0,4,91], -"boot_8php.html#a7fc4b291a7cdaa48b38e27344ea183cf":[5,0,4,116], -"boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed":[5,0,4,196], +"boot_8php.html#a7fc4b291a7cdaa48b38e27344ea183cf":[5,0,4,121], +"boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed":[5,0,4,201], "boot_8php.html#a84057c5bfa1bca5fba8497fe005ee4d8":[5,0,4,60], +"boot_8php.html#a845891f82bf6edd7fa2d578b66703112":[5,0,4,116], "boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688":[5,0,4,64], -"boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[5,0,4,123], -"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[5,0,4,246], -"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[5,0,4,245], -"boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[5,0,4,176], +"boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[5,0,4,128], +"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[5,0,4,251], +"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[5,0,4,250], +"boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[5,0,4,181], "boot_8php.html#a899d24fd074594ceebbf72e1feff335f":[5,0,4,17], "boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[5,0,4,105], -"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[5,0,4,221], -"boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[5,0,4,126], -"boot_8php.html#a8da836617174eed9fc2ac8054125354b":[5,0,4,120], -"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[5,0,4,228], +"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[5,0,4,226], +"boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[5,0,4,131], +"boot_8php.html#a8da836617174eed9fc2ac8054125354b":[5,0,4,125], +"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[5,0,4,233], "boot_8php.html#a9255af5ae9c887520091ea04763c1a88":[5,0,4,34], "boot_8php.html#a926cad0b3d8b9d9ee5da1898fc063ba3":[5,0,4,11], -"boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[5,0,4,144], -"boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[5,0,4,124], -"boot_8php.html#a949116d9a295b214293006c060ca4848":[5,0,4,122], -"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[5,0,4,233], +"boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[5,0,4,149], +"boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[5,0,4,129], +"boot_8php.html#a949116d9a295b214293006c060ca4848":[5,0,4,127], +"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[5,0,4,238], "boot_8php.html#a97769915c9f14adc4f8ab1ea2cecfd90":[5,0,4,19], -"boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[5,0,4,190], -"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[5,0,4,222], -"boot_8php.html#a9c80420e5a063a4a87ce4831f086134d":[5,0,4,56], -"boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e":[5,0,4,5], -"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[5,0,4,214], -"boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[5,0,4,191] +"boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[5,0,4,195], +"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[5,0,4,227], +"boot_8php.html#a9c80420e5a063a4a87ce4831f086134d":[5,0,4,56] }; diff --git a/doc/html/navtreeindex1.js b/doc/html/navtreeindex1.js index b2d7695dc..359b7c8b4 100644 --- a/doc/html/navtreeindex1.js +++ b/doc/html/navtreeindex1.js @@ -1,112 +1,118 @@ var NAVTREEINDEX1 = { -"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[5,0,4,248], -"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[5,0,4,213], -"boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[5,0,4,179], +"boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e":[5,0,4,5], +"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[5,0,4,219], +"boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[5,0,4,196], +"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[5,0,4,253], +"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[5,0,4,218], +"boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[5,0,4,184], "boot_8php.html#aa1e828bbbcba170265eb2668d8daf42e":[5,0,4,29], -"boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[5,0,4,197], +"boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[5,0,4,202], "boot_8php.html#aa3425e2de85b08f7041656d3a8502cb6":[5,0,4,52], -"boot_8php.html#aa3679df31c8dad1b71816b0322d5baff":[5,0,4,151], +"boot_8php.html#aa3679df31c8dad1b71816b0322d5baff":[5,0,4,156], "boot_8php.html#aa4221641e5c21db69fa52c426b9017f5":[5,0,4,9], "boot_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec":[5,0,4,21], -"boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2":[5,0,4,148], +"boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2":[5,0,4,153], +"boot_8php.html#aa589421267f0c2f0d643f727792cce35":[5,0,4,115], "boot_8php.html#aa74438cf71e48e37bf7b440b94243985":[5,0,4,93], "boot_8php.html#aa8a2b61e70900139d1ca28e46f1da49d":[5,0,4,102], -"boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[5,0,4,218], -"boot_8php.html#aad33b494084f729b6ee3b0bc457718a1":[5,0,4,135], +"boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[5,0,4,223], +"boot_8php.html#aad33b494084f729b6ee3b0bc457718a1":[5,0,4,140], "boot_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3":[5,0,4,23], "boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14":[5,0,4,73], -"boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[5,0,4,182], -"boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[5,0,4,115], -"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[5,0,4,204], +"boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[5,0,4,187], +"boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[5,0,4,120], +"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[5,0,4,209], "boot_8php.html#ab346a2ece14993861f3e4206befa94f0":[5,0,4,35], -"boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8":[5,0,4,201], -"boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0":[5,0,4,225], -"boot_8php.html#ab4bddb41a0cf407178ec5278b950c393":[5,0,4,175], -"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[5,0,4,208], +"boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8":[5,0,4,206], +"boot_8php.html#ab4bc9c50ecc927b92d519e36562b0df0":[5,0,4,230], +"boot_8php.html#ab4bddb41a0cf407178ec5278b950c393":[5,0,4,180], +"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[5,0,4,213], "boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764":[5,0,4,114], -"boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[5,0,4,136], +"boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[5,0,4,141], "boot_8php.html#ab55e545b72ec8c097e052ea7d373491f":[5,0,4,44], "boot_8php.html#ab5ddbe69d3d03acd06e1fb281488cb78":[5,0,4,62], -"boot_8php.html#ab724491497ab2618b23a01d5da60aec0":[5,0,4,193], +"boot_8php.html#ab724491497ab2618b23a01d5da60aec0":[5,0,4,198], "boot_8php.html#ab79b8b4555cae20d03f8200666d89d63":[5,0,4,7], "boot_8php.html#ab7d65a7e7417825a4db62906bb600729":[5,0,4,104], "boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda":[5,0,4,45], -"boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86":[5,0,4,229], +"boot_8php.html#abbf5ac24eb8aeedb862f618ee0d21e86":[5,0,4,234], "boot_8php.html#abc0a90a1a77f5b668aa7e4b57d1776a7":[5,0,4,3], -"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[5,0,4,252], +"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[5,0,4,257], "boot_8php.html#abdcdfc873ace4e0902177bad934de0c0":[5,0,4,71], +"boot_8php.html#abeb4d86e17cefa8584f1244e2183b0e1":[5,0,4,117], "boot_8php.html#abedd940e664017c61b48c6efa31d0cb8":[5,0,4,103], -"boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450":[5,0,4,121], +"boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450":[5,0,4,126], "boot_8php.html#ac17fc8a416ea79e9d5cb4dc9a8ff8c5c":[5,0,4,28], -"boot_8php.html#ac195fc9003298923ea81f144388e24b1":[5,0,4,161], -"boot_8php.html#ac43182e0d8bae7576a30b603774974f8":[5,0,4,227], +"boot_8php.html#ac195fc9003298923ea81f144388e24b1":[5,0,4,166], +"boot_8php.html#ac43182e0d8bae7576a30b603774974f8":[5,0,4,232], "boot_8php.html#ac59a18a4838710d6c2de37aed6b21f03":[5,0,4,101], "boot_8php.html#ac608a34f3bc180e7724192e0fd31f9b0":[5,0,4,42], "boot_8php.html#ac8400313df2c831653f9036f71ebd86d":[5,0,4,63], -"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[5,0,4,256], -"boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20":[5,0,4,117], -"boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[5,0,4,119], -"boot_8php.html#aca08bc4f1554ba877500f6abcc99e1e8":[5,0,4,189], +"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[5,0,4,261], +"boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20":[5,0,4,122], +"boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[5,0,4,124], +"boot_8php.html#aca08bc4f1554ba877500f6abcc99e1e8":[5,0,4,194], "boot_8php.html#aca47505b8732177f52bb2d647eb2741c":[5,0,4,41], "boot_8php.html#aca5e42678e178c6b9034610d66666fd7":[5,0,4,13], "boot_8php.html#acc4e0c910af066148b810e5fde55fff1":[5,0,4,8], -"boot_8php.html#acca19aae62e1a6951a856b945de20d67":[5,0,4,164], -"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[5,0,4,215], +"boot_8php.html#acca19aae62e1a6951a856b945de20d67":[5,0,4,169], +"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[5,0,4,220], "boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3":[5,0,4,70], -"boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8":[5,0,4,147], -"boot_8php.html#ad11f30a6590d3d77f0c5e1e3909af8f5":[5,0,4,155], +"boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8":[5,0,4,152], +"boot_8php.html#ad11f30a6590d3d77f0c5e1e3909af8f5":[5,0,4,160], "boot_8php.html#ad206598b909e8eb67eb0e0bb5ef69c13":[5,0,4,10], "boot_8php.html#ad2c97627a313d53df1a1c7b4215ddb51":[5,0,4,16], "boot_8php.html#ad302cb26b838898d475f57f61b0fcc9f":[5,0,4,77], "boot_8php.html#ad34c1547020a305915bcc39707744690":[5,0,4,92], "boot_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620":[5,0,4,36], "boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44":[5,0,4,32], -"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[5,0,4,210], -"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[5,0,4,237], -"boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5":[5,0,4,231], +"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[5,0,4,215], +"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[5,0,4,242], +"boot_8php.html#ad88a70ec62e08d590123d3697dfe64d5":[5,0,4,236], "boot_8php.html#ada72d88ae39a7e3b45baea201cb49a29":[5,0,4,98], -"boot_8php.html#adaeb4f590c56326b2dca3b19f31b6272":[5,0,4,132], -"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[5,0,4,240], +"boot_8php.html#adaeb4f590c56326b2dca3b19f31b6272":[5,0,4,137], +"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[5,0,4,245], "boot_8php.html#add517a0958ac684792c62142a3877f81":[5,0,4,46], "boot_8php.html#adfb2fc7be5a4226c0a8e24131da9d498":[5,0,4,27], -"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[5,0,4,244], +"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[5,0,4,249], "boot_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312":[5,0,4,18], -"boot_8php.html#ae3cef7b63e25e7bafea3fcf6b99fad0e":[5,0,4,172], -"boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[5,0,4,150], -"boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[5,0,4,180], +"boot_8php.html#ae3cef7b63e25e7bafea3fcf6b99fad0e":[5,0,4,177], +"boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[5,0,4,155], +"boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[5,0,4,185], "boot_8php.html#aea7fc57a4d8e9dcb42f2601b0b9b761c":[5,0,4,30], -"boot_8php.html#aead84fa27d7516b855220fe004964a45":[5,0,4,249], -"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[5,0,4,212], -"boot_8php.html#aed0dfb35f7dd00dc9e4f868ea7f7ff53":[5,0,4,156], +"boot_8php.html#aead84fa27d7516b855220fe004964a45":[5,0,4,254], +"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[5,0,4,217], +"boot_8php.html#aed0dfb35f7dd00dc9e4f868ea7f7ff53":[5,0,4,161], "boot_8php.html#aedfb9501ed408278667995524e0d15cf":[5,0,4,106], -"boot_8php.html#aee324eca9de4e0fedf01ab5f92e27c67":[5,0,4,167], -"boot_8php.html#aef4b6c558c68c88c10f13c5a00c20e3d":[5,0,4,181], -"boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[5,0,4,134], +"boot_8php.html#aee324eca9de4e0fedf01ab5f92e27c67":[5,0,4,172], +"boot_8php.html#aef4b6c558c68c88c10f13c5a00c20e3d":[5,0,4,186], +"boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[5,0,4,139], "boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4":[5,0,4,33], -"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[5,0,4,241], -"boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[5,0,4,174], +"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[5,0,4,246], +"boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[5,0,4,179], "boot_8php.html#af3a4271630aabd8be592213f925d6a36":[5,0,4,65], "boot_8php.html#af3bdfc20979c16f15bb9c60446a480f9":[5,0,4,58], -"boot_8php.html#af489d0c3166551b93e63a79ff2c9be35":[5,0,4,138], -"boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461":[5,0,4,194], +"boot_8php.html#af489d0c3166551b93e63a79ff2c9be35":[5,0,4,143], +"boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461":[5,0,4,199], "boot_8php.html#af6f6f6f40139f12fc09ec47373b30919":[5,0,4,95], -"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[5,0,4,239], -"boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d":[5,0,4,186], -"boot_8php.html#afaf93b7026f784b113b4f8921745891e":[5,0,4,168], -"boot_8php.html#afb97615e985a013799839b68b99018d7":[5,0,4,242], +"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[5,0,4,244], +"boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d":[5,0,4,191], +"boot_8php.html#afaf93b7026f784b113b4f8921745891e":[5,0,4,173], +"boot_8php.html#afb97615e985a013799839b68b99018d7":[5,0,4,247], "boot_8php.html#afbb1fe1b2c8c730ec8e08da93b6512c4":[5,0,4,55], "boot_8php.html#afe084c30a1810c10442edb4fbcbc0086":[5,0,4,87], -"boot_8php.html#afe63ae69ba55299f813766e54df06ede":[5,0,4,142], +"boot_8php.html#afe63ae69ba55299f813766e54df06ede":[5,0,4,147], "boot_8php.html#afe88b920aa285982edb817a0dd44eb37":[5,0,4,14], -"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[5,0,4,206], +"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[5,0,4,211], "cache_8php.html":[5,0,0,11], -"channel_8php.html":[5,0,1,8], -"channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1":[5,0,1,8,1], -"channel_8php.html#ac7c8c7845741baadf87fae6bc279f3dc":[5,0,1,8,2], -"channel_8php.html#aea8e189f2fbabfda779349dd94082e8e":[5,0,1,8,0], -"chanview_8php.html":[5,0,1,9], -"chanview_8php.html#a4192c6da888c8c1165851acf9ad4cb8b":[5,0,1,9,0], +"chanman_8php.html":[5,0,1,8], +"channel_8php.html":[5,0,1,9], +"channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1":[5,0,1,9,1], +"channel_8php.html#ac7c8c7845741baadf87fae6bc279f3dc":[5,0,1,9,2], +"channel_8php.html#aea8e189f2fbabfda779349dd94082e8e":[5,0,1,9,0], +"chanview_8php.html":[5,0,1,10], +"chanview_8php.html#a4192c6da888c8c1165851acf9ad4cb8b":[5,0,1,10,0], "classApp.html":[4,0,5], "classApp.html#a037049cba88dfc6ff94f4b5b779e3fd3":[4,0,5,60], "classApp.html#a050b0696118da47e8b30859ad1a2c149":[4,0,5,44], @@ -243,11 +249,5 @@ var NAVTREEINDEX1 = "classFriendicaSmartyEngine.html#a35ec0ee828c36640ea25296bcb84a118":[4,0,16,1], "classFriendicaSmartyEngine.html#aab5994077fc3a64222e41b28e2bd8d88":[4,0,16,2], "classFriendicaSmartyEngine.html#ab7c305bd8c386c2944e4dc9136cea5b6":[4,0,16,0], -"classFriendicaSmartyEngine.html#ad62f1181d2f02b54b46731ad2bd46db2":[4,0,16,3], -"classItem.html":[4,0,17], -"classItem.html#a007424e3e3171dcfb4312a02161da6cd":[4,0,17,30], -"classItem.html#a078f95b4134ce3a1df344cf8d386f986":[4,0,17,33], -"classItem.html#a0c301aaed2b7d682728d18db3a22afa3":[4,0,17,8], -"classItem.html#a1a1e42877e6ac7af50286142ceb483d2":[4,0,17,35], -"classItem.html#a1cb6aa8abdf7ea7daca647e40c8ea3a2":[4,0,17,38] +"classFriendicaSmartyEngine.html#ad62f1181d2f02b54b46731ad2bd46db2":[4,0,16,3] }; diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js index 1b0c20c07..d8367c9f0 100644 --- a/doc/html/navtreeindex2.js +++ b/doc/html/navtreeindex2.js @@ -1,5 +1,11 @@ var NAVTREEINDEX2 = { +"classItem.html":[4,0,17], +"classItem.html#a007424e3e3171dcfb4312a02161da6cd":[4,0,17,30], +"classItem.html#a078f95b4134ce3a1df344cf8d386f986":[4,0,17,33], +"classItem.html#a0c301aaed2b7d682728d18db3a22afa3":[4,0,17,8], +"classItem.html#a1a1e42877e6ac7af50286142ceb483d2":[4,0,17,35], +"classItem.html#a1cb6aa8abdf7ea7daca647e40c8ea3a2":[4,0,17,38], "classItem.html#a248f45871ecfe82a08d1d4c0769b2eb2":[4,0,17,0], "classItem.html#a2ce70ef63f9f4d86a09c351678806925":[4,0,17,23], "classItem.html#a3ee7667c2ec6cd7657328e27848c0bdf":[4,0,17,6], @@ -171,23 +177,23 @@ var NAVTREEINDEX2 = "comanche_8php.html#abd2e508a2a0b911c4a838e3cb7599923":[5,0,0,14,8], "comanche_8php.html#ae9fe1ce574db3dd0931eada80234f82a":[5,0,0,14,5], "comanche_8php.html#af7150df735e5ff9d467994cd6f769c6e":[5,0,0,14,7], -"common_8php.html":[5,0,1,10], -"common_8php.html#a3b12ec67b3d3edcf595c8d195da5d14a":[5,0,1,10,0], -"common_8php.html#ab63408f39abef7a6915186e8dabc5a96":[5,0,1,10,1], -"common_8php.html#aca62f113655809f41f49042ce9b123c2":[5,0,1,10,2], -"community_8php.html":[5,0,1,11], -"community_8php.html#a1197aafd6a6b540dbb4a0c04ade3a25a":[5,0,1,11,0], -"community_8php.html#a56c94ec978a38633c5628fa6f8e386d9":[5,0,1,11,1], -"connect_8php.html":[5,0,1,12], -"connect_8php.html#a417ec27afe33f21a929667a665e32ee2":[5,0,1,12,2], -"connect_8php.html#a489f0a66c660de6ec4d6917b27674f07":[5,0,1,12,0], -"connect_8php.html#ad46a38f32fd7a3d324b1fa26373efa36":[5,0,1,12,1], -"connections_8php.html":[5,0,1,13], -"connections_8php.html#a1224058db8e3fb56463eb312f98e561d":[5,0,1,13,4], -"connections_8php.html#a15af118efee9c948b6f8294e54a73bb2":[5,0,1,13,1], -"connections_8php.html#a1f23623f802af7bd35e95b0e94e5d558":[5,0,1,13,3], -"connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c":[5,0,1,13,2], -"connections_8php.html#af48f7ad20914760ba9874c090384e35a":[5,0,1,13,0], +"common_8php.html":[5,0,1,11], +"common_8php.html#a3b12ec67b3d3edcf595c8d195da5d14a":[5,0,1,11,0], +"common_8php.html#ab63408f39abef7a6915186e8dabc5a96":[5,0,1,11,1], +"common_8php.html#aca62f113655809f41f49042ce9b123c2":[5,0,1,11,2], +"community_8php.html":[5,0,1,12], +"community_8php.html#a1197aafd6a6b540dbb4a0c04ade3a25a":[5,0,1,12,0], +"community_8php.html#a56c94ec978a38633c5628fa6f8e386d9":[5,0,1,12,1], +"connect_8php.html":[5,0,1,13], +"connect_8php.html#a417ec27afe33f21a929667a665e32ee2":[5,0,1,13,2], +"connect_8php.html#a489f0a66c660de6ec4d6917b27674f07":[5,0,1,13,0], +"connect_8php.html#ad46a38f32fd7a3d324b1fa26373efa36":[5,0,1,13,1], +"connections_8php.html":[5,0,1,14], +"connections_8php.html#a1224058db8e3fb56463eb312f98e561d":[5,0,1,14,4], +"connections_8php.html#a15af118efee9c948b6f8294e54a73bb2":[5,0,1,14,1], +"connections_8php.html#a1f23623f802af7bd35e95b0e94e5d558":[5,0,1,14,3], +"connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c":[5,0,1,14,2], +"connections_8php.html#af48f7ad20914760ba9874c090384e35a":[5,0,1,14,0], "contact__selectors_8php.html":[5,0,0,17], "contact__selectors_8php.html#a2c743d2eb526eb758d943a1490162d75":[5,0,0,17,1], "contact__selectors_8php.html#a9839e8fdaac7ffb37bf1420493f5c28f":[5,0,0,17,0], @@ -199,8 +205,8 @@ var NAVTREEINDEX2 = "contact__widgets_8php.html#a552f8544528cec0c995cea7287ea9d65":[5,0,0,18,1], "contact__widgets_8php.html#a57e73ebcfd62bb5d8c7a7b9e663726d6":[5,0,0,18,3], "contact__widgets_8php.html#af24e693532a045954caab515942cfc6f":[5,0,0,18,4], -"contactgroup_8php.html":[5,0,1,14], -"contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3":[5,0,1,14,0], +"contactgroup_8php.html":[5,0,1,15], +"contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3":[5,0,1,15,0], "conversation_8php.html":[5,0,0,19], "conversation_8php.html#a0891aaa4492cba2b51eda12fe01957f3":[5,0,0,19,7], "conversation_8php.html#a0ee05f15255fb1cc3d89f30bc378a654":[5,0,0,19,9], @@ -224,10 +230,10 @@ var NAVTREEINDEX2 = "conversation_8php.html#ae59703b07ce2ddf627b4172ff26058b6":[5,0,0,19,5], "conversation_8php.html#ae996eb116d397a2c6396c312d7b98664":[5,0,0,19,16], "conversation_8php.html#afe5b2f38d8b803edb0d7ec5fa2868db0":[5,0,0,19,12], -"crepair_8php.html":[5,0,1,15], -"crepair_8php.html#a29464c01838e209c8059cfcd2d195caa":[5,0,1,15,0], -"crepair_8php.html#ab089978e50df156bbfabf9f8f5ccd198":[5,0,1,15,1], -"crepair_8php.html#acc4493e1ffd1462a605dd9b870034513":[5,0,1,15,2], +"crepair_8php.html":[5,0,1,16], +"crepair_8php.html#a29464c01838e209c8059cfcd2d195caa":[5,0,1,16,0], +"crepair_8php.html#ab089978e50df156bbfabf9f8f5ccd198":[5,0,1,16,1], +"crepair_8php.html#acc4493e1ffd1462a605dd9b870034513":[5,0,1,16,2], "cronhooks_8php.html":[5,0,0,21], "cronhooks_8php.html#a4c4c1bbec4ecc9a0efa00dd6afd2c0ca":[5,0,0,21,0], "crypto_8php.html":[5,0,0,22], @@ -243,11 +249,5 @@ var NAVTREEINDEX2 = "datetime_8php.html":[5,0,0,23], "datetime_8php.html#a03900dcf0f9e3c58793a031673a70326":[5,0,0,23,6], "datetime_8php.html#a36d3d6dff8d76b5f295bb3d9c535a5b1":[5,0,0,23,11], -"datetime_8php.html#a3f2897db32e745fe2f3e70a6b46578f8":[5,0,0,23,5], -"datetime_8php.html#a5f29553799005b1fd4e9ce9d98ce05aa":[5,0,0,23,3], -"datetime_8php.html#a633dadba426fa2f60b25fabdb19ebc1f":[5,0,0,23,10], -"datetime_8php.html#a7df24d72ea05922d3127363e2295174c":[5,0,0,23,7], -"datetime_8php.html#a8ae8dc95ace7ac27fa5a1ecf42b78c82":[5,0,0,23,9], -"datetime_8php.html#aa51b5a7ea4f931b23acbdfcea46e9865":[5,0,0,23,12], -"datetime_8php.html#aba971b67f17fecf050813f1eba72367f":[5,0,0,23,8] +"datetime_8php.html#a3f2897db32e745fe2f3e70a6b46578f8":[5,0,0,23,5] }; diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js index d7efeb160..730f749c9 100644 --- a/doc/html/navtreeindex3.js +++ b/doc/html/navtreeindex3.js @@ -1,5 +1,11 @@ var NAVTREEINDEX3 = { +"datetime_8php.html#a5f29553799005b1fd4e9ce9d98ce05aa":[5,0,0,23,3], +"datetime_8php.html#a633dadba426fa2f60b25fabdb19ebc1f":[5,0,0,23,10], +"datetime_8php.html#a7df24d72ea05922d3127363e2295174c":[5,0,0,23,7], +"datetime_8php.html#a8ae8dc95ace7ac27fa5a1ecf42b78c82":[5,0,0,23,9], +"datetime_8php.html#aa51b5a7ea4f931b23acbdfcea46e9865":[5,0,0,23,12], +"datetime_8php.html#aba971b67f17fecf050813f1eba72367f":[5,0,0,23,8], "datetime_8php.html#abc1652f96799cec6fce8797ba2ebc2df":[5,0,0,23,0], "datetime_8php.html#ac265b86f384ee094ed5479aae02aa5c8":[5,0,0,23,2], "datetime_8php.html#ad6301e74b0f9267d52f8d432b5beb226":[5,0,0,23,4], @@ -16,8 +22,8 @@ var NAVTREEINDEX3 = "dba__driver_8php.html#af531546fac5f0836a8557a4f6dfee930":[5,0,0,0,0,4], "dba__mysql_8php.html":[5,0,0,0,1], "dba__mysqli_8php.html":[5,0,0,0,2], -"delegate_8php.html":[5,0,1,16], -"delegate_8php.html#a943eea8996ef348eb845c498f9f354dd":[5,0,1,16,0], +"delegate_8php.html":[5,0,1,17], +"delegate_8php.html#a943eea8996ef348eb845c498f9f354dd":[5,0,1,17,0], "deliver_8php.html":[5,0,0,24], "deliver_8php.html#a397afcb9afecf0c1816b0951189dd346":[5,0,0,24,0], "dir_032dd9e2cfe278a2cfa5eb9547448eb9.html":[5,0,3,1,0,0], @@ -37,15 +43,15 @@ var NAVTREEINDEX3 = "dir_d41ce877eb409a4791b288730010abe2.html":[5,0,1], "dir_d44c64559bbebec7f509842c48db8b23.html":[5,0,0], "dir_d795dfe8933002397556cc7aa16eca15.html":[5,0,3,1,1], -"dirfind_8php.html":[5,0,1,18], -"dirfind_8php.html#ac689a812c84f161b3a0d42349f83981c":[5,0,1,18,1], -"dirfind_8php.html#af22b0283f928c4c32e62248a5ae67cee":[5,0,1,18,0], -"dirsearch_8php.html":[5,0,1,19], -"dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752":[5,0,1,19,1], -"dirsearch_8php.html#a985d410a170549429857af6ff2673149":[5,0,1,19,2], -"dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c":[5,0,1,19,0], -"display_8php.html":[5,0,1,20], -"display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0":[5,0,1,20,0], +"dirfind_8php.html":[5,0,1,19], +"dirfind_8php.html#ac689a812c84f161b3a0d42349f83981c":[5,0,1,19,1], +"dirfind_8php.html#af22b0283f928c4c32e62248a5ae67cee":[5,0,1,19,0], +"dirsearch_8php.html":[5,0,1,20], +"dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752":[5,0,1,20,1], +"dirsearch_8php.html#a985d410a170549429857af6ff2673149":[5,0,1,20,2], +"dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c":[5,0,1,20,0], +"display_8php.html":[5,0,1,21], +"display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0":[5,0,1,21,0], "docblox__errorchecker_8php.html":[5,0,2,2], "docblox__errorchecker_8php.html#a1659f0a629d408e0f849dbe4ee061e62":[5,0,2,2,3], "docblox__errorchecker_8php.html#a21b4bbe5aae2d85db33affc7126a67ec":[5,0,2,2,2], @@ -58,14 +64,14 @@ var NAVTREEINDEX3 = "docblox__errorchecker_8php.html#ab66bc0493d25f39bf8b4dcbb429f04e6":[5,0,2,2,4], "docblox__errorchecker_8php.html#ae9562cf60aa693114603d27b55d2185f":[5,0,2,2,1], "docblox__errorchecker_8php.html#af4ca738a05beffe9c8c23e1f7aea3c2d":[5,0,2,2,10], -"editblock_8php.html":[5,0,1,21], -"editblock_8php.html#abbe8f55de06967bc8d79d620509a49e6":[5,0,1,21,0], -"editlayout_8php.html":[5,0,1,22], -"editlayout_8php.html#aa877e4157a26b099de904164181dd386":[5,0,1,22,0], -"editpost_8php.html":[5,0,1,23], -"editpost_8php.html#a34011690864d122680c802e9e748ccfb":[5,0,1,23,0], -"editwebpage_8php.html":[5,0,1,24], -"editwebpage_8php.html#a375e945255fad79a71036528f7480650":[5,0,1,24,0], +"editblock_8php.html":[5,0,1,22], +"editblock_8php.html#abbe8f55de06967bc8d79d620509a49e6":[5,0,1,22,0], +"editlayout_8php.html":[5,0,1,23], +"editlayout_8php.html#aa877e4157a26b099de904164181dd386":[5,0,1,23,0], +"editpost_8php.html":[5,0,1,24], +"editpost_8php.html#a34011690864d122680c802e9e748ccfb":[5,0,1,24,0], +"editwebpage_8php.html":[5,0,1,25], +"editwebpage_8php.html#a375e945255fad79a71036528f7480650":[5,0,1,25,0], "enotify_8php.html":[5,0,0,27], "enotify_8php.html#a3e9a9355b243777c488d2a9883908dfc":[5,0,0,27,1], "event_8php.html":[5,0,0,28], @@ -76,9 +82,9 @@ var NAVTREEINDEX3 = "event_8php.html#a32ba1b9ddf7a744a9a1512b052e5f850":[5,0,0,28,2], "event_8php.html#a89ef533faf345db8d64a58d4856bde3a":[5,0,0,28,3], "event_8php.html#abb74206cf42d694307c3d7abb7af9869":[5,0,0,28,4], -"events_8php.html":[5,0,1,25], -"events_8php.html#a1d293fb217ae6bc9e3858c4b32e363ec":[5,0,1,25,0], -"events_8php.html#ab3e8a8f901175f8e40a8089eea45c075":[5,0,1,25,1], +"events_8php.html":[5,0,1,26], +"events_8php.html#a1d293fb217ae6bc9e3858c4b32e363ec":[5,0,1,26,0], +"events_8php.html#ab3e8a8f901175f8e40a8089eea45c075":[5,0,1,26,1], "expire_8php.html":[5,0,0,29], "expire_8php.html#a444e45c9b67727b27db4c779fd51a298":[5,0,0,29,0], "extract_8php.html":[5,0,2,3], @@ -86,18 +92,20 @@ var NAVTREEINDEX3 = "extract_8php.html#a50b05cf2e02ef0b67fcad97106dd7634":[5,0,2,3,2], "extract_8php.html#a63bb4c41bc532baacf6a4976cfaa0feb":[5,0,2,3,0], "extract_8php.html#a9590b15215a21e9b42eb546aeef79704":[5,0,2,3,1], -"fbrowser_8php.html":[5,0,1,26], -"fbrowser_8php.html#aee476addcf7a3e0fe9454f7dfd5a56c4":[5,0,1,26,0], +"fbrowser_8php.html":[5,0,1,27], +"fbrowser_8php.html#aee476addcf7a3e0fe9454f7dfd5a56c4":[5,0,1,27,0], "features_8php.html":[5,0,0,30], "features_8php.html#a52b5bdfb61b256713efecf7a7b20b0c0":[5,0,0,30,0], "features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c":[5,0,0,30,1], -"feed_8php.html":[5,0,1,27], -"feed_8php.html#af86137700b56f33d1d5f25c8dec22c04":[5,0,1,27,0], -"filer_8php.html":[5,0,1,28], -"filer_8php.html#a5fd5d7e61b2f9c43cb5f110c89dc4274":[5,0,1,28,0], -"filerm_8php.html":[5,0,1,29], -"filerm_8php.html#ae2eb28d2054fa2c37e38689882172208":[5,0,1,29,0], +"feed_8php.html":[5,0,1,28], +"feed_8php.html#af86137700b56f33d1d5f25c8dec22c04":[5,0,1,28,0], +"filer_8php.html":[5,0,1,29], +"filer_8php.html#a5fd5d7e61b2f9c43cb5f110c89dc4274":[5,0,1,29,0], +"filerm_8php.html":[5,0,1,30], +"filerm_8php.html#ae2eb28d2054fa2c37e38689882172208":[5,0,1,30,0], "files.html":[5,0], +"filestorage_8php.html":[5,0,1,31], +"filestorage_8php.html#a61bb1be78472555df4ce619f51014040":[5,0,1,31,0], "fpostit_8php.html":[5,0,2,0,0], "fpostit_8php.html#a3f3ae3ae61578b5671673914fd894443":[5,0,2,0,0,0], "fpostit_8php.html#a501b5ca82f287509fc691c88524064c1":[5,0,2,0,0,1], @@ -118,9 +126,9 @@ var NAVTREEINDEX3 = "friendica-to-smarty-tpl_8py.html#aecf730e0884bb4ddc6c0deb1ef85f8eb":[5,0,2,4,4], "friendica-to-smarty-tpl_8py.html#af6b2c793958aae2aadc294577431f749":[5,0,2,4,3], "friendica__smarty_8php.html":[5,0,0,32], -"fsuggest_8php.html":[5,0,1,31], -"fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d":[5,0,1,31,1], -"fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998":[5,0,1,31,0], +"fsuggest_8php.html":[5,0,1,33], +"fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d":[5,0,1,33,1], +"fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998":[5,0,1,33,0], "full_8php.html":[5,0,3,0,1], "full_8php.html#a6fac1b4b8cdfde06ea1b7713479e92db":[5,0,3,0,1,0], "functions.html":[4,3,0], @@ -201,8 +209,8 @@ var NAVTREEINDEX3 = "globals_func_0x77.html":[5,1,1,23], "globals_func_0x78.html":[5,1,1,24], "globals_func_0x7a.html":[5,1,1,25], -"globals_vars.html":[5,1,2,0], "globals_vars.html":[5,1,2], +"globals_vars.html":[5,1,2,0], "globals_vars_0x61.html":[5,1,2,1], "globals_vars_0x63.html":[5,1,2,2], "globals_vars_0x64.html":[5,1,2,3], @@ -226,28 +234,20 @@ var NAVTREEINDEX3 = "globals_vars_0x7a.html":[5,1,2,21], "gprobe_8php.html":[5,0,0,33], "gprobe_8php.html#adf72cb0a70b5b9d99fdec1cc60e18ed1":[5,0,0,33,0], -"hcard_8php.html":[5,0,1,33], -"hcard_8php.html#a956c7cae2009652a37900306e5b7b73d":[5,0,1,33,0], -"hcard_8php.html#ac34f26b0e6a37eef44fa49bea135136d":[5,0,1,33,1], -"help_8php.html":[5,0,1,34], -"help_8php.html#af055e15f600ffa6fbca9386fdf715224":[5,0,1,34,0], +"hcard_8php.html":[5,0,1,35], +"hcard_8php.html#a956c7cae2009652a37900306e5b7b73d":[5,0,1,35,0], +"hcard_8php.html#ac34f26b0e6a37eef44fa49bea135136d":[5,0,1,35,1], +"help_8php.html":[5,0,1,36], +"help_8php.html#af055e15f600ffa6fbca9386fdf715224":[5,0,1,36,0], "hierarchy.html":[4,2], -"home_8php.html":[5,0,1,35], -"hostxrd_8php.html":[5,0,1,36], -"hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92":[5,0,1,36,0], +"home_8php.html":[5,0,1,37], +"hostxrd_8php.html":[5,0,1,38], +"hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92":[5,0,1,38,0], "html2bbcode_8php.html":[5,0,0,35], "html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7":[5,0,0,35,3], "html2bbcode_8php.html#a5ad726995ac4070213abdb3bd09f4837":[5,0,0,35,1], "html2bbcode_8php.html#a71a07f135d196ec5943b13f7b2e6a9b2":[5,0,0,35,0], "html2bbcode_8php.html#ad174afe0ccbd8c475e48f8a6ee2f27d8":[5,0,0,35,2], "html2plain_8php.html":[5,0,0,36], -"html2plain_8php.html#a3214912e3d00cf0a948072daccf16740":[5,0,0,36,0], -"html2plain_8php.html#a56d29b254333d29abb9d96a9a903a4b0":[5,0,0,36,3], -"html2plain_8php.html#ab3e121fa9f3feb16f9f942e705bc6c04":[5,0,0,36,2], -"html2plain_8php.html#ae1c203d0f089d5678d73a6c64a395201":[5,0,0,36,1], -"identity_8php.html":[5,0,0,37], -"identity_8php.html#a345f4c943d84de502ec6e72d2c813945":[5,0,0,37,2], -"identity_8php.html#a3570a4eb77332b292d394c4132cb8f03":[5,0,0,37,3], -"identity_8php.html#a77d2237f1846964634b1c99089c27c7d":[5,0,0,37,0], -"identity_8php.html#a77ee7d66eb0758f7e7882f70ad0f9485":[5,0,0,37,4] +"html2plain_8php.html#a3214912e3d00cf0a948072daccf16740":[5,0,0,36,0] }; diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js index e4653ef21..23edaaad9 100644 --- a/doc/html/navtreeindex4.js +++ b/doc/html/navtreeindex4.js @@ -1,12 +1,20 @@ var NAVTREEINDEX4 = { +"html2plain_8php.html#a56d29b254333d29abb9d96a9a903a4b0":[5,0,0,36,3], +"html2plain_8php.html#ab3e121fa9f3feb16f9f942e705bc6c04":[5,0,0,36,2], +"html2plain_8php.html#ae1c203d0f089d5678d73a6c64a395201":[5,0,0,36,1], +"identity_8php.html":[5,0,0,37], +"identity_8php.html#a345f4c943d84de502ec6e72d2c813945":[5,0,0,37,2], +"identity_8php.html#a3570a4eb77332b292d394c4132cb8f03":[5,0,0,37,3], +"identity_8php.html#a77d2237f1846964634b1c99089c27c7d":[5,0,0,37,0], +"identity_8php.html#a77ee7d66eb0758f7e7882f70ad0f9485":[5,0,0,37,4], "identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[5,0,0,37,6], "identity_8php.html#abf6a9c6ed92d594f1d4513c4e22a7abd":[5,0,0,37,1], "identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[5,0,0,37,5], "identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[5,0,0,37,7], -"import_8php.html":[5,0,1,37], -"import_8php.html#af17fef0410518f7eac205d0ea416eaa2":[5,0,1,37,1], -"import_8php.html#afdf25ed70096d5dbf4f6d0ca79fea184":[5,0,1,37,0], +"import_8php.html":[5,0,1,39], +"import_8php.html#af17fef0410518f7eac205d0ea416eaa2":[5,0,1,39,1], +"import_8php.html#afdf25ed70096d5dbf4f6d0ca79fea184":[5,0,1,39,0], "include_2api_8php.html":[5,0,0,5], "include_2api_8php.html#a0991f72554f821255397d615e76f3203":[5,0,0,5,12], "include_2api_8php.html#a176c448d79c211ad41c2bbe3124658f5":[5,0,0,5,5], @@ -168,19 +176,20 @@ var NAVTREEINDEX4 = "interfaceITemplateEngine.html":[4,0,18], "interfaceITemplateEngine.html#aaa7381c8becc3d1c1790b53988a0f243":[4,0,18,1], "interfaceITemplateEngine.html#aaf2698adbf46c073c24b162fe1b1c442":[4,0,18,0], -"intro_8php.html":[5,0,1,38], -"intro_8php.html#a3e2a523697633ddb4517b9266a515f5b":[5,0,1,38,1], -"intro_8php.html#abc3abf25da64f98f215126eb08c7936b":[5,0,1,38,0], -"intro_8php.html#af3681062183ccbdf065ae2647b07d6f1":[5,0,1,38,2], -"invite_8php.html":[5,0,1,39], -"invite_8php.html#a244385b28cfd021d308715f01158bfd9":[5,0,1,39,0], -"invite_8php.html#aeb0881c0f93c8e8552e5ed756ce6e5a5":[5,0,1,39,1], -"item_8php.html":[5,0,1,40], -"item_8php.html#a3daae7944f737bd30412a0d042207c0f":[5,0,1,40,0], -"item_8php.html#a693cd09805755ab85bbb5ecae69a48c3":[5,0,1,40,4], -"item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221":[5,0,1,40,3], -"item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[5,0,1,40,1], -"item_8php.html#abd0e603a6696051af16476eb968d52e7":[5,0,1,40,2], +"intro_8php.html":[5,0,1,40], +"intro_8php.html#a3e2a523697633ddb4517b9266a515f5b":[5,0,1,40,1], +"intro_8php.html#abc3abf25da64f98f215126eb08c7936b":[5,0,1,40,0], +"intro_8php.html#af3681062183ccbdf065ae2647b07d6f1":[5,0,1,40,2], +"invite_8php.html":[5,0,1,41], +"invite_8php.html#a244385b28cfd021d308715f01158bfd9":[5,0,1,41,0], +"invite_8php.html#aeb0881c0f93c8e8552e5ed756ce6e5a5":[5,0,1,41,1], +"item_8php.html":[5,0,1,42], +"item_8php.html#a3daae7944f737bd30412a0d042207c0f":[5,0,1,42,0], +"item_8php.html#a5b1b36cb301a94b38150074f0d424e74":[5,0,1,42,3], +"item_8php.html#a693cd09805755ab85bbb5ecae69a48c3":[5,0,1,42,5], +"item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221":[5,0,1,42,4], +"item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[5,0,1,42,1], +"item_8php.html#abd0e603a6696051af16476eb968d52e7":[5,0,1,42,2], "items_8php.html":[5,0,0,40], "items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[5,0,0,40,53], "items_8php.html#a016dd86c827d08db89061ea81d15c6cb":[5,0,0,40,2], @@ -240,14 +249,5 @@ var NAVTREEINDEX4 = "language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0":[5,0,0,41,6], "language_8php.html#a632da17c7ac0d2dc1a00a4706870194b":[5,0,0,41,0], "language_8php.html#a78bd204955ec4cc3a9ac651285a1689d":[5,0,0,41,4], -"language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05":[5,0,0,41,3], -"language_8php.html#a980dee1d8715a98ab02e36b59facf8ed":[5,0,0,41,1], -"language_8php.html#aae0c3638fb476ae1e31f8d242f5dac04":[5,0,0,41,7], -"language_8php.html#ac9142ef1d01a235c760deb0f16643f5a":[5,0,0,41,5], -"language_8php.html#ace67d6cad57da08d030ad9dc9b8c836e":[5,0,0,41,2], -"language_8php.html#ae310fb3880484ee1cc4faefe0c63c06d":[5,0,0,41,8], -"lastpost_8php.html":[5,0,1,41], -"lastpost_8php.html#a6108289ef2a767495c7c85a24f364983":[5,0,1,41,0], -"lastpost_8php.html#a82f14cce5d3cfe27f40bdbd2c679d493":[5,0,1,41,1], -"lastpost_8php.html#ab4c6ebd25736af678e64d55ce508ce8c":[5,0,1,41,2] +"language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05":[5,0,0,41,3] }; diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js index c67976b55..59df79201 100644 --- a/doc/html/navtreeindex5.js +++ b/doc/html/navtreeindex5.js @@ -1,81 +1,90 @@ var NAVTREEINDEX5 = { -"layouts_8php.html":[5,0,1,42], -"layouts_8php.html#a6e0193759ad9eef76d3df2db24237b50":[5,0,1,42,0], -"like_8php.html":[5,0,1,43], -"like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538":[5,0,1,43,0], -"lockview_8php.html":[5,0,1,44], -"lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44":[5,0,1,44,0], -"login_8php.html":[5,0,1,45], -"login_8php.html#a1d69ca88eb9005a7026e128b9a645904":[5,0,1,45,0], -"lostpass_8php.html":[5,0,1,46], -"lostpass_8php.html#a0314d94e48c789b1b3a201d740c9eab3":[5,0,1,46,0], -"lostpass_8php.html#a8ed35ba71a4404eaf4903da61d0321cc":[5,0,1,46,1], -"magic_8php.html":[5,0,1,47], -"magic_8php.html#acea2cc792849ca2d71d4b689f66518bf":[5,0,1,47,0], -"manage_8php.html":[5,0,1,48], -"manage_8php.html#a2bca247b5296827638959138367db4f5":[5,0,1,48,0], -"match_8php.html":[5,0,1,49], -"match_8php.html#a1dd853e959b9e70c1911bb2fb5f5130d":[5,0,1,49,0], +"language_8php.html#a980dee1d8715a98ab02e36b59facf8ed":[5,0,0,41,1], +"language_8php.html#aae0c3638fb476ae1e31f8d242f5dac04":[5,0,0,41,7], +"language_8php.html#ac9142ef1d01a235c760deb0f16643f5a":[5,0,0,41,5], +"language_8php.html#ace67d6cad57da08d030ad9dc9b8c836e":[5,0,0,41,2], +"language_8php.html#ae310fb3880484ee1cc4faefe0c63c06d":[5,0,0,41,8], +"lastpost_8php.html":[5,0,1,43], +"lastpost_8php.html#a6108289ef2a767495c7c85a24f364983":[5,0,1,43,0], +"lastpost_8php.html#a82f14cce5d3cfe27f40bdbd2c679d493":[5,0,1,43,1], +"lastpost_8php.html#ab4c6ebd25736af678e64d55ce508ce8c":[5,0,1,43,2], +"layouts_8php.html":[5,0,1,44], +"layouts_8php.html#a6e0193759ad9eef76d3df2db24237b50":[5,0,1,44,0], +"like_8php.html":[5,0,1,45], +"like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538":[5,0,1,45,0], +"lockview_8php.html":[5,0,1,46], +"lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44":[5,0,1,46,0], +"login_8php.html":[5,0,1,47], +"login_8php.html#a1d69ca88eb9005a7026e128b9a645904":[5,0,1,47,0], +"lostpass_8php.html":[5,0,1,48], +"lostpass_8php.html#a0314d94e48c789b1b3a201d740c9eab3":[5,0,1,48,0], +"lostpass_8php.html#a8ed35ba71a4404eaf4903da61d0321cc":[5,0,1,48,1], +"magic_8php.html":[5,0,1,49], +"magic_8php.html#acea2cc792849ca2d71d4b689f66518bf":[5,0,1,49,0], +"manage_8php.html":[5,0,1,50], +"manage_8php.html#a2bca247b5296827638959138367db4f5":[5,0,1,50,0], +"match_8php.html":[5,0,1,51], +"match_8php.html#a1dd853e959b9e70c1911bb2fb5f5130d":[5,0,1,51,0], "md_README.html":[2], "md_config.html":[0], "md_fresh.html":[1], "minimal_8php.html":[5,0,3,0,2], -"mitem_8php.html":[5,0,1,52], -"mitem_8php.html#a6ee694cca4b551a20d7c7a94b5243ec1":[5,0,1,52,2], -"mitem_8php.html#a7a31b702ecad18eeb6a38b243ff0037e":[5,0,1,52,0], -"mitem_8php.html#a9627cd857cafdf04e4fc0ae48c8e8518":[5,0,1,52,1], +"mitem_8php.html":[5,0,1,54], +"mitem_8php.html#a6ee694cca4b551a20d7c7a94b5243ec1":[5,0,1,54,2], +"mitem_8php.html#a7a31b702ecad18eeb6a38b243ff0037e":[5,0,1,54,0], +"mitem_8php.html#a9627cd857cafdf04e4fc0ae48c8e8518":[5,0,1,54,1], "mod_2api_8php.html":[5,0,1,4], "mod_2api_8php.html#a02ae0f60e240dc806b860edb7d582117":[5,0,1,4,2], "mod_2api_8php.html#a33315b5bbf5418f6850b2038107b526d":[5,0,1,4,0], "mod_2api_8php.html#a6fe77f05c07cb51048df0d557b4b9bd2":[5,0,1,4,1], "mod_2attach_8php.html":[5,0,1,6], "mod_2attach_8php.html#aa88eb5ad87aa1036a30e70339cc6c1b1":[5,0,1,6,0], -"mod_2directory_8php.html":[5,0,1,17], -"mod_2directory_8php.html#a5ee59c213508b6b9787612a8219cb5bf":[5,0,1,17,2], -"mod_2directory_8php.html#aa1d928543212871491706216742dd73c":[5,0,1,17,0], -"mod_2directory_8php.html#aac79396570d759da2efac24fcedf5b44":[5,0,1,17,1], -"mod_2follow_8php.html":[5,0,1,30], -"mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a":[5,0,1,30,1], -"mod_2follow_8php.html#a4c540ea4e9f5c581c1a53516ac585592":[5,0,1,30,0], -"mod_2group_8php.html":[5,0,1,32], -"mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83":[5,0,1,32,1], -"mod_2group_8php.html#aeb0784dd928e53e6d8693513bec8928c":[5,0,1,32,0], -"mod_2group_8php.html#aed1f009b1221348021bb34761160ef35":[5,0,1,32,2], -"mod_2menu_8php.html":[5,0,1,50], -"mod_2menu_8php.html#a6fed23af14d71a78a4153c8363a685cf":[5,0,1,50,0], -"mod_2menu_8php.html#aaa491ef173868fe002aece4632bcf393":[5,0,1,50,1], -"mod_2message_8php.html":[5,0,1,51], -"mod_2message_8php.html#a0db7030362a7e9ed9549b341d7b35718":[5,0,1,51,2], -"mod_2message_8php.html#a3547ed86d09a4bb8fa64ec374a40ee79":[5,0,1,51,1], -"mod_2message_8php.html#af4ba72486117cc24335fd8e92a2112a7":[5,0,1,51,0], -"mod_2network_8php.html":[5,0,1,55], -"mod_2network_8php.html#a180fce90ad11d7e0e45be094da7149ec":[5,0,1,55,1], -"mod_2network_8php.html#a36e03af6f2efe62ecaa247509365bfad":[5,0,1,55,3], -"mod_2network_8php.html#a43f2f29b90c5e29072c561934bc8f8b4":[5,0,1,55,0], -"mod_2network_8php.html#aeaa518c1a317516a3da337b88d358666":[5,0,1,55,2], -"mod_2notify_8php.html":[5,0,1,59], -"mod_2notify_8php.html#a94f9a6a9d4b5fd704baafff0c34f41ae":[5,0,1,59,1], -"mod_2notify_8php.html#acdf3851688ebd6d6a575eb84ef9febe3":[5,0,1,59,0], -"mod_2oembed_8php.html":[5,0,1,60], -"mod_2oembed_8php.html#a9145025aaf057fb5d3f9f7011e5e1014":[5,0,1,60,0], -"mod_2photos_8php.html":[5,0,1,66], -"mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080":[5,0,1,66,2], -"mod_2photos_8php.html#aa87382611a66ec5effdb2d78f13f5812":[5,0,1,66,0], -"mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014":[5,0,1,66,1], +"mod_2directory_8php.html":[5,0,1,18], +"mod_2directory_8php.html#a5ee59c213508b6b9787612a8219cb5bf":[5,0,1,18,2], +"mod_2directory_8php.html#aa1d928543212871491706216742dd73c":[5,0,1,18,0], +"mod_2directory_8php.html#aac79396570d759da2efac24fcedf5b44":[5,0,1,18,1], +"mod_2follow_8php.html":[5,0,1,32], +"mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a":[5,0,1,32,1], +"mod_2follow_8php.html#a4c540ea4e9f5c581c1a53516ac585592":[5,0,1,32,0], +"mod_2group_8php.html":[5,0,1,34], +"mod_2group_8php.html#a07a64f6c65b0080d8190b3d9728a7a83":[5,0,1,34,1], +"mod_2group_8php.html#aeb0784dd928e53e6d8693513bec8928c":[5,0,1,34,0], +"mod_2group_8php.html#aed1f009b1221348021bb34761160ef35":[5,0,1,34,2], +"mod_2menu_8php.html":[5,0,1,52], +"mod_2menu_8php.html#a6fed23af14d71a78a4153c8363a685cf":[5,0,1,52,0], +"mod_2menu_8php.html#aaa491ef173868fe002aece4632bcf393":[5,0,1,52,1], +"mod_2message_8php.html":[5,0,1,53], +"mod_2message_8php.html#a0db7030362a7e9ed9549b341d7b35718":[5,0,1,53,2], +"mod_2message_8php.html#a3547ed86d09a4bb8fa64ec374a40ee79":[5,0,1,53,1], +"mod_2message_8php.html#af4ba72486117cc24335fd8e92a2112a7":[5,0,1,53,0], +"mod_2network_8php.html":[5,0,1,57], +"mod_2network_8php.html#a180fce90ad11d7e0e45be094da7149ec":[5,0,1,57,1], +"mod_2network_8php.html#a36e03af6f2efe62ecaa247509365bfad":[5,0,1,57,3], +"mod_2network_8php.html#a43f2f29b90c5e29072c561934bc8f8b4":[5,0,1,57,0], +"mod_2network_8php.html#aeaa518c1a317516a3da337b88d358666":[5,0,1,57,2], +"mod_2notify_8php.html":[5,0,1,61], +"mod_2notify_8php.html#a94f9a6a9d4b5fd704baafff0c34f41ae":[5,0,1,61,1], +"mod_2notify_8php.html#acdf3851688ebd6d6a575eb84ef9febe3":[5,0,1,61,0], +"mod_2oembed_8php.html":[5,0,1,62], +"mod_2oembed_8php.html#a9145025aaf057fb5d3f9f7011e5e1014":[5,0,1,62,0], +"mod_2photos_8php.html":[5,0,1,68], +"mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080":[5,0,1,68,2], +"mod_2photos_8php.html#aa87382611a66ec5effdb2d78f13f5812":[5,0,1,68,0], +"mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014":[5,0,1,68,1], "mod__import_8php.html":[5,0,3,0,3], "mod__import_8php.html#a8db1899eeeb44dabd0904065b63627bb":[5,0,3,0,3,0], "mod__new__channel_8php.html":[5,0,3,0,4], "mod__new__channel_8php.html#a8db1899eeeb44dabd0904065b63627bb":[5,0,3,0,4,0], "mod__register_8php.html":[5,0,3,0,5], "mod__register_8php.html#a8db1899eeeb44dabd0904065b63627bb":[5,0,3,0,5,0], -"mood_8php.html":[5,0,1,53], -"mood_8php.html#a721b9b6703b3234a005641c92d409b8f":[5,0,1,53,0], -"mood_8php.html#a7ae136dd7476865b4828136175db5022":[5,0,1,53,1], -"msearch_8php.html":[5,0,1,54], -"msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[5,0,1,54,0], -"namespaceFriendica.html":[4,0,1], +"mood_8php.html":[5,0,1,55], +"mood_8php.html#a721b9b6703b3234a005641c92d409b8f":[5,0,1,55,0], +"mood_8php.html#a7ae136dd7476865b4828136175db5022":[5,0,1,55,1], +"msearch_8php.html":[5,0,1,56], +"msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[5,0,1,56,0], "namespaceFriendica.html":[3,0,1], +"namespaceFriendica.html":[4,0,1], "namespaceacl__selectors.html":[4,0,0], "namespaceacl__selectors.html":[3,0,0], "namespacefriendica-to-smarty-tpl.html":[4,0,2], @@ -91,48 +100,48 @@ var NAVTREEINDEX5 = "nav_8php.html":[5,0,0,44], "nav_8php.html#a43be0df73b90647ea70947ce004e231e":[5,0,0,44,0], "nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a":[5,0,0,44,1], -"new__channel_8php.html":[5,0,1,56], -"new__channel_8php.html#a180b0646957db8290482f02454ad7f23":[5,0,1,56,2], -"new__channel_8php.html#a1ad7f99e4366a32942c6b954aba3a164":[5,0,1,56,1], -"new__channel_8php.html#ae585191610f79da129492482ce8e2fee":[5,0,1,56,0], -"nogroup_8php.html":[5,0,1,57], -"nogroup_8php.html#a099cb353bf62e8453069ce107b763212":[5,0,1,57,1], -"nogroup_8php.html#a52085b183f97c552f1db5c4926e8ec30":[5,0,1,57,0], -"notifications_8php.html":[5,0,1,58], -"notifications_8php.html#a5baffec7b2e625c9f9cefbc097550d33":[5,0,1,58,1], -"notifications_8php.html#aadd0b5525bd8c283a5d8a37982bbfe62":[5,0,1,58,0], +"new__channel_8php.html":[5,0,1,58], +"new__channel_8php.html#a180b0646957db8290482f02454ad7f23":[5,0,1,58,2], +"new__channel_8php.html#a1ad7f99e4366a32942c6b954aba3a164":[5,0,1,58,1], +"new__channel_8php.html#ae585191610f79da129492482ce8e2fee":[5,0,1,58,0], +"nogroup_8php.html":[5,0,1,59], +"nogroup_8php.html#a099cb353bf62e8453069ce107b763212":[5,0,1,59,1], +"nogroup_8php.html#a52085b183f97c552f1db5c4926e8ec30":[5,0,1,59,0], +"notifications_8php.html":[5,0,1,60], +"notifications_8php.html#a5baffec7b2e625c9f9cefbc097550d33":[5,0,1,60,1], +"notifications_8php.html#aadd0b5525bd8c283a5d8a37982bbfe62":[5,0,1,60,0], "notifier_8php.html":[5,0,0,46], "notifier_8php.html#a568c502f626cff95e344c0748938b85d":[5,0,0,46,0], "oauth_8php.html":[5,0,0,48], "oauth_8php.html#a7a32a5990f113ac9465b03b29175cf16":[5,0,0,48,3], "oauth_8php.html#ad343cab37aa860d2d14dc86b7f5ca0c6":[5,0,0,48,2], -"oexchange_8php.html":[5,0,1,61], -"oexchange_8php.html#a2d8b785cd7d041a4e6274f5af370cf26":[5,0,1,61,0], -"oexchange_8php.html#ac8e2e469ddc3db984b0c1b44558aca59":[5,0,1,61,1], +"oexchange_8php.html":[5,0,1,63], +"oexchange_8php.html#a2d8b785cd7d041a4e6274f5af370cf26":[5,0,1,63,0], +"oexchange_8php.html#ac8e2e469ddc3db984b0c1b44558aca59":[5,0,1,63,1], "onepoll_8php.html":[5,0,0,50], "onepoll_8php.html#a72753b2fdec79b37c7f432035c91fb6d":[5,0,0,50,0], -"opensearch_8php.html":[5,0,1,62], -"opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9":[5,0,1,62,0], -"page_8php.html":[5,0,1,63], -"page_8php.html#a4d89800c0366a239191b1692c09635cf":[5,0,1,63,1], -"page_8php.html#a91a5f649f68406149108bded1dc90b22":[5,0,1,63,0], +"opensearch_8php.html":[5,0,1,64], +"opensearch_8php.html#ad13034877a496565ac7d99e9fc6f55e9":[5,0,1,64,0], +"page_8php.html":[5,0,1,65], +"page_8php.html#a4d89800c0366a239191b1692c09635cf":[5,0,1,65,1], +"page_8php.html#a91a5f649f68406149108bded1dc90b22":[5,0,1,65,0], "page__widgets_8php.html":[5,0,0,51], "page__widgets_8php.html#a1a1e729da27f252cab6678288a17958f":[5,0,0,51,1], "page__widgets_8php.html#ad82011c1ed90d9de8b9f34c12af5c6f0":[5,0,0,51,0], "pages.html":[], -"parse__url_8php.html":[5,0,1,64], -"parse__url_8php.html#a05a9e8944380ba3cf6bbf5893dd4b74b":[5,0,1,64,2], -"parse__url_8php.html#a25635549f2c22955d72465f4d2e58993":[5,0,1,64,3], -"parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a":[5,0,1,64,1], -"parse__url_8php.html#aa7dd8f961bea042d62726ed909e4a868":[5,0,1,64,0], +"parse__url_8php.html":[5,0,1,66], +"parse__url_8php.html#a05a9e8944380ba3cf6bbf5893dd4b74b":[5,0,1,66,2], +"parse__url_8php.html#a25635549f2c22955d72465f4d2e58993":[5,0,1,66,3], +"parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a":[5,0,1,66,1], +"parse__url_8php.html#aa7dd8f961bea042d62726ed909e4a868":[5,0,1,66,0], "permissions_8php.html":[5,0,0,52], "permissions_8php.html#a040fd3d3b8517658b1668ae0cd093972":[5,0,0,52,2], "permissions_8php.html#a0f5bd9f7f4c8fb7ba4b2c1ed048b4dc7":[5,0,0,52,0], "permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835":[5,0,0,52,3], "permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d":[5,0,0,52,4], "permissions_8php.html#aeca9b280f3dc3358c89976d81d690008":[5,0,0,52,1], -"photo_8php.html":[5,0,1,65], -"photo_8php.html#a582779d24882b0d31ee909a91d70a448":[5,0,1,65,0], +"photo_8php.html":[5,0,1,67], +"photo_8php.html#a582779d24882b0d31ee909a91d70a448":[5,0,1,67,0], "photo__driver_8php.html":[5,0,0,1,0], "photo__driver_8php.html#a102f3f26f67e0e38f4322a771951c1ca":[5,0,0,1,0,3], "photo__driver_8php.html#a1d0bc7161dec0d177b7d3bbe4421af9a":[5,0,0,1,0,2], @@ -152,10 +161,10 @@ var NAVTREEINDEX5 = "php_2default_8php.html":[5,0,3,0,0], "php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762":[5,0,3,0,0,0], "php_2theme__init_8php.html":[5,0,3,0,6], -"php_8php.html":[5,0,1,67], -"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[5,0,1,67,0], -"ping_8php.html":[5,0,1,68], -"ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[5,0,1,68,0], +"php_8php.html":[5,0,1,69], +"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[5,0,1,69,0], +"ping_8php.html":[5,0,1,70], +"ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[5,0,1,70,0], "plugin_8php.html":[5,0,0,54], "plugin_8php.html#a030cec6793b909c439c0336ba39b1571":[5,0,0,54,17], "plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76":[5,0,0,54,20], @@ -185,54 +194,54 @@ var NAVTREEINDEX5 = "plugin_8php.html#aff0178bd8d0b34a94d5efddc883edd35":[5,0,0,54,5], "po2php_8php.html":[5,0,2,6], "po2php_8php.html#a3b75e36f913198299e99559b175cd8b4":[5,0,2,6,0], -"poco_8php.html":[5,0,1,69], -"poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498":[5,0,1,69,0], -"poke_8php.html":[5,0,1,70], -"poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b":[5,0,1,70,1], -"poke_8php.html#ac9190563a8da9c07a16f9dcd71cf6993":[5,0,1,70,0], +"poco_8php.html":[5,0,1,71], +"poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498":[5,0,1,71,0], +"poke_8php.html":[5,0,1,72], +"poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b":[5,0,1,72,1], +"poke_8php.html#ac9190563a8da9c07a16f9dcd71cf6993":[5,0,1,72,0], "poller_8php.html":[5,0,0,55], "poller_8php.html#a5f12df3a4738124b6c039971e87e76da":[5,0,0,55,0], -"post_8php.html":[5,0,1,71], -"post_8php.html#af4b48181ce773ef0cdfc972441445c34":[5,0,1,71,0], -"post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[5,0,1,71,1], -"pretheme_8php.html":[5,0,1,72], -"pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[5,0,1,72,0], -"probe_8php.html":[5,0,1,73], -"probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[5,0,1,73,0], -"profile_8php.html":[5,0,1,74], -"profile_8php.html#a1a2482b775476f2f64ea5e8f4fc3fd1e":[5,0,1,74,0], -"profile_8php.html#a3775cf6eef6587e5143133356a7b76c0":[5,0,1,74,1], -"profile_8php.html#ab5d0246be0552e2182a585c1206d22a5":[5,0,1,74,2], +"post_8php.html":[5,0,1,73], +"post_8php.html#af4b48181ce773ef0cdfc972441445c34":[5,0,1,73,0], +"post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[5,0,1,73,1], +"pretheme_8php.html":[5,0,1,74], +"pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[5,0,1,74,0], +"probe_8php.html":[5,0,1,75], +"probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[5,0,1,75,0], +"profile_8php.html":[5,0,1,76], +"profile_8php.html#a1a2482b775476f2f64ea5e8f4fc3fd1e":[5,0,1,76,0], +"profile_8php.html#a3775cf6eef6587e5143133356a7b76c0":[5,0,1,76,1], +"profile_8php.html#ab5d0246be0552e2182a585c1206d22a5":[5,0,1,76,2], "profile__advanced_8php.html":[5,0,0,56], "profile__advanced_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4":[5,0,0,56,0], -"profile__photo_8php.html":[5,0,1,75], -"profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02":[5,0,1,75,1], -"profile__photo_8php.html#a4b80234074bd603221aa5364f330e479":[5,0,1,75,2], -"profile__photo_8php.html#ac9cd968a767e2ae1b88383b6cdd6dbe3":[5,0,1,75,0], +"profile__photo_8php.html":[5,0,1,77], +"profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02":[5,0,1,77,1], +"profile__photo_8php.html#a4b80234074bd603221aa5364f330e479":[5,0,1,77,2], +"profile__photo_8php.html#ac9cd968a767e2ae1b88383b6cdd6dbe3":[5,0,1,77,0], "profile__selectors_8php.html":[5,0,0,57], "profile__selectors_8php.html#a3b50b3ea4ea4bdbebebfffc5d1b157c7":[5,0,0,57,2], "profile__selectors_8php.html#a7473dd095987e1cdcc79d4f0bb5e6798":[5,0,0,57,1], "profile__selectors_8php.html#ae2b2c087e6530c61c0b256fd26d52355":[5,0,0,57,0], -"profiles_8php.html":[5,0,1,76], -"profiles_8php.html#a2a3ac90f51941ff78b85e9389304969c":[5,0,1,76,0], -"profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e":[5,0,1,76,2], -"profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00":[5,0,1,76,1], -"profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04":[5,0,1,76,3], -"profperm_8php.html":[5,0,1,77], -"profperm_8php.html#a17fb64ec05edee1dc94d95438807d6c6":[5,0,1,77,2], -"profperm_8php.html#a77fd398ae7c25142e1d9ad724ec347cc":[5,0,1,77,0], -"profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023":[5,0,1,77,1], -"pubsites_8php.html":[5,0,1,78], -"pubsites_8php.html#af614e279aab54065345bda6b03eafdf0":[5,0,1,78,0], -"qsearch_8php.html":[5,0,1,79], -"qsearch_8php.html#a0501887b95bd8fa21018b2936a668894":[5,0,1,79,0], +"profiles_8php.html":[5,0,1,78], +"profiles_8php.html#a2a3ac90f51941ff78b85e9389304969c":[5,0,1,78,0], +"profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e":[5,0,1,78,2], +"profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00":[5,0,1,78,1], +"profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04":[5,0,1,78,3], +"profperm_8php.html":[5,0,1,79], +"profperm_8php.html#a17fb64ec05edee1dc94d95438807d6c6":[5,0,1,79,2], +"profperm_8php.html#a77fd398ae7c25142e1d9ad724ec347cc":[5,0,1,79,0], +"profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023":[5,0,1,79,1], +"pubsites_8php.html":[5,0,1,80], +"pubsites_8php.html#af614e279aab54065345bda6b03eafdf0":[5,0,1,80,0], +"qsearch_8php.html":[5,0,1,81], +"qsearch_8php.html#a0501887b95bd8fa21018b2936a668894":[5,0,1,81,0], "queue_8php.html":[5,0,0,59], "queue_8php.html#af8c93de86d866c3200174c8450a0f341":[5,0,0,59,0], "queue__fn_8php.html":[5,0,0,60], "queue__fn_8php.html#a4c2876181f75a4a61e85b7f00dfdbba1":[5,0,0,60,1], "queue__fn_8php.html#a8fe71e981399bbf5d000a6ca42f57b24":[5,0,0,60,0], -"randprof_8php.html":[5,0,1,80], -"randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[5,0,1,80,0], +"randprof_8php.html":[5,0,1,82], +"randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[5,0,1,82,0], "redbasic_2php_2style_8php.html":[5,0,3,1,0,0,1], "redbasic_2php_2style_8php.html#a02d39b683a42fffbb27823d3860283bd":[5,0,3,1,0,0,1,14], "redbasic_2php_2style_8php.html#a03a72942b7428fd9af1224770d20a8ba":[5,0,3,1,0,0,1,5], @@ -240,14 +249,5 @@ var NAVTREEINDEX5 = "redbasic_2php_2style_8php.html#a109bbd7f4add27541707b191b73ef84a":[5,0,3,1,0,0,1,17], "redbasic_2php_2style_8php.html#a232513bf4339fe34908c4c63cb93168b":[5,0,3,1,0,0,1,4], "redbasic_2php_2style_8php.html#a4086b1a341b7c8462a47fb1b25fd49ab":[5,0,3,1,0,0,1,0], -"redbasic_2php_2style_8php.html#a4131d1765ee4deb28e83fc4527943ee0":[5,0,3,1,0,0,1,2], -"redbasic_2php_2style_8php.html#a45e6fafa363bc4586fa91dce1786be4f":[5,0,3,1,0,0,1,16], -"redbasic_2php_2style_8php.html#a6502bedd57105ad1fb2dee2be9cf6351":[5,0,3,1,0,0,1,9], -"redbasic_2php_2style_8php.html#a6628a80911a6b37b464ef110ac8f6e42":[5,0,3,1,0,0,1,3], -"redbasic_2php_2style_8php.html#a8749837e08dfb3372662af9c33fa2a2e":[5,0,3,1,0,0,1,15], -"redbasic_2php_2style_8php.html#a938168352fd3cdaa1c10c16a34f5938a":[5,0,3,1,0,0,1,8], -"redbasic_2php_2style_8php.html#aa658152b727ea1233f6df6ded6437dad":[5,0,3,1,0,0,1,1], -"redbasic_2php_2style_8php.html#ac4c6bc3cd9cc92204f04cf6cb34b47dd":[5,0,3,1,0,0,1,19], -"redbasic_2php_2style_8php.html#acb3046ad9c01b7d60cde20f58d77c548":[5,0,3,1,0,0,1,12], -"redbasic_2php_2style_8php.html#acc190405dda0a23a80551dee11c74c0c":[5,0,3,1,0,0,1,6] +"redbasic_2php_2style_8php.html#a4131d1765ee4deb28e83fc4527943ee0":[5,0,3,1,0,0,1,2] }; diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index 6c9ad83c4..a260404a5 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -1,13 +1,22 @@ var NAVTREEINDEX6 = { +"redbasic_2php_2style_8php.html#a45e6fafa363bc4586fa91dce1786be4f":[5,0,3,1,0,0,1,16], +"redbasic_2php_2style_8php.html#a6502bedd57105ad1fb2dee2be9cf6351":[5,0,3,1,0,0,1,9], +"redbasic_2php_2style_8php.html#a6628a80911a6b37b464ef110ac8f6e42":[5,0,3,1,0,0,1,3], +"redbasic_2php_2style_8php.html#a8749837e08dfb3372662af9c33fa2a2e":[5,0,3,1,0,0,1,15], +"redbasic_2php_2style_8php.html#a938168352fd3cdaa1c10c16a34f5938a":[5,0,3,1,0,0,1,8], +"redbasic_2php_2style_8php.html#aa658152b727ea1233f6df6ded6437dad":[5,0,3,1,0,0,1,1], +"redbasic_2php_2style_8php.html#ac4c6bc3cd9cc92204f04cf6cb34b47dd":[5,0,3,1,0,0,1,19], +"redbasic_2php_2style_8php.html#acb3046ad9c01b7d60cde20f58d77c548":[5,0,3,1,0,0,1,12], +"redbasic_2php_2style_8php.html#acc190405dda0a23a80551dee11c74c0c":[5,0,3,1,0,0,1,6], "redbasic_2php_2style_8php.html#adcfa918e05b5a98cbddc84bc3f1c15cc":[5,0,3,1,0,0,1,11], "redbasic_2php_2style_8php.html#addf42c3d02e53f8e4153f3bb9dabfcda":[5,0,3,1,0,0,1,10], "redbasic_2php_2style_8php.html#aef266cfcb27c6ddb3292584c945bab33":[5,0,3,1,0,0,1,7], "redbasic_2php_2style_8php.html#af3a16c5f0dd7a74cf9acf6a49fff73a7":[5,0,3,1,0,0,1,18], "redbasic_2php_2theme_8php.html":[5,0,3,1,0,0,2], "redbasic_2php_2theme_8php.html#af6eb813e9fc7e2d76ac1b82bc5c0ed9b":[5,0,3,1,0,0,2,0], -"redir_8php.html":[5,0,1,81], -"redir_8php.html#a9ac266c3f5cf0d94ef63e6d0f2edf1f5":[5,0,1,81,0], +"redir_8php.html":[5,0,1,83], +"redir_8php.html#a9ac266c3f5cf0d94ef63e6d0f2edf1f5":[5,0,1,83,0], "redstrap_2php_2style_8php.html":[5,0,3,1,1,0,2], "redstrap_2php_2style_8php.html#a02d39b683a42fffbb27823d3860283bd":[5,0,3,1,1,0,2,13], "redstrap_2php_2style_8php.html#a03a72942b7428fd9af1224770d20a8ba":[5,0,3,1,1,0,2,5], @@ -28,28 +37,28 @@ var NAVTREEINDEX6 = "redstrap_2php_2style_8php.html#aef266cfcb27c6ddb3292584c945bab33":[5,0,3,1,1,0,2,7], "redstrap_2php_2theme_8php.html":[5,0,3,1,1,0,3], "redstrap_2php_2theme_8php.html#a4dac61d466b4261deca2846f548e484a":[5,0,3,1,1,0,3,0], -"register_8php.html":[5,0,1,82], -"register_8php.html#a0e91f57f111407ea8d3223a05022bb2a":[5,0,1,82,0], -"register_8php.html#a51731dcc1917c58a790eb1c0f6132271":[5,0,1,82,2], -"register_8php.html#ae20c0cd40f738d6295de58b9202c83d5":[5,0,1,82,1], -"regmod_8php.html":[5,0,1,83], -"regmod_8php.html#a7953df4e32e63946565e90cdd5d50409":[5,0,1,83,0], -"removeme_8php.html":[5,0,1,84], -"removeme_8php.html#a065a589caa2aa84c60f7073a28f0ad9c":[5,0,1,84,0], -"removeme_8php.html#a7be08738beca44bb98a79e01cdb2ee88":[5,0,1,84,1], -"rmagic_8php.html":[5,0,1,85], -"rmagic_8php.html#a3e28db1e5cfa7e5c2617f90222c1caef":[5,0,1,85,0], -"rmagic_8php.html#a869de069d081b3c4e98b957d06bbf08f":[5,0,1,85,2], -"rmagic_8php.html#a95455edd43f1bff39446a57388cdde16":[5,0,1,85,1], -"rsd__xml_8php.html":[5,0,1,86], -"rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82":[5,0,1,86,0], -"search_8php.html":[5,0,1,87], -"search_8php.html#a230ec9681ddee3b5b8b40c8d550f32f7":[5,0,1,87,2], -"search_8php.html#aa911f7c7f0cdb0284e35d0ed610f19c6":[5,0,1,87,3], -"search_8php.html#ab2568591359edde5b483a6cd9a24b2cc":[5,0,1,87,0], -"search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[5,0,1,87,1], -"search__ac_8php.html":[5,0,1,88], -"search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[5,0,1,88,0], +"register_8php.html":[5,0,1,84], +"register_8php.html#a0e91f57f111407ea8d3223a05022bb2a":[5,0,1,84,0], +"register_8php.html#a51731dcc1917c58a790eb1c0f6132271":[5,0,1,84,2], +"register_8php.html#ae20c0cd40f738d6295de58b9202c83d5":[5,0,1,84,1], +"regmod_8php.html":[5,0,1,85], +"regmod_8php.html#a7953df4e32e63946565e90cdd5d50409":[5,0,1,85,0], +"removeme_8php.html":[5,0,1,86], +"removeme_8php.html#a065a589caa2aa84c60f7073a28f0ad9c":[5,0,1,86,0], +"removeme_8php.html#a7be08738beca44bb98a79e01cdb2ee88":[5,0,1,86,1], +"rmagic_8php.html":[5,0,1,87], +"rmagic_8php.html#a3e28db1e5cfa7e5c2617f90222c1caef":[5,0,1,87,0], +"rmagic_8php.html#a869de069d081b3c4e98b957d06bbf08f":[5,0,1,87,2], +"rmagic_8php.html#a95455edd43f1bff39446a57388cdde16":[5,0,1,87,1], +"rsd__xml_8php.html":[5,0,1,88], +"rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82":[5,0,1,88,0], +"search_8php.html":[5,0,1,89], +"search_8php.html#a230ec9681ddee3b5b8b40c8d550f32f7":[5,0,1,89,2], +"search_8php.html#aa911f7c7f0cdb0284e35d0ed610f19c6":[5,0,1,89,3], +"search_8php.html#ab2568591359edde5b483a6cd9a24b2cc":[5,0,1,89,0], +"search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[5,0,1,89,1], +"search__ac_8php.html":[5,0,1,90], +"search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[5,0,1,90,0], "security_8php.html":[5,0,0,61], "security_8php.html#a20f8b9851f23ee8894b8925584ef6821":[5,0,0,61,2], "security_8php.html#a444ac867dfa8c37cf0a7a226412bee28":[5,0,0,61,4], @@ -73,37 +82,37 @@ var NAVTREEINDEX6 = "session_8php.html#ac95373f4966862a028033dd2f94d4da1":[5,0,0,62,3], "session_8php.html#af0100a2642a5268594bbd5742a03d885":[5,0,0,62,9], "session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052":[5,0,0,62,2], -"settings_8php.html":[5,0,1,89], -"settings_8php.html#a39abc76ff5459c57e3b957664f273f18":[5,0,1,89,0], -"settings_8php.html#a3a4cde287482fced008583f54ba2a722":[5,0,1,89,2], -"settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586":[5,0,1,89,3], -"settings_8php.html#ae5aebccb006bee1300078576baaf5582":[5,0,1,89,1], -"setup_8php.html":[5,0,1,90], -"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[5,0,1,90,2], -"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[5,0,1,90,13], -"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[5,0,1,90,5], -"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[5,0,1,90,12], -"setup_8php.html#a2b375ddc555140236fc500135de99371":[5,0,1,90,9], -"setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f":[5,0,1,90,3], -"setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e":[5,0,1,90,1], -"setup_8php.html#a8652788e8589778c5f81634a9d5b9429":[5,0,1,90,7], -"setup_8php.html#a88247384a96e14516f474d7af6a465c1":[5,0,1,90,11], -"setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76":[5,0,1,90,4], -"setup_8php.html#abe405d227ba7232971964a706d4f3bce":[5,0,1,90,10], -"setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a":[5,0,1,90,8], -"setup_8php.html#addb24714bc2542aa4f4215e98fe48432":[5,0,1,90,15], -"setup_8php.html#ae8e4d9279a61de74d5f39962cb7b6ca1":[5,0,1,90,0], -"setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58":[5,0,1,90,14], -"setup_8php.html#afd8b0b3ade1507c45325caf377bf459d":[5,0,1,90,6], -"share_8php.html":[5,0,1,91], -"share_8php.html#afeb26046bdd02567ecd29ab5f188b249":[5,0,1,91,0], -"siteinfo_8php.html":[5,0,1,92], -"siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[5,0,1,92,1], -"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[5,0,1,92,0], -"sitelist_8php.html":[5,0,1,93], -"sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1":[5,0,1,93,0], -"smilies_8php.html":[5,0,1,94], -"smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[5,0,1,94,0], +"settings_8php.html":[5,0,1,91], +"settings_8php.html#a39abc76ff5459c57e3b957664f273f18":[5,0,1,91,0], +"settings_8php.html#a3a4cde287482fced008583f54ba2a722":[5,0,1,91,2], +"settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586":[5,0,1,91,3], +"settings_8php.html#ae5aebccb006bee1300078576baaf5582":[5,0,1,91,1], +"setup_8php.html":[5,0,1,92], +"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[5,0,1,92,2], +"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[5,0,1,92,13], +"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[5,0,1,92,5], +"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[5,0,1,92,12], +"setup_8php.html#a2b375ddc555140236fc500135de99371":[5,0,1,92,9], +"setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f":[5,0,1,92,3], +"setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e":[5,0,1,92,1], +"setup_8php.html#a8652788e8589778c5f81634a9d5b9429":[5,0,1,92,7], +"setup_8php.html#a88247384a96e14516f474d7af6a465c1":[5,0,1,92,11], +"setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76":[5,0,1,92,4], +"setup_8php.html#abe405d227ba7232971964a706d4f3bce":[5,0,1,92,10], +"setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a":[5,0,1,92,8], +"setup_8php.html#addb24714bc2542aa4f4215e98fe48432":[5,0,1,92,15], +"setup_8php.html#ae8e4d9279a61de74d5f39962cb7b6ca1":[5,0,1,92,0], +"setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58":[5,0,1,92,14], +"setup_8php.html#afd8b0b3ade1507c45325caf377bf459d":[5,0,1,92,6], +"share_8php.html":[5,0,1,93], +"share_8php.html#afeb26046bdd02567ecd29ab5f188b249":[5,0,1,93,0], +"siteinfo_8php.html":[5,0,1,94], +"siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[5,0,1,94,1], +"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[5,0,1,94,0], +"sitelist_8php.html":[5,0,1,95], +"sitelist_8php.html#a665a59bf60f780b40f32c909f4a473b1":[5,0,1,95,0], +"smilies_8php.html":[5,0,1,96], +"smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[5,0,1,96,0], "socgraph_8php.html":[5,0,0,63], "socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586":[5,0,0,63,0], "socgraph_8php.html#a5ef8bef37161df53718a21e93d02fbd6":[5,0,0,63,6], @@ -114,21 +123,21 @@ var NAVTREEINDEX6 = "socgraph_8php.html#ac343a846241d36cdf046b08f3396cfe9":[5,0,0,63,2], "socgraph_8php.html#af175807406d94407a5e11742a3287746":[5,0,0,63,5], "socgraph_8php.html#af29d056beec10b4e38e5209c92452894":[5,0,0,63,3], -"starred_8php.html":[5,0,1,95], -"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[5,0,1,95,0], -"subthread_8php.html":[5,0,1,96], -"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[5,0,1,96,0], -"suggest_8php.html":[5,0,1,97], -"suggest_8php.html#a4df91c84594d51ba56b5918de414230d":[5,0,1,97,0], -"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[5,0,1,97,1], -"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[5,0,1,97,2], +"starred_8php.html":[5,0,1,97], +"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[5,0,1,97,0], +"subthread_8php.html":[5,0,1,98], +"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[5,0,1,98,0], +"suggest_8php.html":[5,0,1,99], +"suggest_8php.html#a4df91c84594d51ba56b5918de414230d":[5,0,1,99,0], +"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[5,0,1,99,1], +"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[5,0,1,99,2], "system__unavailable_8php.html":[5,0,0,64], "system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa":[5,0,0,64,0], -"tagger_8php.html":[5,0,1,98], -"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[5,0,1,98,0], -"tagrm_8php.html":[5,0,1,99], -"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[5,0,1,99,1], -"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[5,0,1,99,0], +"tagger_8php.html":[5,0,1,100], +"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[5,0,1,100,0], +"tagrm_8php.html":[5,0,1,101], +"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[5,0,1,101,1], +"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[5,0,1,101,0], "taxonomy_8php.html":[5,0,0,65], "taxonomy_8php.html#a03f55ee46c5f496e42f3d29db8d09cce":[5,0,0,65,6], "taxonomy_8php.html#a061b3db9426d4b074395f5824062cad4":[5,0,0,65,8], @@ -233,21 +242,12 @@ var NAVTREEINDEX6 = "theme_2redstrap_2php_2default_8php.html":[5,0,3,1,1,0,1], "theme_2redstrap_2php_2default_8php.html#a23bc1996b18e69c1a3ab44536613a762":[5,0,3,1,1,0,1,0], "theme_2redstrap_2php_2theme__init_8php.html":[5,0,3,1,1,0,4], -"thing_8php.html":[5,0,1,100], -"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[5,0,1,100,0], -"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[5,0,1,100,1], -"toggle__mobile_8php.html":[5,0,1,101], -"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[5,0,1,101,0], +"thing_8php.html":[5,0,1,102], +"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[5,0,1,102,0], +"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[5,0,1,102,1], +"toggle__mobile_8php.html":[5,0,1,103], +"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[5,0,1,103,0], "tpldebug_8php.html":[5,0,2,7], "tpldebug_8php.html#a44778457a6c02554812fbfad19d32ba3":[5,0,2,7,0], -"tpldebug_8php.html#a5358407d65f2ca826f96356a6642d149":[5,0,2,7,1], -"tpldebug_8php.html#afbc7aadb3f7ff1edf0aaaa326a42179c":[5,0,2,7,2], -"typo_8php.html":[5,0,2,8], -"typo_8php.html#a1b709c1d79631ebc8320b41bda028b54":[5,0,2,8,1], -"typo_8php.html#a329c9c12217d2c8660c47bbc7c8df4c5":[5,0,2,8,4], -"typo_8php.html#a3ecd17ac846be1b35f3662f5c12ab6bd":[5,0,2,8,3], -"typo_8php.html#a9590b15215a21e9b42eb546aeef79704":[5,0,2,8,2], -"typo_8php.html#acebf83966ef6d7e5645a6b62ba368f9f":[5,0,2,8,0], -"typohelper_8php.html":[5,0,2,9], -"typohelper_8php.html#a7542d95618011800c61773127fa625cf":[5,0,2,9,0] +"tpldebug_8php.html#a5358407d65f2ca826f96356a6642d149":[5,0,2,7,1] }; diff --git a/doc/html/navtreeindex7.js b/doc/html/navtreeindex7.js index 12923a8db..eb72d75c9 100644 --- a/doc/html/navtreeindex7.js +++ b/doc/html/navtreeindex7.js @@ -1,18 +1,27 @@ var NAVTREEINDEX7 = { +"tpldebug_8php.html#afbc7aadb3f7ff1edf0aaaa326a42179c":[5,0,2,7,2], +"typo_8php.html":[5,0,2,8], +"typo_8php.html#a1b709c1d79631ebc8320b41bda028b54":[5,0,2,8,1], +"typo_8php.html#a329c9c12217d2c8660c47bbc7c8df4c5":[5,0,2,8,4], +"typo_8php.html#a3ecd17ac846be1b35f3662f5c12ab6bd":[5,0,2,8,3], +"typo_8php.html#a9590b15215a21e9b42eb546aeef79704":[5,0,2,8,2], +"typo_8php.html#acebf83966ef6d7e5645a6b62ba368f9f":[5,0,2,8,0], +"typohelper_8php.html":[5,0,2,9], +"typohelper_8php.html#a7542d95618011800c61773127fa625cf":[5,0,2,9,0], "typohelper_8php.html#ab6fd357fb5b2a3ba8aab9e8b98c6a805":[5,0,2,9,1], -"uexport_8php.html":[5,0,1,102], -"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[5,0,1,102,0], -"update__channel_8php.html":[5,0,1,103], -"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[5,0,1,103,0], -"update__community_8php.html":[5,0,1,104], -"update__community_8php.html#abdcc5c4ecebbe0b5fcba2755c69cb3b1":[5,0,1,104,0], -"update__display_8php.html":[5,0,1,105], -"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[5,0,1,105,0], -"update__network_8php.html":[5,0,1,106], -"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[5,0,1,106,0], -"update__search_8php.html":[5,0,1,107], -"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[5,0,1,107,0], +"uexport_8php.html":[5,0,1,104], +"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[5,0,1,104,0], +"update__channel_8php.html":[5,0,1,105], +"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[5,0,1,105,0], +"update__community_8php.html":[5,0,1,106], +"update__community_8php.html#abdcc5c4ecebbe0b5fcba2755c69cb3b1":[5,0,1,106,0], +"update__display_8php.html":[5,0,1,107], +"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[5,0,1,107,0], +"update__network_8php.html":[5,0,1,108], +"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[5,0,1,108,0], +"update__search_8php.html":[5,0,1,109], +"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[5,0,1,109,0], "updatetpl_8py.html":[5,0,2,10], "updatetpl_8py.html#a52a85ffa6b6d63d840b185a133478c12":[5,0,2,10,5], "updatetpl_8py.html#a79c20eb62d568c999b56eb08530355d3":[5,0,2,10,2], @@ -28,34 +37,34 @@ var NAVTREEINDEX7 = "view_2theme_2redstrap_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[5,0,3,1,1,0,0,1], "view_2theme_2redstrap_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[5,0,3,1,1,0,0,2], "view_2theme_2redstrap_2php_2config_8php.html#af58e97b437c1e98a5e434886494cc70e":[5,0,3,1,1,0,0,0], -"view_8php.html":[5,0,1,108], -"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[5,0,1,108,0], -"viewconnections_8php.html":[5,0,1,109], -"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[5,0,1,109,2], -"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[5,0,1,109,1], -"viewconnections_8php.html#ae330cea4cddd091559659f8b469617b6":[5,0,1,109,0], -"viewsrc_8php.html":[5,0,1,110], -"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[5,0,1,110,0], -"vote_8php.html":[5,0,1,111], -"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[5,0,1,111,2], -"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[5,0,1,111,0], -"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[5,0,1,111,1], -"wall__attach_8php.html":[5,0,1,112], -"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[5,0,1,112,0], -"wall__upload_8php.html":[5,0,1,113], -"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[5,0,1,113,0], -"webfinger_8php.html":[5,0,1,114], -"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[5,0,1,114,0], -"webpages_8php.html":[5,0,1,115], -"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[5,0,1,115,0], -"wfinger_8php.html":[5,0,1,116], -"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[5,0,1,116,0], -"xchan_8php.html":[5,0,1,117], -"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[5,0,1,117,0], -"xrd_8php.html":[5,0,1,118], -"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[5,0,1,118,0], -"zfinger_8php.html":[5,0,1,119], -"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[5,0,1,119,0], +"view_8php.html":[5,0,1,110], +"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[5,0,1,110,0], +"viewconnections_8php.html":[5,0,1,111], +"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[5,0,1,111,2], +"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[5,0,1,111,1], +"viewconnections_8php.html#ae330cea4cddd091559659f8b469617b6":[5,0,1,111,0], +"viewsrc_8php.html":[5,0,1,112], +"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[5,0,1,112,0], +"vote_8php.html":[5,0,1,113], +"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[5,0,1,113,2], +"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[5,0,1,113,0], +"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[5,0,1,113,1], +"wall__attach_8php.html":[5,0,1,114], +"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[5,0,1,114,0], +"wall__upload_8php.html":[5,0,1,115], +"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[5,0,1,115,0], +"webfinger_8php.html":[5,0,1,116], +"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[5,0,1,116,0], +"webpages_8php.html":[5,0,1,117], +"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[5,0,1,117,0], +"wfinger_8php.html":[5,0,1,118], +"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[5,0,1,118,0], +"xchan_8php.html":[5,0,1,119], +"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[5,0,1,119,0], +"xrd_8php.html":[5,0,1,120], +"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[5,0,1,120,0], +"zfinger_8php.html":[5,0,1,121], +"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[5,0,1,121,0], "zot_8php.html":[5,0,0,68], "zot_8php.html#a083aec6c900d244e1bfc1406f9461465":[5,0,0,68,11], "zot_8php.html#a22e3f9b97b7969ddbe43ccf0db93a19c":[5,0,0,68,20], @@ -68,7 +77,6 @@ var NAVTREEINDEX7 = "zot_8php.html#a55056e863a7860bc0cf922e78fcce073":[5,0,0,68,19], "zot_8php.html#a5bcdfef419b16075a0eca990956223dc":[5,0,0,68,24], "zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea":[5,0,0,68,16], -"zot_8php.html#a666d3efcac00ec1b4a4537a60655f2ab":[5,0,0,68,14], "zot_8php.html#a703f528ade8382cf374e4119bd6f7859":[5,0,0,68,0], "zot_8php.html#a77720d6b59894e9b609af89c310c8a4d":[5,0,0,68,17], "zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d":[5,0,0,68,23], @@ -79,12 +87,13 @@ var NAVTREEINDEX7 = "zot_8php.html#ab0227978011d8601494a7651fa26acf0":[5,0,0,68,6], "zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7":[5,0,0,68,21], "zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142":[5,0,0,68,25], +"zot_8php.html#abd83bc7e3db604bdca85c3a8c7e2bf63":[5,0,0,68,14], "zot_8php.html#ac301c67864917c35922257950ae0f95c":[5,0,0,68,7], "zot_8php.html#ac34e479d27f32b82dd6b33542f81a6a7":[5,0,0,68,1], "zot_8php.html#acdea9362d78a63dce948fdf0ea73ef0e":[5,0,0,68,18], "zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72":[5,0,0,68,2], -"zotfeed_8php.html":[5,0,1,120], -"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,120,0], -"zping_8php.html":[5,0,1,121], -"zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75":[5,0,1,121,0] +"zotfeed_8php.html":[5,0,1,122], +"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,122,0], +"zping_8php.html":[5,0,1,123], +"zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75":[5,0,1,123,0] }; diff --git a/doc/html/plugin_8php.html b/doc/html/plugin_8php.html index 97a646d33..ad38bf4f8 100644 --- a/doc/html/plugin_8php.html +++ b/doc/html/plugin_8php.html @@ -282,7 +282,7 @@ Functions
    -

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

    +

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

    @@ -558,7 +558,7 @@ Functions @@ -586,7 +586,7 @@ Functions @@ -734,7 +734,7 @@ Functions diff --git a/doc/html/redbasic_2php_2style_8php.html b/doc/html/redbasic_2php_2style_8php.html index 0f88577e4..48c55f1de 100644 --- a/doc/html/redbasic_2php_2style_8php.html +++ b/doc/html/redbasic_2php_2style_8php.html @@ -386,7 +386,7 @@ Variables
    -

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

    +

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

    @@ -400,7 +400,7 @@ Variables
    -

    Referenced by Template\_replcb_for(), Template\_replcb_if(), account_remove(), acl_init(), activity_sanitise(), admin_page_themes(), aes_encapsulate(), argv(), array_sanitise(), attach_store(), autoname(), blocks_content(), build_sync_packet(), change_channel(), channel_content(), check_config(), check_form_security_token(), check_list_permissions(), check_webbie(), common_init(), construct_page(), conversation(), crepair_post(), photo_gd\cropImage(), photo_imagick\cropImage(), datesel(), datesel_format(), decode_tags(), deliver_run(), directory_content(), directory_run(), dirfind_content(), display_content(), email_header_encode(), encode_item(), encode_mail(), event_store(), expand_groups(), feature_enabled(), fetch_post_tags(), find_xchan_in_array(), findpeople_widget(), fix_private_photos(), fix_system_urls(), photo_gd\flip(), fsuggest_post(), generate_user_guid(), get_all_perms(), get_item_elements(), get_mail_elements(), get_mentions(), get_profile_elements(), get_terms_oftype(), gprobe_run(), ids_to_querystr(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), json_decode_plus(), json_return_and_die(), lastpost_content(), layouts_content(), legal_webbie(), lrdd(), magic_init(), manage_content(), match_content(), menu_content(), menu_delete_id(), menu_fetch(), menu_render(), message_post(), mimetype_select(), navbar_complete(), network_content(), network_init(), new_channel_init(), new_contact(), notification(), notifier_run(), oembed_fetch_url(), onepoll_run(), parse_xml_string(), perm_is_allowed(), photos_post(), ping_init(), poco_load(), poller_run(), post_init(), post_post(), preg_heart(), prepare_body(), print_template(), private_messages_list(), proc_run(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), public_recips(), dba_mysql\q(), dba_mysqli\q(), randprof_init(), remove_community_tag(), photo_driver\save(), search_ac_init(), send_status_notifications(), App\set_widget(), site_default_perms(), smilies(), photo_driver\store(), stringify_array_elms(), sync_directories(), tag_deliver(), tagadelic(), tagrm_content(), tagrm_post(), theme_status(), timesel(), toggle_theme(), upgrade_bool_message(), upgrade_message(), valid_email(), webpages_content(), xchan_query(), xmlify(), zfinger_init(), zot_process_response(), zot_refresh(), and zot_register_hub().

    +

    Referenced by Template\_replcb_for(), Template\_replcb_if(), account_remove(), acl_init(), activity_sanitise(), admin_page_themes(), aes_encapsulate(), argv(), array_sanitise(), attach_store(), autoname(), blocks_content(), build_sync_packet(), change_channel(), channel_content(), check_config(), check_form_security_token(), check_list_permissions(), check_webbie(), common_init(), construct_page(), conversation(), crepair_post(), photo_gd\cropImage(), photo_imagick\cropImage(), datesel(), datesel_format(), decode_tags(), deliver_run(), directory_content(), directory_run(), dirfind_content(), display_content(), email_header_encode(), encode_item(), encode_mail(), event_store(), expand_groups(), feature_enabled(), fetch_post_tags(), find_xchan_in_array(), findpeople_widget(), fix_private_photos(), fix_system_urls(), photo_gd\flip(), fsuggest_post(), generate_user_guid(), get_all_perms(), get_item_elements(), get_mail_elements(), get_mentions(), get_profile_elements(), get_terms_oftype(), gprobe_run(), ids_to_querystr(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), json_decode_plus(), json_return_and_die(), lastpost_content(), layouts_content(), legal_webbie(), lrdd(), magic_init(), manage_content(), match_content(), menu_content(), menu_delete_id(), menu_fetch(), menu_render(), message_post(), mimetype_select(), navbar_complete(), network_content(), network_init(), new_channel_init(), new_contact(), notification(), notifier_run(), oembed_fetch_url(), onepoll_run(), parse_xml_string(), perm_is_allowed(), photos_post(), ping_init(), poco_load(), poller_run(), post_init(), post_post(), preg_heart(), prepare_body(), print_template(), private_messages_list(), proc_run(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), public_recips(), dba_mysql\q(), dba_mysqli\q(), randprof_init(), remove_community_tag(), photo_driver\save(), search_ac_init(), send_status_notifications(), App\set_widget(), site_default_perms(), smilies(), photo_driver\store(), stringify_array_elms(), sync_directories(), tag_deliver(), tagadelic(), tagrm_content(), tagrm_post(), theme_status(), timesel(), toggle_theme(), update_imported_item(), upgrade_bool_message(), upgrade_message(), valid_email(), webpages_content(), xchan_query(), xmlify(), zfinger_init(), zot_process_response(), zot_refresh(), and zot_register_hub().

    diff --git a/doc/html/search/all_63.js b/doc/html/search/all_63.js index 8da6083e4..dfa406698 100644 --- a/doc/html/search/all_63.js +++ b/doc/html/search/all_63.js @@ -11,6 +11,7 @@ var searchData= ['chanlink_5fcid',['chanlink_cid',['../text_8php.html#a85e3a4851c16674834010d8419a5d7ca',1,'text.php']]], ['chanlink_5fhash',['chanlink_hash',['../text_8php.html#a55ab893be57feda59c2a7ba1e58ff2d0',1,'text.php']]], ['chanlink_5furl',['chanlink_url',['../text_8php.html#a2e8d6c402603be3a1256a16605e09c2a',1,'text.php']]], + ['chanman_2ephp',['chanman.php',['../chanman_8php.html',1,'']]], ['channel_2ephp',['channel.php',['../channel_8php.html',1,'']]], ['channel_5faside',['channel_aside',['../channel_8php.html#aea8e189f2fbabfda779349dd94082e8e',1,'channel.php']]], ['channel_5fcontent',['channel_content',['../channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1',1,'channel.php']]], diff --git a/doc/html/search/all_66.js b/doc/html/search/all_66.js index f1cd4b7f2..8ba44eea7 100644 --- a/doc/html/search/all_66.js +++ b/doc/html/search/all_66.js @@ -24,6 +24,8 @@ var searchData= ['filerm_2ephp',['filerm.php',['../filerm_8php.html',1,'']]], ['filerm_5fcontent',['filerm_content',['../filerm_8php.html#ae2eb28d2054fa2c37e38689882172208',1,'filerm.php']]], ['files',['files',['../namespacefriendica-to-smarty-tpl.html#ae74419b16516956c66f7db714a93a6ac',1,'friendica-to-smarty-tpl']]], + ['filestorage_2ephp',['filestorage.php',['../filestorage_8php.html',1,'']]], + ['filestorage_5fcontent',['filestorage_content',['../filestorage_8php.html#a61bb1be78472555df4ce619f51014040',1,'filestorage.php']]], ['find_5fthread_5fparent_5findex',['find_thread_parent_index',['../conversation_8php.html#ae59703b07ce2ddf627b4172ff26058b6',1,'conversation.php']]], ['find_5fupstream_5fdirectory',['find_upstream_directory',['../dir__fns_8php.html#a8c15aa69da12f2d3476b9e93b82b337d',1,'dir_fns.php']]], ['find_5fxchan_5fin_5farray',['find_xchan_in_array',['../text_8php.html#ace3c98538c63e09b70a363210b414112',1,'text.php']]], diff --git a/doc/html/search/all_68.js b/doc/html/search/all_68.js index c8c136ff9..e09148866 100644 --- a/doc/html/search/all_68.js +++ b/doc/html/search/all_68.js @@ -24,5 +24,10 @@ var searchData= ['html2plain_2ephp',['html2plain.php',['../html2plain_8php.html',1,'']]], ['http_5fstatus_5fexit',['http_status_exit',['../include_2network_8php.html#a4cfb2c05a1c295317283d762440ce0b2',1,'network.php']]], ['hubloc_5fflags_5fprimary',['HUBLOC_FLAGS_PRIMARY',['../boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955',1,'boot.php']]], - ['hubloc_5fflags_5funverified',['HUBLOC_FLAGS_UNVERIFIED',['../boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764',1,'boot.php']]] + ['hubloc_5fflags_5funverified',['HUBLOC_FLAGS_UNVERIFIED',['../boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764',1,'boot.php']]], + ['hubloc_5fnotused',['HUBLOC_NOTUSED',['../boot_8php.html#aa589421267f0c2f0d643f727792cce35',1,'boot.php']]], + ['hubloc_5foffline',['HUBLOC_OFFLINE',['../boot_8php.html#a845891f82bf6edd7fa2d578b66703112',1,'boot.php']]], + ['hubloc_5freceive_5ferror',['HUBLOC_RECEIVE_ERROR',['../boot_8php.html#abeb4d86e17cefa8584f1244e2183b0e1',1,'boot.php']]], + ['hubloc_5fsend_5ferror',['HUBLOC_SEND_ERROR',['../boot_8php.html#a3b56bfc6a0dd159070e316ddac3b7456',1,'boot.php']]], + ['hubloc_5fworks',['HUBLOC_WORKS',['../boot_8php.html#a7a8ba64d089cc0412c59a2eefc6d655c',1,'boot.php']]] ]; diff --git a/doc/html/search/all_69.js b/doc/html/search/all_69.js index d3d619b18..2ddd88cdc 100644 --- a/doc/html/search/all_69.js +++ b/doc/html/search/all_69.js @@ -42,6 +42,7 @@ var searchData= ['item_2ephp',['item.php',['../item_8php.html',1,'']]], ['item_5fblocked',['ITEM_BLOCKED',['../boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f',1,'boot.php']]], ['item_5fbuildblock',['ITEM_BUILDBLOCK',['../boot_8php.html#a7fc4b291a7cdaa48b38e27344ea183cf',1,'boot.php']]], + ['item_5fcheck_5fservice_5fclass',['item_check_service_class',['../item_8php.html#a5b1b36cb301a94b38150074f0d424e74',1,'item.php']]], ['item_5fcontent',['item_content',['../item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221',1,'item.php']]], ['item_5fdelayed_5fpublish',['ITEM_DELAYED_PUBLISH',['../boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20',1,'boot.php']]], ['item_5fdeleted',['ITEM_DELETED',['../boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49',1,'boot.php']]], diff --git a/doc/html/search/all_75.js b/doc/html/search/all_75.js index 5b5b4dd2d..19215dc42 100644 --- a/doc/html/search/all_75.js +++ b/doc/html/search/all_75.js @@ -17,7 +17,7 @@ var searchData= ['update_5fdisplay_5fcontent',['update_display_content',['../update__display_8php.html#aa36ac524059e209d5d75a03c16206246',1,'update_display.php']]], ['update_5ffailed',['UPDATE_FAILED',['../boot_8php.html#a75fc600186b13c3b25e661afefb5eac8',1,'boot.php']]], ['update_5fimported_5fitem',['update_imported_item',['../zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df',1,'zot.php']]], - ['update_5fmodtime',['update_modtime',['../zot_8php.html#a666d3efcac00ec1b4a4537a60655f2ab',1,'zot.php']]], + ['update_5fmodtime',['update_modtime',['../zot_8php.html#abd83bc7e3db604bdca85c3a8c7e2bf63',1,'zot.php']]], ['update_5fnetwork_2ephp',['update_network.php',['../update__network_8php.html',1,'']]], ['update_5fnetwork_5fcontent',['update_network_content',['../update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41',1,'update_network.php']]], ['update_5fqueue_5ftime',['update_queue_time',['../queue__fn_8php.html#a4c2876181f75a4a61e85b7f00dfdbba1',1,'queue_fn.php']]], diff --git a/doc/html/search/files_63.js b/doc/html/search/files_63.js index 7589aec25..284cdea03 100644 --- a/doc/html/search/files_63.js +++ b/doc/html/search/files_63.js @@ -1,6 +1,7 @@ var searchData= [ ['cache_2ephp',['cache.php',['../cache_8php.html',1,'']]], + ['chanman_2ephp',['chanman.php',['../chanman_8php.html',1,'']]], ['channel_2ephp',['channel.php',['../channel_8php.html',1,'']]], ['chanview_2ephp',['chanview.php',['../chanview_8php.html',1,'']]], ['cli_5fstartup_2ephp',['cli_startup.php',['../cli__startup_8php.html',1,'']]], diff --git a/doc/html/search/files_66.js b/doc/html/search/files_66.js index e96d6a488..aba1883e1 100644 --- a/doc/html/search/files_66.js +++ b/doc/html/search/files_66.js @@ -5,8 +5,9 @@ var searchData= ['feed_2ephp',['feed.php',['../feed_8php.html',1,'']]], ['filer_2ephp',['filer.php',['../filer_8php.html',1,'']]], ['filerm_2ephp',['filerm.php',['../filerm_8php.html',1,'']]], - ['follow_2ephp',['follow.php',['../include_2follow_8php.html',1,'']]], + ['filestorage_2ephp',['filestorage.php',['../filestorage_8php.html',1,'']]], ['follow_2ephp',['follow.php',['../mod_2follow_8php.html',1,'']]], + ['follow_2ephp',['follow.php',['../include_2follow_8php.html',1,'']]], ['fpostit_2ephp',['fpostit.php',['../fpostit_8php.html',1,'']]], ['fresh_2emd',['fresh.md',['../fresh_8md.html',1,'']]], ['friendica_2dto_2dsmarty_2dtpl_2epy',['friendica-to-smarty-tpl.py',['../friendica-to-smarty-tpl_8py.html',1,'']]], diff --git a/doc/html/search/functions_66.js b/doc/html/search/functions_66.js index 602d5373b..0f35442fc 100644 --- a/doc/html/search/functions_66.js +++ b/doc/html/search/functions_66.js @@ -16,6 +16,7 @@ var searchData= ['fileas_5fwidget',['fileas_widget',['../contact__widgets_8php.html#a1eda66319d170f60a8d07c7ece95533b',1,'contact_widgets.php']]], ['filer_5fcontent',['filer_content',['../filer_8php.html#a5fd5d7e61b2f9c43cb5f110c89dc4274',1,'filer.php']]], ['filerm_5fcontent',['filerm_content',['../filerm_8php.html#ae2eb28d2054fa2c37e38689882172208',1,'filerm.php']]], + ['filestorage_5fcontent',['filestorage_content',['../filestorage_8php.html#a61bb1be78472555df4ce619f51014040',1,'filestorage.php']]], ['find_5fthread_5fparent_5findex',['find_thread_parent_index',['../conversation_8php.html#ae59703b07ce2ddf627b4172ff26058b6',1,'conversation.php']]], ['find_5fupstream_5fdirectory',['find_upstream_directory',['../dir__fns_8php.html#a8c15aa69da12f2d3476b9e93b82b337d',1,'dir_fns.php']]], ['find_5fxchan_5fin_5farray',['find_xchan_in_array',['../text_8php.html#ace3c98538c63e09b70a363210b414112',1,'text.php']]], diff --git a/doc/html/search/functions_69.js b/doc/html/search/functions_69.js index 67ee74f80..07da17f5e 100644 --- a/doc/html/search/functions_69.js +++ b/doc/html/search/functions_69.js @@ -33,6 +33,7 @@ var searchData= ['is_5fvisiting',['is_visiting',['../classItem.html#a97c7feeea7f26a73176cb19faa455e12',1,'Item']]], ['is_5fwall_5fto_5fwall',['is_wall_to_wall',['../classItem.html#aabf87ded59c25b5fe2b2296678e70509',1,'Item']]], ['is_5fwritable',['is_writable',['../classConversation.html#a5879199008b96bee7550b576d614e1c1',1,'Conversation']]], + ['item_5fcheck_5fservice_5fclass',['item_check_service_class',['../item_8php.html#a5b1b36cb301a94b38150074f0d424e74',1,'item.php']]], ['item_5fcontent',['item_content',['../item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221',1,'item.php']]], ['item_5fexpire',['item_expire',['../items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc',1,'items.php']]], ['item_5fextract_5fimages',['item_extract_images',['../conversation_8php.html#a0ee05f15255fb1cc3d89f30bc378a654',1,'conversation.php']]], diff --git a/doc/html/search/functions_75.js b/doc/html/search/functions_75.js index 815d545d0..0aef15599 100644 --- a/doc/html/search/functions_75.js +++ b/doc/html/search/functions_75.js @@ -12,7 +12,7 @@ var searchData= ['update_5fcommunity_5fcontent',['update_community_content',['../update__community_8php.html#abdcc5c4ecebbe0b5fcba2755c69cb3b1',1,'update_community.php']]], ['update_5fdisplay_5fcontent',['update_display_content',['../update__display_8php.html#aa36ac524059e209d5d75a03c16206246',1,'update_display.php']]], ['update_5fimported_5fitem',['update_imported_item',['../zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df',1,'zot.php']]], - ['update_5fmodtime',['update_modtime',['../zot_8php.html#a666d3efcac00ec1b4a4537a60655f2ab',1,'zot.php']]], + ['update_5fmodtime',['update_modtime',['../zot_8php.html#abd83bc7e3db604bdca85c3a8c7e2bf63',1,'zot.php']]], ['update_5fnetwork_5fcontent',['update_network_content',['../update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41',1,'update_network.php']]], ['update_5fqueue_5ftime',['update_queue_time',['../queue__fn_8php.html#a4c2876181f75a4a61e85b7f00dfdbba1',1,'queue_fn.php']]], ['update_5fsearch_5fcontent',['update_search_content',['../update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52',1,'update_search.php']]], diff --git a/doc/html/search/variables_68.js b/doc/html/search/variables_68.js index 8341c06e1..3faeb538a 100644 --- a/doc/html/search/variables_68.js +++ b/doc/html/search/variables_68.js @@ -1,5 +1,10 @@ var searchData= [ ['hubloc_5fflags_5fprimary',['HUBLOC_FLAGS_PRIMARY',['../boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955',1,'boot.php']]], - ['hubloc_5fflags_5funverified',['HUBLOC_FLAGS_UNVERIFIED',['../boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764',1,'boot.php']]] + ['hubloc_5fflags_5funverified',['HUBLOC_FLAGS_UNVERIFIED',['../boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764',1,'boot.php']]], + ['hubloc_5fnotused',['HUBLOC_NOTUSED',['../boot_8php.html#aa589421267f0c2f0d643f727792cce35',1,'boot.php']]], + ['hubloc_5foffline',['HUBLOC_OFFLINE',['../boot_8php.html#a845891f82bf6edd7fa2d578b66703112',1,'boot.php']]], + ['hubloc_5freceive_5ferror',['HUBLOC_RECEIVE_ERROR',['../boot_8php.html#abeb4d86e17cefa8584f1244e2183b0e1',1,'boot.php']]], + ['hubloc_5fsend_5ferror',['HUBLOC_SEND_ERROR',['../boot_8php.html#a3b56bfc6a0dd159070e316ddac3b7456',1,'boot.php']]], + ['hubloc_5fworks',['HUBLOC_WORKS',['../boot_8php.html#a7a8ba64d089cc0412c59a2eefc6d655c',1,'boot.php']]] ]; diff --git a/doc/html/taxonomy_8php.html b/doc/html/taxonomy_8php.html index 71a42aaba..156cda000 100644 --- a/doc/html/taxonomy_8php.html +++ b/doc/html/taxonomy_8php.html @@ -200,7 +200,7 @@ Functions
    -

    Referenced by channel_content(), and lastpost_content().

    +

    Referenced by lastpost_content().

    @@ -491,7 +491,7 @@ Functions diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index 950b26d07..5fbf3384c 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -1193,7 +1193,7 @@ Variables
    -

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

    +

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

    @@ -1311,6 +1311,8 @@ Variables @@ -1611,7 +1613,7 @@ Variables @@ -1676,7 +1678,7 @@ Variables
    Returns
    string substituted string
    -

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

    +

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

    diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html index f7eee63fd..c18933bc0 100644 --- a/doc/html/typo_8php.html +++ b/doc/html/typo_8php.html @@ -134,7 +134,7 @@ Variables
    -

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

    +

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

    diff --git a/doc/html/zot_8php.html b/doc/html/zot_8php.html index bcfd1c834..79d85da0f 100644 --- a/doc/html/zot_8php.html +++ b/doc/html/zot_8php.html @@ -156,8 +156,8 @@ Functions    import_directory_keywords ($hash, $keywords)   - update_modtime ($hash) -  + update_modtime ($hash, $guid) +   import_site ($arr, $pubkey)    build_sync_packet ($uid=0, $packet=null) @@ -577,7 +577,7 @@ Functions - +
    @@ -585,8 +585,18 @@ Functions - + + + + + + + + + + +
    update_modtime (  $hash)$hash,
     $guid 
    )
    diff --git a/doc/html/zot_8php.js b/doc/html/zot_8php.js index d360beef1..86cc47ab9 100644 --- a/doc/html/zot_8php.js +++ b/doc/html/zot_8php.js @@ -14,7 +14,7 @@ var zot_8php = [ "public_recips", "zot_8php.html#a083aec6c900d244e1bfc1406f9461465", null ], [ "remove_community_tag", "zot_8php.html#aad25a3fe0e1566121d6fb8222979bc10", null ], [ "update_imported_item", "zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df", null ], - [ "update_modtime", "zot_8php.html#a666d3efcac00ec1b4a4537a60655f2ab", null ], + [ "update_modtime", "zot_8php.html#abd83bc7e3db604bdca85c3a8c7e2bf63", null ], [ "zot_build_packet", "zot_8php.html#a3862b3161b2c8557dc1a95020179bd81", null ], [ "zot_fetch", "zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea", null ], [ "zot_finger", "zot_8php.html#a77720d6b59894e9b609af89c310c8a4d", null ], diff --git a/include/items.php b/include/items.php index e987a69b1..c83eceabe 100755 --- a/include/items.php +++ b/include/items.php @@ -18,6 +18,9 @@ function collect_recipients($item,&$private) { require_once('include/group.php'); + if($item['item_private']) + $private = true; + if($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid']) { $allow_people = expand_acl($item['allow_cid']); $allow_groups = expand_groups(expand_acl($item['allow_gid'])); diff --git a/include/notifier.php b/include/notifier.php index e813f7951..e1f150bf2 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -372,6 +372,10 @@ function notifier_run($argv, $argc){ } } + if(($private) && (! $env_recips)) { + // shouldn't happen + logger('notifier: private message with no envelope recipients.' . print_r($argv,true)); + } logger('notifier: recipients (may be delivered to more if public): ' . print_r($recip_list,true), LOGGER_DEBUG); diff --git a/util/messages.po b/util/messages.po index 6b6d2b467..4d41f93f2 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2013-09-06.428\n" +"Project-Id-Version: 2013-09-13.435\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-06 00:01-0700\n" +"POT-Creation-Date: 2013-09-13 00:01-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -246,9 +246,9 @@ msgstr "" msgid "Default" msgstr "" -#: ../../include/Contact.php:87 ../../include/contact_widgets.php:9 +#: ../../include/Contact.php:87 ../../include/contact_widgets.php:23 #: ../../mod/directory.php:163 ../../mod/match.php:58 ../../mod/suggest.php:56 -#: ../../boot.php:1687 +#: ../../boot.php:1696 msgid "Connect" msgstr "" @@ -351,7 +351,7 @@ msgid "RSS/Atom" msgstr "" #: ../../include/contact_selectors.php:77 ../../mod/admin.php:636 -#: ../../mod/admin.php:645 ../../boot.php:1422 +#: ../../mod/admin.php:645 ../../boot.php:1431 msgid "Email" msgstr "" @@ -379,86 +379,6 @@ msgstr "" msgid "MySpace" msgstr "" -#: ../../include/contact_widgets.php:6 -msgid "Add New Connection" -msgstr "" - -#: ../../include/contact_widgets.php:7 -msgid "Enter the channel address" -msgstr "" - -#: ../../include/contact_widgets.php:8 -msgid "Example: bob@example.com, http://example.com/barbara" -msgstr "" - -#: ../../include/contact_widgets.php:23 -#, php-format -msgid "%d invitation available" -msgid_plural "%d invitations available" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/contact_widgets.php:29 -msgid "Find Channels" -msgstr "" - -#: ../../include/contact_widgets.php:30 -msgid "Enter name or interest" -msgstr "" - -#: ../../include/contact_widgets.php:31 -msgid "Connect/Follow" -msgstr "" - -#: ../../include/contact_widgets.php:32 -msgid "Examples: Robert Morgenstein, Fishing" -msgstr "" - -#: ../../include/contact_widgets.php:33 ../../mod/directory.php:182 -#: ../../mod/directory.php:187 ../../mod/connections.php:666 -msgid "Find" -msgstr "" - -#: ../../include/contact_widgets.php:34 ../../mod/suggest.php:64 -msgid "Channel Suggestions" -msgstr "" - -#: ../../include/contact_widgets.php:35 -msgid "Similar Interests" -msgstr "" - -#: ../../include/contact_widgets.php:36 -msgid "Random Profile" -msgstr "" - -#: ../../include/contact_widgets.php:37 -msgid "Invite Friends" -msgstr "" - -#: ../../include/contact_widgets.php:61 ../../include/features.php:58 -msgid "Saved Folders" -msgstr "" - -#: ../../include/contact_widgets.php:64 ../../include/contact_widgets.php:91 -msgid "Everything" -msgstr "" - -#: ../../include/contact_widgets.php:88 -msgid "Categories" -msgstr "" - -#: ../../include/contact_widgets.php:121 -#, php-format -msgid "%d connection in common" -msgid_plural "%d connections in common" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/contact_widgets.php:126 ../../include/js_strings.php:7 -#: ../../include/ItemObject.php:255 -msgid "show more" -msgstr "" - #: ../../include/datetime.php:43 ../../include/datetime.php:45 msgid "Miscellaneous" msgstr "" @@ -550,7 +470,7 @@ msgid "Finishes:" msgstr "" #: ../../include/event.php:40 ../../include/bb2diaspora.php:455 -#: ../../mod/events.php:450 ../../mod/directory.php:138 ../../boot.php:1737 +#: ../../mod/events.php:450 ../../mod/directory.php:138 ../../boot.php:1746 msgid "Location:" msgstr "" @@ -717,6 +637,10 @@ msgstr "" msgid "Add categories to your posts" msgstr "" +#: ../../include/features.php:58 ../../include/contact_widgets.php:76 +msgid "Saved Folders" +msgstr "" + #: ../../include/features.php:58 msgid "Ability to file posts under folders" msgstr "" @@ -789,10 +713,15 @@ msgid "Delete this item?" msgstr "" #: ../../include/js_strings.php:6 ../../include/ItemObject.php:504 -#: ../../mod/photos.php:1073 ../../mod/photos.php:1157 +#: ../../mod/photos.php:1075 ../../mod/photos.php:1159 msgid "Comment" msgstr "" +#: ../../include/js_strings.php:7 ../../include/contact_widgets.php:148 +#: ../../include/ItemObject.php:255 +msgid "show more" +msgstr "" + #: ../../include/js_strings.php:8 msgid "show fewer" msgstr "" @@ -894,12 +823,12 @@ msgstr "" msgid "Stored post could not be verified." msgstr "" -#: ../../include/network.php:1103 +#: ../../include/network.php:1113 msgid "view full size" msgstr "" #: ../../include/photo/photo_driver.php:609 ../../include/photos.php:51 -#: ../../mod/photos.php:97 ../../mod/photos.php:755 ../../mod/photos.php:777 +#: ../../mod/photos.php:97 ../../mod/photos.php:757 ../../mod/photos.php:779 #: ../../mod/profile_photo.php:88 ../../mod/profile_photo.php:235 #: ../../mod/profile_photo.php:346 msgid "Profile Photos" @@ -915,7 +844,7 @@ msgid "Full Name:" msgstr "" #: ../../include/profile_advanced.php:17 ../../mod/directory.php:140 -#: ../../boot.php:1739 +#: ../../boot.php:1748 msgid "Gender:" msgstr "" @@ -936,7 +865,7 @@ msgid "Age:" msgstr "" #: ../../include/profile_advanced.php:37 ../../mod/directory.php:142 -#: ../../boot.php:1740 +#: ../../boot.php:1749 msgid "Status:" msgstr "" @@ -950,7 +879,7 @@ msgid "Sexual Preference:" msgstr "" #: ../../include/profile_advanced.php:48 ../../mod/directory.php:144 -#: ../../boot.php:1741 +#: ../../boot.php:1750 msgid "Homepage:" msgstr "" @@ -1018,7 +947,7 @@ msgstr "" msgid "School/education:" msgstr "" -#: ../../include/nav.php:71 ../../include/nav.php:86 ../../boot.php:1419 +#: ../../include/nav.php:71 ../../include/nav.php:86 ../../boot.php:1428 msgid "Logout" msgstr "" @@ -1047,7 +976,7 @@ msgstr "" msgid "Manage/Edit Profiles" msgstr "" -#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2180 +#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2189 msgid "Photos" msgstr "" @@ -1055,7 +984,7 @@ msgstr "" msgid "Your photos" msgstr "" -#: ../../include/nav.php:84 ../../boot.php:1420 +#: ../../include/nav.php:84 ../../boot.php:1429 msgid "Login" msgstr "" @@ -1076,7 +1005,7 @@ msgstr "" msgid "Home Page" msgstr "" -#: ../../include/nav.php:120 ../../mod/register.php:187 ../../boot.php:1395 +#: ../../include/nav.php:120 ../../mod/register.php:187 ../../boot.php:1404 msgid "Register" msgstr "" @@ -1197,7 +1126,7 @@ msgstr "" msgid "New Message" msgstr "" -#: ../../include/nav.php:169 ../../mod/events.php:348 ../../boot.php:2191 +#: ../../include/nav.php:169 ../../mod/events.php:348 ../../boot.php:2200 msgid "Events" msgstr "" @@ -1254,6 +1183,40 @@ msgstr "" msgid "Please wait..." msgstr "" +#: ../../include/identity.php:14 ../../mod/item.php:1148 +msgid "Unable to obtain identity information from database" +msgstr "" + +#: ../../include/identity.php:36 +msgid "Empty name" +msgstr "" + +#: ../../include/identity.php:38 +msgid "Name too long" +msgstr "" + +#: ../../include/identity.php:80 +msgid "No account identifier" +msgstr "" + +#: ../../include/identity.php:98 +msgid "" +"Nickname has unsupported characters or is already being used on this site." +msgstr "" + +#: ../../include/identity.php:157 +msgid "Unable to retrieve created identity" +msgstr "" + +#: ../../include/identity.php:214 +msgid "Default Profile" +msgstr "" + +#: ../../include/identity.php:239 ../../include/profile_selectors.php:42 +#: ../../mod/network.php:364 ../../mod/connections.php:377 +msgid "Friends" +msgstr "" + #: ../../include/notify.php:23 msgid "created a new post" msgstr "" @@ -1275,7 +1238,7 @@ msgstr "" #: ../../include/attach.php:133 ../../include/attach.php:189 #: ../../include/attach.php:204 ../../include/attach.php:237 #: ../../include/attach.php:251 ../../include/attach.php:272 -#: ../../include/attach.php:464 ../../include/items.php:3336 +#: ../../include/attach.php:464 ../../include/items.php:3359 #: ../../mod/common.php:43 ../../mod/events.php:134 ../../mod/invite.php:13 #: ../../mod/invite.php:102 ../../mod/allfriends.php:10 #: ../../mod/webpages.php:40 ../../mod/api.php:26 ../../mod/api.php:31 @@ -1283,9 +1246,9 @@ msgstr "" #: ../../mod/settings.php:598 ../../mod/viewconnections.php:33 #: ../../mod/viewconnections.php:38 ../../mod/delegate.php:6 #: ../../mod/mitem.php:92 ../../mod/group.php:15 ../../mod/photos.php:74 -#: ../../mod/photos.php:645 ../../mod/viewsrc.php:12 ../../mod/menu.php:40 +#: ../../mod/photos.php:647 ../../mod/viewsrc.php:12 ../../mod/menu.php:40 #: ../../mod/message.php:204 ../../mod/layouts.php:27 ../../mod/layouts.php:42 -#: ../../mod/item.php:152 ../../mod/network.php:7 ../../mod/intro.php:50 +#: ../../mod/network.php:7 ../../mod/intro.php:50 #: ../../mod/connections.php:174 ../../mod/profiles.php:163 #: ../../mod/profiles.php:476 ../../mod/new_channel.php:66 #: ../../mod/new_channel.php:97 ../../mod/manage.php:6 @@ -1294,9 +1257,9 @@ msgstr "" #: ../../mod/profile_photo.php:210 ../../mod/editwebpage.php:43 #: ../../mod/editwebpage.php:65 ../../mod/notifications.php:66 #: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/editpost.php:13 -#: ../../mod/poke.php:128 ../../mod/channel.php:115 ../../mod/fsuggest.php:78 -#: ../../mod/editblock.php:49 ../../mod/suggest.php:32 -#: ../../mod/register.php:60 ../../mod/regmod.php:18 ../../mod/mood.php:112 +#: ../../mod/poke.php:128 ../../mod/channel.php:117 ../../mod/fsuggest.php:78 +#: ../../mod/editblock.php:49 ../../mod/item.php:163 ../../mod/suggest.php:32 +#: ../../mod/register.php:60 ../../mod/regmod.php:18 ../../mod/mood.php:114 #: ../../index.php:178 ../../index.php:340 msgid "Permission denied." msgstr "" @@ -1318,12 +1281,12 @@ msgstr "" msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:287 ../../boot.php:2183 +#: ../../include/photos.php:288 ../../boot.php:2192 msgid "Photo Albums" msgstr "" -#: ../../include/photos.php:291 ../../mod/photos.php:793 -#: ../../mod/photos.php:1267 +#: ../../include/photos.php:292 ../../mod/photos.php:795 +#: ../../mod/photos.php:1269 msgid "Upload New Photos" msgstr "" @@ -1471,11 +1434,6 @@ msgstr "" msgid "Sex Addict" msgstr "" -#: ../../include/profile_selectors.php:42 ../../include/identity.php:236 -#: ../../mod/network.php:364 ../../mod/connections.php:377 -msgid "Friends" -msgstr "" - #: ../../include/profile_selectors.php:42 msgid "Friends/Benefits" msgstr "" @@ -1560,58 +1518,42 @@ msgstr "" msgid "Ask me" msgstr "" -#: ../../include/identity.php:14 -msgid "Unable to obtain identity information from database" +#: ../../include/attach.php:184 ../../include/attach.php:232 +msgid "Item was not found." msgstr "" -#: ../../include/identity.php:36 -msgid "Empty name" +#: ../../include/attach.php:285 +msgid "No source file." msgstr "" -#: ../../include/identity.php:38 -msgid "Name too long" +#: ../../include/attach.php:302 +msgid "Cannot locate file to replace" msgstr "" -#: ../../include/identity.php:80 -msgid "No account identifier" +#: ../../include/attach.php:320 +msgid "Cannot locate file to revise/update" msgstr "" -#: ../../include/identity.php:95 -msgid "" -"Nickname has unsupported characters or is already being used on this site." -msgstr "" - -#: ../../include/identity.php:154 -msgid "Unable to retrieve created identity" -msgstr "" - -#: ../../include/identity.php:211 -msgid "Default Profile" -msgstr "" - -#: ../../include/plugin.php:435 ../../include/plugin.php:437 -msgid "Click here to upgrade." -msgstr "" - -#: ../../include/plugin.php:443 -msgid "This action exceeds the limits set by your subscription plan." -msgstr "" - -#: ../../include/plugin.php:448 -msgid "This action is not available under your subscription plan." -msgstr "" - -#: ../../include/zot.php:423 -msgid "Invalid data packet" -msgstr "" - -#: ../../include/zot.php:433 -msgid "Unable to verify channel signature" -msgstr "" - -#: ../../include/zot.php:572 +#: ../../include/attach.php:331 #, php-format -msgid "Unable to verify site signature for %s" +msgid "File exceeds size limit of %d" +msgstr "" + +#: ../../include/attach.php:342 +#, php-format +msgid "You have reached your limit of %1$.0f Mbytes attachment storage." +msgstr "" + +#: ../../include/attach.php:424 +msgid "File upload failed. Possible system limit or action terminated." +msgstr "" + +#: ../../include/attach.php:436 +msgid "Stored file could not be verified. Upload failed." +msgstr "" + +#: ../../include/attach.php:480 ../../include/attach.php:497 +msgid "Path not available." msgstr "" #: ../../include/account.php:23 @@ -1648,7 +1590,7 @@ msgid "Registration request at %s" msgstr "" #: ../../include/account.php:274 ../../include/account.php:301 -#: ../../include/account.php:358 ../../boot.php:1240 +#: ../../include/account.php:358 msgid "Administrator" msgstr "" @@ -1670,25 +1612,25 @@ msgstr "" msgid "Registration revoked for %s" msgstr "" -#: ../../include/bbcode.php:94 ../../include/bbcode.php:443 -#: ../../include/bbcode.php:446 +#: ../../include/bbcode.php:94 ../../include/bbcode.php:423 +#: ../../include/bbcode.php:426 msgid "Image/photo" msgstr "" -#: ../../include/bbcode.php:161 +#: ../../include/bbcode.php:141 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: ../../include/bbcode.php:163 +#: ../../include/bbcode.php:143 msgid "post" msgstr "" -#: ../../include/bbcode.php:403 ../../include/bbcode.php:423 +#: ../../include/bbcode.php:383 ../../include/bbcode.php:403 msgid "$1 wrote:" msgstr "" -#: ../../include/bbcode.php:450 ../../include/bbcode.php:451 +#: ../../include/bbcode.php:430 ../../include/bbcode.php:431 msgid "Encrypted content" msgstr "" @@ -2048,6 +1990,82 @@ msgstr "" msgid "Login failed." msgstr "" +#: ../../include/contact_widgets.php:14 +#, php-format +msgid "You have %1$.0f of %2$.0f allowed connections." +msgstr "" + +#: ../../include/contact_widgets.php:20 +msgid "Add New Connection" +msgstr "" + +#: ../../include/contact_widgets.php:21 +msgid "Enter the channel address" +msgstr "" + +#: ../../include/contact_widgets.php:22 +msgid "Example: bob@example.com, http://example.com/barbara" +msgstr "" + +#: ../../include/contact_widgets.php:38 +#, php-format +msgid "%d invitation available" +msgid_plural "%d invitations available" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/contact_widgets.php:44 +msgid "Find Channels" +msgstr "" + +#: ../../include/contact_widgets.php:45 +msgid "Enter name or interest" +msgstr "" + +#: ../../include/contact_widgets.php:46 +msgid "Connect/Follow" +msgstr "" + +#: ../../include/contact_widgets.php:47 +msgid "Examples: Robert Morgenstein, Fishing" +msgstr "" + +#: ../../include/contact_widgets.php:48 ../../mod/directory.php:182 +#: ../../mod/directory.php:187 ../../mod/connections.php:666 +msgid "Find" +msgstr "" + +#: ../../include/contact_widgets.php:49 ../../mod/suggest.php:64 +msgid "Channel Suggestions" +msgstr "" + +#: ../../include/contact_widgets.php:50 +msgid "Similar Interests" +msgstr "" + +#: ../../include/contact_widgets.php:51 +msgid "Random Profile" +msgstr "" + +#: ../../include/contact_widgets.php:52 +msgid "Invite Friends" +msgstr "" + +#: ../../include/contact_widgets.php:79 ../../include/contact_widgets.php:113 +msgid "Everything" +msgstr "" + +#: ../../include/contact_widgets.php:110 +msgid "Categories" +msgstr "" + +#: ../../include/contact_widgets.php:143 +#, php-format +msgid "%d connection in common" +msgid_plural "%d connections in common" +msgstr[0] "" +msgstr[1] "" + #: ../../include/follow.php:21 msgid "Channel is blocked on this site." msgstr "" @@ -2188,55 +2206,34 @@ msgstr "" msgid "dislikes" msgstr "" -#: ../../include/attach.php:184 ../../include/attach.php:232 -msgid "Item was not found." +#: ../../include/plugin.php:440 ../../include/plugin.php:442 +msgid "Click here to upgrade." msgstr "" -#: ../../include/attach.php:285 -msgid "No source file." +#: ../../include/plugin.php:448 +msgid "This action exceeds the limits set by your subscription plan." msgstr "" -#: ../../include/attach.php:302 -msgid "Cannot locate file to replace" +#: ../../include/plugin.php:453 +msgid "This action is not available under your subscription plan." msgstr "" -#: ../../include/attach.php:320 -msgid "Cannot locate file to revise/update" -msgstr "" - -#: ../../include/attach.php:331 -#, php-format -msgid "File exceeds size limit of %d" -msgstr "" - -#: ../../include/attach.php:424 -msgid "File upload failed. Possible system limit or action terminated." -msgstr "" - -#: ../../include/attach.php:436 -msgid "Stored file could not be verified. Upload failed." -msgstr "" - -#: ../../include/attach.php:480 ../../include/attach.php:497 -msgid "Path not available." -msgstr "" - -#: ../../include/ItemObject.php:87 ../../mod/photos.php:943 +#: ../../include/ItemObject.php:87 ../../mod/photos.php:945 msgid "Private Message" msgstr "" #: ../../include/ItemObject.php:92 ../../mod/webpages.php:98 #: ../../mod/settings.php:683 ../../mod/menu.php:55 ../../mod/layouts.php:89 -#: ../../mod/editlayout.php:101 ../../mod/editwebpage.php:117 +#: ../../mod/editlayout.php:101 ../../mod/editwebpage.php:120 #: ../../mod/blocks.php:92 ../../mod/editpost.php:94 -#: ../../mod/editblock.php:101 +#: ../../mod/editblock.php:115 msgid "Edit" msgstr "" #: ../../include/ItemObject.php:104 ../../include/conversation.php:631 #: ../../mod/settings.php:684 ../../mod/group.php:182 -#: ../../mod/photos.php:1123 ../../mod/connections.php:344 -#: ../../mod/admin.php:640 +#: ../../mod/photos.php:1125 ../../mod/connections.php:344 +#: ../../mod/admin.php:640 ../../mod/filestorage.php:62 msgid "Delete" msgstr "" @@ -2268,11 +2265,11 @@ msgstr "" msgid "add tag" msgstr "" -#: ../../include/ItemObject.php:165 ../../mod/photos.php:1053 +#: ../../include/ItemObject.php:165 ../../mod/photos.php:1055 msgid "I like this (toggle)" msgstr "" -#: ../../include/ItemObject.php:166 ../../mod/photos.php:1054 +#: ../../include/ItemObject.php:166 ../../mod/photos.php:1056 msgid "I don't like this (toggle)" msgstr "" @@ -2307,10 +2304,10 @@ msgid " from %s" msgstr "" #: ../../include/ItemObject.php:233 ../../include/conversation.php:696 -#: ../../include/conversation.php:1092 ../../mod/photos.php:1056 +#: ../../include/conversation.php:1092 ../../mod/photos.php:1058 #: ../../mod/message.php:298 ../../mod/message.php:461 -#: ../../mod/editlayout.php:110 ../../mod/editwebpage.php:126 -#: ../../mod/editpost.php:103 ../../mod/editblock.php:110 +#: ../../mod/editlayout.php:110 ../../mod/editwebpage.php:129 +#: ../../mod/editpost.php:103 ../../mod/editblock.php:124 msgid "Please wait" msgstr "" @@ -2321,8 +2318,8 @@ msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../include/ItemObject.php:502 ../../mod/photos.php:1071 -#: ../../mod/photos.php:1155 +#: ../../include/ItemObject.php:502 ../../mod/photos.php:1073 +#: ../../mod/photos.php:1157 msgid "This is you" msgstr "" @@ -2332,14 +2329,14 @@ msgstr "" #: ../../mod/settings.php:733 ../../mod/settings.php:761 #: ../../mod/settings.php:785 ../../mod/settings.php:856 #: ../../mod/settings.php:1023 ../../mod/connect.php:96 ../../mod/group.php:87 -#: ../../mod/photos.php:676 ../../mod/photos.php:770 ../../mod/photos.php:1035 -#: ../../mod/photos.php:1074 ../../mod/photos.php:1158 +#: ../../mod/photos.php:678 ../../mod/photos.php:772 ../../mod/photos.php:1037 +#: ../../mod/photos.php:1076 ../../mod/photos.php:1160 #: ../../mod/message.php:299 ../../mod/message.php:460 #: ../../mod/connections.php:421 ../../mod/profiles.php:529 #: ../../mod/admin.php:409 ../../mod/admin.php:633 ../../mod/admin.php:769 -#: ../../mod/admin.php:968 ../../mod/admin.php:1055 ../../mod/import.php:381 +#: ../../mod/admin.php:968 ../../mod/admin.php:1055 ../../mod/import.php:385 #: ../../mod/crepair.php:166 ../../mod/poke.php:166 ../../mod/fsuggest.php:108 -#: ../../mod/mood.php:135 ../../view/theme/redbasic/php/config.php:136 +#: ../../mod/mood.php:137 ../../view/theme/redbasic/php/config.php:136 #: ../../view/theme/redbasic/php/config.php:154 #: ../../view/theme/redstrap/php/config.php:131 msgid "Submit" @@ -2378,9 +2375,9 @@ msgid "Video" msgstr "" #: ../../include/ItemObject.php:514 ../../include/conversation.php:1112 -#: ../../mod/photos.php:1075 ../../mod/editlayout.php:130 -#: ../../mod/editwebpage.php:148 ../../mod/editpost.php:123 -#: ../../mod/editblock.php:130 +#: ../../mod/photos.php:1077 ../../mod/editlayout.php:130 +#: ../../mod/editwebpage.php:151 ../../mod/editpost.php:123 +#: ../../mod/editblock.php:145 msgid "Preview" msgstr "" @@ -2502,7 +2499,7 @@ msgstr "" msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1069 ../../mod/photos.php:1055 +#: ../../include/conversation.php:1069 ../../mod/photos.php:1057 msgid "Share" msgstr "" @@ -2512,8 +2509,8 @@ msgstr "" #: ../../include/conversation.php:1073 ../../mod/message.php:295 #: ../../mod/message.php:457 ../../mod/editlayout.php:102 -#: ../../mod/editwebpage.php:118 ../../mod/editpost.php:95 -#: ../../mod/editblock.php:102 +#: ../../mod/editwebpage.php:121 ../../mod/editpost.php:95 +#: ../../mod/editblock.php:116 msgid "Upload photo" msgstr "" @@ -2523,8 +2520,8 @@ msgstr "" #: ../../include/conversation.php:1075 ../../mod/message.php:296 #: ../../mod/message.php:458 ../../mod/editlayout.php:103 -#: ../../mod/editwebpage.php:119 ../../mod/editpost.php:96 -#: ../../mod/editblock.php:103 +#: ../../mod/editwebpage.php:122 ../../mod/editpost.php:96 +#: ../../mod/editblock.php:117 msgid "Attach file" msgstr "" @@ -2534,8 +2531,8 @@ msgstr "" #: ../../include/conversation.php:1077 ../../mod/message.php:297 #: ../../mod/message.php:459 ../../mod/editlayout.php:104 -#: ../../mod/editwebpage.php:120 ../../mod/editpost.php:97 -#: ../../mod/editblock.php:104 +#: ../../mod/editwebpage.php:123 ../../mod/editpost.php:97 +#: ../../mod/editblock.php:118 msgid "Insert web link" msgstr "" @@ -2560,8 +2557,8 @@ msgid "audio link" msgstr "" #: ../../include/conversation.php:1083 ../../mod/editlayout.php:108 -#: ../../mod/editwebpage.php:124 ../../mod/editpost.php:101 -#: ../../mod/editblock.php:108 +#: ../../mod/editwebpage.php:127 ../../mod/editpost.php:101 +#: ../../mod/editblock.php:122 msgid "Set your location" msgstr "" @@ -2570,8 +2567,8 @@ msgid "set location" msgstr "" #: ../../include/conversation.php:1085 ../../mod/editlayout.php:109 -#: ../../mod/editwebpage.php:125 ../../mod/editpost.php:102 -#: ../../mod/editblock.php:109 +#: ../../mod/editwebpage.php:128 ../../mod/editpost.php:102 +#: ../../mod/editblock.php:123 msgid "Clear browser location" msgstr "" @@ -2580,20 +2577,20 @@ msgid "clear location" msgstr "" #: ../../include/conversation.php:1088 ../../mod/editlayout.php:122 -#: ../../mod/editwebpage.php:140 ../../mod/editpost.php:115 -#: ../../mod/editblock.php:122 +#: ../../mod/editwebpage.php:143 ../../mod/editpost.php:115 +#: ../../mod/editblock.php:137 msgid "Set title" msgstr "" #: ../../include/conversation.php:1091 ../../mod/editlayout.php:124 -#: ../../mod/editwebpage.php:142 ../../mod/editpost.php:117 -#: ../../mod/editblock.php:124 +#: ../../mod/editwebpage.php:145 ../../mod/editpost.php:117 +#: ../../mod/editblock.php:139 msgid "Categories (comma-separated list)" msgstr "" #: ../../include/conversation.php:1093 ../../mod/editlayout.php:111 -#: ../../mod/editwebpage.php:127 ../../mod/editpost.php:104 -#: ../../mod/editblock.php:111 +#: ../../mod/editwebpage.php:130 ../../mod/editpost.php:104 +#: ../../mod/editblock.php:125 msgid "Permission settings" msgstr "" @@ -2602,14 +2599,14 @@ msgid "permissions" msgstr "" #: ../../include/conversation.php:1102 ../../mod/editlayout.php:119 -#: ../../mod/editwebpage.php:135 ../../mod/editpost.php:112 -#: ../../mod/editblock.php:119 +#: ../../mod/editwebpage.php:138 ../../mod/editpost.php:112 +#: ../../mod/editblock.php:134 msgid "Public post" msgstr "" #: ../../include/conversation.php:1104 ../../mod/editlayout.php:125 -#: ../../mod/editwebpage.php:143 ../../mod/editpost.php:118 -#: ../../mod/editblock.php:125 +#: ../../mod/editwebpage.php:146 ../../mod/editpost.php:118 +#: ../../mod/editblock.php:140 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -2618,25 +2615,25 @@ msgstr "" msgid "Permission denied" msgstr "" -#: ../../include/items.php:3285 ../../mod/page.php:60 ../../mod/viewsrc.php:18 +#: ../../include/items.php:3308 ../../mod/page.php:66 ../../mod/viewsrc.php:18 #: ../../mod/home.php:64 ../../mod/admin.php:142 ../../mod/admin.php:677 -#: ../../mod/admin.php:876 ../../mod/display.php:33 +#: ../../mod/admin.php:876 ../../mod/display.php:32 msgid "Item not found." msgstr "" -#: ../../include/items.php:3457 +#: ../../include/items.php:3480 msgid "Archives" msgstr "" -#: ../../include/items.php:3618 ../../mod/group.php:44 ../../mod/group.php:146 +#: ../../include/items.php:3641 ../../mod/group.php:44 ../../mod/group.php:146 msgid "Collection not found." msgstr "" -#: ../../include/items.php:3628 +#: ../../include/items.php:3651 msgid "Collection has no members." msgstr "" -#: ../../include/items.php:3644 +#: ../../include/items.php:3667 msgid "Connection not found." msgstr "" @@ -2658,6 +2655,19 @@ msgid "" "form has been opened for too long (>3 hours) before submitting it." msgstr "" +#: ../../include/zot.php:423 +msgid "Invalid data packet" +msgstr "" + +#: ../../include/zot.php:433 +msgid "Unable to verify channel signature" +msgstr "" + +#: ../../include/zot.php:571 +#, php-format +msgid "Unable to verify site signature for %s" +msgstr "" + #: ../../mod/common.php:10 msgid "No channel." msgstr "" @@ -2862,7 +2872,8 @@ msgid "No friends to display." msgstr "" #: ../../mod/webpages.php:8 ../../mod/connect.php:13 ../../mod/layouts.php:8 -#: ../../mod/blocks.php:10 ../../mod/profile.php:8 ../../boot.php:1593 +#: ../../mod/blocks.php:10 ../../mod/profile.php:8 ../../mod/filestorage.php:8 +#: ../../boot.php:1602 msgid "Requested profile is not available." msgstr "" @@ -3706,7 +3717,7 @@ msgid "Change the behaviour of this account for special situations" msgstr "" #: ../../mod/viewconnections.php:28 ../../mod/directory.php:23 -#: ../../mod/photos.php:559 ../../mod/display.php:9 ../../mod/search.php:80 +#: ../../mod/photos.php:561 ../../mod/display.php:9 ../../mod/search.php:80 #: ../../mod/community.php:18 msgid "Public access denied." msgstr "" @@ -3910,55 +3921,55 @@ msgstr "" msgid "Edit this menu item" msgstr "" -#: ../../mod/mitem.php:142 +#: ../../mod/mitem.php:141 msgid "New Menu Element" msgstr "" -#: ../../mod/mitem.php:144 ../../mod/mitem.php:185 +#: ../../mod/mitem.php:143 ../../mod/mitem.php:184 msgid "Link text" msgstr "" -#: ../../mod/mitem.php:145 ../../mod/mitem.php:186 +#: ../../mod/mitem.php:144 ../../mod/mitem.php:185 msgid "URL of link" msgstr "" -#: ../../mod/mitem.php:146 ../../mod/mitem.php:187 +#: ../../mod/mitem.php:145 ../../mod/mitem.php:186 msgid "Use Red magic-auth if available" msgstr "" -#: ../../mod/mitem.php:147 ../../mod/mitem.php:188 +#: ../../mod/mitem.php:146 ../../mod/mitem.php:187 msgid "Open link in new window" msgstr "" -#: ../../mod/mitem.php:149 ../../mod/mitem.php:190 +#: ../../mod/mitem.php:148 ../../mod/mitem.php:189 msgid "Order in list" msgstr "" -#: ../../mod/mitem.php:149 ../../mod/mitem.php:190 +#: ../../mod/mitem.php:148 ../../mod/mitem.php:189 msgid "Higher numbers will sink to bottom of listing" msgstr "" -#: ../../mod/mitem.php:150 ../../mod/menu.php:79 ../../mod/new_channel.php:117 +#: ../../mod/mitem.php:149 ../../mod/menu.php:79 ../../mod/new_channel.php:117 msgid "Create" msgstr "" -#: ../../mod/mitem.php:162 +#: ../../mod/mitem.php:161 msgid "Menu item not found." msgstr "" -#: ../../mod/mitem.php:171 +#: ../../mod/mitem.php:170 msgid "Menu item deleted." msgstr "" -#: ../../mod/mitem.php:173 +#: ../../mod/mitem.php:172 msgid "Menu item could not be deleted." msgstr "" -#: ../../mod/mitem.php:182 +#: ../../mod/mitem.php:181 msgid "Edit Menu Element" msgstr "" -#: ../../mod/mitem.php:191 ../../mod/menu.php:107 +#: ../../mod/mitem.php:190 ../../mod/menu.php:107 msgid "Modify" msgstr "" @@ -4018,11 +4029,11 @@ msgstr "" msgid "Album not found." msgstr "" -#: ../../mod/photos.php:125 ../../mod/photos.php:771 +#: ../../mod/photos.php:125 ../../mod/photos.php:773 msgid "Delete Album" msgstr "" -#: ../../mod/photos.php:165 ../../mod/photos.php:1036 +#: ../../mod/photos.php:165 ../../mod/photos.php:1038 msgid "Delete Photo" msgstr "" @@ -4035,114 +4046,114 @@ msgstr "" msgid "a photo" msgstr "" -#: ../../mod/photos.php:569 +#: ../../mod/photos.php:571 msgid "No photos selected" msgstr "" -#: ../../mod/photos.php:623 +#: ../../mod/photos.php:625 msgid "Access to this item is restricted." msgstr "" -#: ../../mod/photos.php:687 +#: ../../mod/photos.php:689 #, php-format msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "" -#: ../../mod/photos.php:690 +#: ../../mod/photos.php:692 #, php-format msgid "You have used %1$.2f Mbytes of photo storage." msgstr "" -#: ../../mod/photos.php:698 +#: ../../mod/photos.php:700 msgid "Upload Photos" msgstr "" -#: ../../mod/photos.php:702 ../../mod/photos.php:766 +#: ../../mod/photos.php:704 ../../mod/photos.php:768 msgid "New album name: " msgstr "" -#: ../../mod/photos.php:703 +#: ../../mod/photos.php:705 msgid "or existing album name: " msgstr "" -#: ../../mod/photos.php:704 +#: ../../mod/photos.php:706 msgid "Do not show a status post for this upload" msgstr "" -#: ../../mod/photos.php:706 ../../mod/photos.php:1031 +#: ../../mod/photos.php:708 ../../mod/photos.php:1033 msgid "Permissions" msgstr "" -#: ../../mod/photos.php:755 ../../mod/photos.php:777 ../../mod/photos.php:1203 -#: ../../mod/photos.php:1218 +#: ../../mod/photos.php:757 ../../mod/photos.php:779 ../../mod/photos.php:1205 +#: ../../mod/photos.php:1220 msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:781 +#: ../../mod/photos.php:783 msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:787 +#: ../../mod/photos.php:789 msgid "Show Newest First" msgstr "" -#: ../../mod/photos.php:789 +#: ../../mod/photos.php:791 msgid "Show Oldest First" msgstr "" -#: ../../mod/photos.php:833 ../../mod/photos.php:1250 +#: ../../mod/photos.php:835 ../../mod/photos.php:1252 msgid "View Photo" msgstr "" -#: ../../mod/photos.php:877 +#: ../../mod/photos.php:879 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:879 +#: ../../mod/photos.php:881 msgid "Photo not available" msgstr "" -#: ../../mod/photos.php:937 +#: ../../mod/photos.php:939 msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:965 +#: ../../mod/photos.php:967 msgid "View Full Size" msgstr "" -#: ../../mod/photos.php:1019 +#: ../../mod/photos.php:1021 msgid "Edit photo" msgstr "" -#: ../../mod/photos.php:1021 +#: ../../mod/photos.php:1023 msgid "Rotate CW (right)" msgstr "" -#: ../../mod/photos.php:1022 +#: ../../mod/photos.php:1024 msgid "Rotate CCW (left)" msgstr "" -#: ../../mod/photos.php:1024 +#: ../../mod/photos.php:1026 msgid "New album name" msgstr "" -#: ../../mod/photos.php:1027 +#: ../../mod/photos.php:1029 msgid "Caption" msgstr "" -#: ../../mod/photos.php:1029 +#: ../../mod/photos.php:1031 msgid "Add a Tag" msgstr "" -#: ../../mod/photos.php:1033 +#: ../../mod/photos.php:1035 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/photos.php:1256 +#: ../../mod/photos.php:1258 msgid "View Album" msgstr "" -#: ../../mod/photos.php:1265 +#: ../../mod/photos.php:1267 msgid "Recent Photos" msgstr "" @@ -4154,11 +4165,11 @@ msgstr "" msgid "added your channel" msgstr "" -#: ../../mod/ping.php:230 ../../boot.php:1799 ../../boot.php:1879 +#: ../../mod/ping.php:230 ../../boot.php:1808 ../../boot.php:1888 msgid "g A l F d" msgstr "" -#: ../../mod/ping.php:252 ../../boot.php:1845 ../../boot.php:1920 +#: ../../mod/ping.php:252 ../../boot.php:1854 ../../boot.php:1929 msgid "[today]" msgstr "" @@ -4358,26 +4369,6 @@ msgstr "" msgid "Authenticate" msgstr "" -#: ../../mod/item.php:122 -msgid "Unable to locate original post." -msgstr "" - -#: ../../mod/item.php:290 -msgid "Empty post discarded." -msgstr "" - -#: ../../mod/item.php:334 -msgid "Executable content type not permitted to this channel." -msgstr "" - -#: ../../mod/item.php:779 -msgid "System error. Post not saved." -msgstr "" - -#: ../../mod/item.php:1064 ../../mod/wall_upload.php:41 -msgid "Wall Photos" -msgstr "" - #: ../../mod/network.php:141 ../../mod/search.php:20 msgid "Remove term" msgstr "" @@ -4918,17 +4909,6 @@ msgstr "" msgid "Visible to:" msgstr "" -#: ../../mod/post.php:114 -msgid "" -"Remote authentication blocked. You are logged into this site locally. Please " -"logout and retry." -msgstr "" - -#: ../../mod/post.php:127 -#, php-format -msgid "Welcome %s. Remote authentication successful." -msgstr "" - #: ../../mod/profiles.php:18 ../../mod/profiles.php:138 #: ../../mod/profiles.php:179 ../../mod/profiles.php:486 msgid "Profile not found." @@ -5169,23 +5149,23 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:624 ../../boot.php:1701 +#: ../../mod/profiles.php:624 ../../boot.php:1710 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:625 ../../boot.php:1708 +#: ../../mod/profiles.php:625 ../../boot.php:1717 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:636 ../../boot.php:1722 +#: ../../mod/profiles.php:636 ../../boot.php:1731 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:639 ../../boot.php:1725 +#: ../../mod/profiles.php:639 ../../boot.php:1734 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:640 ../../boot.php:1726 +#: ../../mod/profiles.php:640 ../../boot.php:1735 msgid "Edit visibility" msgstr "" @@ -5737,7 +5717,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1430 +#: ../../mod/lostpass.php:85 ../../boot.php:1439 msgid "Password Reset" msgstr "" @@ -5811,19 +5791,19 @@ msgstr "" msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../mod/import.php:352 +#: ../../mod/import.php:356 msgid "Import completed." msgstr "" -#: ../../mod/import.php:365 +#: ../../mod/import.php:369 msgid "You must be logged in to use this feature." msgstr "" -#: ../../mod/import.php:370 +#: ../../mod/import.php:374 msgid "Import Channel" msgstr "" -#: ../../mod/import.php:371 +#: ../../mod/import.php:375 msgid "" "Use this form to import an existing channel from a different server/hub. You " "may retrieve the channel identity from the old server/hub via the network or " @@ -5831,27 +5811,27 @@ msgid "" "imported. Importation of content is not yet available." msgstr "" -#: ../../mod/import.php:372 +#: ../../mod/import.php:376 msgid "File to Upload" msgstr "" -#: ../../mod/import.php:373 +#: ../../mod/import.php:377 msgid "Or provide the old server/hub details" msgstr "" -#: ../../mod/import.php:374 +#: ../../mod/import.php:378 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../mod/import.php:375 +#: ../../mod/import.php:379 msgid "Your old login email address" msgstr "" -#: ../../mod/import.php:376 +#: ../../mod/import.php:380 msgid "Your old login password" msgstr "" -#: ../../mod/import.php:377 +#: ../../mod/import.php:381 msgid "" "For either option, please choose whether to make this hub your new primary " "address, or whether your old location should continue this role. You will be " @@ -5859,31 +5839,36 @@ msgid "" "location for files, photos, and media." msgstr "" -#: ../../mod/import.php:378 +#: ../../mod/import.php:382 msgid "Make this hub my primary location" msgstr "" -#: ../../mod/manage.php:59 +#: ../../mod/manage.php:62 +#, php-format +msgid "You have created %1$.0f of %2$.0f allowed channels." +msgstr "" + +#: ../../mod/manage.php:70 msgid "Create a new channel" msgstr "" -#: ../../mod/manage.php:64 +#: ../../mod/manage.php:75 msgid "Channel Manager" msgstr "" -#: ../../mod/manage.php:65 +#: ../../mod/manage.php:76 msgid "Current Channel" msgstr "" -#: ../../mod/manage.php:67 +#: ../../mod/manage.php:78 msgid "Attach to one of your channels by selecting it." msgstr "" -#: ../../mod/manage.php:68 +#: ../../mod/manage.php:79 msgid "Default Channel" msgstr "" -#: ../../mod/manage.php:69 +#: ../../mod/manage.php:80 msgid "Make Default" msgstr "" @@ -5985,25 +5970,29 @@ msgstr "" msgid "Item not found" msgstr "" -#: ../../mod/editlayout.php:69 ../../mod/editblock.php:69 -msgid "Edit block" +#: ../../mod/editlayout.php:69 +msgid "Edit Layout" msgstr "" -#: ../../mod/editlayout.php:105 ../../mod/editwebpage.php:121 -#: ../../mod/editpost.php:98 ../../mod/editblock.php:105 +#: ../../mod/editlayout.php:105 ../../mod/editwebpage.php:124 +#: ../../mod/editpost.php:98 ../../mod/editblock.php:119 msgid "Insert YouTube video" msgstr "" -#: ../../mod/editlayout.php:106 ../../mod/editwebpage.php:122 -#: ../../mod/editpost.php:99 ../../mod/editblock.php:106 +#: ../../mod/editlayout.php:106 ../../mod/editwebpage.php:125 +#: ../../mod/editpost.php:99 ../../mod/editblock.php:120 msgid "Insert Vorbis [.ogg] video" msgstr "" -#: ../../mod/editlayout.php:107 ../../mod/editwebpage.php:123 -#: ../../mod/editpost.php:100 ../../mod/editblock.php:107 +#: ../../mod/editlayout.php:107 ../../mod/editwebpage.php:126 +#: ../../mod/editpost.php:100 ../../mod/editblock.php:121 msgid "Insert Vorbis [.ogg] audio" msgstr "" +#: ../../mod/editlayout.php:138 +msgid "Delete Layout" +msgstr "" + #: ../../mod/nogroup.php:58 msgid "Contacts who are not members of a group" msgstr "" @@ -6084,8 +6073,12 @@ msgstr "" msgid "Image size reduction [%s] failed." msgstr "" -#: ../../mod/editwebpage.php:85 ../../mod/editpost.php:40 -msgid "Edit post" +#: ../../mod/editwebpage.php:88 +msgid "Edit Webpage" +msgstr "" + +#: ../../mod/editwebpage.php:159 +msgid "Delete Webpage" msgstr "" #: ../../mod/notifications.php:26 @@ -6230,6 +6223,10 @@ msgstr "" msgid "Item is not editable" msgstr "" +#: ../../mod/editpost.php:40 +msgid "Edit post" +msgstr "" + #: ../../mod/profile.php:111 msgid "Access to this profile has been restricted." msgstr "" @@ -6254,6 +6251,10 @@ msgstr "" msgid "Make this post private" msgstr "" +#: ../../mod/wall_upload.php:41 ../../mod/item.php:1077 +msgid "Wall Photos" +msgstr "" + #: ../../mod/community.php:23 msgid "Not available." msgstr "" @@ -6283,6 +6284,14 @@ msgstr "" msgid "Suggest a friend for %s" msgstr "" +#: ../../mod/editblock.php:83 +msgid "Edit Block" +msgstr "" + +#: ../../mod/editblock.php:154 +msgid "Delete Block" +msgstr "" + #: ../../mod/profperm.php:34 ../../mod/profperm.php:64 msgid "Invalid profile identifier." msgstr "" @@ -6303,6 +6312,32 @@ msgstr "" msgid "All Contacts (with secure profile access)" msgstr "" +#: ../../mod/item.php:133 +msgid "Unable to locate original post." +msgstr "" + +#: ../../mod/item.php:301 +msgid "Empty post discarded." +msgstr "" + +#: ../../mod/item.php:345 +msgid "Executable content type not permitted to this channel." +msgstr "" + +#: ../../mod/item.php:792 +msgid "System error. Post not saved." +msgstr "" + +#: ../../mod/item.php:1153 +#, php-format +msgid "You have reached your limit of %1$.0f top level posts." +msgstr "" + +#: ../../mod/item.php:1159 +#, php-format +msgid "You have reached your limit of %1$.0f webpages." +msgstr "" + #: ../../mod/siteinfo.php:51 #, php-format msgid "Version %s" @@ -6442,6 +6477,17 @@ msgstr "" msgid "Please login." msgstr "" +#: ../../mod/post.php:114 +msgid "" +"Remote authentication blocked. You are logged into this site locally. Please " +"logout and retry." +msgstr "" + +#: ../../mod/post.php:127 +#, php-format +msgid "Welcome %s. Remote authentication successful." +msgstr "" + #: ../../mod/removeme.php:45 ../../mod/removeme.php:48 msgid "Remove My Account" msgstr "" @@ -6456,11 +6502,27 @@ msgstr "" msgid "Please enter your password for verification:" msgstr "" -#: ../../mod/mood.php:131 +#: ../../mod/filestorage.php:22 +msgid "Permission Denied." +msgstr "" + +#: ../../mod/filestorage.php:59 +msgid "Download" +msgstr "" + +#: ../../mod/filestorage.php:64 +msgid "Used: " +msgstr "" + +#: ../../mod/filestorage.php:66 +msgid "Limit: " +msgstr "" + +#: ../../mod/mood.php:133 msgid "Mood" msgstr "" -#: ../../mod/mood.php:132 +#: ../../mod/mood.php:134 msgid "Set your current mood and tell your friends" msgstr "" @@ -6526,104 +6588,104 @@ msgstr "" msgid "0-99 default: 5" msgstr "" -#: ../../boot.php:1234 +#: ../../boot.php:1242 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1237 +#: ../../boot.php:1245 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1394 +#: ../../boot.php:1403 msgid "Create a New Account" msgstr "" -#: ../../boot.php:1423 +#: ../../boot.php:1432 msgid "Password" msgstr "" -#: ../../boot.php:1424 +#: ../../boot.php:1433 msgid "Remember me" msgstr "" -#: ../../boot.php:1429 +#: ../../boot.php:1438 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1548 +#: ../../boot.php:1557 msgid "Requested channel is not available." msgstr "" -#: ../../boot.php:1560 +#: ../../boot.php:1569 msgid " Sorry, you don't have the permission to view this profile. " msgstr "" -#: ../../boot.php:1707 +#: ../../boot.php:1716 msgid "Profiles" msgstr "" -#: ../../boot.php:1707 +#: ../../boot.php:1716 msgid "Manage/edit profiles" msgstr "" -#: ../../boot.php:1711 +#: ../../boot.php:1720 msgid "Edit Profile" msgstr "" -#: ../../boot.php:1800 ../../boot.php:1880 +#: ../../boot.php:1809 ../../boot.php:1889 msgid "F d" msgstr "" -#: ../../boot.php:1857 +#: ../../boot.php:1866 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1858 +#: ../../boot.php:1867 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1913 +#: ../../boot.php:1922 msgid "[No description]" msgstr "" -#: ../../boot.php:1931 +#: ../../boot.php:1940 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1932 +#: ../../boot.php:1941 msgid "Events this week:" msgstr "" -#: ../../boot.php:2166 +#: ../../boot.php:2175 msgid "Channel" msgstr "" -#: ../../boot.php:2169 +#: ../../boot.php:2178 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:2173 +#: ../../boot.php:2182 msgid "About" msgstr "" -#: ../../boot.php:2176 +#: ../../boot.php:2185 msgid "Profile Details" msgstr "" -#: ../../boot.php:2194 +#: ../../boot.php:2203 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:2199 +#: ../../boot.php:2208 msgid "Webpages" msgstr "" -#: ../../boot.php:2202 +#: ../../boot.php:2211 msgid "Manage Webpages" msgstr "" -#: ../../boot.php:2484 +#: ../../boot.php:2493 msgid "toggle mobile" msgstr "" diff --git a/version.inc b/version.inc index 88e400a18..4c592bf06 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-09-12.434 +2013-09-13.435 From 94417eecbae6ca678f402458373406d64efde3d6 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 14 Sep 2013 01:56:25 -0700 Subject: [PATCH 154/330] import_xchan - check every known hubloc/location field and create a new hubloc if anything at all changed anywhere. --- include/zot.php | 12 ++++++++---- version.inc | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/include/zot.php b/include/zot.php index f34344739..a690d8346 100644 --- a/include/zot.php +++ b/include/zot.php @@ -578,13 +578,18 @@ function import_xchan($arr) { } } - $r = q("select * from hubloc where hubloc_hash = '%s' and hubloc_guid = '%s' and hubloc_guid_sig = '%s' - and hubloc_url = '%s' and hubloc_url_sig = '%s' limit 1", + // match as many fields as possible in case anything at all changed. + + $r = q("select * from hubloc where hubloc_hash = '%s' and hubloc_guid = '%s' and hubloc_guid_sig = '%s' and hubloc_url = '%s' and hubloc_url_sig = '%s' and hubloc_host = '%s' and hubloc_addr = '%s' and hubloc_callback = '%s' and hubloc_sitekey = '%s' limit 1", dbesc($xchan_hash), dbesc($arr['guid']), dbesc($arr['guid_sig']), dbesc($location['url']), - dbesc($location['url_sig']) + dbesc($location['url_sig']), + dbesc($location['host']), + dbesc($location['address']), + dbesc($location['callback']), + dbesc($location['sitekey']) ); if($r) { logger('import_xchan: hub exists: ' . $location['url']); @@ -600,7 +605,6 @@ function import_xchan($arr) { dbesc(datetime_convert()), intval($r[0]['hubloc_id']) ); - $changed = true; } continue; diff --git a/version.inc b/version.inc index 4c592bf06..ca5f77852 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-09-13.435 +2013-09-14.436 From 095939f0d8653fbb0a33444fbfcddfdef1419b26 Mon Sep 17 00:00:00 2001 From: mrjive Date: Sat, 14 Sep 2013 20:28:56 +0200 Subject: [PATCH 155/330] First try to tell a comment from a like/dislike in notification system --- include/enotify.php | 94 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 92 insertions(+), 2 deletions(-) diff --git a/include/enotify.php b/include/enotify.php index b2a4f5856..88d5e7744 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -152,7 +152,14 @@ function notification($params) { // differents subjects for messages on the same thread. $subject = sprintf( t('[Red:Notify] Comment to conversation #%1$d by %2$s'), $parent_id, $sender['xchan_name']); - $preamble = sprintf( t('%s commented on an item/conversation you have been following.'), $sender['xchan_name']); + // Let's try to tell if it is a comment or a like/dislike + // of course this is stupid, we should know if the like/dislike has been given to the post + // or to a comment to the post... + if (activity_match($item['verb'],ACTIVITY_LIKE) || activity_match($item['verb'],ACTIVITY_DISLIKE)) { + $preamble = sprintf( t('%s gave a like/dislike to the converation you have been following.' $dender['xchan_name']); + } else { + $preamble = sprintf( t('%s commented on an item/conversation you have been following.'), $sender['xchan_name']); + } $epreamble = $dest_str; $sitelink = t('Please visit %s to view and/or reply to the conversation.'); @@ -265,7 +272,90 @@ function notification($params) { $tsitelink = sprintf( $sitelink, $siteurl ); $hsitelink = sprintf( $sitelink, '' . $sitename . ''); $itemlink = $params['link']; - } + }263 +264 +265 +266 +267 +268 +269 +270 +271 +272 +273 +274 +275 +276 +277 +278 +279 +280 +281 +282 +283 +284 +285 +286 +287 +288 +289 +290 +291 +292 +293 +294 +295 +296 +297 +298 +299 +300 +301 +302 +303 +304 +305 +306 +307 + $sitelink = t('Please visit %s to approve or reject the suggestion.'); + $tsitelink = sprintf( $sitelink, $siteurl ); + $hsitelink = sprintf( $sitelink, '' . $sitename . ''); + $itemlink = $params['link']; + } + if($params['type'] == NOTIFY_CONFIRM) { + } + if($params['type'] == NOTIFY_SYSTEM) { + + } + $h = array( + 'params' => $params, + 'subject' => $subject, + 'preamble' => $preamble, + 'epreamble' => $epreamble, + 'body' => $body, + 'sitelink' => $sitelink, + 'tsitelink' => $tsitelink, + 'hsitelink' => $hsitelink, + 'itemlink' => $itemlink + ); + + call_hooks('enotify',$h); + $subject = $h['subject']; + $preamble = $h['preamble']; + $epreamble = $h['epreamble']; + $body = $h['body']; + $sitelink = $h['sitelink']; + $tsitelink = $h['tsitelink']; + $hsitelink = $h['hsitelink']; + $itemlink = $h['itemlink']; + require_once('include/html2bbcode.php'); + do { + $dups = false; + $hash = random_string(); + $r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' LIMIT 1", +Commit summary: Extended description: (optional) +mrjive mrjive@mrjive.it + if($params['type'] == NOTIFY_CONFIRM) { From 05649fa33acfa405f6be75f8d423d7a10ec5b817 Mon Sep 17 00:00:00 2001 From: Olaf Conradi Date: Sat, 14 Sep 2013 23:39:40 +0200 Subject: [PATCH 156/330] Revert broken commit --- include/enotify.php | 94 +-------------------------------------------- 1 file changed, 2 insertions(+), 92 deletions(-) diff --git a/include/enotify.php b/include/enotify.php index 88d5e7744..b2a4f5856 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -152,14 +152,7 @@ function notification($params) { // differents subjects for messages on the same thread. $subject = sprintf( t('[Red:Notify] Comment to conversation #%1$d by %2$s'), $parent_id, $sender['xchan_name']); - // Let's try to tell if it is a comment or a like/dislike - // of course this is stupid, we should know if the like/dislike has been given to the post - // or to a comment to the post... - if (activity_match($item['verb'],ACTIVITY_LIKE) || activity_match($item['verb'],ACTIVITY_DISLIKE)) { - $preamble = sprintf( t('%s gave a like/dislike to the converation you have been following.' $dender['xchan_name']); - } else { - $preamble = sprintf( t('%s commented on an item/conversation you have been following.'), $sender['xchan_name']); - } + $preamble = sprintf( t('%s commented on an item/conversation you have been following.'), $sender['xchan_name']); $epreamble = $dest_str; $sitelink = t('Please visit %s to view and/or reply to the conversation.'); @@ -272,90 +265,7 @@ function notification($params) { $tsitelink = sprintf( $sitelink, $siteurl ); $hsitelink = sprintf( $sitelink, '' . $sitename . ''); $itemlink = $params['link']; - }263 -264 -265 -266 -267 -268 -269 -270 -271 -272 -273 -274 -275 -276 -277 -278 -279 -280 -281 -282 -283 -284 -285 -286 -287 -288 -289 -290 -291 -292 -293 -294 -295 -296 -297 -298 -299 -300 -301 -302 -303 -304 -305 -306 -307 - $sitelink = t('Please visit %s to approve or reject the suggestion.'); - $tsitelink = sprintf( $sitelink, $siteurl ); - $hsitelink = sprintf( $sitelink, '' . $sitename . ''); - $itemlink = $params['link']; - } - if($params['type'] == NOTIFY_CONFIRM) { - } - if($params['type'] == NOTIFY_SYSTEM) { - - } - $h = array( - 'params' => $params, - 'subject' => $subject, - 'preamble' => $preamble, - 'epreamble' => $epreamble, - 'body' => $body, - 'sitelink' => $sitelink, - 'tsitelink' => $tsitelink, - 'hsitelink' => $hsitelink, - 'itemlink' => $itemlink - ); - - call_hooks('enotify',$h); - $subject = $h['subject']; - $preamble = $h['preamble']; - $epreamble = $h['epreamble']; - $body = $h['body']; - $sitelink = $h['sitelink']; - $tsitelink = $h['tsitelink']; - $hsitelink = $h['hsitelink']; - $itemlink = $h['itemlink']; - require_once('include/html2bbcode.php'); - do { - $dups = false; - $hash = random_string(); - $r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' LIMIT 1", -Commit summary: Extended description: (optional) -mrjive mrjive@mrjive.it - + } if($params['type'] == NOTIFY_CONFIRM) { From 0c4857e1a9f0fbfece2ac90ea90d6670a0d4ba41 Mon Sep 17 00:00:00 2001 From: Michael Johnston Date: Sat, 14 Sep 2013 17:54:32 -0400 Subject: [PATCH 157/330] let me edit menu_desc even if menu_name has not changed --- include/menu.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/menu.php b/include/menu.php index 6d614055a..0e98f3a84 100644 --- a/include/menu.php +++ b/include/menu.php @@ -141,14 +141,16 @@ function menu_edit($arr) { } - $r = q("select * from menu where menu_name = '%s' and menu_channel_id = %d limit 1", + $r = q("select * from menu where menu_name = '%s' and menu_channel_id = %d and menu_desc = '%s' limit 1", dbesc($menu_name), - intval($menu_channel_id) + intval($menu_channel_id), + dbesc($menu_desc) ); if($r) return false; + return q("update menu set menu_name = '%s', menu_desc = '%s' where menu_id = %d and menu_channel_id = %d limit 1", dbesc($menu_name), From ec7b462b1876eb47e38d545bcbcbd05097c31cd5 Mon Sep 17 00:00:00 2001 From: Michael Johnston Date: Sat, 14 Sep 2013 18:16:54 -0400 Subject: [PATCH 158/330] set menu_channel_id before we use it in a query --- include/menu.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/menu.php b/include/menu.php index 0e98f3a84..900b48e65 100644 --- a/include/menu.php +++ b/include/menu.php @@ -118,6 +118,8 @@ function menu_edit($arr) { return false; + $menu_channel_id = intval($arr['menu_channel_id']); + $r = q("select menu_id from menu where menu_name = '%s' and menu_channel_id = %d limit 1", dbesc($menu_name), intval($menu_channel_id) @@ -128,9 +130,6 @@ function menu_edit($arr) { } - - $menu_channel_id = intval($arr['menu_channel_id']); - $r = q("select * from menu where menu_id = %d and menu_channel_id = %d limit 1", intval($menu_id), intval($menu_channel_id) From a36cc949a1d4c106cd02ec8386c24bf964369571 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 14 Sep 2013 16:11:15 -0700 Subject: [PATCH 159/330] this might fix "find channels" but I can't test the keyword search until this is running on a production site. --- mod/directory.php | 2 +- view/tpl/peoplefind.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/directory.php b/mod/directory.php index b7cdaffe7..823c33cf7 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -70,7 +70,7 @@ function directory_content(&$a) { if($url) { $query = $url . '?f=' ; if($search) - $query .= '&name=' . urlencode($search); + $query .= '&name=' . urlencode($search) . '&keywords=' . urlencode($search); if(strpos($search,'@')) $query .= '&address=' . urlencode($search); diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index 72c0830cf..831cd9614 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -1,7 +1,7 @@

    {{$findpeople}}

    {{$desc}}
    - + From 44ed6b0adcd3c9cd65bd847de0a64ea90da0e1d2 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 14 Sep 2013 16:45:14 -0700 Subject: [PATCH 160/330] no longer used --- mod/dirfind.php | 68 ------------------------------------------------- 1 file changed, 68 deletions(-) delete mode 100644 mod/dirfind.php diff --git a/mod/dirfind.php b/mod/dirfind.php deleted file mode 100644 index 54bbf31af..000000000 --- a/mod/dirfind.php +++ /dev/null @@ -1,68 +0,0 @@ -page,'aside')) - $a->page['aside'] = ''; - - $a->page['aside'] .= follow_widget(); - - $a->page['aside'] .= findpeople_widget(); -} - - - -function dirfind_content(&$a) { - - $search = notags(trim($_REQUEST['search'])); - - if(strpos($search,'@') === 0) - $search = substr($search,1); - - $o = ''; - - $o .= '

    ' . t('People Search') . ' - ' . $search . '

    '; - - if($search) { - - $p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : ''); - - if(strlen(get_config('system','directory_submit_url'))) - $x = fetch_url('http://dir.friendica.com/lsearch?f=' . $p . '&search=' . urlencode($search)); - -//TODO fallback local search if global dir not available. -// else -// $x = post_url($a->get_baseurl() . '/lsearch', $params); - - $j = json_decode($x); - - if($j->total) { - $a->set_pager_total($j->total); - $a->set_pager_itemspage($j->items_page); - } - - if(count($j->results)) { - - $tpl = get_markup_template('match.tpl'); - foreach($j->results as $jj) { - - $o .= replace_macros($tpl,array( - '$url' => zid($jj->url), - '$name' => $jj->name, - '$photo' => $jj->photo, - '$tags' => $jj->tags - )); - } - } - else { - info( t('No matches') . EOL); - } - - } - - $o .= '
    '; - $o .= paginate($a); - return $o; -} From 053893b0673d15c255718e5328fbbdb9af29f715 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 14 Sep 2013 17:20:24 -0700 Subject: [PATCH 161/330] some fixes to directory keyword searches --- include/zot.php | 2 +- mod/zfinger.php | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/zot.php b/include/zot.php index a690d8346..53031a6c5 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1383,8 +1383,8 @@ function import_directory_profile($hash,$profile) { foreach($profile['keywords'] as $kw) { $kw = trim(htmlentities($kw,ENT_COMPAT,'UTF-8',false)); $kw = trim($kw,','); + $clean[] = $kw; } - $clean[] = $kw; } $arr['xprof_keywords'] = implode(' ',$clean); diff --git a/mod/zfinger.php b/mod/zfinger.php index 36c1cc493..9a2873df3 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -108,8 +108,10 @@ function zfinger_init(&$a) { $k = explode(' ',$p[0]['keywords']); if($k) foreach($k as $kk) - if(trim($kk)) - $tags[] = trim($kk); + if(trim($kk)) { + $tags[] = trim($kk," \t\n\r\0\x0B,"); + } + } if($tags) $profile['keywords'] = $tags; } From aefb0f823353d15a281d3c94ec6fc044e1b62580 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 14 Sep 2013 17:21:39 -0700 Subject: [PATCH 162/330] fix the missing brace before pushing --- mod/zfinger.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mod/zfinger.php b/mod/zfinger.php index 9a2873df3..70e3bdca6 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -106,12 +106,13 @@ function zfinger_init(&$a) { if($p[0]['keywords']) { $tags = array(); $k = explode(' ',$p[0]['keywords']); - if($k) - foreach($k as $kk) + if($k) { + foreach($k as $kk) { if(trim($kk)) { $tags[] = trim($kk," \t\n\r\0\x0B,"); } } + } if($tags) $profile['keywords'] = $tags; } From 496f869157ab76139d14a3c67fd8276ee6557517 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sun, 15 Sep 2013 03:18:18 +0200 Subject: [PATCH 163/330] Search by date Search by date (archive) works a bit now --- mod/channel.php | 23 ++++++++++++----------- view/tpl/posted_date_widget.tpl | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/mod/channel.php b/mod/channel.php index 5d3855269..2544018f8 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -64,17 +64,18 @@ function channel_content(&$a, $update = 0, $load = false) { $category = $datequery = $datequery2 = ''; - if(argc() > 2) { - for($x = 2; $x < argc(); $x ++) { - if(is_a_date_arg(argv($x))) { - if($datequery) - $datequery2 = escape_tags(argv($x)); - else - $datequery = escape_tags(argv($x)); - } - } - } - + // if(argc() > 2) { + // for($x = 2; $x < argc(); $x ++) { + // if(is_a_date_arg(argv($x))) { + // if($datequery) + // $datequery2 = escape_tags(argv($x)); + // else + // $datequery = escape_tags(argv($x)); + // } + // } + // } + $datequery = ((x($_GET,'dend') && is_a_date_arg($_GET['dend'])) ? notags($_GET['dend']) : ''); + $datequery2 = ((x($_GET,'dbegin') && is_a_date_arg($_GET['dbegin'])) ? notags($_GET['dbegin']) : ''); if(get_config('system','block_public') && (! get_account_id()) && (! remote_user())) { return login(); diff --git a/view/tpl/posted_date_widget.tpl b/view/tpl/posted_date_widget.tpl index 009fa60a6..6720d3628 100755 --- a/view/tpl/posted_date_widget.tpl +++ b/view/tpl/posted_date_widget.tpl @@ -3,7 +3,7 @@
    From 129a119c84d87bffe099cea7ac5b0ed511c26f80 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 15 Sep 2013 03:48:43 -0700 Subject: [PATCH 164/330] implement what I hope will now be the server side of directory sync, add viewsrc to item_photo_menu, and log what changed in import_xchan update objects so we can find out why there are so many updates when nothing _obvious_ has changed that should trigger it. --- include/conversation.php | 20 ++++++++++++-------- include/zot.php | 17 ++++++++++++----- mod/dirsearch.php | 19 +++++++++++++++---- version.inc | 2 +- 4 files changed, 40 insertions(+), 18 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 0c1479356..e7c7831c0 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -876,6 +876,12 @@ function item_photo_menu($item){ $ssl_state = false; + $sub_link=""; + $poke_link=""; + $contact_url=""; + $pm_url=""; + $vsrc_link = ""; + if(local_user()) { $ssl_state = true; if(! count($a->contacts)) @@ -884,14 +890,11 @@ function item_photo_menu($item){ $channel_hash = (($channel) ? $channel['channel_hash'] : ''); } - $sub_link=""; - $poke_link=""; - $contact_url=""; - $pm_url=""; - - if((local_user()) && local_user() == $item['uid'] && $item['parent'] == $item['id'] - && $channel && ($channel_hash != $item['author_xchan'])) { - $sub_link = 'javascript:dosubthread(' . $item['id'] . '); return false;'; + if((local_user()) && local_user() == $item['uid']) { + $vsrc_link = $a->get_baseurl() . '/viewsrc/' . $item['id']; + if($item['parent'] == $item['id'] && $channel && ($channel_hash != $item['author_xchan'])) { + $sub_link = 'javascript:dosubthread(' . $item['id'] . '); return false;'; + } } $profile_link = z_root() . "/chanview/?f=&hash=" . $item['author_xchan']; @@ -910,6 +913,7 @@ function item_photo_menu($item){ } $menu = Array( + t("View Source") => $vsrc_link, t("Follow Thread") => $sub_link, t("View Status") => $status_link, t("View Profile") => $profile_link, diff --git a/include/zot.php b/include/zot.php index 53031a6c5..c461486f0 100644 --- a/include/zot.php +++ b/include/zot.php @@ -417,6 +417,7 @@ function import_xchan($arr) { $dirmode = intval(get_config('system','directory_mode')); $changed = false; + $what = ''; if(! (is_array($arr) && array_key_exists('success',$arr) && $arr['success'])) { logger('import_xchan: invalid data packet: ' . print_r($arr,true)); @@ -492,7 +493,7 @@ function import_xchan($arr) { logger('import_xchan: existing: ' . print_r($r[0],true), LOGGER_DATA); logger('import_xchan: new: ' . print_r($arr,true), LOGGER_DATA); - + $what .= 'xchan '; $changed = true; } } @@ -532,6 +533,7 @@ function import_xchan($arr) { intval($new_flags) ); + $what .= 'new_xchan'; $changed = true; } @@ -552,7 +554,7 @@ function import_xchan($arr) { dbesc($xchan_hash) ); - + $what .= 'photo '; $changed = true; } @@ -605,6 +607,7 @@ function import_xchan($arr) { dbesc(datetime_convert()), intval($r[0]['hubloc_id']) ); + $what = 'primary_hub '; $changed = true; } continue; @@ -644,7 +647,7 @@ function import_xchan($arr) { dbesc(datetime_convert()), dbesc(datetime_convert()) ); - + $what .= 'newhub '; $changed = true; } @@ -656,7 +659,7 @@ function import_xchan($arr) { $r = q("delete from hubloc where hubloc_id = %d limit 1", intval($x['hubloc_id']) ); - + $what .= 'removed_hub'; $changed = true; } } @@ -670,7 +673,7 @@ function import_xchan($arr) { if(array_key_exists('profile',$arr) && is_array($arr['profile'])) { $profile_changed = import_directory_profile($xchan_hash,$arr['profile']); if($profile_changed) { - + $what .= 'profile '; $changed = true; } } @@ -689,6 +692,7 @@ function import_xchan($arr) { if(array_key_exists('site',$arr) && is_array($arr['site'])) { $profile_changed = import_site($arr['site'],$arr['key']); if($profile_changed) { + $what .= 'site '; $changed = true; } } @@ -698,6 +702,7 @@ function import_xchan($arr) { if($changed) { $guid = random_string() . '@' . get_app()->get_hostname(); update_modtime($xchan_hash,$guid); + logger('import_xchan: changed: ' . $what,LOGGER_DEBUG); } if(! x($ret,'message')) { @@ -1396,6 +1401,7 @@ function import_directory_profile($hash,$profile) { $update = false; foreach($r[0] as $k => $v) { if((array_key_exists($k,$arr)) && ($arr[$k] != $v)) { + logger('import_directory_profile: update' . $k . ' => ' . $arr[$k]); $update = true; break; } @@ -1431,6 +1437,7 @@ function import_directory_profile($hash,$profile) { } else { $update = true; + logger('import_directory_profile: new profile'); $x = q("insert into xprof (xprof_hash, xprof_desc, xprof_dob, xprof_age, xprof_gender, xprof_marital, xprof_sexual, xprof_locale, xprof_region, xprof_postcode, xprof_country, xprof_keywords) values ('%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ", dbesc($arr['xprof_hash']), dbesc($arr['xprof_desc']), diff --git a/mod/dirsearch.php b/mod/dirsearch.php index 6034fdc12..04d77a298 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -41,6 +41,7 @@ function dirsearch_content(&$a) { $agege = ((x($_REQUEST,'agege')) ? intval($_REQUEST['agege']) : 0 ); $agele = ((x($_REQUEST,'agele')) ? intval($_REQUEST['agele']) : 0 ); + $sync = ((x($_REQUEST,'sync')) ? datetime_convert('UTC','UTC',$_REQUEST['sync']) : ''); $sort_order = ((x($_REQUEST,'order')) ? $_REQUEST['order'] : ''); // TODO - a meta search which joins all of these things to one search string @@ -82,6 +83,7 @@ function dirsearch_content(&$a) { $limit = (($_REQUEST['limit']) ? intval($_REQUEST['limit']) : 0); $return_total = ((x($_REQUEST,'return_total')) ? intval($_REQUEST['return_total']) : 0); + // mtime is not currently working $mtime = ((x($_REQUEST,'mtime')) ? datetime_convert('UTC','UTC',$_REQUEST['mtime']) : ''); @@ -124,11 +126,19 @@ function dirsearch_content(&$a) { $order = " order by xchan_name asc "; + if($sync) { - $r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash where $logic $sql_extra and not ( xchan_flags & %d ) and not ( xchan_flags & %d ) $order $qlimit ", - intval(XCHAN_FLAGS_HIDDEN), - intval(XCHAN_FLAGS_ORPHAN) - ); + $r = q("select xchan.*, updates.* from xchan left join updates on ud_hash = xchan_hash where ud_date >= '%s' and ud_guid != '' order by ud_date desc", + dbesc($sync) + ); + + } + else { + $r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash where $logic $sql_extra and not ( xchan_flags & %d ) and not ( xchan_flags & %d ) $order $qlimit ", + intval(XCHAN_FLAGS_HIDDEN), + intval(XCHAN_FLAGS_ORPHAN) + ); + } $ret['page'] = $page + 1; $ret['records'] = count($r); @@ -145,6 +155,7 @@ function dirsearch_content(&$a) { $entry['hash'] = $rr['xchan_hash']; $entry['updated'] = (($rr['ud_date']) ? $rr['ud_date'] : '0000-00-00 00:00:00'); + $entry['update_guid'] = (($rr['ud_guid']) ? $rr['ud_guid'] : ''); $entry['url'] = $rr['xchan_url']; $entry['photo'] = $rr['xchan_photo_m']; $entry['address'] = $rr['xchan_addr']; diff --git a/version.inc b/version.inc index ca5f77852..2ee9add97 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-09-14.436 +2013-09-15.437 From e1133ec1d0ab554fedf08eb2b2cd1f91008340ab Mon Sep 17 00:00:00 2001 From: Michael Johnston Date: Sun, 15 Sep 2013 14:36:54 -0400 Subject: [PATCH 165/330] fix photo file browser --- mod/fbrowser.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mod/fbrowser.php b/mod/fbrowser.php index 31004c0d8..baacfe56b 100644 --- a/mod/fbrowser.php +++ b/mod/fbrowser.php @@ -53,7 +53,8 @@ function fbrowser_content($a){ function files1($rr){ global $a; - $types = Photo::supportedTypes(); + $ph = photo_factory(''); + $types = $ph->supportedTypes(); $ext = $types[$rr['type']]; if($a->get_template_engine() === 'internal') { From b3575484c7c8577f1ea648364fd979d7c551d4b9 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 15 Sep 2013 19:04:11 -0700 Subject: [PATCH 166/330] don't create a directory sync notification (entry in the updates table) if the site record was updated - without checking first to see if anything changed. This is causing lots of sync entries when nothing changed to warrant it. --- include/zot.php | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/include/zot.php b/include/zot.php index c461486f0..df3b79f80 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1516,12 +1516,15 @@ function import_site($arr,$pubkey) { } $update = false; + $exists = false; $r = q("select * from site where site_url = '%s' limit 1", dbesc($arr['url']) ); - if($r) - $update = true; + if($r) { + $exists = true; + $siterecord = $r[0]; + } $site_directory = 0; if($arr['directory_mode'] == 'normal') @@ -1552,29 +1555,39 @@ function import_site($arr,$pubkey) { $access_policy = ACCESS_FREE; } + $directory_url = htmlentities($arr['directory_url'],ENT_COMPAT,'UTF-8',false); + $url = htmlentities($arr['url'],ENT_COMPAT,'UTF-8',false); - if($update) { - $r = q("update site set site_flags = %d, site_access = %d, site_directory = '%s', site_register = %d, site_update = '%s' - where site_url = '%s' limit 1", - intval($site_directory), - intval($access_policy), - dbesc(htmlentities($arr['directory_url'],ENT_COMPAT,'UTF-8',false)), - intval($register_policy), - dbesc(datetime_convert()), - dbesc(htmlentities($arr['url'],ENT_COMPAT,'UTF-8',false)) - ); - if(! $r) { - logger('import_site: update failed. ' . print_r($arr,true)); + if($exists) { + if(($siterecord['site_flags'] != $site_directory) + || ($siterecord['site_access'] != $access_policy) + || ($siterecord['site_directory'] != $directory_url) + || ($siterecord['site_register'] != $register_policy)) { + $update = true; + + $r = q("update site set site_flags = %d, site_access = %d, site_directory = '%s', site_register = %d, site_update = '%s' + where site_url = '%s' limit 1", + intval($site_directory), + intval($access_policy), + dbesc($directory_url), + intval($register_policy), + dbesc(datetime_convert()), + dbesc($url) + ); + if(! $r) { + logger('import_site: update failed. ' . print_r($arr,true)); + } } } else { + $update = true; $r = q("insert into site ( site_url, site_access, site_flags, site_update, site_directory, site_register ) values ( '%s', %d, %d, '%s', '%s', %d )", - dbesc(htmlentities($arr['url'],ENT_COMPAT,'UTF-8',false)), + dbesc($url), intval($site_directory), intval($access_policy), dbesc(datetime_convert()), - dbesc(htmlentities($arr['directory_url'],ENT_COMPAT,'UTF-8',false)), + dbesc($directory_url), intval($register_policy) ); if(! $r) { From 3554bab83ac6bf96f34e6dc36d828fa5ff6c18fa Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 16 Sep 2013 05:01:25 +0100 Subject: [PATCH 167/330] Content wrapper breaks feature settings. Get rid of it as a quick fix until I get a chance to work out why it works everywhere except there. --- view/tpl/settings_features.tpl | 3 --- 1 file changed, 3 deletions(-) diff --git a/view/tpl/settings_features.tpl b/view/tpl/settings_features.tpl index 31371e0af..02e4f6159 100755 --- a/view/tpl/settings_features.tpl +++ b/view/tpl/settings_features.tpl @@ -1,4 +1,3 @@ -

    {{$title}}

    @@ -18,5 +17,3 @@
    - -
    From 4decbacda1cceb80af4b96309c6d74947595a1e5 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 15 Sep 2013 22:19:24 -0700 Subject: [PATCH 168/330] more logging --- include/zot.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/zot.php b/include/zot.php index df3b79f80..91fc03a3a 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1565,6 +1565,9 @@ function import_site($arr,$pubkey) { || ($siterecord['site_register'] != $register_policy)) { $update = true; + logger('import_site: input: ' . print_r($arr,true)); + logger('import_site: stored: ' . print_r($siterecord,true)); + $r = q("update site set site_flags = %d, site_access = %d, site_directory = '%s', site_register = %d, site_update = '%s' where site_url = '%s' limit 1", intval($site_directory), From f72cc77e46263a21835f146ca847155da4b6a17a Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 15 Sep 2013 22:33:47 -0700 Subject: [PATCH 169/330] spurious blank lines --- mod/editblock.php | 1 - mod/editlayout.php | 1 - mod/editwebpage.php | 1 - 3 files changed, 3 deletions(-) diff --git a/mod/editblock.php b/mod/editblock.php index 48136b126..a111f6666 100644 --- a/mod/editblock.php +++ b/mod/editblock.php @@ -1,4 +1,3 @@ - Date: Sun, 15 Sep 2013 23:02:18 -0700 Subject: [PATCH 170/330] found it --- include/zot.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/zot.php b/include/zot.php index 91fc03a3a..0f42ddc7f 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1565,8 +1565,8 @@ function import_site($arr,$pubkey) { || ($siterecord['site_register'] != $register_policy)) { $update = true; - logger('import_site: input: ' . print_r($arr,true)); - logger('import_site: stored: ' . print_r($siterecord,true)); +// logger('import_site: input: ' . print_r($arr,true)); +// logger('import_site: stored: ' . print_r($siterecord,true)); $r = q("update site set site_flags = %d, site_access = %d, site_directory = '%s', site_register = %d, site_update = '%s' where site_url = '%s' limit 1", @@ -1598,7 +1598,7 @@ function import_site($arr,$pubkey) { } } - return $r; + return $update; } From 88ea4f80bc0d26a5f04dd66de44e1bd9d0d649f1 Mon Sep 17 00:00:00 2001 From: pixelroot Date: Mon, 16 Sep 2013 08:46:15 +0200 Subject: [PATCH 171/330] modified: view/ru/messages.po --- view/ru/messages.po | 882 ++++++++++++++++++++++++-------------------- 1 file changed, 472 insertions(+), 410 deletions(-) diff --git a/view/ru/messages.po b/view/ru/messages.po index 375af7439..d4ee432e3 100644 --- a/view/ru/messages.po +++ b/view/ru/messages.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Red Matrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-09-06 00:01-0700\n" -"PO-Revision-Date: 2013-09-13 09:56+0000\n" +"POT-Creation-Date: 2013-09-13 00:01-0700\n" +"PO-Revision-Date: 2013-09-16 06:41+0000\n" "Last-Translator: alexej \n" "Language-Team: Russian (http://www.transifex.com/projects/p/red-matrix/language/ru/)\n" "MIME-Version: 1.0\n" @@ -247,9 +247,9 @@ msgstr "" msgid "Default" msgstr "" -#: ../../include/Contact.php:87 ../../include/contact_widgets.php:9 +#: ../../include/Contact.php:87 ../../include/contact_widgets.php:23 #: ../../mod/directory.php:163 ../../mod/match.php:58 ../../mod/suggest.php:56 -#: ../../boot.php:1687 +#: ../../boot.php:1696 msgid "Connect" msgstr "Подключить" @@ -285,7 +285,7 @@ msgstr "Сообщения сети" #: ../../include/Contact.php:467 ../../include/conversation.php:918 msgid "Edit Contact" -msgstr "Редактировать канал" +msgstr "Редактировать контакт" #: ../../include/Contact.php:468 ../../include/conversation.php:919 msgid "Send PM" @@ -352,7 +352,7 @@ msgid "RSS/Atom" msgstr "RSS/Atom" #: ../../include/contact_selectors.php:77 ../../mod/admin.php:636 -#: ../../mod/admin.php:645 ../../boot.php:1422 +#: ../../mod/admin.php:645 ../../boot.php:1431 msgid "Email" msgstr "E-mail" @@ -380,88 +380,6 @@ msgstr "XMPP/IM" msgid "MySpace" msgstr "MySpace" -#: ../../include/contact_widgets.php:6 -msgid "Add New Connection" -msgstr "Добавить новый контакт" - -#: ../../include/contact_widgets.php:7 -msgid "Enter the channel address" -msgstr "Введите адрес вашего канала" - -#: ../../include/contact_widgets.php:8 -msgid "Example: bob@example.com, http://example.com/barbara" -msgstr "Пример: bob@example.com, http://example.com/barbara" - -#: ../../include/contact_widgets.php:23 -#, php-format -msgid "%d invitation available" -msgid_plural "%d invitations available" -msgstr[0] "имеется %d приглашение" -msgstr[1] "имеются %d приглашения" -msgstr[2] "имеется %d приглашений" - -#: ../../include/contact_widgets.php:29 -msgid "Find Channels" -msgstr "Поиск каналов" - -#: ../../include/contact_widgets.php:30 -msgid "Enter name or interest" -msgstr "Впишите имя или интерес" - -#: ../../include/contact_widgets.php:31 -msgid "Connect/Follow" -msgstr "Подключить/следовать" - -#: ../../include/contact_widgets.php:32 -msgid "Examples: Robert Morgenstein, Fishing" -msgstr "Примеры: Владимир Ильич, Революционер" - -#: ../../include/contact_widgets.php:33 ../../mod/directory.php:182 -#: ../../mod/directory.php:187 ../../mod/connections.php:666 -msgid "Find" -msgstr "Поиск" - -#: ../../include/contact_widgets.php:34 ../../mod/suggest.php:64 -msgid "Channel Suggestions" -msgstr "Рекомендации контактов" - -#: ../../include/contact_widgets.php:35 -msgid "Similar Interests" -msgstr "Похожие интересы" - -#: ../../include/contact_widgets.php:36 -msgid "Random Profile" -msgstr "Случайные" - -#: ../../include/contact_widgets.php:37 -msgid "Invite Friends" -msgstr "Пригласить друзей" - -#: ../../include/contact_widgets.php:61 ../../include/features.php:58 -msgid "Saved Folders" -msgstr "Запомненные папки" - -#: ../../include/contact_widgets.php:64 ../../include/contact_widgets.php:91 -msgid "Everything" -msgstr "Все" - -#: ../../include/contact_widgets.php:88 -msgid "Categories" -msgstr "Категории" - -#: ../../include/contact_widgets.php:121 -#, php-format -msgid "%d connection in common" -msgid_plural "%d connections in common" -msgstr[0] "%d совместный канал" -msgstr[1] "%d совместных канала" -msgstr[2] "%d совместных каналов" - -#: ../../include/contact_widgets.php:126 ../../include/js_strings.php:7 -#: ../../include/ItemObject.php:255 -msgid "show more" -msgstr "показать все" - #: ../../include/datetime.php:43 ../../include/datetime.php:45 msgid "Miscellaneous" msgstr "Прочее" @@ -553,7 +471,7 @@ msgid "Finishes:" msgstr "\t\nКонец:" #: ../../include/event.php:40 ../../include/bb2diaspora.php:455 -#: ../../mod/events.php:450 ../../mod/directory.php:138 ../../boot.php:1737 +#: ../../mod/events.php:450 ../../mod/directory.php:138 ../../boot.php:1746 msgid "Location:" msgstr "Откуда:" @@ -720,6 +638,10 @@ msgstr "Категории сообщения" msgid "Add categories to your posts" msgstr "Добавить категории для ваших сообщений" +#: ../../include/features.php:58 ../../include/contact_widgets.php:76 +msgid "Saved Folders" +msgstr "Запомненные папки" + #: ../../include/features.php:58 msgid "Ability to file posts under folders" msgstr "" @@ -761,7 +683,7 @@ msgstr "" #: ../../include/group.php:242 msgid "All Channels" -msgstr "Все контакты" +msgstr "Все каналы" #: ../../include/group.php:264 ../../include/page_widgets.php:8 msgid "edit" @@ -792,10 +714,15 @@ msgid "Delete this item?" msgstr "Удалить этот элемент?" #: ../../include/js_strings.php:6 ../../include/ItemObject.php:504 -#: ../../mod/photos.php:1073 ../../mod/photos.php:1157 +#: ../../mod/photos.php:1075 ../../mod/photos.php:1159 msgid "Comment" msgstr "Комментарий" +#: ../../include/js_strings.php:7 ../../include/contact_widgets.php:148 +#: ../../include/ItemObject.php:255 +msgid "show more" +msgstr "показать все" + #: ../../include/js_strings.php:8 msgid "show fewer" msgstr "показать меньше" @@ -897,12 +824,12 @@ msgstr "Невозможно определить отправителя." msgid "Stored post could not be verified." msgstr "" -#: ../../include/network.php:1103 +#: ../../include/network.php:1113 msgid "view full size" msgstr "посмотреть в полный размер" #: ../../include/photo/photo_driver.php:609 ../../include/photos.php:51 -#: ../../mod/photos.php:97 ../../mod/photos.php:755 ../../mod/photos.php:777 +#: ../../mod/photos.php:97 ../../mod/photos.php:757 ../../mod/photos.php:779 #: ../../mod/profile_photo.php:88 ../../mod/profile_photo.php:235 #: ../../mod/profile_photo.php:346 msgid "Profile Photos" @@ -918,7 +845,7 @@ msgid "Full Name:" msgstr "Полное имя:" #: ../../include/profile_advanced.php:17 ../../mod/directory.php:140 -#: ../../boot.php:1739 +#: ../../boot.php:1748 msgid "Gender:" msgstr "Пол:" @@ -939,7 +866,7 @@ msgid "Age:" msgstr "Возраст:" #: ../../include/profile_advanced.php:37 ../../mod/directory.php:142 -#: ../../boot.php:1740 +#: ../../boot.php:1749 msgid "Status:" msgstr "Статус:" @@ -953,7 +880,7 @@ msgid "Sexual Preference:" msgstr "Сексуальная ориентация:" #: ../../include/profile_advanced.php:48 ../../mod/directory.php:144 -#: ../../boot.php:1741 +#: ../../boot.php:1750 msgid "Homepage:" msgstr "Домашняя страница:" @@ -991,7 +918,7 @@ msgstr "Что вам не нравится:" #: ../../include/profile_advanced.php:67 msgid "Contact information and Social Networks:" -msgstr "Информация и социальные сети канала:" +msgstr "Информация и социальные сети контакта:" #: ../../include/profile_advanced.php:69 msgid "Musical interests:" @@ -1021,7 +948,7 @@ msgstr "Работа / Занятость:" msgid "School/education:" msgstr "Школа / образование:" -#: ../../include/nav.php:71 ../../include/nav.php:86 ../../boot.php:1419 +#: ../../include/nav.php:71 ../../include/nav.php:86 ../../boot.php:1428 msgid "Logout" msgstr "Выход" @@ -1050,7 +977,7 @@ msgstr "Редактирование профилей" msgid "Manage/Edit Profiles" msgstr "Управление / Редактирование профилей" -#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2180 +#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2189 msgid "Photos" msgstr "Фотографии" @@ -1058,7 +985,7 @@ msgstr "Фотографии" msgid "Your photos" msgstr "Ваши фотографии" -#: ../../include/nav.php:84 ../../boot.php:1420 +#: ../../include/nav.php:84 ../../boot.php:1429 msgid "Login" msgstr "Войти" @@ -1079,7 +1006,7 @@ msgstr "" msgid "Home Page" msgstr "Моя страница" -#: ../../include/nav.php:120 ../../mod/register.php:187 ../../boot.php:1395 +#: ../../include/nav.php:120 ../../mod/register.php:187 ../../boot.php:1404 msgid "Register" msgstr "Регистрация" @@ -1138,7 +1065,7 @@ msgstr "Пометить все оповещения матрицы как пр #: ../../include/nav.php:149 msgid "See all channel notifications" -msgstr "Просмотреть все оповещения канала" +msgstr "Просмотреть все уведомления канала" #: ../../include/nav.php:150 msgid "Mark all channel notifications seen" @@ -1174,11 +1101,11 @@ msgstr "Пометить все оповещения как прочитанно #: ../../include/nav.php:161 msgid "Mail" -msgstr "Сообщения" +msgstr "Переписка" #: ../../include/nav.php:161 msgid "Private mail" -msgstr "Ваши личные сообщения" +msgstr "Ваша личная переписка" #: ../../include/nav.php:162 msgid "See all private messages" @@ -1200,7 +1127,7 @@ msgstr "Исходящие" msgid "New Message" msgstr "Новое личное сообщение" -#: ../../include/nav.php:169 ../../mod/events.php:348 ../../boot.php:2191 +#: ../../include/nav.php:169 ../../mod/events.php:348 ../../boot.php:2200 msgid "Events" msgstr "Мероприятия" @@ -1257,6 +1184,40 @@ msgstr "Ничего нового здесь" msgid "Please wait..." msgstr "Подождите пожалуйста ..." +#: ../../include/identity.php:14 ../../mod/item.php:1148 +msgid "Unable to obtain identity information from database" +msgstr "Невозможно получить идентификационную информацию из базы данных" + +#: ../../include/identity.php:36 +msgid "Empty name" +msgstr "Пустое имя" + +#: ../../include/identity.php:38 +msgid "Name too long" +msgstr "Слишком длинное имя" + +#: ../../include/identity.php:80 +msgid "No account identifier" +msgstr "идентификатор аккаунта отсутствует" + +#: ../../include/identity.php:98 +msgid "" +"Nickname has unsupported characters or is already being used on this site." +msgstr "Псевдоним имеет недопустимые символы или уже используется на этом сайте." + +#: ../../include/identity.php:157 +msgid "Unable to retrieve created identity" +msgstr "" + +#: ../../include/identity.php:214 +msgid "Default Profile" +msgstr "Профиль по умолчанию" + +#: ../../include/identity.php:239 ../../include/profile_selectors.php:42 +#: ../../mod/network.php:364 ../../mod/connections.php:377 +msgid "Friends" +msgstr "Друзья" + #: ../../include/notify.php:23 msgid "created a new post" msgstr "создал новое сообщение" @@ -1278,7 +1239,7 @@ msgstr "" #: ../../include/attach.php:133 ../../include/attach.php:189 #: ../../include/attach.php:204 ../../include/attach.php:237 #: ../../include/attach.php:251 ../../include/attach.php:272 -#: ../../include/attach.php:464 ../../include/items.php:3336 +#: ../../include/attach.php:464 ../../include/items.php:3359 #: ../../mod/common.php:43 ../../mod/events.php:134 ../../mod/invite.php:13 #: ../../mod/invite.php:102 ../../mod/allfriends.php:10 #: ../../mod/webpages.php:40 ../../mod/api.php:26 ../../mod/api.php:31 @@ -1286,9 +1247,9 @@ msgstr "" #: ../../mod/settings.php:598 ../../mod/viewconnections.php:33 #: ../../mod/viewconnections.php:38 ../../mod/delegate.php:6 #: ../../mod/mitem.php:92 ../../mod/group.php:15 ../../mod/photos.php:74 -#: ../../mod/photos.php:645 ../../mod/viewsrc.php:12 ../../mod/menu.php:40 +#: ../../mod/photos.php:647 ../../mod/viewsrc.php:12 ../../mod/menu.php:40 #: ../../mod/message.php:204 ../../mod/layouts.php:27 ../../mod/layouts.php:42 -#: ../../mod/item.php:152 ../../mod/network.php:7 ../../mod/intro.php:50 +#: ../../mod/network.php:7 ../../mod/intro.php:50 #: ../../mod/connections.php:174 ../../mod/profiles.php:163 #: ../../mod/profiles.php:476 ../../mod/new_channel.php:66 #: ../../mod/new_channel.php:97 ../../mod/manage.php:6 @@ -1297,9 +1258,9 @@ msgstr "" #: ../../mod/profile_photo.php:210 ../../mod/editwebpage.php:43 #: ../../mod/editwebpage.php:65 ../../mod/notifications.php:66 #: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/editpost.php:13 -#: ../../mod/poke.php:128 ../../mod/channel.php:115 ../../mod/fsuggest.php:78 -#: ../../mod/editblock.php:49 ../../mod/suggest.php:32 -#: ../../mod/register.php:60 ../../mod/regmod.php:18 ../../mod/mood.php:112 +#: ../../mod/poke.php:128 ../../mod/channel.php:117 ../../mod/fsuggest.php:78 +#: ../../mod/editblock.php:49 ../../mod/item.php:163 ../../mod/suggest.php:32 +#: ../../mod/register.php:60 ../../mod/regmod.php:18 ../../mod/mood.php:114 #: ../../index.php:178 ../../index.php:340 msgid "Permission denied." msgstr "Доступ запрещен." @@ -1321,12 +1282,12 @@ msgstr "" msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:287 ../../boot.php:2183 +#: ../../include/photos.php:288 ../../boot.php:2192 msgid "Photo Albums" msgstr "Фотоальбомы" -#: ../../include/photos.php:291 ../../mod/photos.php:793 -#: ../../mod/photos.php:1267 +#: ../../include/photos.php:292 ../../mod/photos.php:795 +#: ../../mod/photos.php:1269 msgid "Upload New Photos" msgstr "Загрузить новые фотографии" @@ -1474,11 +1435,6 @@ msgstr "Неверный" msgid "Sex Addict" msgstr "Секс наркоман" -#: ../../include/profile_selectors.php:42 ../../include/identity.php:236 -#: ../../mod/network.php:364 ../../mod/connections.php:377 -msgid "Friends" -msgstr "Друзья" - #: ../../include/profile_selectors.php:42 msgid "Friends/Benefits" msgstr "" @@ -1563,60 +1519,44 @@ msgstr "Не заботьтесь" msgid "Ask me" msgstr "Спроси меня" -#: ../../include/identity.php:14 -msgid "Unable to obtain identity information from database" -msgstr "Невозможно получить идентификационную информацию из базы данных" +#: ../../include/attach.php:184 ../../include/attach.php:232 +msgid "Item was not found." +msgstr "Элемент не найден." -#: ../../include/identity.php:36 -msgid "Empty name" -msgstr "Пустое имя" +#: ../../include/attach.php:285 +msgid "No source file." +msgstr "Нет исходного файла." -#: ../../include/identity.php:38 -msgid "Name too long" -msgstr "Слишком длинное имя" +#: ../../include/attach.php:302 +msgid "Cannot locate file to replace" +msgstr "Не удается найти файл, чтобы заменить" -#: ../../include/identity.php:80 -msgid "No account identifier" -msgstr "идентификатор аккаунта отсутствует" +#: ../../include/attach.php:320 +msgid "Cannot locate file to revise/update" +msgstr "Не удается найти файл для пересмотра / обновления" -#: ../../include/identity.php:95 -msgid "" -"Nickname has unsupported characters or is already being used on this site." -msgstr "Псевдоним имеет недопустимые символы или уже используется на этом сайте." - -#: ../../include/identity.php:154 -msgid "Unable to retrieve created identity" -msgstr "" - -#: ../../include/identity.php:211 -msgid "Default Profile" -msgstr "Профиль по умолчанию" - -#: ../../include/plugin.php:435 ../../include/plugin.php:437 -msgid "Click here to upgrade." -msgstr "Нажмите здесь, чтобы обновить." - -#: ../../include/plugin.php:443 -msgid "This action exceeds the limits set by your subscription plan." -msgstr "" - -#: ../../include/plugin.php:448 -msgid "This action is not available under your subscription plan." -msgstr "" - -#: ../../include/zot.php:423 -msgid "Invalid data packet" -msgstr "" - -#: ../../include/zot.php:433 -msgid "Unable to verify channel signature" -msgstr "Невозможно проверить сигнатуру канала" - -#: ../../include/zot.php:572 +#: ../../include/attach.php:331 #, php-format -msgid "Unable to verify site signature for %s" +msgid "File exceeds size limit of %d" +msgstr "Файл превышает предельный размер %d" + +#: ../../include/attach.php:342 +#, php-format +msgid "You have reached your limit of %1$.0f Mbytes attachment storage." msgstr "" +#: ../../include/attach.php:424 +msgid "File upload failed. Possible system limit or action terminated." +msgstr "Загрузка файла не удалась. Возможно система перегружена или попытка прекращена." + +#: ../../include/attach.php:436 +msgid "Stored file could not be verified. Upload failed." +msgstr "" + +#: ../../include/attach.php:480 ../../include/attach.php:497 +msgid "Path not available." +msgstr "Путь недоступен." + #: ../../include/account.php:23 msgid "Not a valid email address" msgstr "Не действительный адрес электронной почты" @@ -1651,7 +1591,7 @@ msgid "Registration request at %s" msgstr "Требуется регистрация на %s" #: ../../include/account.php:274 ../../include/account.php:301 -#: ../../include/account.php:358 ../../boot.php:1240 +#: ../../include/account.php:358 msgid "Administrator" msgstr "Администратор" @@ -1673,25 +1613,25 @@ msgstr "Аккаунт утвержден." msgid "Registration revoked for %s" msgstr "Регистрация отозвана для %s" -#: ../../include/bbcode.php:94 ../../include/bbcode.php:443 -#: ../../include/bbcode.php:446 +#: ../../include/bbcode.php:94 ../../include/bbcode.php:423 +#: ../../include/bbcode.php:426 msgid "Image/photo" msgstr "Изображение / фото" -#: ../../include/bbcode.php:161 +#: ../../include/bbcode.php:141 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "%1$s написал следующее %2$s %3$s" -#: ../../include/bbcode.php:163 +#: ../../include/bbcode.php:143 msgid "post" msgstr "сообщение" -#: ../../include/bbcode.php:403 ../../include/bbcode.php:423 +#: ../../include/bbcode.php:383 ../../include/bbcode.php:403 msgid "$1 wrote:" msgstr "$1 писал:" -#: ../../include/bbcode.php:450 ../../include/bbcode.php:451 +#: ../../include/bbcode.php:430 ../../include/bbcode.php:431 msgid "Encrypted content" msgstr "Зашифрованное содержание" @@ -2052,6 +1992,84 @@ msgstr "Ошибка аутентификации" msgid "Login failed." msgstr "Не удалось войти." +#: ../../include/contact_widgets.php:14 +#, php-format +msgid "You have %1$.0f of %2$.0f allowed connections." +msgstr "" + +#: ../../include/contact_widgets.php:20 +msgid "Add New Connection" +msgstr "Добавить новый контакт" + +#: ../../include/contact_widgets.php:21 +msgid "Enter the channel address" +msgstr "Введите адрес канала" + +#: ../../include/contact_widgets.php:22 +msgid "Example: bob@example.com, http://example.com/barbara" +msgstr "Пример: bob@example.com, http://example.com/barbara" + +#: ../../include/contact_widgets.php:38 +#, php-format +msgid "%d invitation available" +msgid_plural "%d invitations available" +msgstr[0] "имеется %d приглашение" +msgstr[1] "имеются %d приглашения" +msgstr[2] "имеется %d приглашений" + +#: ../../include/contact_widgets.php:44 +msgid "Find Channels" +msgstr "Поиск контактов" + +#: ../../include/contact_widgets.php:45 +msgid "Enter name or interest" +msgstr "Впишите имя или интерес" + +#: ../../include/contact_widgets.php:46 +msgid "Connect/Follow" +msgstr "Подключить/следовать" + +#: ../../include/contact_widgets.php:47 +msgid "Examples: Robert Morgenstein, Fishing" +msgstr "Примеры: Владимир Ильич, Революционер" + +#: ../../include/contact_widgets.php:48 ../../mod/directory.php:182 +#: ../../mod/directory.php:187 ../../mod/connections.php:666 +msgid "Find" +msgstr "Поиск" + +#: ../../include/contact_widgets.php:49 ../../mod/suggest.php:64 +msgid "Channel Suggestions" +msgstr "Рекомендации каналов" + +#: ../../include/contact_widgets.php:50 +msgid "Similar Interests" +msgstr "Похожие интересы" + +#: ../../include/contact_widgets.php:51 +msgid "Random Profile" +msgstr "Случайные" + +#: ../../include/contact_widgets.php:52 +msgid "Invite Friends" +msgstr "Пригласить друзей" + +#: ../../include/contact_widgets.php:79 ../../include/contact_widgets.php:113 +msgid "Everything" +msgstr "Все" + +#: ../../include/contact_widgets.php:110 +msgid "Categories" +msgstr "Категории" + +#: ../../include/contact_widgets.php:143 +#, php-format +msgid "%d connection in common" +msgid_plural "%d connections in common" +msgstr[0] "%d совместный контакт" +msgstr[1] "%d совместных контакта" +msgstr[2] "%d совместных контактов" + #: ../../include/follow.php:21 msgid "Channel is blocked on this site." msgstr "Канал блокируется на этом сайте." @@ -2193,55 +2211,34 @@ msgstr "мне не-нравиться" msgid "dislikes" msgstr "мне не-нравиться" -#: ../../include/attach.php:184 ../../include/attach.php:232 -msgid "Item was not found." -msgstr "Элемент не найден." +#: ../../include/plugin.php:440 ../../include/plugin.php:442 +msgid "Click here to upgrade." +msgstr "Нажмите здесь, чтобы обновить." -#: ../../include/attach.php:285 -msgid "No source file." -msgstr "Нет исходного файла." - -#: ../../include/attach.php:302 -msgid "Cannot locate file to replace" -msgstr "Не удается найти файл, чтобы заменить" - -#: ../../include/attach.php:320 -msgid "Cannot locate file to revise/update" -msgstr "Не удается найти файл для пересмотра / обновления" - -#: ../../include/attach.php:331 -#, php-format -msgid "File exceeds size limit of %d" -msgstr "Файл превышает предельный размер %d" - -#: ../../include/attach.php:424 -msgid "File upload failed. Possible system limit or action terminated." -msgstr "Загрузка файла не удалась. Возможно система перегружена или попытка прекращена." - -#: ../../include/attach.php:436 -msgid "Stored file could not be verified. Upload failed." +#: ../../include/plugin.php:448 +msgid "This action exceeds the limits set by your subscription plan." msgstr "" -#: ../../include/attach.php:480 ../../include/attach.php:497 -msgid "Path not available." -msgstr "Путь недоступен." +#: ../../include/plugin.php:453 +msgid "This action is not available under your subscription plan." +msgstr "" -#: ../../include/ItemObject.php:87 ../../mod/photos.php:943 +#: ../../include/ItemObject.php:87 ../../mod/photos.php:945 msgid "Private Message" msgstr "Личное сообщение" #: ../../include/ItemObject.php:92 ../../mod/webpages.php:98 #: ../../mod/settings.php:683 ../../mod/menu.php:55 ../../mod/layouts.php:89 -#: ../../mod/editlayout.php:101 ../../mod/editwebpage.php:117 +#: ../../mod/editlayout.php:101 ../../mod/editwebpage.php:120 #: ../../mod/blocks.php:92 ../../mod/editpost.php:94 -#: ../../mod/editblock.php:101 +#: ../../mod/editblock.php:115 msgid "Edit" msgstr "Редактировать" #: ../../include/ItemObject.php:104 ../../include/conversation.php:631 #: ../../mod/settings.php:684 ../../mod/group.php:182 -#: ../../mod/photos.php:1123 ../../mod/connections.php:344 -#: ../../mod/admin.php:640 +#: ../../mod/photos.php:1125 ../../mod/connections.php:344 +#: ../../mod/admin.php:640 ../../mod/filestorage.php:62 msgid "Delete" msgstr "Удалить" @@ -2273,11 +2270,11 @@ msgstr "помеченные" msgid "add tag" msgstr "добавить тег" -#: ../../include/ItemObject.php:165 ../../mod/photos.php:1053 +#: ../../include/ItemObject.php:165 ../../mod/photos.php:1055 msgid "I like this (toggle)" msgstr "мне это нравится (переключение)" -#: ../../include/ItemObject.php:166 ../../mod/photos.php:1054 +#: ../../include/ItemObject.php:166 ../../mod/photos.php:1056 msgid "I don't like this (toggle)" msgstr "мне это не нравится (переключение)" @@ -2312,10 +2309,10 @@ msgid " from %s" msgstr " от %s" #: ../../include/ItemObject.php:233 ../../include/conversation.php:696 -#: ../../include/conversation.php:1092 ../../mod/photos.php:1056 +#: ../../include/conversation.php:1092 ../../mod/photos.php:1058 #: ../../mod/message.php:298 ../../mod/message.php:461 -#: ../../mod/editlayout.php:110 ../../mod/editwebpage.php:126 -#: ../../mod/editpost.php:103 ../../mod/editblock.php:110 +#: ../../mod/editlayout.php:110 ../../mod/editwebpage.php:129 +#: ../../mod/editpost.php:103 ../../mod/editblock.php:124 msgid "Please wait" msgstr "Подождите пожалуйста" @@ -2327,8 +2324,8 @@ msgstr[0] "%d комментарий" msgstr[1] "%d комментария" msgstr[2] "%d комментариев" -#: ../../include/ItemObject.php:502 ../../mod/photos.php:1071 -#: ../../mod/photos.php:1155 +#: ../../include/ItemObject.php:502 ../../mod/photos.php:1073 +#: ../../mod/photos.php:1157 msgid "This is you" msgstr "Это вы" @@ -2338,14 +2335,14 @@ msgstr "Это вы" #: ../../mod/settings.php:733 ../../mod/settings.php:761 #: ../../mod/settings.php:785 ../../mod/settings.php:856 #: ../../mod/settings.php:1023 ../../mod/connect.php:96 ../../mod/group.php:87 -#: ../../mod/photos.php:676 ../../mod/photos.php:770 ../../mod/photos.php:1035 -#: ../../mod/photos.php:1074 ../../mod/photos.php:1158 +#: ../../mod/photos.php:678 ../../mod/photos.php:772 ../../mod/photos.php:1037 +#: ../../mod/photos.php:1076 ../../mod/photos.php:1160 #: ../../mod/message.php:299 ../../mod/message.php:460 #: ../../mod/connections.php:421 ../../mod/profiles.php:529 #: ../../mod/admin.php:409 ../../mod/admin.php:633 ../../mod/admin.php:769 -#: ../../mod/admin.php:968 ../../mod/admin.php:1055 ../../mod/import.php:381 +#: ../../mod/admin.php:968 ../../mod/admin.php:1055 ../../mod/import.php:385 #: ../../mod/crepair.php:166 ../../mod/poke.php:166 ../../mod/fsuggest.php:108 -#: ../../mod/mood.php:135 ../../view/theme/redbasic/php/config.php:136 +#: ../../mod/mood.php:137 ../../view/theme/redbasic/php/config.php:136 #: ../../view/theme/redbasic/php/config.php:154 #: ../../view/theme/redstrap/php/config.php:131 msgid "Submit" @@ -2384,9 +2381,9 @@ msgid "Video" msgstr "Видео" #: ../../include/ItemObject.php:514 ../../include/conversation.php:1112 -#: ../../mod/photos.php:1075 ../../mod/editlayout.php:130 -#: ../../mod/editwebpage.php:148 ../../mod/editpost.php:123 -#: ../../mod/editblock.php:130 +#: ../../mod/photos.php:1077 ../../mod/editlayout.php:130 +#: ../../mod/editwebpage.php:151 ../../mod/editpost.php:123 +#: ../../mod/editblock.php:145 msgid "Preview" msgstr "Предварительный просмотр" @@ -2508,7 +2505,7 @@ msgstr "Сохранить в папку:" msgid "Where are you right now?" msgstr "Где вы сейчас?" -#: ../../include/conversation.php:1069 ../../mod/photos.php:1055 +#: ../../include/conversation.php:1069 ../../mod/photos.php:1057 msgid "Share" msgstr "Поделиться" @@ -2518,8 +2515,8 @@ msgstr "Ссылка заголовока страницы" #: ../../include/conversation.php:1073 ../../mod/message.php:295 #: ../../mod/message.php:457 ../../mod/editlayout.php:102 -#: ../../mod/editwebpage.php:118 ../../mod/editpost.php:95 -#: ../../mod/editblock.php:102 +#: ../../mod/editwebpage.php:121 ../../mod/editpost.php:95 +#: ../../mod/editblock.php:116 msgid "Upload photo" msgstr "Загрузить фотографию" @@ -2529,8 +2526,8 @@ msgstr "загрузить фотографию" #: ../../include/conversation.php:1075 ../../mod/message.php:296 #: ../../mod/message.php:458 ../../mod/editlayout.php:103 -#: ../../mod/editwebpage.php:119 ../../mod/editpost.php:96 -#: ../../mod/editblock.php:103 +#: ../../mod/editwebpage.php:122 ../../mod/editpost.php:96 +#: ../../mod/editblock.php:117 msgid "Attach file" msgstr "Прикрепить файл" @@ -2540,8 +2537,8 @@ msgstr "прикрепить файл" #: ../../include/conversation.php:1077 ../../mod/message.php:297 #: ../../mod/message.php:459 ../../mod/editlayout.php:104 -#: ../../mod/editwebpage.php:120 ../../mod/editpost.php:97 -#: ../../mod/editblock.php:104 +#: ../../mod/editwebpage.php:123 ../../mod/editpost.php:97 +#: ../../mod/editblock.php:118 msgid "Insert web link" msgstr "Вставить веб-ссылку" @@ -2566,8 +2563,8 @@ msgid "audio link" msgstr "аудио-ссылка" #: ../../include/conversation.php:1083 ../../mod/editlayout.php:108 -#: ../../mod/editwebpage.php:124 ../../mod/editpost.php:101 -#: ../../mod/editblock.php:108 +#: ../../mod/editwebpage.php:127 ../../mod/editpost.php:101 +#: ../../mod/editblock.php:122 msgid "Set your location" msgstr "Указание своего расположения" @@ -2576,8 +2573,8 @@ msgid "set location" msgstr "указание расположения" #: ../../include/conversation.php:1085 ../../mod/editlayout.php:109 -#: ../../mod/editwebpage.php:125 ../../mod/editpost.php:102 -#: ../../mod/editblock.php:109 +#: ../../mod/editwebpage.php:128 ../../mod/editpost.php:102 +#: ../../mod/editblock.php:123 msgid "Clear browser location" msgstr "Стереть указание расположения" @@ -2586,20 +2583,20 @@ msgid "clear location" msgstr "стереть указание расположения" #: ../../include/conversation.php:1088 ../../mod/editlayout.php:122 -#: ../../mod/editwebpage.php:140 ../../mod/editpost.php:115 -#: ../../mod/editblock.php:122 +#: ../../mod/editwebpage.php:143 ../../mod/editpost.php:115 +#: ../../mod/editblock.php:137 msgid "Set title" msgstr "Заголовок" #: ../../include/conversation.php:1091 ../../mod/editlayout.php:124 -#: ../../mod/editwebpage.php:142 ../../mod/editpost.php:117 -#: ../../mod/editblock.php:124 +#: ../../mod/editwebpage.php:145 ../../mod/editpost.php:117 +#: ../../mod/editblock.php:139 msgid "Categories (comma-separated list)" msgstr "Категории (список через запятую)" #: ../../include/conversation.php:1093 ../../mod/editlayout.php:111 -#: ../../mod/editwebpage.php:127 ../../mod/editpost.php:104 -#: ../../mod/editblock.php:111 +#: ../../mod/editwebpage.php:130 ../../mod/editpost.php:104 +#: ../../mod/editblock.php:125 msgid "Permission settings" msgstr "Настройки разрешений" @@ -2608,14 +2605,14 @@ msgid "permissions" msgstr "разрешения" #: ../../include/conversation.php:1102 ../../mod/editlayout.php:119 -#: ../../mod/editwebpage.php:135 ../../mod/editpost.php:112 -#: ../../mod/editblock.php:119 +#: ../../mod/editwebpage.php:138 ../../mod/editpost.php:112 +#: ../../mod/editblock.php:134 msgid "Public post" msgstr "Публичное сообщение" #: ../../include/conversation.php:1104 ../../mod/editlayout.php:125 -#: ../../mod/editwebpage.php:143 ../../mod/editpost.php:118 -#: ../../mod/editblock.php:125 +#: ../../mod/editwebpage.php:146 ../../mod/editpost.php:118 +#: ../../mod/editblock.php:140 msgid "Example: bob@example.com, mary@example.com" msgstr "Пример: bob@example.com, mary@example.com" @@ -2624,27 +2621,27 @@ msgstr "Пример: bob@example.com, mary@example.com" msgid "Permission denied" msgstr "Доступ запрещен" -#: ../../include/items.php:3285 ../../mod/page.php:60 ../../mod/viewsrc.php:18 +#: ../../include/items.php:3308 ../../mod/page.php:66 ../../mod/viewsrc.php:18 #: ../../mod/home.php:64 ../../mod/admin.php:142 ../../mod/admin.php:677 -#: ../../mod/admin.php:876 ../../mod/display.php:33 +#: ../../mod/admin.php:876 ../../mod/display.php:32 msgid "Item not found." msgstr "Элемент не найден." -#: ../../include/items.php:3457 +#: ../../include/items.php:3480 msgid "Archives" msgstr "Архивы" -#: ../../include/items.php:3618 ../../mod/group.php:44 ../../mod/group.php:146 +#: ../../include/items.php:3641 ../../mod/group.php:44 ../../mod/group.php:146 msgid "Collection not found." msgstr "Коллекция не найдена." -#: ../../include/items.php:3628 +#: ../../include/items.php:3651 msgid "Collection has no members." msgstr "В коллекции нет ни одного пользователя." -#: ../../include/items.php:3644 +#: ../../include/items.php:3667 msgid "Connection not found." -msgstr "Канал не найден." +msgstr "Контакт не найден." #: ../../include/security.php:49 msgid "Welcome " @@ -2664,6 +2661,19 @@ msgid "" "form has been opened for too long (>3 hours) before submitting it." msgstr "" +#: ../../include/zot.php:423 +msgid "Invalid data packet" +msgstr "" + +#: ../../include/zot.php:433 +msgid "Unable to verify channel signature" +msgstr "Невозможно проверить сигнатуру канала" + +#: ../../include/zot.php:571 +#, php-format +msgid "Unable to verify site signature for %s" +msgstr "" + #: ../../mod/common.php:10 msgid "No channel." msgstr "Не канал." @@ -2674,7 +2684,7 @@ msgstr "Общие контакты" #: ../../mod/common.php:52 msgid "No connections in common." -msgstr "Общих каналов нет." +msgstr "Общих контактов нет." #: ../../mod/events.php:66 msgid "Event title and start time are required." @@ -2869,7 +2879,8 @@ msgid "No friends to display." msgstr "Нет друзей для показа." #: ../../mod/webpages.php:8 ../../mod/connect.php:13 ../../mod/layouts.php:8 -#: ../../mod/blocks.php:10 ../../mod/profile.php:8 ../../boot.php:1593 +#: ../../mod/blocks.php:10 ../../mod/profile.php:8 ../../mod/filestorage.php:8 +#: ../../boot.php:1602 msgid "Requested profile is not available." msgstr "Запрашиваемый профиль не доступен." @@ -3714,14 +3725,14 @@ msgid "Change the behaviour of this account for special situations" msgstr "" #: ../../mod/viewconnections.php:28 ../../mod/directory.php:23 -#: ../../mod/photos.php:559 ../../mod/display.php:9 ../../mod/search.php:80 +#: ../../mod/photos.php:561 ../../mod/display.php:9 ../../mod/search.php:80 #: ../../mod/community.php:18 msgid "Public access denied." msgstr "Общественный доступ запрещен." #: ../../mod/viewconnections.php:57 msgid "No connections." -msgstr "Никаких каналов." +msgstr "Никаких связей." #: ../../mod/viewconnections.php:69 ../../mod/nogroup.php:40 #, php-format @@ -3730,7 +3741,7 @@ msgstr "Посетить %s's ​​профиль [%s]" #: ../../mod/viewconnections.php:84 msgid "View Connnections" -msgstr "Просмотр каналов" +msgstr "Просмотр контактов" #: ../../mod/tagrm.php:41 msgid "Tag removed" @@ -3918,55 +3929,55 @@ msgstr "" msgid "Edit this menu item" msgstr "" -#: ../../mod/mitem.php:142 +#: ../../mod/mitem.php:141 msgid "New Menu Element" msgstr "" -#: ../../mod/mitem.php:144 ../../mod/mitem.php:185 +#: ../../mod/mitem.php:143 ../../mod/mitem.php:184 msgid "Link text" msgstr "" -#: ../../mod/mitem.php:145 ../../mod/mitem.php:186 +#: ../../mod/mitem.php:144 ../../mod/mitem.php:185 msgid "URL of link" msgstr "" -#: ../../mod/mitem.php:146 ../../mod/mitem.php:187 +#: ../../mod/mitem.php:145 ../../mod/mitem.php:186 msgid "Use Red magic-auth if available" msgstr "" -#: ../../mod/mitem.php:147 ../../mod/mitem.php:188 +#: ../../mod/mitem.php:146 ../../mod/mitem.php:187 msgid "Open link in new window" msgstr "" -#: ../../mod/mitem.php:149 ../../mod/mitem.php:190 +#: ../../mod/mitem.php:148 ../../mod/mitem.php:189 msgid "Order in list" msgstr "" -#: ../../mod/mitem.php:149 ../../mod/mitem.php:190 +#: ../../mod/mitem.php:148 ../../mod/mitem.php:189 msgid "Higher numbers will sink to bottom of listing" msgstr "" -#: ../../mod/mitem.php:150 ../../mod/menu.php:79 ../../mod/new_channel.php:117 +#: ../../mod/mitem.php:149 ../../mod/menu.php:79 ../../mod/new_channel.php:117 msgid "Create" msgstr "Создать" -#: ../../mod/mitem.php:162 +#: ../../mod/mitem.php:161 msgid "Menu item not found." msgstr "" -#: ../../mod/mitem.php:171 +#: ../../mod/mitem.php:170 msgid "Menu item deleted." msgstr "" -#: ../../mod/mitem.php:173 +#: ../../mod/mitem.php:172 msgid "Menu item could not be deleted." msgstr "" -#: ../../mod/mitem.php:182 +#: ../../mod/mitem.php:181 msgid "Edit Menu Element" msgstr "" -#: ../../mod/mitem.php:191 ../../mod/menu.php:107 +#: ../../mod/mitem.php:190 ../../mod/menu.php:107 msgid "Modify" msgstr "" @@ -3984,7 +3995,7 @@ msgstr "Имя коллекции изменено." #: ../../mod/group.php:92 msgid "Create a collection of channels." -msgstr "Создать коллекцию каналов" +msgstr "Создать коллекцию контактов" #: ../../mod/group.php:93 ../../mod/group.php:189 msgid "Collection Name: " @@ -4026,11 +4037,11 @@ msgstr "" msgid "Album not found." msgstr "Альбом не найден." -#: ../../mod/photos.php:125 ../../mod/photos.php:771 +#: ../../mod/photos.php:125 ../../mod/photos.php:773 msgid "Delete Album" msgstr "Удалить альбом" -#: ../../mod/photos.php:165 ../../mod/photos.php:1036 +#: ../../mod/photos.php:165 ../../mod/photos.php:1038 msgid "Delete Photo" msgstr "Удалить фотографию" @@ -4043,115 +4054,115 @@ msgstr "%1$s добавил тег в %2$s на %3$s" msgid "a photo" msgstr "фотография" -#: ../../mod/photos.php:569 +#: ../../mod/photos.php:571 msgid "No photos selected" msgstr "Никакие фотографии не выбраны" -#: ../../mod/photos.php:623 +#: ../../mod/photos.php:625 msgid "Access to this item is restricted." msgstr "Доступ к этому элементу ограничен." -#: ../../mod/photos.php:687 +#: ../../mod/photos.php:689 #, php-format msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "" -#: ../../mod/photos.php:690 +#: ../../mod/photos.php:692 #, php-format msgid "You have used %1$.2f Mbytes of photo storage." msgstr "" -#: ../../mod/photos.php:698 +#: ../../mod/photos.php:700 msgid "Upload Photos" msgstr "Загрузить фотографии" -#: ../../mod/photos.php:702 ../../mod/photos.php:766 +#: ../../mod/photos.php:704 ../../mod/photos.php:768 msgid "New album name: " msgstr "Название нового альбома:" -#: ../../mod/photos.php:703 +#: ../../mod/photos.php:705 msgid "or existing album name: " msgstr "или существующий альбом:" -#: ../../mod/photos.php:704 +#: ../../mod/photos.php:706 msgid "Do not show a status post for this upload" msgstr "" -#: ../../mod/photos.php:706 ../../mod/photos.php:1031 +#: ../../mod/photos.php:708 ../../mod/photos.php:1033 msgid "Permissions" msgstr "Разрешения" -#: ../../mod/photos.php:755 ../../mod/photos.php:777 ../../mod/photos.php:1203 -#: ../../mod/photos.php:1218 +#: ../../mod/photos.php:757 ../../mod/photos.php:779 ../../mod/photos.php:1205 +#: ../../mod/photos.php:1220 msgid "Contact Photos" -msgstr "Фотографии канала" +msgstr "Фотографии контакта" -#: ../../mod/photos.php:781 +#: ../../mod/photos.php:783 msgid "Edit Album" msgstr "Редактировать Фотоальбом" -#: ../../mod/photos.php:787 +#: ../../mod/photos.php:789 msgid "Show Newest First" msgstr "Показать новые первыми" -#: ../../mod/photos.php:789 +#: ../../mod/photos.php:791 msgid "Show Oldest First" msgstr "Показать старые первыми" -#: ../../mod/photos.php:833 ../../mod/photos.php:1250 +#: ../../mod/photos.php:835 ../../mod/photos.php:1252 msgid "View Photo" msgstr "Посмотреть фотографию" -#: ../../mod/photos.php:877 +#: ../../mod/photos.php:879 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:879 +#: ../../mod/photos.php:881 msgid "Photo not available" msgstr "Фотография не доступна" -#: ../../mod/photos.php:937 +#: ../../mod/photos.php:939 msgid "Use as profile photo" msgstr "Использовать в качестве фотографии профиля" -#: ../../mod/photos.php:965 +#: ../../mod/photos.php:967 msgid "View Full Size" msgstr "Посмотреть в полный размер" -#: ../../mod/photos.php:1019 +#: ../../mod/photos.php:1021 msgid "Edit photo" msgstr "Редактировать фотографию" -#: ../../mod/photos.php:1021 +#: ../../mod/photos.php:1023 msgid "Rotate CW (right)" msgstr "Повернуть CW (направо)" -#: ../../mod/photos.php:1022 +#: ../../mod/photos.php:1024 msgid "Rotate CCW (left)" msgstr "Повернуть CCW (налево)" -#: ../../mod/photos.php:1024 +#: ../../mod/photos.php:1026 msgid "New album name" msgstr "Новое название альбома:" -#: ../../mod/photos.php:1027 +#: ../../mod/photos.php:1029 msgid "Caption" msgstr "Подпись" -#: ../../mod/photos.php:1029 +#: ../../mod/photos.php:1031 msgid "Add a Tag" msgstr "Добавить тег" -#: ../../mod/photos.php:1033 +#: ../../mod/photos.php:1035 msgid "" "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Например: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -#: ../../mod/photos.php:1256 +#: ../../mod/photos.php:1258 msgid "View Album" msgstr "Посмотреть фотоальбом" -#: ../../mod/photos.php:1265 +#: ../../mod/photos.php:1267 msgid "Recent Photos" msgstr "Последние фотографии" @@ -4163,11 +4174,11 @@ msgstr "отправил вам личное сообщение" msgid "added your channel" msgstr "добавил ваш канал" -#: ../../mod/ping.php:230 ../../boot.php:1799 ../../boot.php:1879 +#: ../../mod/ping.php:230 ../../boot.php:1808 ../../boot.php:1888 msgid "g A l F d" msgstr "g A l F d" -#: ../../mod/ping.php:252 ../../boot.php:1845 ../../boot.php:1920 +#: ../../mod/ping.php:252 ../../boot.php:1854 ../../boot.php:1929 msgid "[today]" msgstr "[сегодня]" @@ -4367,26 +4378,6 @@ msgstr "Введите адрес вашего канала (например: c msgid "Authenticate" msgstr "Проверка подлинности" -#: ../../mod/item.php:122 -msgid "Unable to locate original post." -msgstr "Не удалось найти оригинал." - -#: ../../mod/item.php:290 -msgid "Empty post discarded." -msgstr "Отказаться от пустой почты." - -#: ../../mod/item.php:334 -msgid "Executable content type not permitted to this channel." -msgstr "" - -#: ../../mod/item.php:779 -msgid "System error. Post not saved." -msgstr "Системная ошибка. Сообщение не сохранено." - -#: ../../mod/item.php:1064 ../../mod/wall_upload.php:41 -msgid "Wall Photos" -msgstr "Стена фотографий" - #: ../../mod/network.php:141 ../../mod/search.php:20 msgid "Remove term" msgstr "Удалить термин" @@ -4666,7 +4657,7 @@ msgstr "Скрыть или показывать этот канал" #: ../../mod/connections.php:347 msgid "Delete this connection" -msgstr "Удалить этот канал" +msgstr "Удалить этот контакт" #: ../../mod/connections.php:380 msgid "Unknown" @@ -4674,7 +4665,7 @@ msgstr "Неизвестный" #: ../../mod/connections.php:390 ../../mod/connections.php:418 msgid "Approve this connection" -msgstr "Утвердить этот канал" +msgstr "Утвердить этот контакт" #: ../../mod/connections.php:390 msgid "Accept connection to allow communication" @@ -4783,11 +4774,11 @@ msgstr "Посетить %s's ​​профиль - %s" #: ../../mod/connections.php:443 msgid "Block/Unblock contact" -msgstr "Запретить/разрешить канал" +msgstr "Запретить/разрешить контакт" #: ../../mod/connections.php:444 msgid "Ignore contact" -msgstr "Игнорировать канал" +msgstr "Игнорировать контакт" #: ../../mod/connections.php:445 msgid "Repair URL settings" @@ -4799,7 +4790,7 @@ msgstr "Просмотр разговоров" #: ../../mod/connections.php:448 msgid "Delete contact" -msgstr "Удалить канал" +msgstr "Удалить контакт" #: ../../mod/connections.php:451 msgid "Last update:" @@ -4864,7 +4855,7 @@ msgstr "Предлагать новые контакты" #: ../../mod/connections.php:557 msgid "Show pending (new) connections" -msgstr "Просмотр (новых) ждущих каналов" +msgstr "Просмотр (новых) ждущих контактов" #: ../../mod/connections.php:560 msgid "All Connections" @@ -4872,7 +4863,7 @@ msgstr "Все контакты" #: ../../mod/connections.php:563 msgid "Show all connections" -msgstr "Просмотр всех каналов" +msgstr "Просмотр всех контактов" #: ../../mod/connections.php:566 msgid "Unblocked" @@ -4905,11 +4896,11 @@ msgstr "%1$s [%2$s]" #: ../../mod/connections.php:640 ../../mod/nogroup.php:41 msgid "Edit contact" -msgstr "Редактировать канал" +msgstr "Редактировать контакт" #: ../../mod/connections.php:664 msgid "Search your connections" -msgstr "Поиск каналов" +msgstr "Поиск ваших связей" #: ../../mod/connections.php:665 msgid "Finding: " @@ -4927,17 +4918,6 @@ msgstr "" msgid "Visible to:" msgstr "Кому видно:" -#: ../../mod/post.php:114 -msgid "" -"Remote authentication blocked. You are logged into this site locally. Please" -" logout and retry." -msgstr "" - -#: ../../mod/post.php:127 -#, php-format -msgid "Welcome %s. Remote authentication successful." -msgstr "" - #: ../../mod/profiles.php:18 ../../mod/profiles.php:138 #: ../../mod/profiles.php:179 ../../mod/profiles.php:486 msgid "Profile not found." @@ -5134,7 +5114,7 @@ msgstr "Хобби / интересы" #: ../../mod/profiles.php:561 msgid "Contact information and Social Networks" -msgstr "Информация и социальные сети канала" +msgstr "Информация и социальные сети контакта" #: ../../mod/profiles.php:562 msgid "My other channels" @@ -5178,29 +5158,29 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "Редактирование / Управление профилей" -#: ../../mod/profiles.php:624 ../../boot.php:1701 +#: ../../mod/profiles.php:624 ../../boot.php:1710 msgid "Change profile photo" msgstr "Изменить фотографию профиля" -#: ../../mod/profiles.php:625 ../../boot.php:1708 +#: ../../mod/profiles.php:625 ../../boot.php:1717 msgid "Create New Profile" msgstr "Создать новый профиль" -#: ../../mod/profiles.php:636 ../../boot.php:1722 +#: ../../mod/profiles.php:636 ../../boot.php:1731 msgid "Profile Image" msgstr "Изображение профиля" -#: ../../mod/profiles.php:639 ../../boot.php:1725 +#: ../../mod/profiles.php:639 ../../boot.php:1734 msgid "visible to everybody" msgstr "видно всем" -#: ../../mod/profiles.php:640 ../../boot.php:1726 +#: ../../mod/profiles.php:640 ../../boot.php:1735 msgid "Edit visibility" msgstr "Редактировать видимость" #: ../../mod/new_channel.php:107 msgid "Add a Channel" -msgstr "Добавить канал" +msgstr "Добавить контакт" #: ../../mod/new_channel.php:108 msgid "" @@ -5270,7 +5250,7 @@ msgstr "Регистрации пользователей, которые жду #: ../../mod/admin.php:180 msgid "Message queues" -msgstr "Непрочитанный сообщений" +msgstr "Очередь недоставленных сообщений" #: ../../mod/admin.php:185 ../../mod/admin.php:407 ../../mod/admin.php:631 #: ../../mod/admin.php:725 ../../mod/admin.php:767 ../../mod/admin.php:930 @@ -5745,7 +5725,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1430 +#: ../../mod/lostpass.php:85 ../../boot.php:1439 msgid "Password Reset" msgstr "Сбросить пароль" @@ -5819,19 +5799,19 @@ msgstr "" msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../mod/import.php:352 +#: ../../mod/import.php:356 msgid "Import completed." msgstr "Импорт завершен." -#: ../../mod/import.php:365 +#: ../../mod/import.php:369 msgid "You must be logged in to use this feature." msgstr "Вы должны войти в систему, чтобы использовать эту функцию." -#: ../../mod/import.php:370 +#: ../../mod/import.php:374 msgid "Import Channel" msgstr "Импорт канала" -#: ../../mod/import.php:371 +#: ../../mod/import.php:375 msgid "" "Use this form to import an existing channel from a different server/hub. You" " may retrieve the channel identity from the old server/hub via the network " @@ -5839,27 +5819,27 @@ msgid "" "be imported. Importation of content is not yet available." msgstr "" -#: ../../mod/import.php:372 +#: ../../mod/import.php:376 msgid "File to Upload" msgstr "Файл для загрузки" -#: ../../mod/import.php:373 +#: ../../mod/import.php:377 msgid "Or provide the old server/hub details" msgstr "" -#: ../../mod/import.php:374 +#: ../../mod/import.php:378 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../mod/import.php:375 +#: ../../mod/import.php:379 msgid "Your old login email address" msgstr "Ваш старый адрес электронной почты" -#: ../../mod/import.php:376 +#: ../../mod/import.php:380 msgid "Your old login password" msgstr "Ваш старый пароль" -#: ../../mod/import.php:377 +#: ../../mod/import.php:381 msgid "" "For either option, please choose whether to make this hub your new primary " "address, or whether your old location should continue this role. You will be" @@ -5867,31 +5847,36 @@ msgid "" "primary location for files, photos, and media." msgstr "" -#: ../../mod/import.php:378 +#: ../../mod/import.php:382 msgid "Make this hub my primary location" msgstr "" -#: ../../mod/manage.php:59 +#: ../../mod/manage.php:62 +#, php-format +msgid "You have created %1$.0f of %2$.0f allowed channels." +msgstr "" + +#: ../../mod/manage.php:70 msgid "Create a new channel" msgstr "Создать новый канал" -#: ../../mod/manage.php:64 +#: ../../mod/manage.php:75 msgid "Channel Manager" msgstr "Настройки канала" -#: ../../mod/manage.php:65 +#: ../../mod/manage.php:76 msgid "Current Channel" msgstr "Текущий канал" -#: ../../mod/manage.php:67 +#: ../../mod/manage.php:78 msgid "Attach to one of your channels by selecting it." msgstr "" -#: ../../mod/manage.php:68 +#: ../../mod/manage.php:79 msgid "Default Channel" msgstr "Канал по умолчанию" -#: ../../mod/manage.php:69 +#: ../../mod/manage.php:80 msgid "Make Default" msgstr "Сделать стандартным" @@ -5921,16 +5906,16 @@ msgstr "" #: ../../mod/crepair.php:104 msgid "Contact update failed." -msgstr "Ошибка обновления канала." +msgstr "Ошибка обновления контакта." #: ../../mod/crepair.php:129 ../../mod/fsuggest.php:20 #: ../../mod/fsuggest.php:92 msgid "Contact not found." -msgstr "Канал не найден." +msgstr "Контакт не найден." #: ../../mod/crepair.php:135 msgid "Repair Contact Settings" -msgstr "Починить настройки канала" +msgstr "Починить настройки контакта" #: ../../mod/crepair.php:137 msgid "" @@ -5946,7 +5931,7 @@ msgstr "" #: ../../mod/crepair.php:144 msgid "Return to contact editor" -msgstr "Вернуться к редактору канала" +msgstr "Вернуться к редактору контакта" #: ../../mod/crepair.php:149 msgid "Account Nickname" @@ -5986,32 +5971,36 @@ msgstr "" #: ../../mod/follow.php:25 msgid "Channel added." -msgstr "Канал добавлен." +msgstr "Контакт добавлен." #: ../../mod/editlayout.php:37 ../../mod/editwebpage.php:31 #: ../../mod/editpost.php:20 ../../mod/editblock.php:37 msgid "Item not found" msgstr "Элемент не найден" -#: ../../mod/editlayout.php:69 ../../mod/editblock.php:69 -msgid "Edit block" +#: ../../mod/editlayout.php:69 +msgid "Edit Layout" msgstr "" -#: ../../mod/editlayout.php:105 ../../mod/editwebpage.php:121 -#: ../../mod/editpost.php:98 ../../mod/editblock.php:105 +#: ../../mod/editlayout.php:105 ../../mod/editwebpage.php:124 +#: ../../mod/editpost.php:98 ../../mod/editblock.php:119 msgid "Insert YouTube video" msgstr "Вставить YouTube видео" -#: ../../mod/editlayout.php:106 ../../mod/editwebpage.php:122 -#: ../../mod/editpost.php:99 ../../mod/editblock.php:106 +#: ../../mod/editlayout.php:106 ../../mod/editwebpage.php:125 +#: ../../mod/editpost.php:99 ../../mod/editblock.php:120 msgid "Insert Vorbis [.ogg] video" msgstr "Вставить Vorbis [.ogg] видео" -#: ../../mod/editlayout.php:107 ../../mod/editwebpage.php:123 -#: ../../mod/editpost.php:100 ../../mod/editblock.php:107 +#: ../../mod/editlayout.php:107 ../../mod/editwebpage.php:126 +#: ../../mod/editpost.php:100 ../../mod/editblock.php:121 msgid "Insert Vorbis [.ogg] audio" msgstr "Вставить Vorbis [.ogg] музыку" +#: ../../mod/editlayout.php:138 +msgid "Delete Layout" +msgstr "" + #: ../../mod/nogroup.php:58 msgid "Contacts who are not members of a group" msgstr "" @@ -6092,9 +6081,13 @@ msgstr "Загрузка изображениея прошла безуспеш msgid "Image size reduction [%s] failed." msgstr "" -#: ../../mod/editwebpage.php:85 ../../mod/editpost.php:40 -msgid "Edit post" -msgstr "Редактировать сообщение" +#: ../../mod/editwebpage.php:88 +msgid "Edit Webpage" +msgstr "" + +#: ../../mod/editwebpage.php:159 +msgid "Delete Webpage" +msgstr "" #: ../../mod/notifications.php:26 msgid "Invalid request identifier." @@ -6238,6 +6231,10 @@ msgstr "Публикация прошла успешно." msgid "Item is not editable" msgstr "Элемент нельзя редактировать" +#: ../../mod/editpost.php:40 +msgid "Edit post" +msgstr "Редактировать сообщение" + #: ../../mod/profile.php:111 msgid "Access to this profile has been restricted." msgstr "Доступ к этому профилю ограничен." @@ -6262,6 +6259,10 @@ msgstr "" msgid "Make this post private" msgstr "Сделать это сообщение личным" +#: ../../mod/wall_upload.php:41 ../../mod/item.php:1077 +msgid "Wall Photos" +msgstr "Стена фотографий" + #: ../../mod/community.php:23 msgid "Not available." msgstr "Недоступно." @@ -6291,6 +6292,14 @@ msgstr "Пригласить друзей" msgid "Suggest a friend for %s" msgstr "" +#: ../../mod/editblock.php:83 +msgid "Edit Block" +msgstr "" + +#: ../../mod/editblock.php:154 +msgid "Delete Block" +msgstr "" + #: ../../mod/profperm.php:34 ../../mod/profperm.php:64 msgid "Invalid profile identifier." msgstr "" @@ -6311,6 +6320,32 @@ msgstr "Видно" msgid "All Contacts (with secure profile access)" msgstr "Все контакты (с доступом защищенному профилю)" +#: ../../mod/item.php:133 +msgid "Unable to locate original post." +msgstr "Не удалось найти оригинал." + +#: ../../mod/item.php:301 +msgid "Empty post discarded." +msgstr "Отказаться от пустой почты." + +#: ../../mod/item.php:345 +msgid "Executable content type not permitted to this channel." +msgstr "" + +#: ../../mod/item.php:792 +msgid "System error. Post not saved." +msgstr "Системная ошибка. Сообщение не сохранено." + +#: ../../mod/item.php:1153 +#, php-format +msgid "You have reached your limit of %1$.0f top level posts." +msgstr "" + +#: ../../mod/item.php:1159 +#, php-format +msgid "You have reached your limit of %1$.0f webpages." +msgstr "" + #: ../../mod/siteinfo.php:51 #, php-format msgid "Version %s" @@ -6451,6 +6486,17 @@ msgstr "" msgid "Please login." msgstr "Войдите пожалуйста." +#: ../../mod/post.php:114 +msgid "" +"Remote authentication blocked. You are logged into this site locally. Please" +" logout and retry." +msgstr "" + +#: ../../mod/post.php:127 +#, php-format +msgid "Welcome %s. Remote authentication successful." +msgstr "" + #: ../../mod/removeme.php:45 ../../mod/removeme.php:48 msgid "Remove My Account" msgstr "Удалить мой аккаунт" @@ -6465,11 +6511,27 @@ msgstr "" msgid "Please enter your password for verification:" msgstr "" -#: ../../mod/mood.php:131 +#: ../../mod/filestorage.php:22 +msgid "Permission Denied." +msgstr "" + +#: ../../mod/filestorage.php:59 +msgid "Download" +msgstr "" + +#: ../../mod/filestorage.php:64 +msgid "Used: " +msgstr "" + +#: ../../mod/filestorage.php:66 +msgid "Limit: " +msgstr "" + +#: ../../mod/mood.php:133 msgid "Mood" msgstr "" -#: ../../mod/mood.php:132 +#: ../../mod/mood.php:134 msgid "Set your current mood and tell your friends" msgstr "" @@ -6535,104 +6597,104 @@ msgstr "Угловой радиус" msgid "0-99 default: 5" msgstr "0-99 по умолчанию: 5" -#: ../../boot.php:1234 +#: ../../boot.php:1242 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1237 +#: ../../boot.php:1245 #, php-format msgid "Update Error at %s" msgstr "Ошибка обновления на %s" -#: ../../boot.php:1394 +#: ../../boot.php:1403 msgid "Create a New Account" msgstr "Создать новый аккаунт" -#: ../../boot.php:1423 +#: ../../boot.php:1432 msgid "Password" msgstr "Пароль" -#: ../../boot.php:1424 +#: ../../boot.php:1433 msgid "Remember me" msgstr "Запомнить" -#: ../../boot.php:1429 +#: ../../boot.php:1438 msgid "Forgot your password?" msgstr "Забыли пароль или логин?" -#: ../../boot.php:1548 +#: ../../boot.php:1557 msgid "Requested channel is not available." msgstr "Запрашиваемый канал не доступен." -#: ../../boot.php:1560 +#: ../../boot.php:1569 msgid " Sorry, you don't have the permission to view this profile. " msgstr "" -#: ../../boot.php:1707 +#: ../../boot.php:1716 msgid "Profiles" msgstr "Профили" -#: ../../boot.php:1707 +#: ../../boot.php:1716 msgid "Manage/edit profiles" msgstr "Управление / Редактирование профилей" -#: ../../boot.php:1711 +#: ../../boot.php:1720 msgid "Edit Profile" msgstr "Редактировать профиль" -#: ../../boot.php:1800 ../../boot.php:1880 +#: ../../boot.php:1809 ../../boot.php:1889 msgid "F d" msgstr "F d" -#: ../../boot.php:1857 +#: ../../boot.php:1866 msgid "Birthday Reminders" msgstr "Напоминания о Днях Рождения" -#: ../../boot.php:1858 +#: ../../boot.php:1867 msgid "Birthdays this week:" msgstr "Дни Рождения на этой неделе:" -#: ../../boot.php:1913 +#: ../../boot.php:1922 msgid "[No description]" msgstr "[без описания]" -#: ../../boot.php:1931 +#: ../../boot.php:1940 msgid "Event Reminders" msgstr "Напоминания мероприятий" -#: ../../boot.php:1932 +#: ../../boot.php:1941 msgid "Events this week:" msgstr "Мероприятия на этой неделе:" -#: ../../boot.php:2166 +#: ../../boot.php:2175 msgid "Channel" msgstr "Канал" -#: ../../boot.php:2169 +#: ../../boot.php:2178 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:2173 +#: ../../boot.php:2182 msgid "About" msgstr "О себе" -#: ../../boot.php:2176 +#: ../../boot.php:2185 msgid "Profile Details" msgstr "Сведения о профиле" -#: ../../boot.php:2194 +#: ../../boot.php:2203 msgid "Events and Calendar" msgstr "Мероприятия и календарь" -#: ../../boot.php:2199 +#: ../../boot.php:2208 msgid "Webpages" msgstr "Веб-страницы" -#: ../../boot.php:2202 +#: ../../boot.php:2211 msgid "Manage Webpages" msgstr "Управление веб-страниц" -#: ../../boot.php:2484 +#: ../../boot.php:2493 msgid "toggle mobile" msgstr "мобильное подключение" From 6c308a2d7275e3f9a32979aadfbacced70e033dc Mon Sep 17 00:00:00 2001 From: Tazman DeVille Date: Tue, 17 Sep 2013 04:52:36 +0200 Subject: [PATCH 172/330] fixed link to wiki --- doc/Developers.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Developers.md b/doc/Developers.md index 1d9c2aaa1..074dda7af 100644 --- a/doc/Developers.md +++ b/doc/Developers.md @@ -22,4 +22,4 @@ Please pull in any changes from the project repository and merge them with your Also - **test your changes**. Don't assume that a simple fix won't break something else. If possible get an experienced Red developer to review the code. -Further documentation can be found at the Github wiki pages at: https://github.com/friendica/red/wiki \ No newline at end of file +Further documentation can be found at the Github wiki pages at: [https://github.com/friendica/red/wiki](https://github.com/friendica/red/wiki). From 9bff739d9624d3a4ba1fb488673ec1a18bc6d395 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 16 Sep 2013 21:35:52 -0700 Subject: [PATCH 173/330] several oauth fixes - shred doesn't completely work yet, but it also doesn't completely NOT work, so at least there's some improvement --- include/api.php | 11 +- include/oauth.php | 67 ++++++----- library/OAuth1.php | 13 ++- util/shred/FriendicaOAuth.sh | 173 ++++++++++++++++++++++++++++ util/shred/JSON.sh | 129 +++++++++++++++++++++ util/shred/OAuth.sh | 214 +++++++++++++++++++++++++++++++++++ util/shred/shred | 211 ++++++++++++++++++++++++++++++++++ version.inc | 2 +- 8 files changed, 781 insertions(+), 39 deletions(-) create mode 100755 util/shred/FriendicaOAuth.sh create mode 100755 util/shred/JSON.sh create mode 100755 util/shred/OAuth.sh create mode 100755 util/shred/shred diff --git a/include/api.php b/include/api.php index a49258d18..d76d82626 100644 --- a/include/api.php +++ b/include/api.php @@ -1823,9 +1823,13 @@ require_once('include/photos.php'); function api_oauth_request_token(&$a, $type){ try{ $oauth = new FKOAuth1(); - $r = $oauth->fetch_request_token(OAuthRequest::from_request()); + $req = OAuthRequest::from_request(); +logger('Req: ' . var_export($req,true)); + $r = $oauth->fetch_request_token($req); }catch(Exception $e){ - echo "error=". OAuthUtil::urlencode_rfc3986($e->getMessage()); killme(); + logger('oauth_exception: ' . print_r($e->getMessage(),true)); + echo "error=". OAuthUtil::urlencode_rfc3986($e->getMessage()); + killme(); } echo $r; killme(); @@ -1833,7 +1837,8 @@ require_once('include/photos.php'); function api_oauth_access_token(&$a, $type){ try{ $oauth = new FKOAuth1(); - $r = $oauth->fetch_access_token(OAuthRequest::from_request()); + $req = OAuthRequest::from_request(); + $r = $oauth->fetch_access_token($req); }catch(Exception $e){ echo "error=". OAuthUtil::urlencode_rfc3986($e->getMessage()); killme(); } diff --git a/include/oauth.php b/include/oauth.php index 6ec5285e4..b10802ecd 100644 --- a/include/oauth.php +++ b/include/oauth.php @@ -18,11 +18,12 @@ class FKOAuthDataStore extends OAuthDataStore { function lookup_consumer($consumer_key) { logger(__function__.":".$consumer_key); - //echo "
    "; var_dump($consumer_key); killme();
    -	  
    +//      echo "
    "; var_dump($consumer_key); killme();
    +
     		$r = q("SELECT client_id, pw, redirect_uri FROM clients WHERE client_id='%s'",
     			dbesc($consumer_key)
     		);
    +
     		if (count($r))
     			return new OAuthConsumer($r[0]['client_id'],$r[0]['pw'],$r[0]['redirect_uri']);
     		return null;
    @@ -30,11 +31,13 @@ class FKOAuthDataStore extends OAuthDataStore {
     
       function lookup_token($consumer, $token_type, $token) {
     		logger(__function__.":".$consumer.", ". $token_type.", ".$token);
    +
     		$r = q("SELECT id, secret,scope, expires, uid  FROM tokens WHERE client_id='%s' AND scope='%s' AND id='%s'",
     			dbesc($consumer->key),
     			dbesc($token_type),
     			dbesc($token)
     		);
    +
     		if (count($r)){
     			$ot=new OAuthToken($r[0]['id'],$r[0]['secret']);
     			$ot->scope=$r[0]['scope'];
    @@ -46,12 +49,14 @@ class FKOAuthDataStore extends OAuthDataStore {
       }
     
       function lookup_nonce($consumer, $token, $nonce, $timestamp) {
    -		//echo __file__.":".__line__."
    "; var_dump($consumer,$key); killme();
    +//		echo __file__.":".__line__."
    "; var_dump($consumer,$key); killme();
    +
     		$r = q("SELECT id, secret  FROM tokens WHERE client_id='%s' AND id='%s' AND expires=%d",
     			dbesc($consumer->key),
     			dbesc($nonce),
     			intval($timestamp)
     		);
    +
     		if (count($r))
     			return new OAuthToken($r[0]['id'],$r[0]['secret']);
     		return null;
    @@ -67,13 +72,14 @@ class FKOAuthDataStore extends OAuthDataStore {
     		} else {
     			$k = $consumer;
     		}
    -		
    +
     		$r = q("INSERT INTO tokens (id, secret, client_id, scope, expires) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP()+%d)",
     				dbesc($key),
     				dbesc($sec),
     				dbesc($k),
     				'request',
     				intval(REQUEST_TOKEN_DURATION));
    +
     		if (!$r) return null;
     		return new OAuthToken($key,$sec);
       }
    @@ -95,6 +101,7 @@ class FKOAuthDataStore extends OAuthDataStore {
     		
     		$key = $this->gen_token();
     		$sec = $this->gen_token();
    +
     		$r = q("INSERT INTO tokens (id, secret, client_id, scope, expires, uid) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP()+%d, %d)",
     				dbesc($key),
     				dbesc($sec),
    @@ -102,6 +109,7 @@ class FKOAuthDataStore extends OAuthDataStore {
     				'access',
     				intval(ACCESS_TOKEN_DURATION),
     				intval($uverifier));
    +
     		if ($r)
     			$ret = new OAuthToken($key,$sec);		
     	}
    @@ -131,9 +139,9 @@ class FKOAuth1 extends OAuthServer {
     	}
     	
     	function loginUser($uid){
    -		logger("FKOAuth1::loginUser $uid");
    +		logger("RedOAuth1::loginUser $uid");
     		$a = get_app();
    -		$r = q("SELECT * FROM `user` WHERE uid=%d AND `blocked` = 0 AND `account_expired` = 0 AND `verified` = 1 LIMIT 1",
    +		$r = q("SELECT * FROM channel WHERE channel_id = %d LIMIT 1",
     			intval($uid)
     		);
     		if(count($r)){
    @@ -143,35 +151,36 @@ class FKOAuth1 extends OAuthServer {
     		    header('HTTP/1.0 401 Unauthorized');
     		    die('This api requires login');
     		}
    -		$_SESSION['uid'] = $record['uid'];
    -		$_SESSION['theme'] = $record['theme'];
    -		$_SESSION['mobile_theme'] = get_pconfig($record['uid'], 'system', 'mobile_theme');
    +		$_SESSION['uid'] = $record['channel_id'];
    +		$_SESSION['theme'] = $record['channel_theme'];
    +		$_SESSION['account_id'] = $record['channel_account_id'];
    +		$_SESSION['mobile_theme'] = get_pconfig($record['channel_id'], 'system', 'mobile_theme');
     		$_SESSION['authenticated'] = 1;
    -		$_SESSION['page_flags'] = $record['page-flags'];
    -		$_SESSION['my_url'] = $a->get_baseurl() . '/channel/' . $record['nickname'];
    +//		$_SESSION['page_flags'] = $record['page-flags'];
    +		$_SESSION['my_url'] = $a->get_baseurl() . '/channel/' . $record['channel_address'];
     		$_SESSION['addr'] = $_SERVER['REMOTE_ADDR'];
    +		$_SESSION['allow_api'] = true;
     
    -		//notice( t("Welcome back ") . $record['username'] . EOL);
    -		$a->user = $record;
    +		$a->channel = $record;
     
    -		if(strlen($a->user['timezone'])) {
    -			date_default_timezone_set($a->user['timezone']);
    -			$a->timezone = $a->user['timezone'];
    +		if(strlen($a->channel['channel_timezone'])) {
    +			date_default_timezone_set($a->channel['channel_timezone']);
    +//			$a->timezone = $a->user['timezone'];
     		}
     
    -		$r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1",
    -			intval($_SESSION['uid']));
    -		if(count($r)) {
    -			$a->contact = $r[0];
    -			$a->cid = $r[0]['id'];
    -			$_SESSION['cid'] = $a->cid;
    -		}
    -		q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d LIMIT 1",
    -			dbesc(datetime_convert()),
    -			intval($_SESSION['uid'])
    -		);
    -
    -		call_hooks('logged_in', $a->user);		
    +//		$r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1",
    +//			intval($_SESSION['uid']));
    +//		if(count($r)) {
    +//			$a->contact = $r[0];
    +//			$a->cid = $r[0]['id'];
    +//			$_SESSION['cid'] = $a->cid;
    +//		}
    +//		q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d LIMIT 1",
    +//			dbesc(datetime_convert()),
    +//			intval($_SESSION['uid'])
    +//		);
    +//
    +//		call_hooks('logged_in', $a->user);		
     	}
     	
     }
    diff --git a/library/OAuth1.php b/library/OAuth1.php
    index 0db6fabcb..b790655af 100644
    --- a/library/OAuth1.php
    +++ b/library/OAuth1.php
    @@ -273,6 +273,7 @@ class OAuthRequest {
               && @strstr($request_headers["Content-Type"],
                          "application/x-www-form-urlencoded")
               ) {
    +
             $post_data = OAuthUtil::parse_parameters(
               file_get_contents(self::$POST_INPUT)
             );
    @@ -286,15 +287,15 @@ class OAuthRequest {
               $request_headers['Authorization']
             );
             $parameters = array_merge($parameters, $header_parameters);
    +
           }
     
         }
         // fix for friendica redirect system
    -    
    +    // FIXME or don't, but figure out if this is absolutely necessary and act accordingly
         $http_url =  substr($http_url, 0, strpos($http_url,$parameters['q'])+strlen($parameters['q']));
         unset( $parameters['q'] );
         
    -	//echo "
    ".__function__."\n"; var_dump($http_method, $http_url, $parameters, $_SERVER['REQUEST_URI']); killme();
         return new OAuthRequest($http_method, $http_url, $parameters);
       }
     
    @@ -514,9 +515,7 @@ class OAuthServer {
        */
       public function fetch_request_token(&$request) {
         $this->get_version($request);
    -
         $consumer = $this->get_consumer($request);
    -
         // no token required for the initial token request
         $token = NULL;
     
    @@ -525,7 +524,6 @@ class OAuthServer {
         // Rev A change
         $callback = $request->get_parameter('oauth_callback');
         $new_token = $this->data_store->new_request_token($consumer, $callback);
    -
         return $new_token;
       }
     
    @@ -796,7 +794,8 @@ class OAuthUtil {
               );
             $out[$key] = $value;
           }
    -    } else {
    +    }
    +	if((! isset($out)) || (! array_key_exists('Authorization',$out))) {
           // otherwise we don't have apache and are just going to have to hope
           // that $_SERVER actually contains what we need
           $out = array();
    @@ -806,6 +805,8 @@ class OAuthUtil {
             $out['Content-Type'] = $_ENV['CONTENT_TYPE'];
     
           foreach ($_SERVER as $key => $value) {
    +		if($key === 'REDIRECT_REMOTE_USER')
    +			$out['Authorization'] = $value;
             if (substr($key, 0, 5) == "HTTP_") {
               // this is chaos, basically it is just there to capitalize the first
               // letter of every word that is not an initial HTTP and strip HTTP
    diff --git a/util/shred/FriendicaOAuth.sh b/util/shred/FriendicaOAuth.sh
    new file mode 100755
    index 000000000..a20da7879
    --- /dev/null
    +++ b/util/shred/FriendicaOAuth.sh
    @@ -0,0 +1,173 @@
    +#!/bin/bash
    +# Copyright (c) 2012 Fabio Comuni
    +# Copyright (c) 2012 Michael Nowack
    +# Copyright (c) 2010, 2012 Yu-Jie Lin
    +# 
    +# Permission is hereby granted, free of charge, to any person obtaining a copy of
    +# this software and associated documentation files (the "Software"), to deal in
    +# the Software without restriction, including without limitation the rights to
    +# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
    +# of the Software, and to permit persons to whom the Software is furnished to do
    +# so, subject to the following conditions:
    +# 
    +# The above copyright notice and this permission notice shall be included in all
    +# copies or substantial portions of the Software.
    +# 
    +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
    +# SOFTWARE.
    +
    +FRIENDICAOAUTH_VERSION=0.1.1
    +
    +F_API_VERSION="1"
    +
    +# Friendica API endpoints
    +
    +F_ACCOUNF_UPDATE_PROFILE_IMAGE="${redmatrix_url}/api/account/update_profile_image"
    +F_STATUSES_UPDATE="${redmatrix_url}/api/statuses/update"
    +F_STATUSES_HOME_TIMELINE="${redmatrix_url}/api/statuses/home_timeline"
    +
    +F_REQUESF_TOKEN=${redmatrix_url}'/api/oauth/request_token'
    +F_ACCESS_TOKEN=${redmatrix_url}'/api/oauth/access_token'
    +F_AUTHORIZE_TOKEN=${redmatrix_url}'/api/oauth/authorize'
    +
    +# Source OAuth.sh
    +
    +OAuth_sh=$(which OAuth.sh)
    +(( $? != 0 )) && echo 'Unable to locate OAuth.sh! Make sure it is in searching PATH.' && exit 1
    +source "$OAuth_sh"
    +
    +FO_debug () {
    +  # Print out all parameters, each in own line
    +  [[ "$FO_DEBUG" == "" ]] && return
    +  local t=$(date +%FT%T.%N)
    +  while (( $# > 0 )); do
    +    echo "[FO][DEBUG][$t] $1"
    +    shift 1
    +    done
    +  }
    +
    +FO_extract_value () {
    +  # $1 key name
    +  # $2 string to find
    +  egrep -o "$1=[a-zA-Z0-9-]*" <<< "$2" | cut -d\= -f 2
    +  }
    +
    +
    +FO_init() {
    +  # Initialize FriendicaOAuth
    +  oauth_version='1.0'
    +  oauth_signature_method='HMAC-SHA1'
    +  oauth_basic_params=(
    +    $(OAuth_param 'oauth_consumer_key' "$oauth_consumer_key")
    +    $(OAuth_param 'oauth_signature_method' "$oauth_signature_method")
    +    $(OAuth_param 'oauth_version' "$oauth_version")
    +    )
    +  }
    +
    +FO_access_token_helper () {
    +  # Help guide user to get access token
    +
    +  local resp PIN
    +
    +  # Request Token
    +  
    +  local auth_header="$(_OAuth_authorization_header 'Authorization' "$redmatrix_url/" "$oauth_consumer_key" "$oauth_consumer_secret" '' '' "$oauth_signature_method" "$oauth_version" "$(OAuth_nonce)" "$(OAuth_timestamp)" 'POST' "$F_REQUESF_TOKEN" "$(OAuth_param 'oauth_callback' 'oob')"), $(OAuth_param_quote 'oauth_callback' 'oob')"
    +
    +#  echo $auth_header
    +#  echo $F_REQUESF_TOKEN
    +  
    +  resp=$(curl -s -d '' -H "$auth_header" "$F_REQUESF_TOKEN")
    +  FO_rval=$?
    +  (( $? != 0 )) && return $FO_rval
    +
    +  local _oauth_token=$(FO_extract_value 'oauth_token' "$resp")
    +  local _oauth_token_secret=$(FO_extract_value 'oauth_token_secret' "$resp")
    +
    +  echo 'Please go to the following link to get the PIN:'
    +  echo "  ${F_AUTHORIZE_TOKEN}?oauth_token=$_oauth_token"
    +  
    +  read -p 'PIN: ' PIN
    +
    +  # Access Token
    +
    +  local auth_header="$(_OAuth_authorization_header 'Authorization' "$redmatrix_url/" "$oauth_consumer_key" "$oauth_consumer_secret" "$_oauth_token" "$_oauth_token_secret" "$oauth_signature_method" "$oauth_version" "$(OAuth_nonce)" "$(OAuth_timestamp)" 'POST' "$F_ACCESS_TOKEN" "$(OAuth_param 'oauth_verifier' "$PIN")"), $(OAuth_param_quote 'oauth_verifier' "$PIN")"
    +
    +  resp=$(curl -s -d "" -H "$auth_header" "$F_ACCESS_TOKEN")
    +  FO_rval=$?
    +  (( $? != 0 )) && return $FO_rval
    +  
    +  FO_ret=(
    +    $(FO_extract_value 'oauth_token' "$resp")
    +    $(FO_extract_value 'oauth_token_secret' "$resp")
    +    $(FO_extract_value 'user_id' "$resp")
    +    $(FO_extract_value 'screen_name' "$resp")
    +    )
    +  }
    +
    +# APIs
    +######
    +
    +FO_statuses_update () {
    +  # $1 format
    +  # $2 status
    +  # $3 in_reply_to_status_id
    +  # The followins are not implemented yet:
    +  # $4 lat
    +  # $5 long
    +  # $6 place_id
    +  # $7 display_coordinates
    +  local format="$1"
    +  [[ "$format" == "" ]] && format="xml"
    +  
    +  local params=(
    +    $(OAuth_param 'status' "$2")
    +    )
    +  
    +  params[${#params[@]}]=$(OAuth_param 'source' "fcli")
    +  
    +  [[ "$3" != "" ]] && params[${#params[@]}]=$(OAuth_param 'in_reply_to_status_id' "$3") && local in_reply_to_status_id=( '--data-urlencode' "in_reply_to_status_id=$3" )
    +    
    +  
    +  local auth_header=$(OAuth_authorization_header 'Authorization' "$redmatrix_url" '' '' 'POST' "$F_STATUSES_UPDATE.$format" ${params[@]})
    +    
    +  
    +  FO_ret=$(curl -s -H "$auth_header" --data-urlencode "status=$2" --data-urlencode "source=fcli" ${in_reply_to_status_id[@]} "$F_STATUSES_UPDATE.$format")
    +
    +  FO_rval=$?
    +  return $FO_rval
    +  }
    +
    +
    +# gets the user home_timeline.
    +#
    +# @sets FO_ret API response
    +# @returns status
    +# @public
    +FO_statuses_home_timeline () {
    +  # $1 format
    +  # $2 screen_name
    +  # $3 count
    +  local format="$1"
    +  local screen_name="$2"
    +  local count="$3"
    +  [[ "$format" == "" ]] && format="xml"
    +  [[ "$count" == "" ]] && count=1
    +
    +  local params=(
    +    $(OAuth_param 'screen_name' $screen_name)
    +    $(OAuth_param 'count' $count)
    +    )
    +g
    +  local auth_header=$(OAuth_authorization_header 'Authorization' "$redmatrix_url" '' '' 'GET' "$F_STATUSES_HOME_TIMELINE.$format" ${params[@]})
    +
    +  convscreen=$(OAuth_PE "$screen_name");
    +  FO_ret=$(curl -s --get "${F_STATUSES_HOME_TIMELINE}.${format}" --data "screen_name=${convscreen}&count=${count}" --header "${auth_header}")
    +  FO_rval=$?
    +
    +  return $FO_rval
    +  }
    diff --git a/util/shred/JSON.sh b/util/shred/JSON.sh
    new file mode 100755
    index 000000000..65f5f1f66
    --- /dev/null
    +++ b/util/shred/JSON.sh
    @@ -0,0 +1,129 @@
    +# The MIT License
    +#
    +# Copyright (c) 2011 Dominic Tarr
    +#
    +# Permission is hereby granted, free of charge,
    +# to any person obtaining a copy of this software and
    +# associated documentation files (the "Software"), to
    +# deal in the Software without restriction, including
    +# without limitation the rights to use, copy, modify,
    +# merge, publish, distribute, sublicense, and/or sell
    +# copies of the Software, and to permit persons to whom
    +# the Software is furnished to do so,
    +# subject to the following conditions:
    +#
    +# The above copyright notice and this permission notice
    +# shall be included in all copies or substantial portions of the Software.
    +#
    +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
    +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
    +# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
    +# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
    +# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
    +# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
    +# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
    +#
    +#
    +# https://github.com/dominictarr/JSON.sh
    +#
    +throw () {
    +  echo "$*" >&2
    +  exit 1
    +}
    +
    +tokenize () {
    +  local ESCAPE='(\\[^u[:cntrl:]]|\\u[0-9a-fA-F]{4})'
    +  local CHAR='[^[:cntrl:]"\\]'
    +  local STRING="\"$CHAR*($ESCAPE$CHAR*)*\""
    +  local NUMBER='-?(0|[1-9][0-9]*)([.][0-9]*)?([eE][+-]?[0-9]*)?'
    +  local KEYWORD='null|false|true'
    +  local SPACE='[[:space:]]+'
    +  egrep -ao "$STRING|$NUMBER|$KEYWORD|$SPACE|." --color=never |
    +    egrep -v "^$SPACE$"  # eat whitespace
    +}
    +
    +parse_array () {
    +  local index=0
    +  local ary=''
    +  read -r token
    +  case "$token" in
    +    ']') ;;
    +    *)
    +      while :
    +      do
    +        parse_value "$1" "$index"
    +        let index=$index+1
    +        ary="$ary""$value" 
    +        read -r token
    +        case "$token" in
    +          ']') break ;;
    +          ',') ary="$ary," ;;
    +          *) throw "EXPECTED , or ] GOT ${token:-EOF}" ;;
    +        esac
    +        read -r token
    +      done
    +      ;;
    +  esac
    +  value=`printf '[%s]' "$ary"`
    +}
    +
    +parse_object () {
    +  local key
    +  local obj=''
    +  read -r token
    +  case "$token" in
    +    '}') ;;
    +    *)
    +      while :
    +      do
    +        case "$token" in
    +          '"'*'"') key=$token ;;
    +          *) throw "EXPECTED string GOT ${token:-EOF}" ;;
    +        esac
    +        read -r token
    +        case "$token" in
    +          ':') ;;
    +          *) throw "EXPECTED : GOT ${token:-EOF}" ;;
    +        esac
    +        read -r token
    +        parse_value "$1" "$key"
    +        obj="$obj$key:$value"        
    +        read -r token
    +        case "$token" in
    +          '}') break ;;
    +          ',') obj="$obj," ;;
    +          *) throw "EXPECTED , or } GOT ${token:-EOF}" ;;
    +        esac
    +        read -r token
    +      done
    +    ;;
    +  esac
    +  value=`printf '{%s}' "$obj"`
    +}
    +
    +parse_value () {
    +  local jpath="${1:+$1,}$2"
    +  case "$token" in
    +    '{') parse_object "$jpath" ;;
    +    '[') parse_array  "$jpath" ;;
    +    # At this point, the only valid single-character tokens are digits.
    +    ''|[^0-9]) throw "EXPECTED value GOT ${token:-EOF}" ;;
    +    *) value=$token ;;
    +  esac
    +  printf "[%s]\t%s\n" "$jpath" "$value"
    +}
    +
    +parse () {
    +  read -r token
    +  parse_value
    +  read -r token
    +  case "$token" in
    +    '') ;;
    +    *) throw "EXPECTED EOF GOT $token" ;;
    +  esac
    +}
    +
    +if [ $0 = $BASH_SOURCE ];
    +then
    +  tokenize | parse
    +fi
    diff --git a/util/shred/OAuth.sh b/util/shred/OAuth.sh
    new file mode 100755
    index 000000000..4be4ed35b
    --- /dev/null
    +++ b/util/shred/OAuth.sh
    @@ -0,0 +1,214 @@
    +#!/bin/bash
    +# Copyright (c) 2010, 2012 Yu-Jie Lin
    +# 
    +# Permission is hereby granted, free of charge, to any person obtaining a copy of
    +# this software and associated documentation files (the "Software"), to deal in
    +# the Software without restriction, including without limitation the rights to
    +# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
    +# of the Software, and to permit persons to whom the Software is furnished to do
    +# so, subject to the following conditions:
    +# 
    +# The above copyright notice and this permission notice shall be included in all
    +# copies or substantial portions of the Software.
    +# 
    +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
    +# SOFTWARE.
    +
    +BASHOAUTH_VERSION=0.1.2
    +
    +OAuth_debug () {
    +	# Print out all parameters, each in own line
    +	[[ "$OAUTH_DEBUG" == "" ]] && return
    +	local t=$(date +%FT%T.%N)
    +	while (( $# > 0 )); do
    +		echo "[OAuth][DEBUG][$t] $1"
    +		shift 1
    +		done
    +	}
    +
    +OAuth_nonce () {
    +	# Return a nonce
    +	md5sum <<< "$RANDOM-$(date +%s.%N)" | cut -d' ' -f 1
    +	}
    +
    +OAuth_timestamp () {
    +	# Return timestamp
    +	echo "$(date +%s)"
    +	}
    +
    +OAuth_PE () {
    +	# Encode $1 using Percent-encoding as defined in
    +	# http://tools.ietf.org/html/rfc5849#section-3.6
    +	# Any character other than [a-zA-Z0-9-._~] is converted into format %XX
    +    [ -n "$1" ] \
    +	&& echo -n "$1" | perl -p -e 's/([^A-Za-z0-9-._~])/sprintf("%%%02X", ord($1))/seg'
    +}
    +
    +OAuth_PE_file () {
    +	# Encode a file $1 using Percent-encoding as defined in
    +	# http://tools.ietf.org/html/rfc5849#section-3.6
    +	# $1 a filename, not the content of file
    +    perl -p -e 's/([^A-Za-z0-9-._~])/sprintf("%%%02X", ord($1))/seg' < "$1"
    +}
    +
    +OAuth_params_string () {
    +	# Sort the paramters and join them into one-line string
    +	while (( $# > 0 )); do
    +		echo $1
    +		shift 1
    +		done | sort | tr '\n' '&' | sed 's/&$//'
    +	}
    +
    +OAuth_base_string () {
    +	# $1 method: "GET", "POST", etc
    +	# $2 url
    +	# $3-$N params
    +	local method=$1
    +	local url=$2
    +	shift 2
    +
    +	local params_string=$(OAuth_params_string $@)
    +
    +	echo "$method&$(OAuth_PE "$url")&$(OAuth_PE "$params_string")"
    +	}
    +
    +OAuth_param () {
    +	# Return a percent encoded key-value pair
    +	# $1 key
    +	# $2 value
    +	echo "$(OAuth_PE "$1")=$(OAuth_PE "$2")"
    +	}
    +
    +OAuth_param_quote () {
    +	# Return a percent encoded key-value pair, value is quoted
    +	# $1 key
    +	# $2 value
    +	echo "$(OAuth_PE "$1")=\"$(OAuth_PE "$2")\""
    +	}
    +
    +OAuth_param_file () {
    +	# Return a percent encoded key-value pair, the value is an encoded file content
    +	# $1 key
    +	# $2 filename
    +	echo "$(OAuth_PE "$1")=$(OAuth_PE_file "$2")"
    +	}
    +
    +OAuth_param_raw_value () {
    +	# Return a percent encoded key-value pair, only key will be encoded by this function
    +	# $1 key
    +	# $2 value
    +	echo "$(OAuth_PE "$1")=$2"
    +	}
    +
    +OAuth_HMAC_SHA1 () {
    +	# Hash the text $1 with key $2
    +    local text="$1"
    +	local key="$2"
    +    echo -n "$text" | openssl dgst -sha1 -binary -hmac "$key" | base64
    +	}
    +
    +_OAuth_signature () {
    +	# Return the signature, note it's necessary to pass to OAuth_PE before add to header
    +	# $1 signature_method
    +	# $2 base_string
    +	# $3 consumer_secret
    +	# $4 token_secret
    +	local signature_method="OAuth_${1//-/_}"
    +	local base_string=$2
    +	local c_secret=$3
    +	local t_secret=$4
    +	$signature_method "$base_string" "$c_secret&$t_secret"
    +	}
    +
    +OAuth_signature () {
    +	# Return the signature, note it's necessary to pass to OAuth_PE before add to header
    +	# $1 base_string
    +	_OAuth_signature "$oauth_signature_method" "$1" "$oauth_consumer_secret" "$oauth_token_secret"
    +	}
    +
    +_OAuth_authorization_header_params_string () {
    +	while (( $# > 0 )); do
    +		echo -n "$(cut -d\= -f 1 <<< "$1")=\"$(cut -d\= -f 2 <<< "$1")\""
    +		shift 1
    +		# Use break to prevent error code being returned
    +		(( $# > 0 )) && echo -n ', ' || break
    +		done
    +	}
    +
    +_OAuth_authorization_header () {
    +	# Return header string
    +	# $1 header key
    +	# $2 OAuth realm, can be empty string
    +	# $3 OAuth consumer key
    +	# $4 OAuth consumer secret
    +	# $5 OAuth token
    +	# $6 OAuth token secret
    +	# $7 OAuth signature method
    +	# $8 OAuth version
    +	# $9 nonce
    +	# $10 timestamp
    +	# $11 method
    +	# $12 url
    +	# $13-$N params
    +	echo -n "$1: OAuth "
    +	[[ "$2" != "" ]] && echo -n "realm=\"$2\", "
    +	local oauth_consumer_key="$3"
    +	local oauth_consumer_secret="$4"
    +	local oauth_token="$5"
    +	local oauth_token_secret="$6"
    +	local oauth_signature_method="$7"
    +	local oauth_version="$8"
    +	local oauth_nonce="$9"
    +	[[ "$oauth_nonce" == "" ]] && oauth_nonce="$(OAuth_nonce)" 
    +	local oauth_timestamp="${10}"
    +	[[ "$oauth_timestamp" == "" ]] && oauth_timestamp="$(OAuth_timestamp)" 
    +	local method="${11}"
    +	local url="${12}"
    +	shift 12
    +	local params=(
    +		$(OAuth_param 'oauth_consumer_key' "$oauth_consumer_key")
    +		$(OAuth_param 'oauth_signature_method' "$oauth_signature_method")
    +		$(OAuth_param 'oauth_version' "$oauth_version")
    +		$(OAuth_param 'oauth_nonce' "$oauth_nonce")
    +		$(OAuth_param 'oauth_timestamp' "$oauth_timestamp")
    +		)
    +	[[ "$oauth_token" != "" ]] && params[${#params[@]}]=$(OAuth_param 'oauth_token' "$oauth_token")
    +	local sign_params=${params[@]}
    +	while (( $# > 0 )); do
    +		sign_params[${#sign_params[@]}]="$1"
    +		shift 1
    +		done
    +	local base_string=$(OAuth_base_string "$method" "$url" ${sign_params[@]})
    +	local signature=$(_OAuth_signature "$oauth_signature_method" "$base_string" "$oauth_consumer_secret" "$oauth_token_secret")
    +	params[${#params[@]}]=$(OAuth_param 'oauth_signature' "$signature")
    +	_OAuth_authorization_header_params_string ${params[@]}
    +	}
    +
    +OAuth_authorization_header () {
    +	# Return header string
    +	# $1 header key
    +	# $2 OAuth realm, can be empty string
    +	# $3 OAuth nonce
    +	# $4 OAuth timestamp
    +	# $5 method
    +	# $6 url
    +	# $7-$N params
    +	local header_key="$1"
    +	local realm="$2"
    +	local oauth_nonce="$3"
    +	local oauth_timestamp="$4"
    +	local method="$5"
    +	local url="$6"
    +	shift 6
    +	local params=()
    +	while (( $# > 0 )); do
    +		params[${#params[@]}]="$1"
    +		shift 1
    +		done
    +	_OAuth_authorization_header "$header_key" "$realm" "$oauth_consumer_key" "$oauth_consumer_secret" "$oauth_token" "$oauth_token_secret" "$oauth_signature_method" "$oauth_version" "$oauth_nonce" "$oauth_timestamp" "$method" "$url" ${params[@]}
    +	}
    diff --git a/util/shred/shred b/util/shred/shred
    new file mode 100755
    index 000000000..113898ff9
    --- /dev/null
    +++ b/util/shred/shred
    @@ -0,0 +1,211 @@
    +#!/bin/bash
    +# Copyright (c) 2012 Fabio Comuni
    +# Copyright (c) 2010, 2012 Yu-Jie Lin
    +# 
    +# Permission is hereby granted, free of charge, to any person obtaining a copy of
    +# this software and associated documentation files (the "Software"), to deal in
    +# the Software without restriction, including without limitation the rights to
    +# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
    +# of the Software, and to permit persons to whom the Software is furnished to do
    +# so, subject to the following conditions:
    +# 
    +# The above copyright notice and this permission notice shall be included in all
    +# copies or substantial portions of the Software.
    +# 
    +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
    +# SOFTWARE.
    +
    +FCLI_RC="$HOME/.shred.rc"
    +
    +# Source Config
    +[[ -f "$FCLI_RC" ]] && . "$FCLI_RC" || show_config_help 1
    +
    +# Source FriendicaOAuth.sh
    +OAuth_sh=$(which FriendicaOAuth.sh)
    +(( $? != 0 )) && echo 'Unable to locate FriendicaOAuth.sh! Make sure it is in searching PATH.' && exit 1
    +source "$OAuth_sh"
    +
    +# Source JSON.sh
    +JSON_sh=$(which JSON.sh)
    +(( $? != 0 )) && echo 'Unable to locate JSON.sh! Make sure it is in searching PATH.' && exit 1
    +source "$JSON_sh"
    +
    +
    +usage () {
    +	echo "usage: $0 options
    +
    +OPTIONS:
    +  -h      Show this message
    +
    +  -c      Command
    +    
    +	Valid Commands:
    +      statuses_update
    +      home_timeline
    +
    +Use -h -c command to get options for the command.
    +"
    +	exit $1
    +	}
    +
    +show_config_help () {
    +	echo "Please create $FCLI_RC with:
    +redmatrix_url=YOR_SERVER_URL (no trailing /)
    +oauth_consumer_key=YOUR_CONSUMER_KEY
    +oauth_consumer_secret=YOUR_CONSUMER_SECRET
    +
    +You can register new app consumer key and secret at
    +  http://yourserver.com/settings/oauth
    +"
    +	exit $1
    +	}
    +
    +
    +show_statuses_update () {
    +	echo "Command statuses_update
    +
    +Requires:
    +  -s status
    +
    +Optional:
    +  -r in_reply_to_status_id
    +"
    +	exit $1
    +	}
    +
    +show_home_timeline () {
    +    echo "Command home_timeline"
    +    
    +    exit $1
    +    }
    +
    +#json helper
    +#
    +# usage:
    +#   echo "$parsed_json" | js key1 [key2 [key3 ...]][,] 
    +#
    +#   echoes the value of json[key1][key2][key3], without surronding quotes
    +#   with "," as last argument, no newline is printed
    +#
    +js () {
    +    local arg
    +    local rg='^\['
    +    local ret
    +    for arg in $@
    +    do
    +        [[ "$arg" == "," ]] && break;
    +        if [[ $arg == ${arg//[0-9]/} ]]
    +        then
    +            rg="${rg}\"$arg\","
    +        else
    +            rg="${rg}$arg,"
    +        fi
    +    done
    +    rg="${rg%?}\]"
    +    ret=$(grep $rg  | cut -f 2 | sed 's/^"\(.*\)"$/\1/' | sed "s/\\\\\//\//g" )
    +    if [[ "$arg" == "," ]]
    +    then
    +        echo -e "$ret" | tr -d '\012\015'
    +    else
    +        echo -e "$ret"
    +    fi
    +}
    +
    +
    +load_config () {
    +
    +	[[ "$oauth_consumer_key" == "" ]] && show_config_help 1
    +	[[ "$oauth_consumer_secret" == "" ]] && show_config_help 1
    +
    +
    +	FO_init
    +
    +	if [[ "$oauth_token" == "" ]] || [[ "$oauth_token_secret" == "" ]]; then
    +		FO_access_token_helper
    +		if (( $? == 0 )); then
    +			oauth_token=${FO_ret[0]}
    +			oauth_token_secret=${FO_ret[1]}
    +			echo "oauth_token='${FO_ret[0]}'" >> "$FCLI_RC"
    +			echo "oauth_token_secret='${FO_ret[1]}'" >> "$FCLI_RC"
    +			echo "Token saved."
    +		else
    +			echo 'Unable to get access token'
    +			exit 1
    +		fi
    +	fi
    +	}
    +
    +main () {
    +	load_config
    +	
    +	fcli_command=
    +	fcli_status=
    +	fcli_in_reply_to_status_id=
    +	fcli_file=
    +	fcli_help_flag=
    +	while getopts "c:s:r:f:h" name
    +	do
    +		case $name in
    +		c)	fcli_command="$OPTARG";;
    +		s)	fcli_status="$OPTARG";;
    +		r)	fcli_in_reply_to_status_id="$OPTARG";;
    +		f)	fcli_file="$OPTARG";;
    +		h)  fcli_help_flag="1";;
    +		?)	usage
    +			exit 2;;
    +		esac
    +	done
    +
    +	if [[ "$fcli_help_flag" == "1" ]]; then case $fcli_command in
    +	statuses_update)
    +		show_statuses_update 0
    +		;;
    +	home_timeline)
    +	    show_home_timeline 0
    +	    ;;
    +	*)
    +		[[ "$fcli_command" == "" ]] && usage 0
    +		usage 1
    +	esac ; fi
    +
    +	case $fcli_command in
    +	home_timeline)
    +        FO_statuses_home_timeline 'json' '' 5
    +        JS_Parsed=$(echo "$FO_ret" | tokenize | parse)
    +		for id in 0 1 2 3 4
    +		do
    +		    echo "$JS_Parsed" | js $id "user" "name" ,
    +		    echo -n " - "
    +		    echo "$JS_Parsed" | js $id "created_at"
    +            echo "$JS_Parsed" | js $id "text"
    +		    echo ""
    +		    echo "------------------------------------------------------------------------------"
    +		done
    +        
    +		return $FO_rval
    +		;;
    +	statuses_update)
    +		[[ "$fcli_status" == "" ]] && show_statuses_update 1
    +		FO_statuses_update 'json' "$fcli_status" "$fcli_in_reply_to_status_id"
    +        JS_Parsed=$(echo "$FO_ret" | tokenize | parse)
    +        echo "$JS_Parsed" | js "user" "name" ,
    +	    echo -n " - "
    +	    echo "$JS_Parsed" | js "created_at"
    +        echo "$JS_Parsed" | js "text"
    +	    echo ""
    +	    echo "------------------------------------------------------------------------------"
    +		return $FO_rval
    +		;;
    +	*)
    +		usage 1
    +		;;
    +	esac
    +	return 0
    +	}
    +
    +main "$@"
    diff --git a/version.inc b/version.inc
    index 2ee9add97..186ac999c 100644
    --- a/version.inc
    +++ b/version.inc
    @@ -1 +1 @@
    -2013-09-15.437
    +2013-09-16.438
    
    From c6d6c01fb619b37fa47f19966421a6636155180c Mon Sep 17 00:00:00 2001
    From: friendica 
    Date: Mon, 16 Sep 2013 22:40:53 -0700
    Subject: [PATCH 174/330] use prepare_body in api calls to properly render
     content, add 'mode' to conversation templates so that themes can use the
     module context to suppress or show comments as desired
    
    ---
     include/ItemObject.php   |  4 +++-
     include/api.php          | 14 +++++++-------
     include/conversation.php |  1 +
     mod/photos.php           |  2 ++
     4 files changed, 13 insertions(+), 8 deletions(-)
    
    diff --git a/include/ItemObject.php b/include/ItemObject.php
    index 22b191e79..0256160e9 100644
    --- a/include/ItemObject.php
    +++ b/include/ItemObject.php
    @@ -88,6 +88,8 @@ class Item extends BaseObject {
     			: false);
     		$shareable = ((($conv->get_profile_owner() == local_user()) && ($item['item_private'] != 1)) ? true : false);
     
    +		$mode = $conv->get_mode();
    +
     		if(local_user() && $observer['xchan_hash'] === $item['author_xchan'])
     			$edpost = array($a->get_baseurl($ssl_state)."/editpost/".$item['id'], t("Edit"));
     		else
    @@ -183,7 +185,7 @@ class Item extends BaseObject {
     
     		$tmp_item = array(
     			'template' => $this->get_template(),
    -			
    +			'mode' => $mode,			
     			'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
     			'tags' => array(),
     			'body' => $body,
    diff --git a/include/api.php b/include/api.php
    index d76d82626..0ca8393c1 100644
    --- a/include/api.php
    +++ b/include/api.php
    @@ -732,7 +732,7 @@ require_once('include/photos.php');
     				}
     			}  
     			$status_info = array(
    -				'text' => html2plain(bbcode($lastwall['body']), 0),
    +				'text' => html2plain(prepare_text($lastwall['body'],$lastwall['mimetype']), 0),
     				'truncated' => false,
     				'created_at' => api_date($lastwall['created']),
     				'in_reply_to_status_id' => $in_reply_to_status_id,
    @@ -804,7 +804,7 @@ require_once('include/photos.php');
     				}
     			}  
     			$user_info['status'] = array(
    -				'text' => html2plain(bbcode($lastwall['body']), 0),
    +				'text' => html2plain(prepare_text($lastwall['body'],$lastwall['mimetype']), 0),
     				'truncated' => false,
     				'created_at' => api_date($lastwall['created']),
     				'in_reply_to_status_id' => $in_reply_to_status_id,
    @@ -1374,14 +1374,14 @@ require_once('include/photos.php');
     		if (x($_GET, 'getText')) {
     			$ret['title'] = $item['title'] ;
     			if ($_GET["getText"] == "html") {
    -				$ret['text'] = bbcode($item['body']);
    +				$ret['text'] = prepare_text($item['body'],$item['mimetype']);
     			}
     			elseif ($_GET["getText"] == "plain") {
    -				$ret['text'] = html2plain(bbcode($item['body']), 0);
    +				$ret['text'] = html2plain(prepare_text($item['body'],$item['mimetype']), 0);
     			}
     		}
     		else {
    -			$ret['text'] = $item['title']."\n".html2plain(bbcode($item['body']), 0);
    +			$ret['text'] = $item['title']."\n".html2plain(prepare_text($item['body'],$item['mimetype']), 0);
     		}
     		if (isset($_GET["getUserObjects"]) && $_GET["getUserObjects"] == "false") {
     			unset($ret['sender']);
    @@ -1427,7 +1427,7 @@ require_once('include/photos.php');
     			}
     
     			// Workaround for ostatus messages where the title is identically to the body
    -			$statusbody = trim(html2plain(bbcode($item['body']), 0));
    +			$statusbody = trim(html2plain(prepare_text($item['body'],$item['mimetype']), 0));
     			$statustitle = trim($item['title']);
     
     			if (($statustitle != '') and (strpos($statusbody, $statustitle) !== false))
    @@ -1448,7 +1448,7 @@ require_once('include/photos.php');
     				'geo'                       => '',
     				'favorited'                 => (($item['item_flags'] & ITEM_STARRED) ? true : false),
     				'user'                      =>  $status_user ,
    -				'statusnet_html'		    => trim(bbcode($item['body'])),
    +				'statusnet_html'		    => trim(prepare_text($item['body']),$item['mimetype']),
     				'statusnet_conversation_id'	=> $item['parent'],
     			);
     
    diff --git a/include/conversation.php b/include/conversation.php
    index e7c7831c0..c3f29295e 100644
    --- a/include/conversation.php
    +++ b/include/conversation.php
    @@ -651,6 +651,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') {
     				$tmp_item = array(
     					'template' => $tpl,
     					'toplevel' => 'toplevel_item',
    +					'mode' => $mode,
     					'id' => (($preview) ? 'P0' : $item['item_id']),
     					'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, $profile_url),
     					'profile_url' => $profile_link,
    diff --git a/mod/photos.php b/mod/photos.php
    index d60029688..b2c5cd985 100644
    --- a/mod/photos.php
    +++ b/mod/photos.php
    @@ -1064,6 +1064,7 @@ function photos_content(&$a) {
     				if($can_post || $a->data['perms']['post_comments']) {
     					$comments .= replace_macros($cmnt_tpl,array(
     						'$return_path' => '', 
    +						'$mode' => 'photos',
     						'$jsreload' => $return_url,
     						'$type' => 'wall-comment',
     						'$id' => $link_item['id'],
    @@ -1131,6 +1132,7 @@ function photos_content(&$a) {
     
     					$comments .= replace_macros($template,array(
     						'$id' => $item['item_id'],
    +						'$mode' => 'photos',
     						'$profile_url' => $profile_link,
     						'$name' => $name_e,
     						'$thumb' => $profile_avatar,
    
    From a78b76d3938b6747da97bc729521c58f9491105f Mon Sep 17 00:00:00 2001
    From: friendica 
    Date: Mon, 16 Sep 2013 22:51:39 -0700
    Subject: [PATCH 175/330] more work on viewing obscured api posts
    
    ---
     include/api.php  |  8 +++++---
     include/text.php | 19 ++++++++++++-------
     2 files changed, 17 insertions(+), 10 deletions(-)
    
    diff --git a/include/api.php b/include/api.php
    index 0ca8393c1..2760914e9 100644
    --- a/include/api.php
    +++ b/include/api.php
    @@ -730,7 +730,8 @@ require_once('include/photos.php');
     					$in_reply_to_user_id = $user_info['id'];
     					$in_reply_to_screen_name = $user_info['screen_name'];
     				}
    -			}  
    +			}
    +			unobscure($lastwall);  
     			$status_info = array(
     				'text' => html2plain(prepare_text($lastwall['body'],$lastwall['mimetype']), 0),
     				'truncated' => false,
    @@ -803,6 +804,7 @@ require_once('include/photos.php');
     					$in_reply_to_screen_name = $user_info['screen_name'];
     				}
     			}  
    +			unobscure($lastwall);
     			$user_info['status'] = array(
     				'text' => html2plain(prepare_text($lastwall['body'],$lastwall['mimetype']), 0),
     				'truncated' => false,
    @@ -1369,7 +1371,7 @@ require_once('include/photos.php');
     				'recipient_screen_name' => $recipient['screen_name'],
     				'recipient'             => $recipient,
     		);
    -
    +		unobscure($item);
     		//don't send title to regular StatusNET requests to avoid confusing these apps
     		if (x($_GET, 'getText')) {
     			$ret['title'] = $item['title'] ;
    @@ -1425,7 +1427,7 @@ require_once('include/photos.php');
     				$in_reply_to_user_id = 0;
     				$in_reply_to_status_id = 0;
     			}
    -
    +			unobscure($item);
     			// Workaround for ostatus messages where the title is identically to the body
     			$statusbody = trim(html2plain(prepare_text($item['body'],$item['mimetype']), 0));
     			$statustitle = trim($item['title']);
    diff --git a/include/text.php b/include/text.php
    index ac82e4429..e1f0a4e00 100755
    --- a/include/text.php
    +++ b/include/text.php
    @@ -1004,6 +1004,17 @@ function link_compare($a,$b) {
     // If attach is true, also add icons for item attachments
     
     
    +function unobscure(&$item) {
    +	if(array_key_exists('item_flags',$item) && ($item['item_flags'] & ITEM_OBSCURED)) {
    +		$key = get_config('system','prvkey');
    +		if($item['title'])
    +			$item['title'] = aes_unencapsulate(json_decode_plus($item['title']),$key);
    +		if($item['body'])
    +			$item['body'] = aes_unencapsulate(json_decode_plus($item['body']),$key);
    +	}
    +
    +}
    +
     
     function prepare_body(&$item,$attach = false) {
     
    @@ -1013,13 +1024,7 @@ function prepare_body(&$item,$attach = false) {
     
     	call_hooks('prepare_body_init', $item); 
     
    -	if(array_key_exists('item_flags',$item) && ($item['item_flags'] & ITEM_OBSCURED)) {
    -		$key = get_config('system','prvkey');
    -		if($item['title'])
    -			$item['title'] = aes_unencapsulate(json_decode_plus($item['title']),$key);
    -		if($item['body'])
    -			$item['body'] = aes_unencapsulate(json_decode_plus($item['body']),$key);
    -	}
    +	unobscure($item);
     
     	$s = prepare_text($item['body'],$item['mimetype']);
     
    
    From 4335ef68d6e94d7e2ea8d8865c2c5bb0a60b483f Mon Sep 17 00:00:00 2001
    From: friendica 
    Date: Mon, 16 Sep 2013 22:56:36 -0700
    Subject: [PATCH 176/330] assuming permissions are correct, unobscure photo
     comments. Should probably make sure permissions are correct and figure out
     why some photo comments on public photos are getting stored with privacy.
     This probably requires that whenever we change photo permissions for linked
     photos/items we change the item permissions to match. They might be out of
     sync.
    
    ---
     mod/photos.php | 3 ++-
     1 file changed, 2 insertions(+), 1 deletion(-)
    
    diff --git a/mod/photos.php b/mod/photos.php
    index b2c5cd985..217f9785f 100644
    --- a/mod/photos.php
    +++ b/mod/photos.php
    @@ -1128,7 +1128,8 @@ function photos_content(&$a) {
     
     					$name_e = $profile_name;
     					$title_e = $item['title'];
    -					$body_e = bbcode($item['body']);
    +					unobscure($item);
    +					$body_e = prepare_text($item['body'],$item['mimetype']);
     
     					$comments .= replace_macros($template,array(
     						'$id' => $item['item_id'],
    
    From ff56e95c6e907f05ecd18f40a372aa98b1b24926 Mon Sep 17 00:00:00 2001
    From: dsp1986 
    Date: Tue, 17 Sep 2013 09:41:48 +0200
    Subject: [PATCH 177/330] fix include paths
    
    ---
     index.php     | 4 ++--
     mod/setup.php | 2 +-
     2 files changed, 3 insertions(+), 3 deletions(-)
    
    diff --git a/index.php b/index.php
    index d93c73233..fe09e88fc 100755
    --- a/index.php
    +++ b/index.php
    @@ -50,7 +50,7 @@ if(! $install) {
     	load_config('system');
     	load_config('feature');
     
    -	require_once("session.php");
    +	require_once("include/session.php");
     	load_hooks();
     	call_hooks('init_1');
     	
    @@ -102,7 +102,7 @@ if((x($_GET,'zid')) && (! $install)) {
     }
     
     if((x($_SESSION,'authenticated')) || (x($_POST,'auth-params')) || ($a->module === 'login'))
    -	require("auth.php");
    +	require("include/auth.php");
     
     
     if(! x($_SESSION,'sysmsg'))
    diff --git a/mod/setup.php b/mod/setup.php
    index 3c0a133b7..97bdba34e 100755
    --- a/mod/setup.php
    +++ b/mod/setup.php
    @@ -286,7 +286,7 @@ function setup_content(&$a) {
     			return $o;
     		}; break;
     		case 3: { // Site settings
    -			require_once('datetime.php');
    +			require_once('include/datetime.php');
     			$dbhost = ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost');
     			$dbport = intval(notags(trim($_POST['dbuser'])));
     			$dbuser = notags(trim($_POST['dbuser']));
    
    From d330df05f221e96b92d2bd17c7336152b7d8c128 Mon Sep 17 00:00:00 2001
    From: Michael Meer 
    Date: Tue, 17 Sep 2013 10:11:22 +0200
    Subject: [PATCH 178/330] extend admin page for hubloc / server key management
    
    ---
     mod/admin.php            | 16 ++++++++++++++++
     mod/post.php             |  1 +
     view/tpl/admin_aside.tpl |  1 +
     3 files changed, 18 insertions(+)
    
    diff --git a/mod/admin.php b/mod/admin.php
    index fb1a9ab53..455897f6f 100644
    --- a/mod/admin.php
    +++ b/mod/admin.php
    @@ -54,6 +54,9 @@ function admin_post(&$a){
     			case 'logs':
     				admin_page_logs_post($a);
     				break;
    +			case 'hubloc':
    +				admin_page_hubloc_post($a);
    +				break;
     			case 'dbsync':
     				admin_page_dbsync_post($a);
     				break;
    @@ -84,6 +87,7 @@ function admin_content(&$a) {
     		'users'	 =>	Array($a->get_baseurl(true)."/admin/users/", t("Users") , "users"),
     		'plugins'=>	Array($a->get_baseurl(true)."/admin/plugins/", t("Plugins") , "plugins"),
     		'themes' =>	Array($a->get_baseurl(true)."/admin/themes/", t("Themes") , "themes"),
    +		'hubloc' =>	Array($a->get_baseurl(true)."/admin/hubloc/", t("Server") , "server"),
     		'dbsync' => Array($a->get_baseurl(true)."/admin/dbsync/", t('DB updates'), "dbsync")
     	);
     	
    @@ -132,6 +136,9 @@ function admin_content(&$a) {
     			case 'themes':
     				$o = admin_page_themes($a);
     				break;
    +			case 'hubloc':
    +				$o = admin_page_hubloc($a);
    +				break;
     			case 'logs':
     				$o = admin_page_logs($a);
     				break;
    @@ -443,6 +450,15 @@ function admin_page_site(&$a) {
     	));
     
     }
    +function admin_page_hubloc_post(&$a){
    +	 check_form_security_token_redirectOnErr('/admin/hubloc', 'hubloc');
    +	return;
    +}
    +
    +function admin_page_hubloc(&$a) {
    +	$o = '';
    +	return $o;
    +}
     
     
     function admin_page_dbsync(&$a) {
    diff --git a/mod/post.php b/mod/post.php
    index 378192cbf..825131495 100644
    --- a/mod/post.php
    +++ b/mod/post.php
    @@ -20,6 +20,7 @@ function post_init(&$a) {
     
     		if(array_key_exists('auth',$_REQUEST)) {
     			logger('mod_zot: auth request received.');
    +			logger('mod_post: $_REQUEST contains: ' . print_r($_REQUEST,true) . ' for ' . $webbie);
     			$address = $_REQUEST['auth'];
     			$dest    = $_REQUEST['dest'];
     			$sec     = $_REQUEST['sec'];
    diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl
    index acf58668d..fdf070aa2 100755
    --- a/view/tpl/admin_aside.tpl
    +++ b/view/tpl/admin_aside.tpl
    @@ -16,6 +16,7 @@
     	
     	
     	
    +	
     	
     
     
    
    From 4f55d154d41f45c9c04547b80fbff41eb3013b06 Mon Sep 17 00:00:00 2001
    From: Michael Meer 
    Date: Tue, 17 Sep 2013 10:14:52 +0200
    Subject: [PATCH 179/330] removed logger statement
    
    ---
     mod/post.php | 1 -
     1 file changed, 1 deletion(-)
    
    diff --git a/mod/post.php b/mod/post.php
    index 825131495..378192cbf 100644
    --- a/mod/post.php
    +++ b/mod/post.php
    @@ -20,7 +20,6 @@ function post_init(&$a) {
     
     		if(array_key_exists('auth',$_REQUEST)) {
     			logger('mod_zot: auth request received.');
    -			logger('mod_post: $_REQUEST contains: ' . print_r($_REQUEST,true) . ' for ' . $webbie);
     			$address = $_REQUEST['auth'];
     			$dest    = $_REQUEST['dest'];
     			$sec     = $_REQUEST['sec'];
    
    From 3354abfd428d1baef3d69886b75588163292aeae Mon Sep 17 00:00:00 2001
    From: friendica 
    Date: Tue, 17 Sep 2013 01:31:46 -0700
    Subject: [PATCH 180/330] add -C cfgfile option to shred to allow multiple
     configurations. I just added the option for multiple configs, I didn't make
     it work as it requires quite a bit of change to the shred program flow; which
     tries to load the default config before doing anything at all.
    
    ---
     doc/Developers.md | 4 ++++
     util/shred/shred  | 5 ++++-
     version.inc       | 2 +-
     3 files changed, 9 insertions(+), 2 deletions(-)
    
    diff --git a/doc/Developers.md b/doc/Developers.md
    index 074dda7af..e4905ccd1 100644
    --- a/doc/Developers.md
    +++ b/doc/Developers.md
    @@ -16,6 +16,10 @@ to create and use your own tracking fork on github
     Then go to your github page and create a "Pull request" when you are ready
     to notify us to merge your work.
     
    +**Translations**
    +
    +Our translations are managed through Transifex. If you wish to help out translating the Red Matrix to another language, sign up on transifex.com, visit [https://www.transifex.com/projects/p/red-matrix/](https://www.transifex.com/projects/p/red-matrix/) and request to join one of the existing language teams or create a new one. Notify one of the core developers when you have a translation update which requires merging, or ask about merging it yourself if you're comfortable with git and PHP. We have a string file called 'messages.po' which is gettext compliant and a handful of email templates, and from there we automatically generate the application's language files.   
    +
     **Important**
     
     Please pull in any changes from the project repository and merge them with your work **before** issuing a pull request. We reserve the right to reject any patch which results in a large number of merge conflicts. This is especially true in the case of language translations - where we may not be able to understand the subtle differences between conflicting versions.
    diff --git a/util/shred/shred b/util/shred/shred
    index 113898ff9..2e463ac6d 100755
    --- a/util/shred/shred
    +++ b/util/shred/shred
    @@ -43,6 +43,8 @@ OPTIONS:
       -h      Show this message
     
       -c      Command
    +
    +  -C      Config-Filename
         
     	Valid Commands:
           statuses_update
    @@ -141,7 +143,6 @@ load_config () {
     	}
     
     main () {
    -	load_config
     	
     	fcli_command=
     	fcli_status=
    @@ -152,6 +153,7 @@ main () {
     	do
     		case $name in
     		c)	fcli_command="$OPTARG";;
    +		C)  FCLI_RC="$OPTARG";;
     		s)	fcli_status="$OPTARG";;
     		r)	fcli_in_reply_to_status_id="$OPTARG";;
     		f)	fcli_file="$OPTARG";;
    @@ -160,6 +162,7 @@ main () {
     			exit 2;;
     		esac
     	done
    +	load_config
     
     	if [[ "$fcli_help_flag" == "1" ]]; then case $fcli_command in
     	statuses_update)
    diff --git a/version.inc b/version.inc
    index 186ac999c..44ebbfe27 100644
    --- a/version.inc
    +++ b/version.inc
    @@ -1 +1 @@
    -2013-09-16.438
    +2013-09-17.439
    
    From 56de8aa05b0475b982946d9f3e36818c43d19803 Mon Sep 17 00:00:00 2001
    From: friendica 
    Date: Tue, 17 Sep 2013 02:26:34 -0700
    Subject: [PATCH 181/330] SEO: add keywords to appropriate channel pages
    
    ---
     boot.php | 7 +++++++
     1 file changed, 7 insertions(+)
    
    diff --git a/boot.php b/boot.php
    index b30d9ae49..a0c1abf90 100755
    --- a/boot.php
    +++ b/boot.php
    @@ -1614,6 +1614,13 @@ function profile_load(&$a, $nickname, $profile = '') {
     			$r[0]['keywords'] = $x[0]['keywords'];
     	}
     
    +	if($r[0]['keywords']) {
    +		$keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$R[0]['keywords']);
    +		if(strlen($keywords))
    +			$a->page['htmlhead'] .= '' . "\r\n" ;
    +
    +	}
    +
     	$a->profile = $r[0];
     	$a->profile_uid = $r[0]['profile_uid'];
     
    
    From 6a9e86e540085ea804b3a49529cf7b57c8f3669e Mon Sep 17 00:00:00 2001
    From: friendica 
    Date: Tue, 17 Sep 2013 02:30:28 -0700
    Subject: [PATCH 182/330] bumped the capslock
    
    ---
     boot.php | 2 +-
     1 file changed, 1 insertion(+), 1 deletion(-)
    
    diff --git a/boot.php b/boot.php
    index a0c1abf90..b9013711d 100755
    --- a/boot.php
    +++ b/boot.php
    @@ -1615,7 +1615,7 @@ function profile_load(&$a, $nickname, $profile = '') {
     	}
     
     	if($r[0]['keywords']) {
    -		$keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$R[0]['keywords']);
    +		$keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$r[0]['keywords']);
     		if(strlen($keywords))
     			$a->page['htmlhead'] .= '' . "\r\n" ;
     
    
    From 9d718ac5290506e08222c62e2fd36026256fba41 Mon Sep 17 00:00:00 2001
    From: friendica 
    Date: Tue, 17 Sep 2013 17:38:43 -0700
    Subject: [PATCH 183/330] sync photo permissions with the attached item
     whenever they change.
    
    ---
     mod/item.php   |  5 ++++-
     mod/photos.php | 17 ++++++++++++++++-
     2 files changed, 20 insertions(+), 2 deletions(-)
    
    diff --git a/mod/item.php b/mod/item.php
    index 367a0c4be..895784ff9 100644
    --- a/mod/item.php
    +++ b/mod/item.php
    @@ -1087,12 +1087,15 @@ function fix_attached_photo_permissions($uid,$xchan_hash,$body,
     						intval($uid)
     					);
     					if($r) {
    -						$r = q("UPDATE item SET allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s'
    +						$private = (($str_contact_allow || $str_group_allow || $str_contact_deny || $str_group_deny) ? true : false);
    +
    +						$r = q("UPDATE item SET allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s', item_private = %d
     							WHERE id = %d AND uid = %d limit 1",
     							dbesc($str_contact_allow),
     							dbesc($str_group_allow),
     							dbesc($str_contact_deny),
     							dbesc($str_group_deny),
    +							intval($private),
     							intval($r[0]['id']),
     							intval($uid)
     						);
    diff --git a/mod/photos.php b/mod/photos.php
    index 217f9785f..8e63a42ea 100644
    --- a/mod/photos.php
    +++ b/mod/photos.php
    @@ -303,6 +303,9 @@ function photos_post(&$a) {
     			);
     		}
     
    +		$item_private = (($str_contact_allow || $str_group_allow || $str_contact_deny || $str_group_deny) ? true : false);
    +
    +
     		/* Don't make the item visible if the only change was the album name */
     
     		$visibility = 0;
    @@ -320,11 +323,23 @@ function photos_post(&$a) {
     				intval($page_owner_uid)
     			);
     		}
    -		if(count($r)) {
    +		if($r) {
     			$old_tag    = $r[0]['tag'];
     			$old_inform = $r[0]['inform'];
     		}
     
    +		// make sure the linked item has the same permissions as the photo regardless of any other changes
    +		$x = q("update item set allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s', item_private = %d
    +			where id = %d limit 1",
    +				dbesc($str_contact_allow),
    +				dbesc($str_group_allow),
    +				dbesc($str_contact_deny),
    +				dbesc($str_group_deny),
    +				intval($item_private),
    +				intval($item_id)
    +		);
    +
    +
     		if(strlen($rawtags)) {
     
     			$str_tags = '';
    
    From 4fa68c7f3de68dda519f12719c552df7b62bf17f Mon Sep 17 00:00:00 2001
    From: friendica 
    Date: Tue, 17 Sep 2013 17:53:44 -0700
    Subject: [PATCH 184/330] missing verb on items linked to photos
    
    ---
     include/photos.php | 2 +-
     1 file changed, 1 insertion(+), 1 deletion(-)
    
    diff --git a/include/photos.php b/include/photos.php
    index 517212e57..ea4b494e0 100644
    --- a/include/photos.php
    +++ b/include/photos.php
    @@ -216,7 +216,7 @@ function photo_upload($channel, $observer, $args) {
     	$arr['allow_gid']     = $str_group_allow;
     	$arr['deny_cid']      = $str_contact_deny;
     	$arr['deny_gid']      = $str_group_deny;
    -
    +	$arr['verb']          = ACTIVITY_POST;
     
     	$arr['body']          = '[zrl=' . z_root() . '/photos/' . $channel['channel_address'] . '/image/' . $photo_hash . ']' 
     				. '[zmg]' . z_root() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/zmg]' 
    
    From 8542127274f7a856a9733254889c4e1a24903324 Mon Sep 17 00:00:00 2001
    From: Thomas Willingham 
    Date: Wed, 18 Sep 2013 02:45:49 +0100
    Subject: [PATCH 185/330] Filestorage perms (no ACL), fix nav for browsers that
     can't handle PCSS, put content wrapper back now JS is fixed for features
     page.
    
    ---
     mod/filestorage.php            | 20 ++++++++++++++++++++
     view/css/default.css           |  1 +
     view/tpl/settings_features.tpl |  2 ++
     3 files changed, 23 insertions(+)
    
    diff --git a/mod/filestorage.php b/mod/filestorage.php
    index 41055f98e..12b1db1d9 100644
    --- a/mod/filestorage.php
    +++ b/mod/filestorage.php
    @@ -17,12 +17,32 @@ function filestorage_content(&$a) {
                     $owner = intval($r[0]['channel_id']);
     	}
     
    +        $observer = $a->get_observer();
    +        $ob_hash = (($observer) ? $observer['xchan_hash'] : '');
    +
    +        $perms = get_all_perms($owner,$ob_hash);
    +
    +        if(! $perms['view_storage']) {
    +                notice( t('Permission denied.') . EOL);
    +                return;
    +        }
    +
    +//	Since we have ACL'd files in the wild, but don't have ACL here yet, we 
    +//	need to return for anoyne other than the owner, despite the perms check for now.
    +
     	$is_owner = (((local_user()) && ($owner  == local_user())) ? true : false);
     	if (! $is_owner) {
     		 info( t('Permission Denied.') . EOL );
     	return;
     	}
    +
    +// 	TODO This will also need to check for files on disk and delete them from there as well as the DB.
     	if ((argc() > 3 && argv(3) === 'delete') ? true : false);{
    +	        if(! $perms['view_storage']) {
    +        	        notice( t('Permission denied.  VS.') . EOL);
    +                return;
    +		}
    +
     		 $file = argv(2);
     		 $r = q("delete from attach where id = '%s' and uid = '%s' limit 1",
     			dbesc($file),
    diff --git a/view/css/default.css b/view/css/default.css
    index d39bcd394..9abb69588 100644
    --- a/view/css/default.css
    +++ b/view/css/default.css
    @@ -5,6 +5,7 @@ nav {
     	position: fixed;
     	width: 100%;
     	z-index: 100;
    +	background-color: #ff0000;
     }
     
     aside {
    diff --git a/view/tpl/settings_features.tpl b/view/tpl/settings_features.tpl
    index 02e4f6159..a03817f82 100755
    --- a/view/tpl/settings_features.tpl
    +++ b/view/tpl/settings_features.tpl
    @@ -1,3 +1,4 @@
    +

    {{$title}}

    @@ -17,3 +18,4 @@
    +
    From 7f4b865c2bbdf481fa94639518026d70a8bf9492 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Wed, 18 Sep 2013 02:49:14 +0100 Subject: [PATCH 186/330] Didn't git add again after fixing typo... --- mod/filestorage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/filestorage.php b/mod/filestorage.php index 12b1db1d9..5e1e61f42 100644 --- a/mod/filestorage.php +++ b/mod/filestorage.php @@ -38,7 +38,7 @@ function filestorage_content(&$a) { // TODO This will also need to check for files on disk and delete them from there as well as the DB. if ((argc() > 3 && argv(3) === 'delete') ? true : false);{ - if(! $perms['view_storage']) { + if(! $perms['write_storage']) { notice( t('Permission denied. VS.') . EOL); return; } From ff2ada207a7c90f095d1fad1513440eb08d3840a Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 17 Sep 2013 20:50:09 -0700 Subject: [PATCH 187/330] Pieces we'll need to tie together chanman and account/channel deletion and directory sync. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. OK? Understood? --- boot.php | 1 + include/Contact.php | 59 +++++++++++++++++++++++++++++++++----------- include/notifier.php | 35 ++++++++++++++++++++++---- include/zot.php | 10 ++++++++ mod/chanman.php | 2 ++ mod/zfinger.php | 3 ++- 6 files changed, 89 insertions(+), 21 deletions(-) diff --git a/boot.php b/boot.php index b9013711d..6c4ad0ca0 100755 --- a/boot.php +++ b/boot.php @@ -341,6 +341,7 @@ define ( 'NOTIFY_SYSTEM', 0x8000 ); define ( 'HUBLOC_FLAGS_PRIMARY', 0x0001); define ( 'HUBLOC_FLAGS_UNVERIFIED', 0x0002); +define ( 'HUBLOC_FLAGS_DELETED', 0x1000); define ( 'XCHAN_FLAGS_HIDDEN', 0x0001); diff --git a/include/Contact.php b/include/Contact.php index 46d356f3f..b9e879bcf 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -147,7 +147,9 @@ function user_remove($uid) { } -function account_remove($account_id) { +function account_remove($account_id,$local = true) { + + logger('account_remove: ' . $account_id); if(! intval($account_id)) { logger('account_remove: no account.'); @@ -179,7 +181,7 @@ function account_remove($account_id) { ); if($x) { foreach($x as $xx) { - channel_remove($xx['channel_id']); + channel_remove($xx['channel_id'],$local); } } @@ -191,7 +193,7 @@ function account_remove($account_id) { } -function channel_remove($channel_id) { +function channel_remove($channel_id, $local = true) { if(! $channel_id) return; @@ -199,13 +201,38 @@ function channel_remove($channel_id) { logger('Removing channel: ' . $channel_id); $r = q("select * from channel where channel_id = %d limit 1", intval($channel_id)); + if(! $r) { + logger('channel_remove: channel not found: ' . $channel_id); + return; + } + + $channel = $r[0]; call_hooks('channel_remove',$r[0]); + if(! $local) { + // FIXME notify the directory // FIXME notify all contacts + $r = q("update channel set channel_pageflags = (channel_pageflags | %d), channel_r_stream = 0, channel_r_profile = 0, + channel_r_photos = 0, channel_r_abook = 0, channel_w_stream = 0, channel_w_wall = 0, channel_w_tagwall = 0, + channel_w_comment = 0, channel_w_mail = 0, channel_w_photos = 0, channel_w_chat = 0, channel_a_delegate = 0, + channel_r_storage = 0, channel_w_storage = 0, channel_r_pages = 0, channel_w_pages = 0 where channel_id = %d limit 1", + intval(PAGE_REMOVED), + intval($channel_id) + ); + + $r = q("update hubloc set hubloc_flags = hubloc_flags | %d where hubloc_hash = '%s'", + intval(HUBLOC_FLAGS_DELETED), + dbesc($channel['channel_hash']) + ); + + proc_run('php','include/notifier.php','purge_all',$channel_id); + + + } q("DELETE FROM `group` WHERE `uid` = %d", intval($channel_id)); q("DELETE FROM `group_member` WHERE `uid` = %d", intval($channel_id)); @@ -278,18 +305,20 @@ function remove_all_xchan_resources($xchan, $channel_id = 0) { ); - $r = q("delete from xchan where xchan_hash = '%s' limit 1", - dbesc($xchan) - ); - $r = q("delete from hubloc where hubloc_hash = '%s'", - dbesc($xchan) - ); - $r = q("delete from abook where abook_xchan = '%s'", - dbesc($xchan) - ); - $r = q("delete from xtag where xtag_hash = '%s'", - dbesc($xchan) - ); +// This could get sticky with directories + +// $r = q("delete from xchan where xchan_hash = '%s' limit 1", +// dbesc($xchan) +// ); +// $r = q("delete from hubloc where hubloc_hash = '%s'", +// dbesc($xchan) +// ); +// $r = q("delete from abook where abook_xchan = '%s'", +// dbesc($xchan) +// ); +// $r = q("delete from xtag where xtag_hash = '%s'", +// dbesc($xchan) +// ); } } diff --git a/include/notifier.php b/include/notifier.php index e1f150bf2..0c7ac5264 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -54,6 +54,7 @@ require_once('include/html2plain.php'); * ZOT * permission_update abook_id * refresh_all channel_id + * purge_all channel_id * expire channel_id * relay item_id (item was relayed to owner, we will deliver it as owner) * @@ -219,6 +220,26 @@ function notifier_run($argv, $argc){ $private = false; $packet_type = 'refresh'; } + elseif($cmd === 'purge_all') { + logger('notifier: purge_all: ' . $item_id); + $s = q("select * from channel where channel_id = %d limit 1", + intval($item_id) + ); + if($s) + $channel = $s[0]; + $uid = $item_id; + $recipients = array(); + $r = q("select abook_xchan from abook where abook_channel = %d", + intval($item_id) + ); + if($r) { + foreach($r as $rr) { + $recipients[] = $rr['abook_xchan']; + } + } + $private = false; + $packet_type = 'purge'; + } else { // Normal items @@ -388,7 +409,7 @@ function notifier_run($argv, $argc){ $sql_extra = (($private) ? "" : " or hubloc_url = '" . z_root() . "' "); - $r = q("select distinct hubloc_sitekey, hubloc_callback, hubloc_host from hubloc + $r = q("select distinct hubloc_sitekey, hubloc_flags, hubloc_callback, hubloc_host from hubloc where hubloc_hash in (" . implode(',',$recipients) . ") $sql_extra group by hubloc_sitekey"); if(! $r) { logger('notifier: no hubs'); @@ -397,8 +418,12 @@ function notifier_run($argv, $argc){ $hubs = $r; $hublist = array(); - foreach($hubs as $hub) - $hublist[] = $hub['hubloc_host']; + foreach($hubs as $hub) { + // don't try to deliver to deleted hublocs + if(! ($hub['hubloc_flags'] & HUBLOC_FLAGS_DELETED)) { + $hublist[] = $hub['hubloc_host']; + } + } logger('notifier: will notify/deliver to these hubs: ' . print_r($hublist,true), LOGGER_DEBUG); @@ -414,8 +439,8 @@ function notifier_run($argv, $argc){ foreach($hubs as $hub) { $hash = random_string(); - if($packet_type === 'refresh') { - $n = zot_build_packet($channel,'refresh'); + if($packet_type === 'refresh' || $packet_type === 'purge') { + $n = zot_build_packet($channel,$packet_type); q("insert into outq ( outq_hash, outq_account, outq_channel, outq_posturl, outq_async, outq_created, outq_updated, outq_notify, outq_msg ) values ( '%s', %d, %d, '%s', %d, '%s', '%s', '%s', '%s' )", dbesc($hash), intval($channel['channel_account']), diff --git a/include/zot.php b/include/zot.php index 0f42ddc7f..74ac6d015 100644 --- a/include/zot.php +++ b/include/zot.php @@ -610,6 +610,16 @@ function import_xchan($arr) { $what = 'primary_hub '; $changed = true; } + if((($r[0]['hubloc_flags'] & HUBLOC_FLAGS_DELETED) && (! $location['deleted'])) + || ((! ($r[0]['hubloc_flags'] & HUBLOC_FLAGS_DELETED)) && ($location['deleted']))) { + $r = q("update hubloc set hubloc_flags = (hubloc_flags ^ %d), hubloc_updated = '%s' where hubloc_id = %d limit 1", + intval(HUBLOC_FLAGS_DELETED), + dbesc(datetime_convert()), + intval($r[0]['hubloc_id']) + ); + $what = 'delete_hub '; + $changed = true; + } continue; } diff --git a/mod/chanman.php b/mod/chanman.php index 2657e7be9..7a89708d7 100644 --- a/mod/chanman.php +++ b/mod/chanman.php @@ -27,3 +27,5 @@ - Some of these actions should probably require email verification */ + + diff --git a/mod/zfinger.php b/mod/zfinger.php index 70e3bdca6..a06d9f4b5 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -179,7 +179,8 @@ function zfinger_init(&$a) { 'url' => $hub['hubloc_url'], 'url_sig' => $hub['hubloc_url_sig'], 'callback' => $hub['hubloc_callback'], - 'sitekey' => $hub['hubloc_sitekey'] + 'sitekey' => $hub['hubloc_sitekey'], + 'deleted' => (($hub['hubloc_flags'] & HUBLOC_FLAGS_DELETED) ? true : false) ); } } From d3aa31be4d84764e4d119343d8bc5eba5a84272b Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 17 Sep 2013 22:27:51 -0700 Subject: [PATCH 188/330] site sellpage links --- boot.php | 2 +- include/zot.php | 12 ++++++++---- install/database.sql | 4 +++- install/update.php | 10 +++++++++- mod/dirsearch.php | 2 +- mod/pubsites.php | 2 +- mod/zfinger.php | 1 + 7 files changed, 24 insertions(+), 9 deletions(-) diff --git a/boot.php b/boot.php index 6c4ad0ca0..81b977a9d 100755 --- a/boot.php +++ b/boot.php @@ -44,7 +44,7 @@ require_once('include/taxonomy.php'); define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1069 ); +define ( 'DB_UPDATE_VERSION', 1070 ); define ( 'EOL', '
    ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/include/zot.php b/include/zot.php index 74ac6d015..c416d18f9 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1567,24 +1567,27 @@ function import_site($arr,$pubkey) { $directory_url = htmlentities($arr['directory_url'],ENT_COMPAT,'UTF-8',false); $url = htmlentities($arr['url'],ENT_COMPAT,'UTF-8',false); + $sellpage = htmlentities($arr['sellpage'],ENT_COMPAT,'UTF-8',false); if($exists) { if(($siterecord['site_flags'] != $site_directory) || ($siterecord['site_access'] != $access_policy) || ($siterecord['site_directory'] != $directory_url) + || ($siterecord['site_sellpage'] != $sellpage) || ($siterecord['site_register'] != $register_policy)) { $update = true; // logger('import_site: input: ' . print_r($arr,true)); // logger('import_site: stored: ' . print_r($siterecord,true)); - $r = q("update site set site_flags = %d, site_access = %d, site_directory = '%s', site_register = %d, site_update = '%s' + $r = q("update site set site_flags = %d, site_access = %d, site_directory = '%s', site_register = %d, site_update = '%s', site_sellpage = '%s' where site_url = '%s' limit 1", intval($site_directory), intval($access_policy), dbesc($directory_url), intval($register_policy), dbesc(datetime_convert()), + dbesc($sellpage), dbesc($url) ); if(! $r) { @@ -1594,14 +1597,15 @@ function import_site($arr,$pubkey) { } else { $update = true; - $r = q("insert into site ( site_url, site_access, site_flags, site_update, site_directory, site_register ) - values ( '%s', %d, %d, '%s', '%s', %d )", + $r = q("insert into site ( site_url, site_access, site_flags, site_update, site_directory, site_register, site_sellpage ) + values ( '%s', %d, %d, '%s', '%s', %d, '%s' )", dbesc($url), intval($site_directory), intval($access_policy), dbesc(datetime_convert()), dbesc($directory_url), - intval($register_policy) + intval($register_policy), + dbesc($sellpage) ); if(! $r) { logger('import_site: record create failed. ' . print_r($arr,true)); diff --git a/install/database.sql b/install/database.sql index 41fb968c8..2e420fcbd 100644 --- a/install/database.sql +++ b/install/database.sql @@ -825,12 +825,14 @@ CREATE TABLE IF NOT EXISTS `site` ( `site_update` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `site_directory` char(255) NOT NULL DEFAULT '', `site_register` int(11) NOT NULL DEFAULT '0', + `site_sellpage` char(255) NOT NULL DEFAULT '', PRIMARY KEY (`site_url`), KEY `site_access` (`site_access`), KEY `site_flags` (`site_flags`), KEY `site_update` (`site_update`), KEY `site_directory` (`site_directory`), - KEY `site_register` (`site_register`) + KEY `site_register` (`site_register`), + KEY `site_sellpage` (`site_sellpage`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `spam` ( diff --git a/install/update.php b/install/update.php index 24aed374d..3c40ee0c5 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ $rr['site_url'], 'access' => $access, 'register' => $register); + $ret['sites'][] = array('url' => $rr['site_url'], 'access' => $access, 'register' => $register, 'sellpage' => $rr['site_sellpage']); } } return $ret; diff --git a/mod/pubsites.php b/mod/pubsites.php index d226f5d9f..b9f7510fc 100644 --- a/mod/pubsites.php +++ b/mod/pubsites.php @@ -27,7 +27,7 @@ function pubsites_content(&$a) { if($j) { $o .= ''; foreach($j['sites'] as $jj) { - $o .= ''; + $o .= ''; } $o .= '
    ' . t('Site URL') . '' . t('Access Type') . '' . t('Registration Policy') . '
    ' . '' . $jj['url'] . '' . '' . $jj['access'] . '' . $jj['register'] . '
    ' . '' . $jj['url'] . '' . '' . $jj['access'] . '' . $jj['register'] . '
    '; diff --git a/mod/zfinger.php b/mod/zfinger.php index a06d9f4b5..675b31b1e 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -249,6 +249,7 @@ function zfinger_init(&$a) { $ret['site']['plugins'] = $visible_plugins; $ret['site']['sitehash'] = get_config('system','location_hash'); $ret['site']['sitename'] = get_config('system','sitename'); + $ret['site']['sellpage'] = get_config('system','sellpage'); } json_return_and_die($ret); From f7acc94bfedae6f23e0bc883541ca23132e95a06 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 17 Sep 2013 22:52:46 -0700 Subject: [PATCH 189/330] provide the back-end for a directory tag cloud --- include/taxonomy.php | 60 ++++++++++++++++++++++++++++++++++++++++++++ mod/dirsearch.php | 10 +++++++- 2 files changed, 69 insertions(+), 1 deletion(-) diff --git a/include/taxonomy.php b/include/taxonomy.php index b6803743a..b8180f7c8 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -99,6 +99,7 @@ function format_term_for_display($term) { function tagadelic($uid, $count = 0, $authors = '', $flags = 0, $type = TERM_HASHTAG) { $sql_options = ''; + $count = intval($count); if($flags) $sql_options .= " and ((item_flags & " . intval($flags) . ") = " . intval($flags) . ") "; @@ -157,6 +158,47 @@ function tags_sort($a,$b) { } +function dir_tagadelic($count = 0) { + + $sql_options = ''; + $count = intval($count); + + // Fetch tags + $r = q("select xtag_term, count(xtag_term) as total from xtag + group by term order by total desc %s", + ((intval($count)) ? "limit $count" : '') + ); + + if(! $r) + return array(); + + // Find minimum and maximum log-count. + $tags = array(); + $min = 1e9; + $max = -1e9; + + $x = 0; + foreach($r as $rr) { + $tags[$x][0] = $rr['xtag_term']; + $tags[$x][1] = log($rr['total']); + $tags[$x][2] = 0; + $min = min($min,$tags[$x][1]); + $max = max($max,$tags[$x][1]); + $x ++; + } + + usort($tags,'tags_sort'); + + $range = max(.01, $max - $min) * 1.0001; + + for($x = 0; $x < count($tags); $x ++) { + $tags[$x][2] = 1 + floor(5 * ($tags[$x][1] - $min) / $range); + } + + return $tags; +} + + function tagblock($link,$uid,$count = 0,$authors = '',$flags = 0,$type = TERM_HASHTAG) { $o = ''; $tab = 0; @@ -172,6 +214,24 @@ function tagblock($link,$uid,$count = 0,$authors = '',$flags = 0,$type = TERM_HA return $o; } +function dir_tagblock($link,$r) { + $o = ''; + $tab = 0; + + if($r) { + $o = '

    ' . t('Keywords') . '

    '; + foreach($r as $rr) { + $o .= ''.$rr['term'].' ' . "\r\n"; + } + $o .= '
    '; + } + return $o; +} + + + + + /** * verbs: [0] = first person singular, e.g. "I want", [1] = 3rd person singular, e.g. "Bill wants" diff --git a/mod/dirsearch.php b/mod/dirsearch.php index a285d9b8c..0a4d0ed2b 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -175,7 +175,15 @@ function dirsearch_content(&$a) { } $ret['results'] = $entries; - + if(! $sync) { + $k = dir_tagadelic(24); + if($k) { + $ret['keywords'] = array(); + foreach($k as $kv) { + $ret['keywords'][] = array('term' => $kv[0],'weight' => $kv[1]); + } + } + } } json_return_and_die($ret); From b0a4f1b30ab9bf5de2182b475ab5639f63a8e53f Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 17 Sep 2013 22:56:09 -0700 Subject: [PATCH 190/330] fix sql for directory tagcloud --- include/taxonomy.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/taxonomy.php b/include/taxonomy.php index b8180f7c8..30eb08f65 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -165,7 +165,7 @@ function dir_tagadelic($count = 0) { // Fetch tags $r = q("select xtag_term, count(xtag_term) as total from xtag - group by term order by total desc %s", + group by xtag_term order by total desc %s", ((intval($count)) ? "limit $count" : '') ); From 98e87b2149cec4179bf8d6677a600e8f7564402e Mon Sep 17 00:00:00 2001 From: Olivier Migeot Date: Wed, 18 Sep 2013 12:11:46 +0200 Subject: [PATCH 191/330] Changed CSS class "selected" to "active" in navbar, according to https://abcentric.net/display/f17b319c6d4b616a0d0a639e177969c6ae084248f1ee2bec9d8147c9291bf495@abcentric.net --- include/nav.php | 2 +- view/theme/redbasic/css/style.css | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/nav.php b/include/nav.php index dd11f10d5..812c90537 100644 --- a/include/nav.php +++ b/include/nav.php @@ -235,5 +235,5 @@ function nav_set_selected($item){ 'manage' => null, 'register' => null, ); - $a->nav_sel[$item] = 'selected'; + $a->nav_sel[$item] = 'active'; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index c1e5b76d1..d57fac71b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -204,7 +204,7 @@ nav .nav-link { background-color: transparent !important; } -.nav-commlink.selected { +.nav-commlink.active { background-color: #ffffff; border-bottom: 1px solid #ffffff; color: #000000 !important; @@ -350,7 +350,7 @@ footer { margin-bottom: 10px; } -.group-selected, .nets-selected, .fileas-selected, .categories-selected, .settings-widget .selected { +.group-selected, .nets-selected, .fileas-selected, .categories-selected, .settings-widget .active { color: #444444 !important; } @@ -2925,7 +2925,7 @@ nav .nav-menu-icon { -webkit-border-radius: $radiuspx; border-radius: $radiuspx; } -nav .nav-menu-icon.selected { +nav .nav-menu-icon.active { background-color: #FF0000; } nav .nav-menu-icon img { @@ -2948,7 +2948,7 @@ nav:hover .nav-menu { /* border-bottom: 3px solid #f00; */ } -nav .nav-menu.selected a { +nav .nav-menu.active a { color: #444444; } @@ -2962,7 +2962,7 @@ nav .nav-notify { filter:alpha(opacity=60); } -.nav-notify:hover, nav .nav-notify.selected span { +.nav-notify:hover, nav .nav-notify.active span { color: #ffffff; } @@ -2985,10 +2985,10 @@ nav #nav-site-linkmenu .menu-popup { left: auto; } nav #nav-notifications-linkmenu.on .icon.s22.notify, -nav #nav-notifications-linkmenu.selected .icon.s22.notify { +nav #nav-notifications-linkmenu.active .icon.s22.notify { background-image: url("../../../../images/icons/22/notify_on.png"); } -nav #nav-apps-link.selected { +nav #nav-apps-link.active { background-color: #364e59; } ul.menu-popup { From 9d49f2a47bda2d01b0d08327d12e44ce3d5afb43 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 18 Sep 2013 04:06:44 -0700 Subject: [PATCH 192/330] make collections work again --- mod/network.php | 13 +++++++++---- version.inc | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/mod/network.php b/mod/network.php index 9b108aef8..0d5f57a39 100644 --- a/mod/network.php +++ b/mod/network.php @@ -432,16 +432,21 @@ function network_content(&$a, $update = 0, $load = false) { // NOTREACHED } - $contacts = expand_groups(array($arr['group'])); - if((is_array($contacts)) && count($contacts)) { - $contact_str = implode(',',$contacts); + $contact_str = ''; + $contacts = group_get_members($group); + if($contacts) { + foreach($contacts as $c) { + if($contact_str) + $contact_str .= ','; + $contact_str .= "'" . $c['xchan'] . "'"; + } } else { $contact_str = ' 0 '; info( t('Group is empty')); } - $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND ( author_xchan IN ( $contact_str ) OR owner_xchan in ( $contact_str) or allow_gid like '" . protect_sprintf('%<' . dbesc($r[0]['hash']) . '>%') . "' ) and item_restrict = 0 ) "; + $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND (( author_xchan IN ( $contact_str ) OR owner_xchan in ( $contact_str)) or allow_gid like '" . protect_sprintf('%<' . dbesc($r[0]['hash']) . '>%') . "' ) and item_restrict = 0 ) "; } diff --git a/version.inc b/version.inc index 44ebbfe27..b1c3d8c72 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-09-17.439 +2013-09-18.440 From e4d2e2200e04c8df699d9a8efade661123ef7ac8 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 18 Sep 2013 17:47:26 -0700 Subject: [PATCH 193/330] add "tiered" access policy, add tagcloud to directory pages --- boot.php | 2 +- include/taxonomy.php | 2 +- include/zot.php | 2 ++ mod/directory.php | 10 +++++++++- mod/dirsearch.php | 9 ++++++--- mod/zfinger.php | 2 ++ view/en/htconfig.tpl | 10 ++++++++-- 7 files changed, 29 insertions(+), 8 deletions(-) diff --git a/boot.php b/boot.php index 81b977a9d..1bbdd0e52 100755 --- a/boot.php +++ b/boot.php @@ -149,7 +149,7 @@ define ( 'REGISTER_OPEN', 2 ); define ( 'ACCESS_PRIVATE', 0 ); define ( 'ACCESS_PAID', 1 ); define ( 'ACCESS_FREE', 2 ); - +define ( 'ACCESS_TIERED', 3 ); /** * relationship types diff --git a/include/taxonomy.php b/include/taxonomy.php index 30eb08f65..a3c3fc7b4 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -221,7 +221,7 @@ function dir_tagblock($link,$r) { if($r) { $o = '

    ' . t('Keywords') . '

    '; foreach($r as $rr) { - $o .= ''.$rr['term'].' ' . "\r\n"; + $o .= ''.$rr['term'].' ' . "\r\n"; } $o .= '
    '; } diff --git a/include/zot.php b/include/zot.php index c416d18f9..58b3d74d3 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1563,6 +1563,8 @@ function import_site($arr,$pubkey) { $access_policy = ACCESS_PAID; if($arr['access_policy'] === 'free') $access_policy = ACCESS_FREE; + if($arr['access_policy'] === 'tiered') + $access_policy = ACCESS_TIERED; } $directory_url = htmlentities($arr['directory_url'],ENT_COMPAT,'UTF-8',false); diff --git a/mod/directory.php b/mod/directory.php index 823c33cf7..c4305dfde 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -32,6 +32,7 @@ function directory_content(&$a) { else $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : ''); + $keywords = (($_GET['keywords']) ? $_GET['keywords'] : ''); $tpl = get_markup_template('directory_header.tpl'); @@ -68,11 +69,14 @@ function directory_content(&$a) { if($url) { - $query = $url . '?f=' ; + // We might want to make the tagadelic count (&kw=) configurable or turn it off completely. + $query = $url . '?f=&kw=24' ; if($search) $query .= '&name=' . urlencode($search) . '&keywords=' . urlencode($search); if(strpos($search,'@')) $query .= '&address=' . urlencode($search); + if($keywords) + $query .= '&keywords=' . urlencode($keywords); $sort_order = ((x($_REQUEST,'order')) ? $_REQUEST['order'] : ''); if($sort_order) @@ -175,6 +179,10 @@ function directory_content(&$a) { } + if($j['keywords']) { + $a->set_widget('dirtagblock',dir_tagblock(z_root() . '/directory',$j['keywords'])); + } + // logger('mod_directory: entries: ' . print_r($entries,true), LOGGER_DATA); $o .= replace_macros($tpl, array( diff --git a/mod/dirsearch.php b/mod/dirsearch.php index 0a4d0ed2b..a522cd541 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -40,6 +40,7 @@ function dirsearch_content(&$a) { $keywords = ((x($_REQUEST,'keywords')) ? $_REQUEST['keywords'] : ''); $agege = ((x($_REQUEST,'agege')) ? intval($_REQUEST['agege']) : 0 ); $agele = ((x($_REQUEST,'agele')) ? intval($_REQUEST['agele']) : 0 ); + $kw = ((x($_REQUEST,'kw')) ? intval($_REQUEST['kw']) : 0 ); $sync = ((x($_REQUEST,'sync')) ? datetime_convert('UTC','UTC',$_REQUEST['sync']) : ''); $sort_order = ((x($_REQUEST,'order')) ? $_REQUEST['order'] : ''); @@ -175,12 +176,12 @@ function dirsearch_content(&$a) { } $ret['results'] = $entries; - if(! $sync) { - $k = dir_tagadelic(24); + if(($kw) && (! $sync)) { + $k = dir_tagadelic($kw); if($k) { $ret['keywords'] = array(); foreach($k as $kv) { - $ret['keywords'][] = array('term' => $kv[0],'weight' => $kv[1]); + $ret['keywords'][] = array('term' => $kv[0],'weight' => $kv[1], 'normalise' => $kv[2]); } } } @@ -203,6 +204,8 @@ function list_public_sites() { $access = 'free'; elseif($rr['site_access'] == ACCESS_PAID) $access = 'paid'; + elseif($rr['site_access'] == ACCESS_TIERED) + $access = 'tiered'; else $access = 'private'; diff --git a/mod/zfinger.php b/mod/zfinger.php index 675b31b1e..e1e19054e 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -226,6 +226,8 @@ function zfinger_init(&$a) { $ret['site']['access_policy'] = 'paid'; if($access_policy == ACCESS_FREE) $ret['site']['access_policy'] = 'free'; + if($access_policy == ACCESS_TIERED) + $ret['site']['access_policy'] = 'tiered'; require_once('include/account.php'); $ret['site']['accounts'] = account_total(); diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl index 3e1269441..4896376e5 100644 --- a/view/en/htconfig.tpl +++ b/view/en/htconfig.tpl @@ -47,16 +47,22 @@ $a->config['system']['admin_email'] = '{{$adminmail}}'; // Site access restrictions. By default we will create private sites. -// Your choices are ACCESS_PRIVATE, ACCESS_PAID, and ACCESS_FREE. +// Your choices are ACCESS_PRIVATE, ACCESS_PAID, ACCESS_TIERED, and ACCESS_FREE. // If you leave REGISTER_OPEN above, anybody may register on your // site, however your site will not be listed anywhere as an open // registration hub. We will use the system access policy (below) // to determine whether or not to list your site in the directory // as an open hub where anybody may create accounts. Your choice of -// paid or free determines how these listings will be presented. +// paid, tiered, or free determines how these listings will be presented. + $a->config['system']['access_policy'] = ACCESS_PRIVATE; +// If you operate a public site, you might wish that people are directed +// to a "sellpage" where you can describe for features or policies or service plans in depth. +// This must be an absolute URL beginning with http:// or https:// . + +$a->config['system']['sellpage'] = ''; // Maximum size of an imported message, 0 is unlimited From 5607737c395c32a0c9f0ee071c571f6a7509f8eb Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 18 Sep 2013 21:20:54 -0700 Subject: [PATCH 194/330] set default charset of email_header_encode, add ud_flags to indicate which updates have been processed in some way. --- boot.php | 2 +- include/network.php | 2 +- install/database.sql | 4 +++- install/update.php | 10 +++++++++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/boot.php b/boot.php index 1bbdd0e52..ec1184e4e 100755 --- a/boot.php +++ b/boot.php @@ -44,7 +44,7 @@ require_once('include/taxonomy.php'); define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1070 ); +define ( 'DB_UPDATE_VERSION', 1071 ); define ( 'EOL', '
    ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/include/network.php b/include/network.php index 00d931f19..99a0a8e2b 100644 --- a/include/network.php +++ b/include/network.php @@ -1336,7 +1336,7 @@ function xml2array($contents, $namespaces = true, $get_attributes=1, $priority = } -function email_header_encode($in_str, $charset) { +function email_header_encode($in_str, $charset = 'UTF-8') { $out_str = $in_str; $need_to_convert = false; diff --git a/install/database.sql b/install/database.sql index 2e420fcbd..21d7575e9 100644 --- a/install/database.sql +++ b/install/database.sql @@ -891,10 +891,12 @@ CREATE TABLE IF NOT EXISTS `updates` ( `ud_hash` char(128) NOT NULL, `ud_guid` char(255) NOT NULL DEFAULT '', `ud_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `ud_flags` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`ud_id`), KEY `ud_hash` (`ud_hash`), KEY `ud_guid` (`ud_guid`), - KEY `ud_date` (`ud_date`) + KEY `ud_date` (`ud_date`), + KEY `ud_flags` (`ud_flags`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `verify` ( diff --git a/install/update.php b/install/update.php index 3c40ee0c5..c135cc586 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Wed, 18 Sep 2013 21:20:54 -0700 Subject: [PATCH 195/330] set default charset of email_header_encode, add ud_flags to indicate which (directory sync) updates have been processed in some way. --- boot.php | 2 +- include/network.php | 2 +- install/database.sql | 4 +++- install/update.php | 10 +++++++++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/boot.php b/boot.php index 1bbdd0e52..ec1184e4e 100755 --- a/boot.php +++ b/boot.php @@ -44,7 +44,7 @@ require_once('include/taxonomy.php'); define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1070 ); +define ( 'DB_UPDATE_VERSION', 1071 ); define ( 'EOL', '
    ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/include/network.php b/include/network.php index 00d931f19..99a0a8e2b 100644 --- a/include/network.php +++ b/include/network.php @@ -1336,7 +1336,7 @@ function xml2array($contents, $namespaces = true, $get_attributes=1, $priority = } -function email_header_encode($in_str, $charset) { +function email_header_encode($in_str, $charset = 'UTF-8') { $out_str = $in_str; $need_to_convert = false; diff --git a/install/database.sql b/install/database.sql index 2e420fcbd..21d7575e9 100644 --- a/install/database.sql +++ b/install/database.sql @@ -891,10 +891,12 @@ CREATE TABLE IF NOT EXISTS `updates` ( `ud_hash` char(128) NOT NULL, `ud_guid` char(255) NOT NULL DEFAULT '', `ud_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `ud_flags` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`ud_id`), KEY `ud_hash` (`ud_hash`), KEY `ud_guid` (`ud_guid`), - KEY `ud_date` (`ud_date`) + KEY `ud_date` (`ud_date`), + KEY `ud_flags` (`ud_flags`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `verify` ( diff --git a/install/update.php b/install/update.php index 3c40ee0c5..c135cc586 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Thu, 19 Sep 2013 01:01:51 -0700 Subject: [PATCH 196/330] sync item_search with yesterday's network fix for collections. Add ud_addr to update table to store the target address since it's possible the mirroring directory won't yet have an xchan or hubloc they can link the ud_hash to and therefore mayn't know how to contact them. --- boot.php | 2 +- include/items.php | 18 ++++++++++++------ install/database.sql | 4 +++- install/update.php | 10 +++++++++- version.inc | 2 +- 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/boot.php b/boot.php index ec1184e4e..04adea33e 100755 --- a/boot.php +++ b/boot.php @@ -44,7 +44,7 @@ require_once('include/taxonomy.php'); define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1071 ); +define ( 'DB_UPDATE_VERSION', 1072 ); define ( 'EOL', '
    ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/include/items.php b/include/items.php index c83eceabe..a60e3fdd6 100755 --- a/include/items.php +++ b/include/items.php @@ -3645,16 +3645,22 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C return $result; } - $contacts = expand_groups(array($arr['group'])); - if((is_array($contacts)) && count($contacts)) { - $contact_str = implode(',',$contacts); + + $contact_str = ''; + $contacts = group_get_members($group); + if($contacts) { + foreach($contacts as $c) { + if($contact_str) + $contact_str .= ','; + $contact_str .= "'" . $c['xchan'] . "'"; + } } else { - $contact_str = ' 0 '; - $result['message'] = t('Collection has no members.'); + $contact_str = ' 0 '; + info( t('Group is empty')); } - $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND ( author_xchan IN ( $contact_str ) OR owner_xchan in ( $contact_str) or allow_gid like '" . protect_sprintf('%<' . dbesc($r[0]['hash']) . '>%') . "' ) and item_restrict = 0 ) "; + $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND (( author_xchan IN ( $contact_str ) OR owner_xchan in ( $contact_str)) or allow_gid like '" . protect_sprintf('%<' . dbesc($r[0]['hash']) . '>%') . "' ) and item_restrict = 0 ) "; } elseif($arr['cid'] && $uid) { diff --git a/install/database.sql b/install/database.sql index 21d7575e9..a74b30d59 100644 --- a/install/database.sql +++ b/install/database.sql @@ -892,11 +892,13 @@ CREATE TABLE IF NOT EXISTS `updates` ( `ud_guid` char(255) NOT NULL DEFAULT '', `ud_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `ud_flags` int(11) NOT NULL DEFAULT '0', + `ud_addr` char(255) NOT NULL DEFAULT '', PRIMARY KEY (`ud_id`), KEY `ud_hash` (`ud_hash`), KEY `ud_guid` (`ud_guid`), KEY `ud_date` (`ud_date`), - KEY `ud_flags` (`ud_flags`) + KEY `ud_flags` (`ud_flags`), + KEY `ud_addr` (`ud_addr`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `verify` ( diff --git a/install/update.php b/install/update.php index c135cc586..ccbdd79fd 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Thu, 19 Sep 2013 01:45:06 -0700 Subject: [PATCH 197/330] trim commas from keywords --- include/zot.php | 1 + 1 file changed, 1 insertion(+) diff --git a/include/zot.php b/include/zot.php index 58b3d74d3..c0b53bdc1 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1487,6 +1487,7 @@ function import_directory_keywords($hash,$keywords) { $clean = array(); foreach($keywords as $kw) { $kw = trim(htmlentities($kw,ENT_COMPAT,'UTF-8',false)); + $kw = trim($kw,','); $clean[] = $kw; } From 2eaea801954f34e0f8a320b5853eb8f4035d4f69 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Thu, 19 Sep 2013 22:36:25 +0100 Subject: [PATCH 198/330] Add tiered access option. --- mod/admin.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mod/admin.php b/mod/admin.php index 455897f6f..e9a456b52 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -401,7 +401,8 @@ function admin_page_site(&$a) { $access_choices = Array( ACCESS_PRIVATE => t("Private"), ACCESS_PAID => t("Paid Access"), - ACCESS_FREE => t("Free Access") + ACCESS_FREE => t("Free Access"), + ACCESS_TIERED => t("Tiered Access") ); // $ssl_choices = array( From ef88ba11ba97f5eb09fb917a6495037256aaa5ec Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Sep 2013 17:40:17 -0700 Subject: [PATCH 199/330] prefill private mail recip from $_REQUEST['to'] if it's there. --- mod/message.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mod/message.php b/mod/message.php index f5a60b73b..652481579 100644 --- a/mod/message.php +++ b/mod/message.php @@ -273,6 +273,11 @@ function message_content(&$a) { $prefill = (($preselect) ? $prename : ''); + if(! $prefill) { + if(array_key_exists('to',$_REQUEST)) + $prefill = $_REQUEST['to']; + } + // the ugly select box $select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10); From 49cfca4b4cc60f332024a048a80e61e1fb39eb0f Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Fri, 20 Sep 2013 02:38:59 +0100 Subject: [PATCH 200/330] Make $kw configurable. --- mod/directory.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mod/directory.php b/mod/directory.php index c4305dfde..c3c1a30d5 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -70,7 +70,10 @@ function directory_content(&$a) { if($url) { // We might want to make the tagadelic count (&kw=) configurable or turn it off completely. - $query = $url . '?f=&kw=24' ; + $numtags = $a->config['system']['directorytags']; + + $kw = ((intval($numtags)) ? $numtags : 24); + $query = $url . '?f=&kw=' . $kw; if($search) $query .= '&name=' . urlencode($search) . '&keywords=' . urlencode($search); if(strpos($search,'@')) From 30f85a19b1bee0ffaf2505db8d48f647dfee9ad1 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Fri, 20 Sep 2013 03:24:38 +0100 Subject: [PATCH 201/330] Use get_config --- mod/directory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/directory.php b/mod/directory.php index c3c1a30d5..cc4e7e81f 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -70,7 +70,7 @@ function directory_content(&$a) { if($url) { // We might want to make the tagadelic count (&kw=) configurable or turn it off completely. - $numtags = $a->config['system']['directorytags']; + $numtags = get_config('system','directorytags'); $kw = ((intval($numtags)) ? $numtags : 24); $query = $url . '?f=&kw=' . $kw; From 54abed8457c504e69e3d139238d2ff09b0ec6cc8 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Sep 2013 19:50:13 -0700 Subject: [PATCH 202/330] provide a "safe search" backend and allow for self-censorship using nsfw or adult profile keywords. Eventually the directories will be forced to mark adult profiles and sync this knowledge between them. At the moment there's no way to do an unsafe search, but we really just need a checkbox and pass the value through directory to dirsearch on the back end, and some will want this as a pconfig. --- boot.php | 2 +- include/text.php | 6 ++++++ include/zot.php | 10 ++++++++++ mod/dirsearch.php | 8 ++++++-- 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index 632394cb6..29c8eedaf 100755 --- a/boot.php +++ b/boot.php @@ -347,7 +347,7 @@ define ( 'HUBLOC_FLAGS_DELETED', 0x1000); define ( 'XCHAN_FLAGS_HIDDEN', 0x0001); define ( 'XCHAN_FLAGS_ORPHAN', 0x0002); - +define ( 'XCHAN_FLAGS_CENSORED', 0x0004); /* * Traficlights for Administration of HubLoc diff --git a/include/text.php b/include/text.php index e1f0a4e00..40df8bd89 100755 --- a/include/text.php +++ b/include/text.php @@ -1848,3 +1848,9 @@ function design_tools() { } +/* case insensitive in_array() */ + +function in_arrayi($needle, $haystack) { + return in_array(strtolower($needle), array_map('strtolower', $haystack)); +} + diff --git a/include/zot.php b/include/zot.php index c0b53bdc1..3929fa4c1 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1404,6 +1404,16 @@ function import_directory_profile($hash,$profile) { $arr['xprof_keywords'] = implode(' ',$clean); + // Self censored, make it so + // These are not translated, so the German "erwachsenen" keyword will not censor the directory profile. Only the English form - "adult". + + if(in_arrayi('nsfw',$clean) || in_arrayi('adult',$clean)) { + q("update xchan set xchan_flags = (xchan_flags | %d) where xchan_hash = '%s' limit 1", + intval(XCHAN_FLAGS_CENSORED) + ); + } + + $r = q("select * from xprof where xprof_hash = '%s' limit 1", dbesc($hash) ); diff --git a/mod/dirsearch.php b/mod/dirsearch.php index a522cd541..a92134942 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -41,6 +41,8 @@ function dirsearch_content(&$a) { $agege = ((x($_REQUEST,'agege')) ? intval($_REQUEST['agege']) : 0 ); $agele = ((x($_REQUEST,'agele')) ? intval($_REQUEST['agele']) : 0 ); $kw = ((x($_REQUEST,'kw')) ? intval($_REQUEST['kw']) : 0 ); + // by default use a safe search + $safe = ((x($_REQUEST,'safe')) ? intval($_REQUEST['safe']) : 1 ); $sync = ((x($_REQUEST,'sync')) ? datetime_convert('UTC','UTC',$_REQUEST['sync']) : ''); $sort_order = ((x($_REQUEST,'order')) ? $_REQUEST['order'] : ''); @@ -99,12 +101,14 @@ function dirsearch_content(&$a) { $logic = ((strlen($sql_extra)) ? 0 : 1); + $safesql = (($safe) ? " and not ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED) . " ) " : ''); + if($limit) $qlimit = " LIMIT $limit "; else { $qlimit = " LIMIT " . intval($startrec) . " , " . intval($perpage); if($return_total) { - $r = q("SELECT COUNT(xchan_hash) AS `total` FROM xchan left join xprof on xchan_hash = xprof_hash where $logic $sql_extra and not ( xchan_flags & %d) and not ( xchan_flags & %d ) ", + $r = q("SELECT COUNT(xchan_hash) AS `total` FROM xchan left join xprof on xchan_hash = xprof_hash where $logic $sql_extra and not ( xchan_flags & %d) and not ( xchan_flags & %d ) $safesql ", intval(XCHAN_FLAGS_HIDDEN), intval(XCHAN_FLAGS_ORPHAN) ); @@ -135,7 +139,7 @@ function dirsearch_content(&$a) { } else { - $r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash where $logic $sql_extra and not ( xchan_flags & %d ) and not ( xchan_flags & %d ) $order $qlimit ", + $r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash where $logic $sql_extra and not ( xchan_flags & %d ) and not ( xchan_flags & %d ) $safesql $order $qlimit ", intval(XCHAN_FLAGS_HIDDEN), intval(XCHAN_FLAGS_ORPHAN) ); From 876a9d1850ec6fc2aa26f530e8ab554028158734 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Sep 2013 21:13:45 -0700 Subject: [PATCH 203/330] missing hash --- include/taxonomy.php | 2 +- include/zot.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/taxonomy.php b/include/taxonomy.php index a3c3fc7b4..85396a51d 100644 --- a/include/taxonomy.php +++ b/include/taxonomy.php @@ -221,7 +221,7 @@ function dir_tagblock($link,$r) { if($r) { $o = '

    ' . t('Keywords') . '

    '; foreach($r as $rr) { - $o .= ''.$rr['term'].' ' . "\r\n"; + $o .= ''.$rr['term'].' ' . "\r\n"; } $o .= '
    '; } diff --git a/include/zot.php b/include/zot.php index 3929fa4c1..a98aca711 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1409,7 +1409,8 @@ function import_directory_profile($hash,$profile) { if(in_arrayi('nsfw',$clean) || in_arrayi('adult',$clean)) { q("update xchan set xchan_flags = (xchan_flags | %d) where xchan_hash = '%s' limit 1", - intval(XCHAN_FLAGS_CENSORED) + intval(XCHAN_FLAGS_CENSORED), + dbesc($hash) ); } From 6cb81f6e474c3b904e5c759ee96e7fac115050e9 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Sep 2013 21:36:22 -0700 Subject: [PATCH 204/330] use &safe=-1 for unsafe only --- mod/dirsearch.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mod/dirsearch.php b/mod/dirsearch.php index a92134942..fc0ac4fe3 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -41,6 +41,7 @@ function dirsearch_content(&$a) { $agege = ((x($_REQUEST,'agege')) ? intval($_REQUEST['agege']) : 0 ); $agele = ((x($_REQUEST,'agele')) ? intval($_REQUEST['agele']) : 0 ); $kw = ((x($_REQUEST,'kw')) ? intval($_REQUEST['kw']) : 0 ); + // by default use a safe search $safe = ((x($_REQUEST,'safe')) ? intval($_REQUEST['safe']) : 1 ); @@ -101,7 +102,9 @@ function dirsearch_content(&$a) { $logic = ((strlen($sql_extra)) ? 0 : 1); - $safesql = (($safe) ? " and not ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED) . " ) " : ''); + $safesql = (($safe > 0) ? " and not ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED) . " ) " : ''); + if($safe < 0) + $safesql = " and ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED) . " ) "; if($limit) $qlimit = " LIMIT $limit "; From 977b350866f9abecf409fbf4556c1e1e3e288a14 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Sep 2013 21:45:09 -0700 Subject: [PATCH 205/330] bring safe mode to the client side --- mod/directory.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/mod/directory.php b/mod/directory.php index cc4e7e81f..dfc0efc88 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -24,6 +24,17 @@ function directory_content(&$a) { return; } + $safe_mode = 1; + + if(local_user()) { + $safe_mode = get_pconfig(local_user(),'directory','safe_mode'); + } + if($safe_mode === false) + $safe_mode = 1; + else + $safe_mode = intval($safe_mode); + + $o = ''; nav_set_selected('directory'); @@ -73,7 +84,7 @@ function directory_content(&$a) { $numtags = get_config('system','directorytags'); $kw = ((intval($numtags)) ? $numtags : 24); - $query = $url . '?f=&kw=' . $kw; + $query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : ''); if($search) $query .= '&name=' . urlencode($search) . '&keywords=' . urlencode($search); if(strpos($search,'@')) From e81db4428d32839a7920f971f947757de64e0a9c Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Sep 2013 21:48:55 -0700 Subject: [PATCH 206/330] now bring it to the url --- mod/directory.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mod/directory.php b/mod/directory.php index dfc0efc88..629174560 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -34,6 +34,8 @@ function directory_content(&$a) { else $safe_mode = intval($safe_mode); + if(x($_REQUEST,'safe') + $safe_mode = intval($_REQUEST['safe']); $o = ''; nav_set_selected('directory'); From 53de5f348a019d6a19ccca49a811c1985d094126 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Sep 2013 21:51:52 -0700 Subject: [PATCH 207/330] typo --- mod/directory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/directory.php b/mod/directory.php index 629174560..195ca993e 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -34,7 +34,7 @@ function directory_content(&$a) { else $safe_mode = intval($safe_mode); - if(x($_REQUEST,'safe') + if(x($_REQUEST,'safe')) $safe_mode = intval($_REQUEST['safe']); $o = ''; From e62dfc6f8aa4b215682311bca427142b2fe30a88 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 19 Sep 2013 22:27:12 -0700 Subject: [PATCH 208/330] add a flag field to xtags so that we can filter tags based on whether or not the parent xchan is safe or not. Otherwise we'll have tags that lead to nowhere because the directory entry is hidden but the tag isn't. A successful porn site in the matrix could also swamp the directory with x-rated tags, even if the site was playing nice and did everything right to self-censor. Accomplishing this with joins would be horrendously inefficient, though it will take a bit of code re-org to get this flag where it needs to be when it's time to set keywords. --- boot.php | 2 +- install/database.sql | 4 +++- install/update.php | 9 ++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index 29c8eedaf..76b350500 100755 --- a/boot.php +++ b/boot.php @@ -45,7 +45,7 @@ define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1072 ); +define ( 'DB_UPDATE_VERSION', 1073 ); define ( 'EOL', '
    ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/install/database.sql b/install/database.sql index a74b30d59..44e211630 100644 --- a/install/database.sql +++ b/install/database.sql @@ -1025,7 +1025,9 @@ CREATE TABLE IF NOT EXISTS `xtag` ( `xtag_id` int(10) unsigned NOT NULL AUTO_INCREMENT, `xtag_hash` char(255) NOT NULL, `xtag_term` char(255) NOT NULL DEFAULT '', + `xtag_flags` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`xtag_id`), KEY `xtag_term` (`xtag_term`), - KEY `xtag_hash` (`xtag_hash`) + KEY `xtag_hash` (`xtag_hash`), + KEY `xtag_flags` (`xtag_flags`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/install/update.php b/install/update.php index ccbdd79fd..d2d6a0cb7 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Fri, 20 Sep 2013 05:43:30 -0700 Subject: [PATCH 209/330] doc updates --- doc/html/Contact_8php.html | 40 +- doc/html/Contact_8php.js | 4 +- doc/html/admin_8php.html | 40 ++ doc/html/admin_8php.js | 2 + doc/html/bbcode_8php.html | 2 +- doc/html/boot_8php.html | 80 +++- doc/html/boot_8php.js | 3 + doc/html/contact__widgets_8php.html | 4 +- doc/html/crypto_8php.html | 2 +- doc/html/datetime_8php.html | 2 +- doc/html/dba__driver_8php.html | 4 +- .../dir_d41ce877eb409a4791b288730010abe2.html | 4 +- .../dir_d41ce877eb409a4791b288730010abe2.js | 3 +- .../dir_d44c64559bbebec7f509842c48db8b23.html | 2 + .../dir_d44c64559bbebec7f509842c48db8b23.js | 1 + doc/html/files.html | 326 +++++++------- doc/html/globals_0x61.html | 11 +- doc/html/globals_0x63.html | 5 +- doc/html/globals_0x64.html | 12 +- doc/html/globals_0x65.html | 2 +- doc/html/globals_0x68.html | 3 + doc/html/globals_0x69.html | 3 + doc/html/globals_0x75.html | 3 + doc/html/globals_0x78.html | 3 + doc/html/globals_func_0x61.html | 8 +- doc/html/globals_func_0x63.html | 5 +- doc/html/globals_func_0x64.html | 12 +- doc/html/globals_func_0x65.html | 2 +- doc/html/globals_func_0x69.html | 3 + doc/html/globals_func_0x75.html | 3 + doc/html/globals_vars_0x61.html | 3 + doc/html/globals_vars_0x68.html | 3 + doc/html/globals_vars_0x78.html | 3 + doc/html/include_2chanman_8php.html | 137 ++++++ doc/html/include_2chanman_8php.js | 4 + doc/html/include_2config_8php.html | 4 +- doc/html/include_2group_8php.html | 4 +- doc/html/include_2network_8php.html | 10 +- doc/html/include_2network_8php.js | 2 +- doc/html/language_8php.html | 2 +- doc/html/mod_2chanman_8php.html | 112 +++++ doc/html/navtree.js | 14 +- doc/html/navtreeindex0.js | 332 +++++++------- doc/html/navtreeindex1.js | 168 +++---- doc/html/navtreeindex2.js | 128 +++--- doc/html/navtreeindex3.js | 166 +++---- doc/html/navtreeindex4.js | 370 +++++++-------- doc/html/navtreeindex5.js | 384 ++++++++-------- doc/html/navtreeindex6.js | 426 +++++++++--------- doc/html/navtreeindex7.js | 150 +++--- doc/html/permissions_8php.html | 2 +- doc/html/photo__driver_8php.html | 2 +- doc/html/php2po_8php.html | 2 +- doc/html/plugin_8php.html | 4 +- doc/html/redbasic_2php_2style_8php.html | 2 +- doc/html/search/all_61.js | 5 +- doc/html/search/all_63.js | 6 +- doc/html/search/all_64.js | 5 +- doc/html/search/all_65.js | 2 +- doc/html/search/all_68.js | 1 + doc/html/search/all_69.js | 1 + doc/html/search/all_75.js | 1 + doc/html/search/all_78.js | 1 + doc/html/search/files_63.js | 3 +- doc/html/search/files_64.js | 3 +- doc/html/search/functions_61.js | 4 +- doc/html/search/functions_63.js | 3 +- doc/html/search/functions_64.js | 4 +- doc/html/search/functions_65.js | 2 +- doc/html/search/functions_69.js | 1 + doc/html/search/functions_75.js | 1 + doc/html/search/variables_61.js | 1 + doc/html/search/variables_68.js | 1 + doc/html/search/variables_78.js | 1 + doc/html/security_8php.html | 2 +- doc/html/taxonomy_8php.html | 50 ++ doc/html/taxonomy_8php.js | 2 + doc/html/text_8php.html | 64 ++- doc/html/text_8php.js | 2 + doc/html/typo_8php.html | 2 +- 80 files changed, 1870 insertions(+), 1326 deletions(-) create mode 100644 doc/html/include_2chanman_8php.html create mode 100644 doc/html/include_2chanman_8php.js create mode 100644 doc/html/mod_2chanman_8php.html diff --git a/doc/html/Contact_8php.html b/doc/html/Contact_8php.html index 4c7f6190c..430904dc4 100644 --- a/doc/html/Contact_8php.html +++ b/doc/html/Contact_8php.html @@ -130,10 +130,10 @@ Functions    user_remove ($uid)   - account_remove ($account_id) -  - channel_remove ($channel_id) -  + account_remove ($account_id, $local=true) +  + channel_remove ($channel_id, $local=true) +   remove_all_xchan_resources ($xchan, $channel_id=0)    contact_remove ($channel_id, $abook_id) @@ -220,7 +220,7 @@ Functions - +
    @@ -228,15 +228,27 @@ Functions - + + + + + + + + + + +
    account_remove (  $account_id)$account_id,
     $local = true 
    )
    - +
    @@ -244,13 +256,23 @@ Functions - + + + + + + + + + + +
    channel_remove (  $channel_id)$channel_id,
     $local = true 
    )
    -

    Referenced by account_remove().

    +

    Referenced by account_remove().

    diff --git a/doc/html/Contact_8php.js b/doc/html/Contact_8php.js index 6a4f7843d..e6b927b3a 100644 --- a/doc/html/Contact_8php.js +++ b/doc/html/Contact_8php.js @@ -3,8 +3,8 @@ var Contact_8php = [ "abook_connections", "Contact_8php.html#ae8803c330352cbf1e828eb7490edf47e", null ], [ "abook_self", "Contact_8php.html#ad5b02c2a962ee55b1b7ca6c159d6e4c5", null ], [ "abook_toggle_flag", "Contact_8php.html#a024919623a830e8703ac4f23496dd66c", null ], - [ "account_remove", "Contact_8php.html#a3eef54a5523e568a28257c1f9b1644d8", null ], - [ "channel_remove", "Contact_8php.html#ad46ff6764f12b6d3ab45c49b797f98aa", null ], + [ "account_remove", "Contact_8php.html#a6e64de7db60b7243dce45fb6347636ff", null ], + [ "channel_remove", "Contact_8php.html#a186162051a5127069cc851d78740f205", null ], [ "channelx_by_hash", "Contact_8php.html#a483cda56f9e37c3a4a8773dcdfeb0258", null ], [ "channelx_by_n", "Contact_8php.html#a3a0844dac1e86d523de5d2f432cfeebc", null ], [ "channelx_by_nick", "Contact_8php.html#a87e699f74a1102b25e8aa0432d86a91e", null ], diff --git a/doc/html/admin_8php.html b/doc/html/admin_8php.html index f7b01d939..4419c6ef4 100644 --- a/doc/html/admin_8php.html +++ b/doc/html/admin_8php.html @@ -122,6 +122,10 @@ Functions    admin_page_site (&$a)   + admin_page_hubloc_post (&$a) +  + admin_page_hubloc (&$a) +   admin_page_dbsync (&$a)    admin_page_users_post (&$a) @@ -185,6 +189,42 @@ Functions

    Referenced by admin_content().

    + + + +
    +
    + + + + + + + + +
    admin_page_hubloc ($a)
    +
    + +

    Referenced by admin_content().

    + +
    +
    + +
    +
    + + + + + + + + +
    admin_page_hubloc_post ($a)
    +
    + +

    Referenced by admin_post().

    +
    diff --git a/doc/html/admin_8php.js b/doc/html/admin_8php.js index c3f42aa49..973a7a9aa 100644 --- a/doc/html/admin_8php.js +++ b/doc/html/admin_8php.js @@ -2,6 +2,8 @@ var admin_8php = [ [ "admin_content", "admin_8php.html#afef415e4011607fbb665610441595015", null ], [ "admin_page_dbsync", "admin_8php.html#aaa6addf2dbc3f3fcf99244a56b41eade", null ], + [ "admin_page_hubloc", "admin_8php.html#a6943543f3138f6ee182cb701f415d1cc", null ], + [ "admin_page_hubloc_post", "admin_8php.html#a60ba9783ad14545814919970bc3fb725", null ], [ "admin_page_logs", "admin_8php.html#a1d1362698af14d209aa3a0fb655551dd", null ], [ "admin_page_logs_post", "admin_8php.html#a233b7c8c31776b7020532003c6e44e1c", null ], [ "admin_page_plugins", "admin_8php.html#a54128076986ba80c4a103de3fc3e19a8", null ], diff --git a/doc/html/bbcode_8php.html b/doc/html/bbcode_8php.html index 0ad017f65..444997e93 100644 --- a/doc/html/bbcode_8php.html +++ b/doc/html/bbcode_8php.html @@ -221,7 +221,7 @@ Functions diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index d9d754e9b..7273f19ea 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -224,7 +224,7 @@ Variables   const ZOT_REVISION 1   -const DB_UPDATE_VERSION 1069 +const DB_UPDATE_VERSION 1073   const EOL '<br />' . "\r\n"   @@ -282,6 +282,8 @@ Variables   const ACCESS_FREE 2   +const ACCESS_TIERED 3 +  const CONTACT_IS_FOLLOWER 1   const CONTACT_IS_SHARING 2 @@ -458,10 +460,14 @@ Variables   const HUBLOC_FLAGS_UNVERIFIED 0x0002   +const HUBLOC_FLAGS_DELETED 0x1000 +  const XCHAN_FLAGS_HIDDEN 0x0001   const XCHAN_FLAGS_ORPHAN 0x0002   +const XCHAN_FLAGS_CENSORED 0x0004 +  const HUBLOC_NOTUSED 0x0000   const HUBLOC_SEND_ERROR 0x0001 @@ -700,7 +706,7 @@ Variables
    -

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

    +

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

    @@ -718,7 +724,7 @@ Variables
    -

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

    +

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

    @@ -940,7 +946,7 @@ Variables
    -

    Referenced by FriendicaSmarty\__construct(), FriendicaSmartyEngine\__construct(), abook_toggle_flag(), allowed_public_recips(), api_apply_template(), api_format_items(), api_get_user(), api_statuses_home_timeline(), api_statuses_repeat(), api_user(), argc(), argv(), atom_entry(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), 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_menu(), comanche_replace_region(), comanche_widget(), common_friends_visitor_widget(), connections_content(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), dfrn_deliver(), drop_item(), event_store(), fetch_url(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), follow_widget(), format_event_diaspora(), get_account_id(), get_best_language(), get_birthdays(), get_events(), get_feed_for(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_observer_hash(), get_plink(), get_theme_config_file(), get_theme_screenshot(), gprobe_run(), group_select(), guess_image_type(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), info(), is_site_admin(), item_message_id(), item_photo_menu(), item_redir_and_replace_images(), items_fetch(), load_contact_links(), load_hooks(), login(), FKOAuth1\loginUser(), lrdd(), manage_content(), map_scope(), nav_set_selected(), new_contact(), notice(), notification(), notifier_run(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), onepoll_run(), page_content(), ping_init(), poco_load(), poller_run(), post_activity_item(), post_url(), preg_heart(), prepare_body(), proc_run(), process_delivery(), profile_activity(), profile_sidebar(), public_permissions_sql(), replace_macros(), rmagic_init(), saved_searches(), scale_external_images(), search(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), service_class_allows(), service_class_fetch(), smilies(), tag_deliver(), terminate_friendship(), tgroup_check(), theme_include(), tt(), update_suggestions(), user_allow(), vcard_from_xchan(), what_next(), widget_profile(), z_fetch_url(), and zot_finger().

    +

    Referenced by FriendicaSmarty\__construct(), FriendicaSmartyEngine\__construct(), abook_toggle_flag(), allowed_public_recips(), api_apply_template(), api_format_items(), api_get_user(), api_statuses_home_timeline(), api_statuses_repeat(), api_user(), argc(), argv(), atom_entry(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), 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_menu(), comanche_replace_region(), comanche_widget(), common_friends_visitor_widget(), connections_content(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), dfrn_deliver(), drop_item(), event_store(), fetch_url(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), follow_widget(), format_event_diaspora(), get_account_id(), get_best_language(), get_birthdays(), get_events(), get_feed_for(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_observer_hash(), get_plink(), get_theme_config_file(), get_theme_screenshot(), gprobe_run(), group_select(), guess_image_type(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_xchan(), info(), is_site_admin(), item_message_id(), item_photo_menu(), item_redir_and_replace_images(), items_fetch(), load_contact_links(), load_hooks(), login(), FKOAuth1\loginUser(), lrdd(), manage_content(), map_scope(), nav_set_selected(), new_contact(), notice(), notification(), notifier_run(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), onepoll_run(), page_content(), ping_init(), poco_load(), poller_run(), post_activity_item(), post_url(), preg_heart(), prepare_body(), proc_run(), process_delivery(), profile_activity(), profile_sidebar(), public_permissions_sql(), replace_macros(), rmagic_init(), saved_searches(), scale_external_images(), search(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), service_class_allows(), service_class_fetch(), smilies(), tag_deliver(), terminate_friendship(), tgroup_check(), theme_include(), tt(), update_suggestions(), user_allow(), vcard_from_xchan(), what_next(), widget_profile(), z_fetch_url(), and zot_finger().

    @@ -1099,7 +1105,7 @@ Variables
    -

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

    +

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

    @@ -1150,7 +1156,7 @@ Variables
    -

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

    +

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

    @@ -1236,7 +1242,7 @@ Variables
    -

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

    +

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

    @@ -1310,7 +1316,7 @@ Variables

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

    $cmd and string args are surrounded with ""

    -

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

    +

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

    @@ -1527,7 +1533,7 @@ Variables
    -

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

    +

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

    @@ -1633,7 +1639,7 @@ Variables
    Returns
    string

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

    -

    Referenced by bb_ShareAttributes(), conversation(), dirfind_content(), intro_content(), like_puller(), localize_item(), match_content(), menu_render(), new_contact(), notifications_content(), and viewconnections_content().

    +

    Referenced by bb_ShareAttributes(), conversation(), intro_content(), like_puller(), localize_item(), match_content(), menu_render(), new_contact(), notifications_content(), and viewconnections_content().

    @@ -1781,6 +1787,20 @@ Variables

    Referenced by admin_page_site(), import_site(), and zfinger_init().

    + + + +
    +
    + + + + +
    const ACCESS_TIERED 3
    +
    @@ -1863,7 +1883,7 @@ Variables @@ -2172,7 +2192,7 @@ Variables @@ -2376,7 +2396,7 @@ Variables
    - +
    const DB_UPDATE_VERSION 1069const DB_UPDATE_VERSION 1073
    @@ -2490,7 +2510,7 @@ Variables
    -

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

    +

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

    @@ -2531,6 +2551,20 @@ Variables

    item weight for query ordering

    +
    + + +
    +
    + + + + +
    const HUBLOC_FLAGS_DELETED 0x1000
    +
    @@ -2771,7 +2805,7 @@ Variables @@ -3826,7 +3860,7 @@ Variables @@ -4580,6 +4614,20 @@ Variables

    Referenced by admin_page_dbsync().

    + + + +
    +
    + + + + +
    const XCHAN_FLAGS_CENSORED 0x0004
    +
    diff --git a/doc/html/boot_8php.js b/doc/html/boot_8php.js index 950cd4ea7..1006ce9a6 100644 --- a/doc/html/boot_8php.js +++ b/doc/html/boot_8php.js @@ -58,6 +58,7 @@ var boot_8php = [ "ACCESS_FREE", "boot_8php.html#afbb1fe1b2c8c730ec8e08da93b6512c4", null ], [ "ACCESS_PAID", "boot_8php.html#a9c80420e5a063a4a87ce4831f086134d", null ], [ "ACCESS_PRIVATE", "boot_8php.html#a7f3474fec541e261fc8dff47313c4017", null ], + [ "ACCESS_TIERED", "boot_8php.html#aeb1039302affcbe7e8872c01c08c88f8", null ], [ "ACCOUNT_BLOCKED", "boot_8php.html#af3bdfc20979c16f15bb9c60446a480f9", null ], [ "ACCOUNT_EXPIRED", "boot_8php.html#a400519fa181591cd6fdbb8f25fbcba0a", null ], [ "ACCOUNT_OK", "boot_8php.html#a84057c5bfa1bca5fba8497fe005ee4d8", null ], @@ -113,6 +114,7 @@ var boot_8php = [ "GRAVITY_COMMENT", "boot_8php.html#a4a12ce5de39789b0361e308d89925a20", null ], [ "GRAVITY_LIKE", "boot_8php.html#a1f5906598e90b5ea2b4245f682be4348", null ], [ "GRAVITY_PARENT", "boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3", null ], + [ "HUBLOC_FLAGS_DELETED", "boot_8php.html#a7c286add8961fd2d79216314cd4aadd8", null ], [ "HUBLOC_FLAGS_PRIMARY", "boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955", null ], [ "HUBLOC_FLAGS_UNVERIFIED", "boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764", null ], [ "HUBLOC_NOTUSED", "boot_8php.html#aa589421267f0c2f0d643f727792cce35", null ], @@ -262,6 +264,7 @@ var boot_8php = [ "TERM_UNKNOWN", "boot_8php.html#a0c59dde058efebbc66520d136cbd1631", null ], [ "UPDATE_FAILED", "boot_8php.html#a75fc600186b13c3b25e661afefb5eac8", null ], [ "UPDATE_SUCCESS", "boot_8php.html#ac86615ddc0763a00f5311c90e991730c", null ], + [ "XCHAN_FLAGS_CENSORED", "boot_8php.html#accd6f36cc9f40225cbd720e4d12a7c6e", null ], [ "XCHAN_FLAGS_HIDDEN", "boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2", null ], [ "XCHAN_FLAGS_ORPHAN", "boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f", null ], [ "ZCURL_TIMEOUT", "boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af", null ], diff --git a/doc/html/contact__widgets_8php.html b/doc/html/contact__widgets_8php.html index d67fdb0df..6ee437953 100644 --- a/doc/html/contact__widgets_8php.html +++ b/doc/html/contact__widgets_8php.html @@ -211,7 +211,7 @@ Functions @@ -228,7 +228,7 @@ Functions diff --git a/doc/html/crypto_8php.html b/doc/html/crypto_8php.html index 25c416ed9..96bea9390 100644 --- a/doc/html/crypto_8php.html +++ b/doc/html/crypto_8php.html @@ -252,7 +252,7 @@ Functions diff --git a/doc/html/datetime_8php.html b/doc/html/datetime_8php.html index b3fc3d84f..99f2d22c0 100644 --- a/doc/html/datetime_8php.html +++ b/doc/html/datetime_8php.html @@ -332,7 +332,7 @@ Functions
    -

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

    +

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

    diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html index 0cf704be4..7c632482d 100644 --- a/doc/html/dba__driver_8php.html +++ b/doc/html/dba__driver_8php.html @@ -202,7 +202,7 @@ Functions
    -

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

    +

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

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

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

    -

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

    +

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

    diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html index 21dfadab0..6dddfa879 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html @@ -120,7 +120,7 @@ Files   file  blocks.php   -file  chanman.php +file  chanman.php   file  channel.php   @@ -142,8 +142,6 @@ Files   file  directory.php   -file  dirfind.php -  file  dirsearch.php   file  display.php diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js index 53154e4b6..91a016e0e 100644 --- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js +++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js @@ -8,7 +8,7 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "apps.php", "apps_8php.html", "apps_8php" ], [ "attach.php", "mod_2attach_8php.html", "mod_2attach_8php" ], [ "blocks.php", "blocks_8php.html", "blocks_8php" ], - [ "chanman.php", "chanman_8php.html", null ], + [ "chanman.php", "mod_2chanman_8php.html", null ], [ "channel.php", "channel_8php.html", "channel_8php" ], [ "chanview.php", "chanview_8php.html", "chanview_8php" ], [ "common.php", "common_8php.html", "common_8php" ], @@ -19,7 +19,6 @@ var dir_d41ce877eb409a4791b288730010abe2 = [ "crepair.php", "crepair_8php.html", "crepair_8php" ], [ "delegate.php", "delegate_8php.html", "delegate_8php" ], [ "directory.php", "mod_2directory_8php.html", "mod_2directory_8php" ], - [ "dirfind.php", "dirfind_8php.html", "dirfind_8php" ], [ "dirsearch.php", "dirsearch_8php.html", "dirsearch_8php" ], [ "display.php", "display_8php.html", "display_8php" ], [ "editblock.php", "editblock_8php.html", "editblock_8php" ], diff --git a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html index 90fe2f89a..d8cda941a 100644 --- a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html +++ b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html @@ -131,6 +131,8 @@ Files   file  cache.php   +file  chanman.php +  file  cli_startup.php   file  cli_suggest.php diff --git a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js index ae8918d5b..5dd985e32 100644 --- a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js +++ b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js @@ -16,6 +16,7 @@ var dir_d44c64559bbebec7f509842c48db8b23 = [ "cache.php", "cache_8php.html", [ [ "Cache", "classCache.html", null ] ] ], + [ "chanman.php", "include_2chanman_8php.html", "include_2chanman_8php" ], [ "cli_startup.php", "cli__startup_8php.html", "cli__startup_8php" ], [ "cli_suggest.php", "cli__suggest_8php.html", "cli__suggest_8php" ], [ "comanche.php", "comanche_8php.html", "comanche_8php" ], diff --git a/doc/html/files.html b/doc/html/files.html index deb426527..a36fa8ac8 100644 --- a/doc/html/files.html +++ b/doc/html/files.html @@ -128,63 +128,64 @@ $(document).ready(function(){initNavTree('files.html','');}); |o*bb2diaspora.php |o*bbcode.php |o*cache.php -|o*cli_startup.php -|o*cli_suggest.php -|o*comanche.php -|o*config.php -|o*Contact.php -|o*contact_selectors.php -|o*contact_widgets.php -|o*conversation.php -|o*ConversationObject.php -|o*cronhooks.php -|o*crypto.php -|o*datetime.php -|o*deliver.php -|o*dir_fns.php -|o*directory.php -|o*enotify.php -|o*event.php -|o*expire.php -|o*features.php -|o*follow.php -|o*friendica_smarty.php -|o*gprobe.php -|o*group.php -|o*html2bbcode.php -|o*html2plain.php -|o*identity.php -|o*ItemObject.php -|o*ITemplateEngine.php -|o*items.php -|o*language.php -|o*menu.php -|o*message.php -|o*nav.php -|o*network.php -|o*notifier.php -|o*notify.php -|o*oauth.php -|o*oembed.php -|o*onepoll.php -|o*page_widgets.php -|o*permissions.php -|o*photos.php -|o*plugin.php -|o*poller.php -|o*profile_advanced.php -|o*profile_selectors.php -|o*ProtoDriver.php -|o*queue.php -|o*queue_fn.php -|o*security.php -|o*session.php -|o*socgraph.php -|o*system_unavailable.php -|o*taxonomy.php -|o*template_processor.php -|o*text.php -|\*zot.php +|o*chanman.php +|o*cli_startup.php +|o*cli_suggest.php +|o*comanche.php +|o*config.php +|o*Contact.php +|o*contact_selectors.php +|o*contact_widgets.php +|o*conversation.php +|o*ConversationObject.php +|o*cronhooks.php +|o*crypto.php +|o*datetime.php +|o*deliver.php +|o*dir_fns.php +|o*directory.php +|o*enotify.php +|o*event.php +|o*expire.php +|o*features.php +|o*follow.php +|o*friendica_smarty.php +|o*gprobe.php +|o*group.php +|o*html2bbcode.php +|o*html2plain.php +|o*identity.php +|o*ItemObject.php +|o*ITemplateEngine.php +|o*items.php +|o*language.php +|o*menu.php +|o*message.php +|o*nav.php +|o*network.php +|o*notifier.php +|o*notify.php +|o*oauth.php +|o*oembed.php +|o*onepoll.php +|o*page_widgets.php +|o*permissions.php +|o*photos.php +|o*plugin.php +|o*poller.php +|o*profile_advanced.php +|o*profile_selectors.php +|o*ProtoDriver.php +|o*queue.php +|o*queue_fn.php +|o*security.php +|o*session.php +|o*socgraph.php +|o*system_unavailable.php +|o*taxonomy.php +|o*template_processor.php +|o*text.php +|\*zot.php o+mod |o*_well_known.php |o*acl.php @@ -194,7 +195,7 @@ $(document).ready(function(){initNavTree('files.html','');}); |o*apps.php |o*attach.php |o*blocks.php -|o*chanman.php +|o*chanman.php |o*channel.php |o*chanview.php |o*common.php @@ -205,111 +206,110 @@ $(document).ready(function(){initNavTree('files.html','');}); |o*crepair.php |o*delegate.php |o*directory.php -|o*dirfind.php -|o*dirsearch.php -|o*display.php -|o*editblock.php -|o*editlayout.php -|o*editpost.php -|o*editwebpage.php -|o*events.php -|o*fbrowser.php -|o*feed.php -|o*filer.php -|o*filerm.php -|o*filestorage.php -|o*follow.php -|o*fsuggest.php -|o*group.php -|o*hcard.php -|o*help.php -|o*home.php -|o*hostxrd.php -|o*import.php -|o*intro.php -|o*invite.php -|o*item.php -|o*lastpost.php -|o*layouts.php -|o*like.php -|o*lockview.php -|o*login.php -|o*lostpass.php -|o*magic.php -|o*manage.php -|o*match.php -|o*menu.php -|o*message.php -|o*mitem.php -|o*mood.php -|o*msearch.php -|o*network.php -|o*new_channel.php -|o*nogroup.php -|o*notifications.php -|o*notify.php -|o*oembed.php -|o*oexchange.php -|o*opensearch.php -|o*page.php -|o*parse_url.php -|o*photo.php -|o*photos.php -|o*php.php -|o*ping.php -|o*poco.php -|o*poke.php -|o*post.php -|o*pretheme.php -|o*probe.php -|o*profile.php -|o*profile_photo.php -|o*profiles.php -|o*profperm.php -|o*pubsites.php -|o*qsearch.php -|o*randprof.php -|o*redir.php -|o*register.php -|o*regmod.php -|o*removeme.php -|o*rmagic.php -|o*rsd_xml.php -|o*search.php -|o*search_ac.php -|o*settings.php -|o*setup.php -|o*share.php -|o*siteinfo.php -|o*sitelist.php -|o*smilies.php -|o*starred.php -|o*subthread.php -|o*suggest.php -|o*tagger.php -|o*tagrm.php -|o*thing.php -|o*toggle_mobile.php -|o*uexport.php -|o*update_channel.php -|o*update_community.php -|o*update_display.php -|o*update_network.php -|o*update_search.php -|o*view.php -|o*viewconnections.php -|o*viewsrc.php -|o*vote.php -|o*wall_attach.php -|o*wall_upload.php -|o*webfinger.php -|o*webpages.php -|o*wfinger.php -|o*xchan.php -|o*xrd.php -|o*zfinger.php -|o*zotfeed.php -|\*zping.php +|o*dirsearch.php +|o*display.php +|o*editblock.php +|o*editlayout.php +|o*editpost.php +|o*editwebpage.php +|o*events.php +|o*fbrowser.php +|o*feed.php +|o*filer.php +|o*filerm.php +|o*filestorage.php +|o*follow.php +|o*fsuggest.php +|o*group.php +|o*hcard.php +|o*help.php +|o*home.php +|o*hostxrd.php +|o*import.php +|o*intro.php +|o*invite.php +|o*item.php +|o*lastpost.php +|o*layouts.php +|o*like.php +|o*lockview.php +|o*login.php +|o*lostpass.php +|o*magic.php +|o*manage.php +|o*match.php +|o*menu.php +|o*message.php +|o*mitem.php +|o*mood.php +|o*msearch.php +|o*network.php +|o*new_channel.php +|o*nogroup.php +|o*notifications.php +|o*notify.php +|o*oembed.php +|o*oexchange.php +|o*opensearch.php +|o*page.php +|o*parse_url.php +|o*photo.php +|o*photos.php +|o*php.php +|o*ping.php +|o*poco.php +|o*poke.php +|o*post.php +|o*pretheme.php +|o*probe.php +|o*profile.php +|o*profile_photo.php +|o*profiles.php +|o*profperm.php +|o*pubsites.php +|o*qsearch.php +|o*randprof.php +|o*redir.php +|o*register.php +|o*regmod.php +|o*removeme.php +|o*rmagic.php +|o*rsd_xml.php +|o*search.php +|o*search_ac.php +|o*settings.php +|o*setup.php +|o*share.php +|o*siteinfo.php +|o*sitelist.php +|o*smilies.php +|o*starred.php +|o*subthread.php +|o*suggest.php +|o*tagger.php +|o*tagrm.php +|o*thing.php +|o*toggle_mobile.php +|o*uexport.php +|o*update_channel.php +|o*update_community.php +|o*update_display.php +|o*update_network.php +|o*update_search.php +|o*view.php +|o*viewconnections.php +|o*viewsrc.php +|o*vote.php +|o*wall_attach.php +|o*wall_upload.php +|o*webfinger.php +|o*webpages.php +|o*wfinger.php +|o*xchan.php +|o*xrd.php +|o*zfinger.php +|o*zotfeed.php +|\*zping.php o+util |o+fpostit ||\*fpostit.php diff --git a/doc/html/globals_0x61.html b/doc/html/globals_0x61.html index 75e2d36ba..524d8afcf 100644 --- a/doc/html/globals_0x61.html +++ b/doc/html/globals_0x61.html @@ -183,6 +183,9 @@ $(document).ready(function(){initNavTree('globals_0x61.html','');});
  • ACCESS_PRIVATE : boot.php
  • +
  • ACCESS_TIERED +: boot.php +
  • ACCESS_TOKEN_DURATION : oauth.php
  • @@ -199,7 +202,7 @@ $(document).ready(function(){initNavTree('globals_0x61.html','');}); : boot.php
  • account_remove() -: Contact.php +: Contact.php
  • ACCOUNT_REMOVED : boot.php @@ -318,6 +321,12 @@ $(document).ready(function(){initNavTree('globals_0x61.html','');});
  • admin_page_dbsync() : admin.php
  • +
  • admin_page_hubloc() +: admin.php +
  • +
  • admin_page_hubloc_post() +: admin.php +
  • admin_page_logs() : admin.php
  • diff --git a/doc/html/globals_0x63.html b/doc/html/globals_0x63.html index 3527881d2..41a4bfee0 100644 --- a/doc/html/globals_0x63.html +++ b/doc/html/globals_0x63.html @@ -168,6 +168,9 @@ $(document).ready(function(){initNavTree('globals_0x63.html','');});
  • chanlink_url() : text.php
  • +
  • chanman_remove_everything_from_network() +: chanman.php +
  • channel_aside() : channel.php
  • @@ -178,7 +181,7 @@ $(document).ready(function(){initNavTree('globals_0x63.html','');}); : channel.php
  • channel_remove() -: Contact.php +: Contact.php
  • channel_total() : identity.php diff --git a/doc/html/globals_0x64.html b/doc/html/globals_0x64.html index c9573a753..dd09f7376 100644 --- a/doc/html/globals_0x64.html +++ b/doc/html/globals_0x64.html @@ -228,6 +228,12 @@ $(document).ready(function(){initNavTree('globals_0x64.html','');});
  • diaspora_ul() : bb2diaspora.php
  • +
  • dir_tagadelic() +: taxonomy.php +
  • +
  • dir_tagblock() +: taxonomy.php +
  • directory_aside() : directory.php
  • @@ -258,12 +264,6 @@ $(document).ready(function(){initNavTree('globals_0x64.html','');});
  • directory_run() : directory.php
  • -
  • dirfind_content() -: dirfind.php -
  • -
  • dirfind_init() -: dirfind.php -
  • dirsearch_content() : dirsearch.php
  • diff --git a/doc/html/globals_0x65.html b/doc/html/globals_0x65.html index 45d38cb53..0610a3871 100644 --- a/doc/html/globals_0x65.html +++ b/doc/html/globals_0x65.html @@ -162,7 +162,7 @@ $(document).ready(function(){initNavTree('globals_0x65.html','');}); , tpldebug.php
  • email_header_encode() -: network.php +: network.php
  • email_send() : network.php diff --git a/doc/html/globals_0x68.html b/doc/html/globals_0x68.html index 987b252fc..5103e6fe6 100644 --- a/doc/html/globals_0x68.html +++ b/doc/html/globals_0x68.html @@ -192,6 +192,9 @@ $(document).ready(function(){initNavTree('globals_0x68.html','');});
  • http_status_exit() : network.php
  • +
  • HUBLOC_FLAGS_DELETED +: boot.php +
  • HUBLOC_FLAGS_PRIMARY : boot.php
  • diff --git a/doc/html/globals_0x69.html b/doc/html/globals_0x69.html index 85714b02b..961d66478 100644 --- a/doc/html/globals_0x69.html +++ b/doc/html/globals_0x69.html @@ -191,6 +191,9 @@ $(document).ready(function(){initNavTree('globals_0x69.html','');});
  • import_xchan() : zot.php
  • +
  • in_arrayi() +: text.php +
  • info() : boot.php
  • diff --git a/doc/html/globals_0x75.html b/doc/html/globals_0x75.html index ff65b2afd..02c22be8b 100644 --- a/doc/html/globals_0x75.html +++ b/doc/html/globals_0x75.html @@ -162,6 +162,9 @@ $(document).ready(function(){initNavTree('globals_0x75.html','');});
  • unload_plugin() : plugin.php
  • +
  • unobscure() +: text.php +
  • unregister_hook() : plugin.php
  • diff --git a/doc/html/globals_0x78.html b/doc/html/globals_0x78.html index f5e15ee01..7aa6e4490 100644 --- a/doc/html/globals_0x78.html +++ b/doc/html/globals_0x78.html @@ -150,6 +150,9 @@ $(document).ready(function(){initNavTree('globals_0x78.html','');});
  • xchan_content() : xchan.php
  • +
  • XCHAN_FLAGS_CENSORED +: boot.php +
  • XCHAN_FLAGS_HIDDEN : boot.php
  • diff --git a/doc/html/globals_func_0x61.html b/doc/html/globals_func_0x61.html index 1e00c557a..0be103cdb 100644 --- a/doc/html/globals_func_0x61.html +++ b/doc/html/globals_func_0x61.html @@ -156,7 +156,7 @@ $(document).ready(function(){initNavTree('globals_func_0x61.html','');}); : boot.php
  • account_remove() -: Contact.php +: Contact.php
  • account_total() : account.php @@ -185,6 +185,12 @@ $(document).ready(function(){initNavTree('globals_func_0x61.html','');});
  • admin_page_dbsync() : admin.php
  • +
  • admin_page_hubloc() +: admin.php +
  • +
  • admin_page_hubloc_post() +: admin.php +
  • admin_page_logs() : admin.php
  • diff --git a/doc/html/globals_func_0x63.html b/doc/html/globals_func_0x63.html index 0c8414fb6..9029ab6ad 100644 --- a/doc/html/globals_func_0x63.html +++ b/doc/html/globals_func_0x63.html @@ -167,6 +167,9 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');});
  • chanlink_url() : text.php
  • +
  • chanman_remove_everything_from_network() +: chanman.php +
  • channel_aside() : channel.php
  • @@ -177,7 +180,7 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');}); : channel.php
  • channel_remove() -: Contact.php +: Contact.php
  • channel_total() : identity.php diff --git a/doc/html/globals_func_0x64.html b/doc/html/globals_func_0x64.html index 96de8abd4..c73b57683 100644 --- a/doc/html/globals_func_0x64.html +++ b/doc/html/globals_func_0x64.html @@ -221,6 +221,12 @@ $(document).ready(function(){initNavTree('globals_func_0x64.html','');});
  • diaspora_ul() : bb2diaspora.php
  • +
  • dir_tagadelic() +: taxonomy.php +
  • +
  • dir_tagblock() +: taxonomy.php +
  • directory_aside() : directory.php
  • @@ -233,12 +239,6 @@ $(document).ready(function(){initNavTree('globals_func_0x64.html','');});
  • directory_run() : directory.php
  • -
  • dirfind_content() -: dirfind.php -
  • -
  • dirfind_init() -: dirfind.php -
  • dirsearch_content() : dirsearch.php
  • diff --git a/doc/html/globals_func_0x65.html b/doc/html/globals_func_0x65.html index 3069c0d0f..290ea76b4 100644 --- a/doc/html/globals_func_0x65.html +++ b/doc/html/globals_func_0x65.html @@ -156,7 +156,7 @@ $(document).ready(function(){initNavTree('globals_func_0x65.html','');}); : editwebpage.php
  • email_header_encode() -: network.php +: network.php
  • email_send() : network.php diff --git a/doc/html/globals_func_0x69.html b/doc/html/globals_func_0x69.html index 1733078c3..17ed3fecc 100644 --- a/doc/html/globals_func_0x69.html +++ b/doc/html/globals_func_0x69.html @@ -182,6 +182,9 @@ $(document).ready(function(){initNavTree('globals_func_0x69.html','');});
  • import_xchan() : zot.php
  • +
  • in_arrayi() +: text.php +
  • info() : boot.php
  • diff --git a/doc/html/globals_func_0x75.html b/doc/html/globals_func_0x75.html index 9b5bc1607..c6c22560d 100644 --- a/doc/html/globals_func_0x75.html +++ b/doc/html/globals_func_0x75.html @@ -161,6 +161,9 @@ $(document).ready(function(){initNavTree('globals_func_0x75.html','');});
  • unload_plugin() : plugin.php
  • +
  • unobscure() +: text.php +
  • unregister_hook() : plugin.php
  • diff --git a/doc/html/globals_vars_0x61.html b/doc/html/globals_vars_0x61.html index bb34b28f3..c7c2cf186 100644 --- a/doc/html/globals_vars_0x61.html +++ b/doc/html/globals_vars_0x61.html @@ -166,6 +166,9 @@ $(document).ready(function(){initNavTree('globals_vars_0x61.html','');});
  • ACCESS_PRIVATE : boot.php
  • +
  • ACCESS_TIERED +: boot.php +
  • ACCESS_TOKEN_DURATION : oauth.php
  • diff --git a/doc/html/globals_vars_0x68.html b/doc/html/globals_vars_0x68.html index 223c815d5..1cf8653e9 100644 --- a/doc/html/globals_vars_0x68.html +++ b/doc/html/globals_vars_0x68.html @@ -139,6 +139,9 @@ $(document).ready(function(){initNavTree('globals_vars_0x68.html','');});  

    - h -