diff --git a/boot.php b/boot.php
index 48f772587..110bf423e 100755
--- a/boot.php
+++ b/boot.php
@@ -37,11 +37,13 @@ require_once('include/permissions.php');
require_once('library/Mobile_Detect/Mobile_Detect.php');
require_once('include/BaseObject.php');
require_once('include/features.php');
+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', 1043 );
+define ( 'DB_UPDATE_VERSION', 1048 );
define ( 'EOL', ' ' . "\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
@@ -117,7 +119,7 @@ define ( 'DEFAULT_DB_ENGINE', 'MyISAM' );
define ( 'SSL_POLICY_NONE', 0 );
define ( 'SSL_POLICY_FULL', 1 );
-define ( 'SSL_POLICY_SELFSIGN', 2 );
+define ( 'SSL_POLICY_SELFSIGN', 2 ); // NOT supported in Red
/**
@@ -313,18 +315,21 @@ define ( 'XCHAN_FLAGS_HIDDEN', 0x0001);
* Tag/term types
*/
-define ( 'TERM_UNKNOWN', 0 );
-define ( 'TERM_HASHTAG', 1 );
-define ( 'TERM_MENTION', 2 );
-define ( 'TERM_CATEGORY', 3 );
-define ( 'TERM_PCATEGORY', 4 );
-define ( 'TERM_FILE', 5 );
-define ( 'TERM_SAVEDSEARCH', 6 );
-
-
-define ( 'TERM_OBJ_POST', 1 );
-define ( 'TERM_OBJ_PHOTO', 2 );
+define ( 'TERM_UNKNOWN', 0 );
+define ( 'TERM_HASHTAG', 1 );
+define ( 'TERM_MENTION', 2 );
+define ( 'TERM_CATEGORY', 3 );
+define ( 'TERM_PCATEGORY', 4 );
+define ( 'TERM_FILE', 5 );
+define ( 'TERM_SAVEDSEARCH', 6 );
+define ( 'TERM_THING', 7 );
+define ( 'TERM_OBJ_POST', 1 );
+define ( 'TERM_OBJ_PHOTO', 2 );
+define ( 'TERM_OBJ_PROFILE', 3 );
+define ( 'TERM_OBJ_CHANNEL', 4 );
+define ( 'TERM_OBJ_OBJECT', 5 );
+define ( 'TERM_OBJ_THING', 6 );
/**
@@ -379,6 +384,7 @@ define ( 'ACTIVITY_OBJ_EVENT', NAMESPACE_ACTIVITY_SCHEMA . 'event' );
define ( 'ACTIVITY_OBJ_GROUP', NAMESPACE_ACTIVITY_SCHEMA . 'group' );
define ( 'ACTIVITY_OBJ_TAGTERM', NAMESPACE_ZOT . '/activity/tagterm' );
define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_ZOT . '/activity/profile' );
+define ( 'ACTIVITY_OBJ_THING', NAMESPACE_ZOT . '/activity/thing' );
/**
* item weight for query ordering
@@ -436,6 +442,7 @@ define ( 'ITEM_NOTSHOWN', 0x0080); // technically visible but not normal
define ( 'ITEM_NSFW', 0x0100);
define ( 'ITEM_RELAY', 0x0200); // used only in the communication layers, not stored
define ( 'ITEM_MENTIONSME', 0x0400);
+define ( 'ITEM_NOCOMMENT', 0x0800); // commenting/followups are disabled
/**
@@ -2061,12 +2068,16 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
function get_my_url() {
+ if(x($_SESSION,'zrl_override'))
+ return $_SESSION['zrl_override'];
if(x($_SESSION,'my_url'))
return $_SESSION['my_url'];
return false;
}
function get_my_address() {
+ if(x($_SESSION,'zid_override'))
+ return $_SESSION['zid_override'];
if(x($_SESSION,'my_address'))
return $_SESSION['my_address'];
return false;
@@ -2104,12 +2115,12 @@ function zid_init(&$a) {
}
/**
- * @function zid($s,$force = false)
+ * @function zid($s,$address = '')
* Adds a zid parameter to a url
* @param string $s
* The url to accept the zid
- * @param boolean $force
- * Currently unused
+ * @param boolean $address
+ * $address to use instead of session environment
* @return string
*
* @hooks 'zid'
@@ -2119,7 +2130,7 @@ function zid_init(&$a) {
*/
-function zid($s,$force = false) {
+function zid($s,$address = '') {
if(! strlen($s) || strpos($s,'zid='))
return $s;
$has_params = ((strpos($s,'?')) ? true : false);
@@ -2129,9 +2140,9 @@ function zid($s,$force = false) {
$achar = strpos($s,'?') ? '&' : '?';
$mine = get_my_url();
- $myaddr = get_my_address();
+ $myaddr = (($address) ? $address : get_my_address());
- if($mine and ! link_compare($mine,$s))
+ if($mine && $myaddr && (! link_compare($mine,$s)))
$zurl = $s . (($num_slashes >= 3) ? '' : '/') . $achar . 'zid=' . urlencode($myaddr);
else
$zurl = $s;
diff --git a/doc/html/bbcode_8php.html b/doc/html/bbcode_8php.html
index 5948b387c..4297aac74 100644
--- a/doc/html/bbcode_8php.html
+++ b/doc/html/bbcode_8php.html
@@ -221,7 +221,7 @@ Functions
-
Referenced by api_format_items() , api_format_messages() , api_status_show() , api_users_show() , atom_entry() , bb2diaspora() , construct_activity_object() , construct_activity_target() , events_content() , format_event_html() , format_notification() , get_events() , message_content() , notification() , notifications_content() , notify_content() , ping_init() , and tagrm_content() .
+
Referenced by api_format_items() , api_format_messages() , api_status_show() , api_users_show() , atom_entry() , bb2diaspora() , construct_activity_object() , construct_activity_target() , conversation() , events_content() , format_event_html() , format_notification() , get_events() , message_content() , notification() , notifications_content() , notify_content() , ping_init() , and tagrm_content() .
diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html
index 320a68e20..d2f8d73f8 100644
--- a/doc/html/boot_8php.html
+++ b/doc/html/boot_8php.html
@@ -189,8 +189,8 @@ Functions
zid_init (&$a)
- zid ($s, $force=false)
-
+ zid ($s, $address= '')
+
build_querystring ($params, $name=null)
argc ()
@@ -216,7 +216,7 @@ Variables
const ZOT_REVISION 1
-const DB_UPDATE_VERSION 1043
+const DB_UPDATE_VERSION 1047
const EOL '<br />' . "\r\n"
@@ -436,10 +436,20 @@ Variables
const TERM_SAVEDSEARCH 6
+const TERM_THING 7
+
const TERM_OBJ_POST 1
const TERM_OBJ_PHOTO 2
+const TERM_OBJ_PROFILE 3
+
+const TERM_OBJ_CHANNEL 4
+
+const TERM_OBJ_OBJECT 5
+
+const TERM_OBJ_THING 6
+
const NAMESPACE_ZOT 'http://purl.org/zot'
const NAMESPACE_DFRN 'http://purl.org/macgirvin/dfrn/1.0'
@@ -520,6 +530,8 @@ Variables
const ACTIVITY_OBJ_PROFILE NAMESPACE_ZOT . '/activity/profile'
+const ACTIVITY_OBJ_THING NAMESPACE_ZOT . '/activity/thing'
+
const GRAVITY_PARENT 0
const GRAVITY_LIKE 3
@@ -580,6 +592,8 @@ Variables
const ITEM_MENTIONSME 0x0400
+const ITEM_NOCOMMENT 0x0800
+
@@ -628,7 +642,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() , events_content() , feed_init() , group_content() , group_post() , like_content() , lockview_content() , manage_content() , message_content() , 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() , poller_run() , 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() , uexport_init() , update_channel_content() , update_display_content() , update_network_content() , update_search_content() , viewconnections_init() , viewsrc_content() , wall_attach_post() , wall_upload_post() , 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() , connections_content() , connections_init() , contactgroup_content() , display_content() , editpost_content() , events_content() , feed_init() , group_content() , group_post() , like_content() , lockview_content() , manage_content() , message_content() , 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() , poller_run() , 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() , uexport_init() , update_channel_content() , update_display_content() , update_network_content() , update_search_content() , viewconnections_init() , viewsrc_content() , wall_attach_post() , wall_upload_post() , and zotfeed_init() .
@@ -646,7 +660,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() , events_content() , feed_init() , group_content() , group_post() , like_content() , lockview_content() , manage_content() , message_aside() , message_content() , 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() , poller_run() , 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() , 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() , connections_content() , connections_init() , connections_post() , contactgroup_content() , display_content() , editpost_content() , events_content() , feed_init() , group_content() , group_post() , like_content() , lockview_content() , manage_content() , message_aside() , message_content() , 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() , poller_run() , 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() , and zotfeed_init() .
@@ -806,7 +820,7 @@ Variables
@@ -851,7 +865,7 @@ Variables
-
Referenced by api_user() , change_channel() , channel_content() , events_post() , feed_init() , import_post() , manage_content() , mood_init() , nav() , new_channel_content() , new_channel_post() , new_contact() , profile_content() , profile_photo_post() , profiles_init() , settings_post() , and zotfeed_init() .
+
Referenced by api_user() , change_channel() , channel_content() , events_post() , feed_init() , import_post() , manage_content() , mood_init() , nav() , new_channel_content() , new_channel_post() , new_contact() , profile_content() , profile_photo_post() , profiles_init() , settings_post() , and zotfeed_init() .
@@ -868,7 +882,7 @@ Variables
-
Referenced by FriendicaSmarty\__construct() , FriendicaSmartyEngine\__construct() , 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() , call_hooks() , categories_widget() , change_channel() , channel_remove() , check_form_security_token() , check_form_security_token_ForbiddenOnErr() , check_form_security_token_redirectOnErr() , check_htaccess() , common_friends_visitor_widget() , connections_content() , consume_feed() , 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_permissions_sql() , items_fetch() , load_contact_links() , load_hooks() , local_delivery() , login() , FKOAuth1\loginUser() , lrdd() , manage_content() , map_scope() , nav_set_selected() , new_contact() , new_follower() , notice() , notification() , notifier_run() , oembed_fetch_url() , oembed_format_object() , oembed_iframe() , onepoll_run() , permissions_sql() , ping_init() , poco_load() , poller_run() , post_activity_item() , post_url() , preg_heart() , prepare_body() , proc_run() , 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() , 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() , common_friends_visitor_widget() , connections_content() , consume_feed() , 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_permissions_sql() , item_photo_menu() , item_redir_and_replace_images() , items_fetch() , load_contact_links() , load_hooks() , local_delivery() , login() , FKOAuth1\loginUser() , lrdd() , manage_content() , map_scope() , nav_set_selected() , new_contact() , new_follower() , notice() , notification() , notifier_run() , oembed_fetch_url() , oembed_format_object() , oembed_iframe() , onepoll_run() , permissions_sql() , ping_init() , poco_load() , poller_run() , post_activity_item() , post_url() , preg_heart() , prepare_body() , proc_run() , 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() , what_next() , z_fetch_url() , and zot_finger() .
@@ -932,7 +946,7 @@ Variables
@@ -949,7 +963,7 @@ Variables
@@ -984,7 +998,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() , intro_post() , item_post() , login_content() , lostpass_content() , lostpass_post() , magic_init() , manage_content() , message_content() , 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() , connections_content() , connections_post() , delegate_content() , directory_content() , drop_item() , events_post() , filerm_content() , follow_init() , group_content() , group_post() , intro_post() , item_post() , login_content() , lostpass_content() , lostpass_post() , magic_init() , manage_content() , message_content() , 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() .
@@ -1002,7 +1016,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() , file_tag_save_file() , follow_init() , fsuggest_post() , group_content() , group_post() , intro_post() , item_post() , lostpass_content() , lostpass_post() , match_content() , message_content() , 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() , 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() , follow_init() , fsuggest_post() , group_content() , group_post() , intro_post() , item_post() , lostpass_content() , lostpass_post() , match_content() , message_content() , 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() , user_allow() , and viewconnections_content() .
@@ -1053,7 +1067,7 @@ Variables
-
Referenced by FriendicaSmartyEngine\__construct() , acl_init() , admin_content() , api_content() , api_ff_ids() , api_friendica_version() , api_oauth_access_token() , api_oauth_request_token() , api_statusnet_version() , attach_init() , check_form_security_token_ForbiddenOnErr() , contactgroup_content() , events_content() , fbrowser_content() , feed_init() , filer_content() , filerm_content() , goaway() , http_status_exit() , item_post() , json_return_and_die() , like_content() , lockview_content() , msearch_post() , network_content() , oembed_init() , oexchange_init() , opensearch_init() , parse_url_content() , photo_init() , photos_post() , ping_init() , poco_init() , poller_run() , post_init() , pretheme_init() , qsearch_init() , App\register_template_engine() , regmod_content() , search_ac_init() , setup_init() , setup_post() , share_init() , siteinfo_init() , starred_init() , subthread_content() , system_unavailable() , tagger_content() , App\template_engine() , uexport_init() , update_channel_content() , update_community_content() , update_display_content() , update_network_content() , update_search_content() , view_init() , viewsrc_content() , wall_attach_post() , wall_upload_post() , wfinger_init() , xml_status() , and xrd_init() .
+
Referenced by FriendicaSmartyEngine\__construct() , acl_init() , admin_content() , api_content() , api_ff_ids() , api_friendica_version() , api_oauth_access_token() , api_oauth_request_token() , api_statusnet_version() , attach_init() , check_form_security_token_ForbiddenOnErr() , contactgroup_content() , events_content() , fbrowser_content() , feed_init() , filer_content() , filerm_content() , goaway() , http_status_exit() , item_post() , json_return_and_die() , like_content() , lockview_content() , msearch_post() , network_content() , oembed_init() , oexchange_init() , opensearch_init() , parse_url_content() , photo_init() , photos_post() , php_init() , ping_init() , poco_init() , poller_run() , post_init() , pretheme_init() , qsearch_init() , App\register_template_engine() , regmod_content() , search_ac_init() , setup_init() , setup_post() , share_init() , siteinfo_init() , starred_init() , subthread_content() , system_unavailable() , tagger_content() , App\template_engine() , uexport_init() , update_channel_content() , update_community_content() , update_display_content() , update_network_content() , update_search_content() , view_init() , viewsrc_content() , wall_attach_post() , wall_upload_post() , wfinger_init() , xml_status() , and xrd_init() .
@@ -1071,7 +1085,7 @@ Variables
@@ -1088,7 +1102,7 @@ Variables
-
Referenced by Item\__construct() , acl_init() , allfriends_content() , api_content() , api_get_user() , api_post() , api_user() , best_link_url() , App\build_pagehead() , 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() , crepair_content() , crepair_init() , crepair_post() , delegate_content() , directory_aside() , directory_content() , display_content() , drop_item() , drop_items() , editpost_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() , 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_post() , lockview_content() , login() , login_content() , magic_init() , manage_content() , match_content() , message_content() , message_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_photo_aside() , profile_photo_init() , profile_photo_post() , profile_sidebar() , profiles_aside() , profiles_content() , profiles_init() , profiles_post() , profperm_aside() , profperm_content() , profperm_init() , qsearch_init() , redbasic_form() , redir_init() , regmod_content() , removeme_content() , removeme_post() , rmagic_init() , saved_searches() , search_ac_init() , search_content() , search_init() , search_saved_searches() , service_class_allows() , service_class_fetch() , Conversation\set_mode() , settings_aside() , 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() , uexport_init() , vcard_from_xchan() , viewconnections_aside() , viewconnections_content() , viewconnections_init() , viewsrc_content() , and zid_init() .
+
Referenced by Item\__construct() , acl_init() , 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() , delegate_content() , directory_aside() , directory_content() , display_content() , drop_item() , drop_items() , editpost_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() , 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() , like_puller() , lockview_content() , login() , login_content() , magic_init() , manage_content() , match_content() , message_content() , message_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_photo_aside() , profile_photo_init() , profile_photo_post() , profile_sidebar() , profiles_aside() , profiles_content() , profiles_init() , profiles_post() , profperm_aside() , profperm_content() , profperm_init() , qsearch_init() , redbasic_form() , redir_init() , regmod_content() , removeme_content() , removeme_post() , rmagic_init() , saved_searches() , search_ac_init() , search_content() , search_init() , search_saved_searches() , service_class_allows() , service_class_fetch() , Conversation\set_mode() , settings_aside() , 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_init() , uexport_init() , vcard_from_xchan() , viewconnections_aside() , viewconnections_content() , viewconnections_init() , viewsrc_content() , and zid_init() .
@@ -1140,7 +1154,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() , 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() , like_content() , lostpass_content() , lostpass_post() , magic_init() , manage_content() , match_content() , message_content() , message_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() , user_deny() , viewconnections_content() , viewsrc_content() , wall_attach_post() , wall_upload_post() , 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() , connections_content() , connections_post() , crepair_content() , crepair_post() , delegate_content() , directory_content() , display_content() , drop_item() , editpost_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() , like_content() , lostpass_content() , lostpass_post() , magic_init() , manage_content() , match_content() , message_content() , message_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() , user_deny() , viewconnections_content() , viewsrc_content() , wall_attach_post() , wall_upload_post() , and xchan_content() .
@@ -1162,7 +1176,7 @@ Variables
e.g.: proc_run("ls","-la","/tmp");
$cmd and string args are surrounded with ""
-Referenced by connections_content() , connections_post() , create_identity() , directory_run() , drop_item() , drop_items() , events_post() , fsuggest_post() , item_expire() , item_post() , like_content() , local_delivery() , mood_init() , new_contact() , notifier_run() , photo_upload() , photos_post() , poller_run() , post_activity_item() , process_delivery() , profile_activity() , profile_photo_post() , profiles_post() , send_message() , settings_post() , tag_deliver() , tagger_content() , zid_init() , and zot_refresh() .
+Referenced by build_sync_packet() , connections_content() , connections_post() , create_identity() , directory_run() , drop_item() , drop_items() , events_post() , fsuggest_post() , item_expire() , item_post() , like_content() , local_delivery() , mood_init() , new_contact() , notifier_run() , photo_upload() , photos_post() , poller_run() , post_activity_item() , process_delivery() , profile_activity() , profile_photo_post() , profiles_post() , send_message() , settings_post() , tag_deliver() , tagger_content() , zid_init() , and zot_refresh() .
@@ -1363,7 +1377,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() , create_account() , create_identity() , crepair_init() , crepair_post() , current_theme() , del_config() , 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() , load_contact_links() , local_delivery() , 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() , load_contact_links() , local_delivery() , 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() .
@@ -1431,11 +1445,11 @@ Variables
-
Referenced by allowed_public_recips() , chanlink_cid() , chanlink_hash() , chanlink_url() , channel_content() , chanview_content() , check_config() , connections_content() , create_identity() , deliver_run() , directory_content() , display_content() , event_store() , follow_init() , format_css_if_exists() , format_js_if_exists() , group_post() , hostxrd_init() , import_post() , import_xchan() , intro_post() , item_store() , like_content() , login_content() , lostpass_content() , lostpass_post() , magic_init() , magiclink_url() , manage_content() , mood_init() , navbar_complete() , network_content() , new_channel_post() , 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() , user_allow() , vcard_from_xchan() , 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() , 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() , hostxrd_init() , import_post() , import_xchan() , intro_post() , item_photo_menu() , item_store() , login_content() , lostpass_content() , lostpass_post() , magic_init() , magiclink_url() , manage_content() , 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() , user_allow() , vcard_from_xchan() , wfinger_init() , zfinger_init() , zid_init() , zot_build_packet() , zot_fetch() , and zot_new_uid() .
-
+
@@ -1449,7 +1463,7 @@ Variables
- $force = false
+ $address = ''
@@ -1458,18 +1472,18 @@ Variables
-
zid($s,$force = false) Adds a zid parameter to a url
+
zid($s,$address = '') Adds a zid parameter to a url
Parameters
string $s The url to accept the zid
- boolean $force Currently unused
+ boolean $address $address to use instead of session environment
Returns string
'zid' string url - url to accept zid string zid - urlencoded zid string result - the return string we calculated, change it if you want to return something else
-
Referenced by bb_ShareAttributes() , dirfind_content() , intro_content() , localize_item() , match_content() , notifications_content() , and viewconnections_content() .
+
Referenced by bb_ShareAttributes() , conversation() , dirfind_content() , intro_content() , like_puller() , localize_item() , match_content() , notifications_content() , and viewconnections_content() .
@@ -1558,7 +1572,7 @@ Variables
-
Referenced by acl_init() , collect_recipients() , connections_content() , connections_post() , get_all_perms() , group_content() , group_get_members() , intro_content() , notifier_run() , perm_is_allowed() , ping_init() , and zot_refresh() .
+
Referenced by acl_init() , collect_recipients() , connections_content() , connections_post() , get_all_perms() , group_content() , group_get_members() , intro_content() , perm_is_allowed() , ping_init() , and zot_refresh() .
@@ -1572,7 +1586,7 @@ Variables
-
Referenced by abook_connections() , abook_self() , acl_init() , api_get_user() , collect_recipients() , connections_content() , connections_post() , contact_remove() , contact_select() , contactgroup_content() , create_identity() , get_all_perms() , group_content() , group_get_members() , intro_content() , load_contact_links() , new_contact() , notifier_run() , perm_is_allowed() , ping_init() , poco_init() , settings_aside() , and zot_refresh() .
+
Referenced by abook_connections() , abook_self() , acl_init() , api_get_user() , collect_recipients() , connections_content() , connections_post() , contact_remove() , contact_select() , contactgroup_content() , create_identity() , get_all_perms() , group_content() , group_get_members() , intro_content() , load_contact_links() , new_contact() , notifier_run() , perm_is_allowed() , ping_init() , poco_init() , settings_aside() , and zot_refresh() .
@@ -1684,7 +1698,7 @@ Variables
-
Referenced by Item\add_child() , Conversation\add_thread() , consume_feed() , like_content() , local_delivery() , localize_item() , notifications_content() , and visible_activity() .
+
Referenced by Item\add_child() , Conversation\add_thread() , consume_feed() , conversation() , like_content() , like_puller() , local_delivery() , localize_item() , notifications_content() , and visible_activity() .
@@ -1724,7 +1738,7 @@ Variables
@@ -1751,7 +1765,7 @@ Variables
activity stream defines
-
Referenced by Item\add_child() , Conversation\add_thread() , consume_feed() , like_content() , local_delivery() , localize_item() , notifications_content() , and visible_activity() .
+
Referenced by Item\add_child() , Conversation\add_thread() , consume_feed() , conversation() , like_content() , like_puller() , local_delivery() , localize_item() , notifications_content() , and visible_activity() .
@@ -1765,7 +1779,7 @@ Variables
@@ -1803,7 +1817,7 @@ Variables
-
Referenced by consume_feed() , event_store() , local_delivery() , localize_item() , process_delivery() , and tagger_content() .
+
Referenced by consume_feed() , event_store() , local_delivery() , localize_item() , process_delivery() , and tagger_content() .
@@ -1841,7 +1855,7 @@ Variables
-
Referenced by api_format_items() , consume_feed() , like_content() , local_delivery() , localize_item() , post_activity_item() , subthread_content() , and tagger_content() .
+
Referenced by api_format_items() , consume_feed() , like_content() , local_delivery() , localize_item() , post_activity_item() , subthread_content() , and tagger_content() .
@@ -1867,7 +1881,7 @@ Variables
@@ -1881,7 +1895,7 @@ Variables
@@ -1911,6 +1925,20 @@ Variables
Referenced by consume_feed() , local_delivery() , tag_deliver() , and tagger_content() .
+
+
+
+
+
+
+
+ const ACTIVITY_OBJ_THING NAMESPACE_ZOT . '/activity/thing'
+
+
+
@@ -1923,7 +1951,7 @@ Variables
@@ -2143,7 +2171,7 @@ Variables
- const DB_UPDATE_VERSION 1043
+ const DB_UPDATE_VERSION 1047
@@ -2257,7 +2285,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() , events_content() , events_post() , follow_init() , 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() , like_content() , load_database() , lostpass_content() , lostpass_post() , magic_init() , manage_content() , match_content() , message_content() , message_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() , 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() , connections_content() , connections_post() , crepair_content() , crepair_post() , delegate_content() , directory_content() , dirfind_content() , display_content() , drop_item() , editpost_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() , like_content() , load_database() , lostpass_content() , lostpass_post() , magic_init() , manage_content() , match_content() , message_content() , message_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() , and xchan_content() .
@@ -2310,7 +2338,7 @@ Variables
-
Referenced by create_identity() , import_author_xchan() , import_post() , import_xchan() , magic_init() , xchan_mail_query() , xchan_query() , zfinger_init() , zot_finger() , zot_get_hubloc() , and zot_refresh() .
+
Referenced by create_identity() , import_author_xchan() , import_post() , import_xchan() , magic_init() , xchan_mail_query() , xchan_query() , zfinger_init() , zot_finger() , zot_get_hubloc() , and zot_refresh() .
@@ -2408,6 +2436,20 @@ Variables
Referenced by item_post() .
+
+
+
+
+
+
+
+ const ITEM_NOCOMMENT 0x0800
+
+
+
@@ -2596,7 +2638,7 @@ Variables
@@ -2668,7 +2710,7 @@ Variables
-
Referenced by admin_page_logs() , check_form_security_token_ForbiddenOnErr() , check_form_security_token_redirectOnErr() , consume_feed() , detect_language() , dfrn_deliver() , directory_content() , fetch_xrd_links() , fix_private_photos() , import_xchan() , item_post() , item_store() , item_store_update() , lrdd() , mail_store() , message_content() , message_post() , mini_group_select() , new_contact() , notifier_run() , parse_xml_string() , photos_post() , poco_load() , post_post() , tag_deliver() , webfinger_dfrn() , xml2array() , zot_build_packet() , zot_fetch() , zot_import() , zot_process_response() , zot_refresh() , and zot_register_hub() .
+
Referenced by admin_page_logs() , check_form_security_token_ForbiddenOnErr() , check_form_security_token_redirectOnErr() , consume_feed() , detect_language() , dfrn_deliver() , directory_content() , fetch_xrd_links() , fix_private_photos() , import_xchan() , item_post() , item_store() , item_store_update() , lrdd() , mail_store() , message_content() , message_post() , mini_group_select() , new_contact() , notifier_run() , parse_xml_string() , photos_post() , poco_load() , post_post() , tag_deliver() , tgroup_check() , webfinger_dfrn() , xml2array() , zot_build_packet() , zot_fetch() , zot_import() , zot_process_response() , zot_refresh() , and zot_register_hub() .
@@ -2682,7 +2724,7 @@ Variables
-
Referenced by Item\add_child() , Conversation\add_thread() , admin_page_logs() , api_login() , api_statuses_user_timeline() , authenticate_success() , avatar_img() , consume_feed() , delete_imported_item() , deliver_run() , dfrn_deliver() , directory_content() , directory_run() , expire_run() , fix_private_photos() , Conversation\get_template_data() , group_content() , guess_image_type() , import_author_xchan() , import_channel_photo() , import_directory_profile() , import_profile_photo() , import_xchan() , item_post() , item_store() , item_store_update() , like_content() , limit_body_size() , local_delivery() , FKOAuth1\loginUser() , lrdd() , mail_store() , mood_init() , notification() , notifier_run() , parse_url_content() , photo_upload() , photos_post() , poco_init() , poco_load() , poke_init() , post_post() , process_delivery() , process_profile_delivery() , profile_load() , redir_init() , Item\remove_child() , scale_external_images() , enotify\send() , Conversation\set_mode() , syncdirs() , unload_plugin() , zot_finger() , zot_gethub() , and zot_register_hub() .
+
Referenced by Item\add_child() , Conversation\add_thread() , admin_page_logs() , api_login() , api_statuses_user_timeline() , authenticate_success() , avatar_img() , consume_feed() , conversation() , delete_imported_item() , deliver_run() , dfrn_deliver() , directory_content() , directory_run() , expire_run() , fix_private_photos() , Conversation\get_template_data() , group_content() , guess_image_type() , import_author_xchan() , import_channel_photo() , import_directory_profile() , import_profile_photo() , import_xchan() , item_post() , item_store() , item_store_update() , like_content() , limit_body_size() , local_delivery() , FKOAuth1\loginUser() , lrdd() , mail_store() , mood_init() , notification() , notifier_run() , parse_url_content() , photo_upload() , photos_post() , poco_init() , poco_load() , poke_init() , post_post() , process_delivery() , process_profile_delivery() , profile_load() , redir_init() , Item\remove_child() , scale_external_images() , enotify\send() , Conversation\set_mode() , syncdirs() , unload_plugin() , zot_finger() , zot_gethub() , and zot_register_hub() .
@@ -3024,7 +3066,7 @@ Variables
Network and protocol family types
-
Referenced by acl_init() , best_link_url() , consume_feed() , delegate_content() , get_birthdays() , network_to_name() , notifications_content() , redir_init() , and terminate_friendship() .
+
Referenced by acl_init() , best_link_url() , consume_feed() , delegate_content() , get_birthdays() , network_to_name() , notifications_content() , redir_init() , and terminate_friendship() .
@@ -3618,7 +3660,7 @@ Variables
@@ -3702,7 +3744,7 @@ Variables
@@ -3777,7 +3819,7 @@ Variables
@@ -3792,7 +3834,7 @@ Variables
registration policies
-
Referenced by admin_page_site() , api_statusnet_config() , invite_content() , login_content() , register_content() , register_post() , and regmod_content() .
+
Referenced by admin_page_site() , api_statusnet_config() , invite_content() , login_content() , register_content() , register_post() , regmod_content() , and zfinger_init() .
@@ -3806,7 +3848,7 @@ Variables
@@ -3863,7 +3905,7 @@ Variables
-
Referenced by categories_widget() , decode_tags() , encode_item_terms() , file_tag_file_query() , filerm_content() , item_post() , and prepare_body() .
+
Referenced by categories_widget() , decode_tags() , encode_item_terms() , file_tag_file_query() , filerm_content() , item_post() , and prepare_body() .
@@ -3877,7 +3919,7 @@ Variables
-
Referenced by decode_tags() , file_tag_file_query() , fileas_widget() , filer_content() , filerm_content() , items_fetch() , network_content() , and prepare_body() .
+
Referenced by decode_tags() , file_tag_file_query() , fileas_widget() , filer_content() , filerm_content() , items_fetch() , network_content() , and prepare_body() .
@@ -3891,7 +3933,7 @@ Variables
-
Referenced by decode_tags() , encode_item_terms() , format_term_for_display() , get_atom_elements() , handle_tag() , item_getfeedtags() , item_post() , items_fetch() , network_content() , search_ac_init() , search_content() , and tag_deliver() .
+
Referenced by conversation() , decode_tags() , encode_item_terms() , format_term_for_display() , get_atom_elements() , handle_tag() , item_getfeedtags() , item_post() , items_fetch() , network_content() , search_ac_init() , search_content() , and tag_deliver() .
@@ -3905,7 +3947,31 @@ Variables
-
Referenced by decode_tags() , encode_item_terms() , fetch_post_tags() , format_term_for_display() , get_atom_elements() , get_mentions() , handle_tag() , item_getfeedtags() , item_post() , and tag_deliver() .
+
Referenced by conversation() , decode_tags() , encode_item_terms() , fetch_post_tags() , format_term_for_display() , get_atom_elements() , get_mentions() , handle_tag() , item_getfeedtags() , item_post() , tag_deliver() , and tgroup_check() .
+
+
+
+
+
+
+
+
+ const TERM_OBJ_CHANNEL 4
+
+
+
+
+
+
+
+
+
+
+
+ const TERM_OBJ_OBJECT 5
+
+
+
@@ -3931,7 +3997,33 @@ Variables
-
Referenced by delete_item_lowlevel() , fetch_post_tags() , filer_content() , get_atom_elements() , item_post() , item_store() , item_store_update() , search_content() , tag_deliver() , and tagadelic() .
+
Referenced by delete_item_lowlevel() , fetch_post_tags() , filer_content() , get_atom_elements() , item_post() , item_store() , item_store_update() , search_content() , tag_deliver() , and tagadelic() .
+
+
+
+
+
+
+
+
+ const TERM_OBJ_PROFILE 3
+
+
+
+
+
+
+
+
+
+
+
+ const TERM_OBJ_THING 6
+
+
+
@@ -3961,6 +4053,20 @@ Variables
Referenced by network_init() , saved_searches() , search_init() , and search_saved_searches() .
+
+
+
+
+
+
+
+ const TERM_THING 7
+
+
+
@@ -3974,7 +4080,7 @@ Variables
diff --git a/doc/html/boot_8php.js b/doc/html/boot_8php.js
index 0e67a1104..317d8be2f 100644
--- a/doc/html/boot_8php.js
+++ b/doc/html/boot_8php.js
@@ -43,7 +43,7 @@ var boot_8php =
[ "z_birthday", "boot_8php.html#ab55e545b72ec8c097e052ea7d373491f", null ],
[ "z_path", "boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda", null ],
[ "z_root", "boot_8php.html#add517a0958ac684792c62142a3877f81", null ],
- [ "zid", "boot_8php.html#a5b7ce5c0a79796800883644c389dc87f", null ],
+ [ "zid", "boot_8php.html#a5b815330f3d177ab383af37a6c12e532", null ],
[ "zid_init", "boot_8php.html#a680fbafc2db023c5b1309e0180e81315", null ],
[ "ABOOK_FLAG_ARCHIVED", "boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5", null ],
[ "ABOOK_FLAG_BLOCKED", "boot_8php.html#a52b599cd13e152ebc80d7e4413683195", null ],
@@ -76,6 +76,7 @@ var boot_8php =
[ "ACTIVITY_OBJ_PHOTO", "boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966", null ],
[ "ACTIVITY_OBJ_PROFILE", "boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5", null ],
[ "ACTIVITY_OBJ_TAGTERM", "boot_8php.html#a1da180f961f49a11573cac4ff6c62c05", null ],
+ [ "ACTIVITY_OBJ_THING", "boot_8php.html#a0fb63e51c2a9814941842ae8f2f4dff8", null ],
[ "ACTIVITY_POKE", "boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd", null ],
[ "ACTIVITY_POST", "boot_8php.html#a5c3747e0f505f0d5271dc4c54e3feaf4", null ],
[ "ACTIVITY_REQ_FRIEND", "boot_8php.html#afe084c30a1810c10442edb4fbcbc0086", null ],
@@ -112,6 +113,7 @@ var boot_8php =
[ "ITEM_HIDDEN", "boot_8php.html#ac99fc4d040764eac1736bec6973556fe", null ],
[ "ITEM_MENTIONSME", "boot_8php.html#a8da836617174eed9fc2ac8054125354b", null ],
[ "ITEM_MODERATED", "boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450", null ],
+ [ "ITEM_NOCOMMENT", "boot_8php.html#a949116d9a295b214293006c060ca4848", null ],
[ "ITEM_NOTSHOWN", "boot_8php.html#a8663f32171568489dbb2a01dd00371f8", null ],
[ "ITEM_NSFW", "boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08", null ],
[ "ITEM_ORIGIN", "boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7", null ],
@@ -220,10 +222,15 @@ var boot_8php =
[ "TERM_FILE", "boot_8php.html#afb97615e985a013799839b68b99018d7", null ],
[ "TERM_HASHTAG", "boot_8php.html#a2750985ec445617d7e82ae3098c91e3f", null ],
[ "TERM_MENTION", "boot_8php.html#ae37444eaa42705185080ccf3e670cbc2", null ],
+ [ "TERM_OBJ_CHANNEL", "boot_8php.html#a8892374789fd261eb32a7969d934a14a", null ],
+ [ "TERM_OBJ_OBJECT", "boot_8php.html#a882b666adfe21f035a0f8c02806066d6", null ],
[ "TERM_OBJ_PHOTO", "boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd", null ],
[ "TERM_OBJ_POST", "boot_8php.html#a9eeb8989272d5ff804a616898bb13659", null ],
+ [ "TERM_OBJ_PROFILE", "boot_8php.html#aead84fa27d7516b855220fe004964a45", null ],
+ [ "TERM_OBJ_THING", "boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe", null ],
[ "TERM_PCATEGORY", "boot_8php.html#a45b12aefab9675baffc7a07a09486db8", null ],
[ "TERM_SAVEDSEARCH", "boot_8php.html#abd7bb40da9cc073297e49736b338ca07", null ],
+ [ "TERM_THING", "boot_8php.html#a0d877df1e20bae765e1708be50f6b503", null ],
[ "TERM_UNKNOWN", "boot_8php.html#a0c59dde058efebbc66520d136cbd1631", null ],
[ "UPDATE_FAILED", "boot_8php.html#a75fc600186b13c3b25e661afefb5eac8", null ],
[ "UPDATE_SUCCESS", "boot_8php.html#ac86615ddc0763a00f5311c90e991730c", null ],
diff --git a/doc/html/connections_8php.html b/doc/html/connections_8php.html
index 2136bf89e..9543f38fc 100644
--- a/doc/html/connections_8php.html
+++ b/doc/html/connections_8php.html
@@ -118,6 +118,8 @@ Functions
connections_post (&$a)
+ connections_clone (&$a)
+
connections_content (&$a)
@@ -136,6 +138,24 @@ Functions
+
+
+
+
+
+
+
+ connections_clone
+ (
+ &
+ $a )
+
+
+
+
diff --git a/doc/html/connections_8php.js b/doc/html/connections_8php.js
index 35ab2ee7a..ecab7efc9 100644
--- a/doc/html/connections_8php.js
+++ b/doc/html/connections_8php.js
@@ -1,6 +1,7 @@
var connections_8php =
[
[ "connections_aside", "connections_8php.html#af48f7ad20914760ba9874c090384e35a", null ],
+ [ "connections_clone", "connections_8php.html#a15af118efee9c948b6f8294e54a73bb2", null ],
[ "connections_content", "connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c", null ],
[ "connections_init", "connections_8php.html#a1f23623f802af7bd35e95b0e94e5d558", null ],
[ "connections_post", "connections_8php.html#a1224058db8e3fb56463eb312f98e561d", null ]
diff --git a/doc/html/conversation_8php.html b/doc/html/conversation_8php.html
index 838addbc4..a2d4d76da 100644
--- a/doc/html/conversation_8php.html
+++ b/doc/html/conversation_8php.html
@@ -112,19 +112,28 @@ $(document).ready(function(){initNavTree('conversation_8php.html','');});
-if (!function_exists('item_extract_images'))
-if (!function_exists('item_redir_and_replace_images')) localize_item (&$item)
-
+ item_extract_images ($body)
+
+ item_redir_and_replace_images ($body, $images, $cid)
+
+ localize_item (&$item)
+
count_descendants ($item)
visible_activity ($item)
-if (!function_exists('conversation')) best_link_url ($item)
-
-if (!function_exists('item_photo_menu'))
-if (!function_exists('like_puller'))
-if (!function_exists('format_like')) status_editor ($a, $x , $popup=false)
-
+ conversation (&$a, $items, $mode, $update, $page_mode= 'traditional')
+
+ best_link_url ($item)
+
+ item_photo_menu ($item)
+
+ like_puller ($a, $item, &$arr, $mode)
+
+ format_like ($cnt, $arr, $type, $id)
+
+ status_editor ($a, $x , $popup=false)
+
get_item_children ($arr, $parent)
sort_item_children ($items)
@@ -175,12 +184,12 @@ Functions
-
+
- if (!function_exists('conversation')) best_link_url
+ best_link_url
(
$item )
@@ -188,11 +197,8 @@ Functions
-
"Render" a conversation or list of items for HTML display. There are two major forms of display:
-
-Sequential or unthreaded ("New Item View" or search results)
-conversation view The $mode parameter decides between the various renderings and also figures out how to determine page owner and other contextual items that are based on unique features of the calling module.
-
+
+
Referenced by conversation() .
@@ -222,6 +228,57 @@ Functions
Referenced by channel_content() , display_content() , items_fetch() , network_content() , and search_content() .
+
+
+
+
+
+
+
+ conversation
+ (
+ &
+ $a ,
+
+
+
+
+
+ $items ,
+
+
+
+
+
+ $mode ,
+
+
+
+
+
+ $update ,
+
+
+
+
+
+ $page_mode = 'traditional'
+
+
+
+ )
+
+
+
+
@@ -265,6 +322,46 @@ Functions
+
+
+
+
+
+
+
+ format_like
+ (
+
+ $cnt ,
+
+
+
+
+
+ $arr ,
+
+
+
+
+
+ $type ,
+
+
+
+
+
+ $id
+
+
+
+ )
+
+
+
+
@@ -281,7 +378,7 @@ Functions
@@ -311,12 +408,122 @@ Functions
-
+
- if (!function_exists('item_extract_images')) if (!function_exists('item_redir_and_replace_images')) localize_item
+ item_extract_images
+ (
+
+ $body )
+
+
+
+
+
+
+
+
+
+
+ item_photo_menu
+ (
+
+ $item )
+
+
+
+
+
+
+
+
+
+
+ item_redir_and_replace_images
+ (
+
+ $body ,
+
+
+
+
+
+ $images ,
+
+
+
+
+
+ $cid
+
+
+
+ )
+
+
+
+
+
+
+
+
+
+
+ like_puller
+ (
+
+ $a ,
+
+
+
+
+
+ $item ,
+
+
+
+
+ &
+ $arr ,
+
+
+
+
+
+ $mode
+
+
+
+ )
+
+
+
+
+
+
+
+
+
+
+ localize_item
(
&
$item )
@@ -326,7 +533,7 @@ Functions
@@ -458,12 +665,12 @@ Functions
-
+
- if (!function_exists('item_photo_menu')) if (!function_exists('like_puller')) if (!function_exists('format_like')) status_editor
+ status_editor
(
$a ,
@@ -506,7 +713,7 @@ Functions
diff --git a/doc/html/conversation_8php.js b/doc/html/conversation_8php.js
index 69820960f..4417191d0 100644
--- a/doc/html/conversation_8php.js
+++ b/doc/html/conversation_8php.js
@@ -1,19 +1,25 @@
var conversation_8php =
[
[ "add_children_to_list", "conversation_8php.html#ad3e1d4b15e7d6d026ee182edd58f692b", null ],
- [ "best_link_url", "conversation_8php.html#a32e7750ae6adbfdd1f227f6e89221ce3", null ],
+ [ "best_link_url", "conversation_8php.html#ad470fc7766f0db66d138fa1916c7a8b7", null ],
[ "conv_sort", "conversation_8php.html#abed85a41f1160598de880b84021c9cf7", null ],
+ [ "conversation", "conversation_8php.html#a1e97305a441dc143edbe09e17d1ceda1", null ],
[ "count_descendants", "conversation_8php.html#ab2383dff4f823e580399ff469d90ab19", null ],
[ "find_thread_parent_index", "conversation_8php.html#ae59703b07ce2ddf627b4172ff26058b6", null ],
+ [ "format_like", "conversation_8php.html#a3d8e30cc94f9a175054c021305d3aca3", null ],
[ "format_location", "conversation_8php.html#a0891aaa4492cba2b51eda12fe01957f3", null ],
[ "get_item_children", "conversation_8php.html#a7f6ef0dfa554bacf620e84c18d386e67", null ],
- [ "localize_item", "conversation_8php.html#afea815dd1768e8417d2b30be53e9e0b4", null ],
+ [ "item_extract_images", "conversation_8php.html#a0ee05f15255fb1cc3d89f30bc378a654", null ],
+ [ "item_photo_menu", "conversation_8php.html#aacbb12d372d5e9c3ab0735b4aea48fb3", null ],
+ [ "item_redir_and_replace_images", "conversation_8php.html#adda79b75bf1ccf6ce9503aa310953533", null ],
+ [ "like_puller", "conversation_8php.html#afe5b2f38d8b803edb0d7ec5fa2868db0", null ],
+ [ "localize_item", "conversation_8php.html#a9bd7f9fb6678736c581bcba3b17f471c", null ],
[ "prepare_page", "conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c", null ],
[ "render_location_default", "conversation_8php.html#a40b9b5e7825bc73932a32e667f05e6f2", null ],
[ "sort_item_children", "conversation_8php.html#ae996eb116d397a2c6396c312d7b98664", null ],
[ "sort_thr_commented", "conversation_8php.html#a9f909b8885259b79c6ac8da93afd8f11", null ],
[ "sort_thr_created", "conversation_8php.html#ac55e070f65f46fcc8e269f7896be4c7d", null ],
[ "sort_thr_created_rev", "conversation_8php.html#a9cc2a679606da9e535a06433f9f553a0", null ],
- [ "status_editor", "conversation_8php.html#aedf008b9eac87f693d7dcc1a01404d85", null ],
+ [ "status_editor", "conversation_8php.html#a2a7d541854bba755eb8ada59af7dcb1a", null ],
[ "visible_activity", "conversation_8php.html#a7eeaaf44506815576f3bd80053ef52c3", null ]
];
\ No newline at end of file
diff --git a/doc/html/datetime_8php.html b/doc/html/datetime_8php.html
index 80b54ad6c..4a085458a 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() , cal() , channel_content() , Cache\clear() , consume_feed() , 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() , invite_post() , item_post() , item_store() , item_store_update() , items_fetch() , like_content() , local_delivery() , logger() , FKOAuth1\loginUser() , magic_init() , mail_store() , message_content() , network_content() , new_contact() , new_follower() , 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() , 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() , invite_post() , item_post() , item_store() , item_store_update() , items_fetch() , like_content() , local_delivery() , logger() , FKOAuth1\loginUser() , magic_init() , mail_store() , message_content() , network_content() , new_contact() , new_follower() , 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() , 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() .
@@ -474,7 +474,7 @@ Functions
-
Referenced by admin_page_users() , advanced_profile() , bb_ShareAttributes() , format_notification() , Item\get_template_data() , notifications_content() , notify_content() , and ping_init() .
+
Referenced by admin_page_users() , advanced_profile() , bb_ShareAttributes() , conversation() , format_notification() , Item\get_template_data() , notifications_content() , notify_content() , and ping_init() .
diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html
index 3c68babe7..01d9b8275 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() , 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() , 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() , 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() , event_store() , events_content() , expand_groups() , fbrowser_content() , feed_init() , fetch_post_tags() , file_tag_file_query() , file_tag_save_file() , file_tag_unsave_file() , 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() , get_events() , get_pconfig() , get_xconfig() , 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_xchan() , install_plugin() , invite_post() , item_message_id() , item_permissions_sql() , item_post() , item_store() , item_store_update() , items_fetch() , like_content() , load_config() , load_pconfig() , load_plugin() , load_xconfig() , local_delivery() , lockview_content() , FKOAuth1\loginUser() , FKOAuthDataStore\lookup_consumer() , FKOAuthDataStore\lookup_nonce() , FKOAuthDataStore\lookup_token() , lostpass_content() , lostpass_post() , magic_init() , mail_store() , member_of() , msearch_post() , network_content() , network_init() , FKOAuthDataStore\new_access_token() , new_contact() , new_cookie() , new_follower() , 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_delivery() , process_mail_delivery() , profile_init() , profile_load() , profile_photo_post() , profiles_init() , profiles_post() , public_permissions_sql() , public_recips() , qsearch_init() , queue_run() , 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_queue_item() , rmagic_init() , rmagic_post() , 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() , suggestion_query() , sync_directories() , syncdirs() , tag_deliver() , tagger_content() , tagrm_post() , term_query() , uninstall_plugin() , unregister_hook() , update_modtime() , update_queue_time() , user_allow() , user_deny() , vcard_from_xchan() , wall_attach_post() , wall_upload_post() , wfinger_init() , xchan_content() , xchan_mail_query() , xchan_query() , xrd_init() , z_readdir() , zfinger_init() , zid_init() , zot_finger() , zot_get_hubloc() , zot_gethub() , zot_process_response() , zot_refresh() , and zotfeed_init() .
+
Referenced by account_verify_password() , acl_init() , add_fcontact() , 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() , 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() , 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_xchan() , install_plugin() , invite_post() , item_message_id() , item_permissions_sql() , item_post() , item_store() , item_store_update() , items_fetch() , like_content() , load_config() , load_pconfig() , load_plugin() , load_xconfig() , local_delivery() , lockview_content() , FKOAuth1\loginUser() , FKOAuthDataStore\lookup_consumer() , FKOAuthDataStore\lookup_nonce() , FKOAuthDataStore\lookup_token() , lostpass_content() , lostpass_post() , magic_init() , mail_store() , member_of() , msearch_post() , network_content() , network_init() , FKOAuthDataStore\new_access_token() , new_contact() , new_cookie() , new_follower() , 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_delivery() , process_mail_delivery() , profile_init() , profile_load() , profile_photo_post() , profiles_init() , profiles_post() , public_permissions_sql() , public_recips() , qsearch_init() , queue_run() , 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_queue_item() , rmagic_init() , rmagic_post() , 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() , suggestion_query() , sync_directories() , syncdirs() , tag_deliver() , tagger_content() , tagrm_post() , term_query() , thing_init() , uninstall_plugin() , unregister_hook() , update_modtime() , update_queue_time() , user_allow() , user_deny() , vcard_from_xchan() , wall_attach_post() , wall_upload_post() , wfinger_init() , xchan_content() , xchan_mail_query() , xchan_query() , xrd_init() , z_readdir() , zfinger_init() , zid_init() , 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_total() , account_verify_password() , acl_init() , add_fcontact() , admin_content() , admin_page_dbsync() , admin_page_summary() , admin_page_users() , admin_page_users_post() , 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() , 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_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() , del_config() , del_pconfig() , del_xconfig() , delegate_content() , delete_imported_item() , delete_item_lowlevel() , deliver_run() , dfrn_deliver() , directory_run() , dirsearch_content() , display_content() , drop_item() , editpost_content() , encode_item() , event_store() , events_content() , expand_groups() , expire_run() , fbrowser_content() , feed_init() , fetch_post_tags() , file_tag_save_file() , file_tag_unsave_file() , file_tag_update_pconfig() , 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() , get_events() , get_pconfig() , get_xconfig() , 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_xchan() , install_plugin() , intro_content() , intro_post() , invite_post() , item_expire() , item_message_id() , item_post() , item_store() , item_store_update() , items_fetch() , like_content() , load_config() , load_contact_links() , load_hooks() , load_pconfig() , load_plugin() , load_translation_table() , load_xconfig() , local_delivery() , lockview_content() , FKOAuth1\loginUser() , FKOAuthDataStore\lookup_consumer() , FKOAuthDataStore\lookup_nonce() , FKOAuthDataStore\lookup_token() , lose_follower() , lose_sharer() , lostpass_content() , lostpass_post() , magic_init() , mail_store() , manage_content() , match_content() , member_of() , message_content() , mini_group_select() , mood_init() , msearch_post() , network_content() , network_init() , FKOAuthDataStore\new_access_token() , new_contact() , new_cookie() , new_follower() , FKOAuthDataStore\new_request_token() , notification() , notifications_content() , notifications_post() , notifier_run() , notify_content() , notify_init() , oauth_get_client() , onepoll_run() , page_content() , 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_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() , 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_queue_item() , rmagic_init() , rmagic_post() , 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() , 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() , 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() , 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_total() , account_verify_password() , acl_init() , add_fcontact() , admin_content() , admin_page_dbsync() , admin_page_summary() , admin_page_users() , admin_page_users_post() , 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() , 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() , del_config() , del_pconfig() , del_xconfig() , delegate_content() , delete_imported_item() , delete_item_lowlevel() , deliver_run() , dfrn_deliver() , directory_run() , dirsearch_content() , display_content() , drop_item() , editpost_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_xchan() , install_plugin() , intro_content() , intro_post() , invite_post() , item_expire() , item_message_id() , item_post() , item_store() , item_store_update() , items_fetch() , like_content() , load_config() , load_contact_links() , load_hooks() , load_pconfig() , load_plugin() , load_translation_table() , load_xconfig() , local_delivery() , lockview_content() , FKOAuth1\loginUser() , FKOAuthDataStore\lookup_consumer() , FKOAuthDataStore\lookup_nonce() , FKOAuthDataStore\lookup_token() , lose_follower() , lose_sharer() , lostpass_content() , lostpass_post() , magic_init() , mail_store() , manage_content() , match_content() , member_of() , message_content() , mini_group_select() , mood_init() , msearch_post() , network_content() , network_init() , FKOAuthDataStore\new_access_token() , new_contact() , new_cookie() , new_follower() , FKOAuthDataStore\new_request_token() , notification() , notifications_content() , notifications_post() , notifier_run() , notify_content() , notify_init() , oauth_get_client() , onepoll_run() , page_content() , 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_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() , 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_queue_item() , rmagic_init() , rmagic_post() , 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() , 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() , 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 9d5192183..e4b42c196 100644
--- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.html
+++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.html
@@ -220,6 +220,8 @@ Files
file photos.php
+file php.php
+
file ping.php
file poco.php
@@ -260,7 +262,7 @@ Files
file search_ac.php
-file settings.php
+file settings.php
file setup.php
@@ -280,6 +282,8 @@ Files
file tagrm.php
+file thing.php
+
file toggle_mobile.php
file uexport.php
diff --git a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js
index 4d63322ee..e36dae017 100644
--- a/doc/html/dir_d41ce877eb409a4791b288730010abe2.js
+++ b/doc/html/dir_d41ce877eb409a4791b288730010abe2.js
@@ -58,6 +58,7 @@ var dir_d41ce877eb409a4791b288730010abe2 =
[ "parse_url.php", "parse__url_8php.html", "parse__url_8php" ],
[ "photo.php", "photo_8php.html", "photo_8php" ],
[ "photos.php", "mod_2photos_8php.html", "mod_2photos_8php" ],
+ [ "php.php", "php_8php.html", "php_8php" ],
[ "ping.php", "ping_8php.html", "ping_8php" ],
[ "poco.php", "poco_8php.html", "poco_8php" ],
[ "poke.php", "poke_8php.html", "poke_8php" ],
@@ -78,7 +79,7 @@ var dir_d41ce877eb409a4791b288730010abe2 =
[ "rsd_xml.php", "rsd__xml_8php.html", "rsd__xml_8php" ],
[ "search.php", "search_8php.html", "search_8php" ],
[ "search_ac.php", "search__ac_8php.html", "search__ac_8php" ],
- [ "settings.php", "settings_8php.html", "settings_8php" ],
+ [ "settings.php", "mod_2settings_8php.html", "mod_2settings_8php" ],
[ "setup.php", "setup_8php.html", "setup_8php" ],
[ "share.php", "share_8php.html", "share_8php" ],
[ "siteinfo.php", "siteinfo_8php.html", "siteinfo_8php" ],
@@ -88,6 +89,7 @@ var dir_d41ce877eb409a4791b288730010abe2 =
[ "suggest.php", "suggest_8php.html", "suggest_8php" ],
[ "tagger.php", "tagger_8php.html", "tagger_8php" ],
[ "tagrm.php", "tagrm_8php.html", "tagrm_8php" ],
+ [ "thing.php", "thing_8php.html", "thing_8php" ],
[ "toggle_mobile.php", "toggle__mobile_8php.html", "toggle__mobile_8php" ],
[ "uexport.php", "uexport_8php.html", "uexport_8php" ],
[ "update_channel.php", "update__channel_8php.html", "update__channel_8php" ],
diff --git a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html
index f56d2aca4..ba55e5124 100644
--- a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html
+++ b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.html
@@ -225,10 +225,14 @@ Files
file session.php
+file settings.php
+
file socgraph.php
file system_unavailable.php
+file taxonomy.php
+
file template_processor.php
file text.php
diff --git a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js
index 8be6beda8..6dd34558a 100644
--- a/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js
+++ b/doc/html/dir_d44c64559bbebec7f509842c48db8b23.js
@@ -75,8 +75,10 @@ var dir_d44c64559bbebec7f509842c48db8b23 =
[ "queue_fn.php", "queue__fn_8php.html", "queue__fn_8php" ],
[ "security.php", "security_8php.html", "security_8php" ],
[ "session.php", "session_8php.html", "session_8php" ],
+ [ "settings.php", "include_2settings_8php.html", "include_2settings_8php" ],
[ "socgraph.php", "socgraph_8php.html", "socgraph_8php" ],
[ "system_unavailable.php", "system__unavailable_8php.html", "system__unavailable_8php" ],
+ [ "taxonomy.php", "taxonomy_8php.html", "taxonomy_8php" ],
[ "template_processor.php", "template__processor_8php.html", "template__processor_8php" ],
[ "text.php", "text_8php.html", "text_8php" ],
[ "zot.php", "zot_8php.html", "zot_8php" ]
diff --git a/doc/html/docblox__errorchecker_8php.html b/doc/html/docblox__errorchecker_8php.html
index d1b54ab0c..ea69f6350 100644
--- a/doc/html/docblox__errorchecker_8php.html
+++ b/doc/html/docblox__errorchecker_8php.html
@@ -253,7 +253,7 @@ Variables
-
Referenced by aes_encapsulate() , aes_unencapsulate() , alt_pager() , check_config() , consume_feed() , drop_item() , fix_private_photos() , get_bb_tag_pos() , is_a_date_arg() , item_post() , jindent() , load_database_rem() , local_delivery() , node2bbcodesub() , paginate() , photos_post() , profile_activity() , reload_plugins() , scale_external_images() , tag_deliver() , and zot_import() .
+
Referenced by aes_encapsulate() , aes_unencapsulate() , alt_pager() , check_config() , consume_feed() , drop_item() , fix_private_photos() , get_bb_tag_pos() , is_a_date_arg() , item_post() , item_redir_and_replace_images() , jindent() , load_database_rem() , local_delivery() , node2bbcodesub() , paginate() , photos_post() , profile_activity() , reload_plugins() , scale_external_images() , tag_deliver() , and zot_import() .
diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html
index 7d1617ad0..0e6c790c5 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() , create_account() , create_identity() , dbesc_array() , directory_content() , event_store() , feature_enabled() , fetch_xrd_links() , find_xchan_in_array() , 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_xchan() , item_getfeedattach() , item_store() , item_store_update() , items_fetch() , like_content() , load_database() , lrdd() , magic_init() , mail_store() , mood_init() , network_content() , new_channel_post() , new_contact() , 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_delivery() , process_mail_delivery() , process_profile_delivery() , profile_activity() , profile_sidebar() , profile_tabs() , profiles_content() , register_post() , 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() , 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() , 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_xchan() , item_getfeedattach() , item_store() , item_store_update() , items_fetch() , like_content() , like_puller() , load_database() , lrdd() , magic_init() , mail_store() , mood_init() , network_content() , new_channel_post() , new_contact() , 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_delivery() , process_mail_delivery() , process_profile_delivery() , profile_activity() , profile_sidebar() , profile_tabs() , profiles_content() , register_post() , 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() , tgroup_check() , 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() , 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() , 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() .
diff --git a/doc/html/features_8php.html b/doc/html/features_8php.html
index d07178ab8..54fcf31ab 100644
--- a/doc/html/features_8php.html
+++ b/doc/html/features_8php.html
@@ -142,7 +142,7 @@ Functions
-
Referenced by categories_widget() , connections_content() , editpost_content() , Item\get_comment_box() , Item\get_template_data() , item_post() , message_content() , message_post() , nav() , network_content() , photos_content() , posted_date_widget() , profile_sidebar() , profiles_content() , redbasic_form() , saved_searches() , search_saved_searches() , and theme_content() .
+
Referenced by categories_widget() , connections_content() , conversation() , editpost_content() , Item\get_comment_box() , Item\get_template_data() , item_post() , message_content() , message_post() , nav() , network_content() , photos_content() , posted_date_widget() , profile_sidebar() , profiles_content() , redbasic_form() , saved_searches() , search_saved_searches() , and theme_content() .
diff --git a/doc/html/files.html b/doc/html/files.html
index c375e59f6..3a74e995f 100644
--- a/doc/html/files.html
+++ b/doc/html/files.html
@@ -175,11 +175,13 @@ $(document).ready(function(){initNavTree('files.html','');});
queue_fn.php
security.php
session.php
-socgraph.php
-system_unavailable.php
-template_processor.php
-text.php
-zot.php
+settings.php
+socgraph.php
+system_unavailable.php
+taxonomy.php
+template_processor.php
+text.php
+zot.php
mod
_well_known.php
acl.php
@@ -239,54 +241,56 @@ $(document).ready(function(){initNavTree('files.html','');});
parse_url.php
photo.php
photos.php
-ping.php
-poco.php
-poke.php
-post.php
-pretheme.php
-probe.php
-profile.php
-profile_photo.php
-profiles.php
-profperm.php
-qsearch.php
-randprof.php
-redir.php
-register.php
-regmod.php
-removeme.php
-rmagic.php
-rsd_xml.php
-search.php
-search_ac.php
-settings.php
-setup.php
-share.php
-siteinfo.php
-smilies.php
-starred.php
-subthread.php
-suggest.php
-tagger.php
-tagrm.php
-toggle_mobile.php
-uexport.php
-update_channel.php
-update_community.php
-update_display.php
-update_network.php
-update_search.php
-view.php
-viewconnections.php
-viewsrc.php
-wall_attach.php
-wall_upload.php
-webfinger.php
-wfinger.php
-xchan.php
-xrd.php
-zfinger.php
-zotfeed.php
+php.php
+ping.php
+poco.php
+poke.php
+post.php
+pretheme.php
+probe.php
+profile.php
+profile_photo.php
+profiles.php
+profperm.php
+qsearch.php
+randprof.php
+redir.php
+register.php
+regmod.php
+removeme.php
+rmagic.php
+rsd_xml.php
+search.php
+search_ac.php
+settings.php
+setup.php
+share.php
+siteinfo.php
+smilies.php
+starred.php
+subthread.php
+suggest.php
+tagger.php
+tagrm.php
+thing.php
+toggle_mobile.php
+uexport.php
+update_channel.php
+update_community.php
+update_display.php
+update_network.php
+update_search.php
+view.php
+viewconnections.php
+viewsrc.php
+wall_attach.php
+wall_upload.php
+webfinger.php
+wfinger.php
+xchan.php
+xrd.php
+zfinger.php
+zotfeed.php
util
fpostit
fpostit.php
diff --git a/doc/html/globals_0x61.html b/doc/html/globals_0x61.html
index 03db9b5cc..3b2ddc74e 100644
--- a/doc/html/globals_0x61.html
+++ b/doc/html/globals_0x61.html
@@ -264,6 +264,9 @@ $(document).ready(function(){initNavTree('globals_0x61.html','');});
ACTIVITY_OBJ_TAGTERM
: boot.php
+ACTIVITY_OBJ_THING
+: boot.php
+
ACTIVITY_POKE
: boot.php
diff --git a/doc/html/globals_0x62.html b/doc/html/globals_0x62.html
index 82cac0cdf..0ccd06dfe 100644
--- a/doc/html/globals_0x62.html
+++ b/doc/html/globals_0x62.html
@@ -181,7 +181,7 @@ $(document).ready(function(){initNavTree('globals_0x62.html','');});
: event.php
best_link_url()
-: conversation.php
+: conversation.php
breaklines()
: html2plain.php
@@ -189,6 +189,9 @@ $(document).ready(function(){initNavTree('globals_0x62.html','');});
build_querystring()
: boot.php
+build_sync_packet()
+: settings.php
+
diff --git a/doc/html/globals_0x63.html b/doc/html/globals_0x63.html
index 8f4141812..7c2aa6af0 100644
--- a/doc/html/globals_0x63.html
+++ b/doc/html/globals_0x63.html
@@ -150,6 +150,9 @@ $(document).ready(function(){initNavTree('globals_0x63.html','');});
call_hooks()
: plugin.php
+can_comment_on_post()
+: items.php
+
categories_widget()
: contact_widgets.php
@@ -300,6 +303,9 @@ $(document).ready(function(){initNavTree('globals_0x63.html','');});
connections_aside()
: connections.php
+connections_clone()
+: connections.php
+
connections_content()
: connections.php
@@ -360,6 +366,9 @@ $(document).ready(function(){initNavTree('globals_0x63.html','');});
conv_sort()
: conversation.php
+conversation()
+: conversation.php
+
convert_xml_element_to_array()
: network.php
diff --git a/doc/html/globals_0x66.html b/doc/html/globals_0x66.html
index 78c620986..aa8c48510 100644
--- a/doc/html/globals_0x66.html
+++ b/doc/html/globals_0x66.html
@@ -175,28 +175,13 @@ $(document).ready(function(){initNavTree('globals_0x66.html','');});
: datetime.php
file_tag_decode()
-: text.php
+: taxonomy.php
file_tag_encode()
-: text.php
+: taxonomy.php
file_tag_file_query()
-: text.php
-
-file_tag_file_to_list()
-: text.php
-
-file_tag_list_to_file()
-: text.php
-
-file_tag_save_file()
-: text.php
-
-file_tag_unsave_file()
-: text.php
-
-file_tag_update_pconfig()
-: text.php
+: taxonomy.php
fileas_widget()
: contact_widgets.php
@@ -270,6 +255,9 @@ $(document).ready(function(){initNavTree('globals_0x66.html','');});
format_js_if_exists()
: plugin.php
+format_like()
+: conversation.php
+
format_location()
: conversation.php
@@ -277,7 +265,7 @@ $(document).ready(function(){initNavTree('globals_0x66.html','');});
: notify.php
format_term_for_display()
-: text.php
+: taxonomy.php
fsuggest_content()
: fsuggest.php
diff --git a/doc/html/globals_0x67.html b/doc/html/globals_0x67.html
index 0d120414e..9ca401729 100644
--- a/doc/html/globals_0x67.html
+++ b/doc/html/globals_0x67.html
@@ -178,7 +178,10 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');});
: network.php
get_config()
-: config.php
+: config.php
+
+get_config_from_storage()
+: config.php
get_db_errno()
: setup.php
@@ -265,10 +268,10 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');});
: text.php
get_terms_oftype()
-: text.php
+: taxonomy.php
get_theme_config_file()
-: settings.php
+: settings.php
get_theme_info()
: plugin.php
@@ -277,7 +280,7 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');});
: plugin.php
get_xconfig()
-: config.php
+: config.php
goaway()
: boot.php
diff --git a/doc/html/globals_0x69.html b/doc/html/globals_0x69.html
index 917665055..d221fffdb 100644
--- a/doc/html/globals_0x69.html
+++ b/doc/html/globals_0x69.html
@@ -233,6 +233,9 @@ $(document).ready(function(){initNavTree('globals_0x69.html','');});
item_expire()
: items.php
+item_extract_images()
+: conversation.php
+
item_getfeedattach()
: items.php
@@ -251,6 +254,9 @@ $(document).ready(function(){initNavTree('globals_0x69.html','');});
ITEM_MODERATED
: boot.php
+ITEM_NOCOMMENT
+: boot.php
+
ITEM_NOTSHOWN
: boot.php
@@ -263,12 +269,18 @@ $(document).ready(function(){initNavTree('globals_0x69.html','');});
item_permissions_sql()
: security.php
+item_photo_menu()
+: conversation.php
+
item_post()
: item.php
item_post_type()
: text.php
+item_redir_and_replace_images()
+: conversation.php
+
ITEM_RELAY
: boot.php
diff --git a/doc/html/globals_0x6c.html b/doc/html/globals_0x6c.html
index 064b57d0c..a73c11ea1 100644
--- a/doc/html/globals_0x6c.html
+++ b/doc/html/globals_0x6c.html
@@ -159,6 +159,9 @@ $(document).ready(function(){initNavTree('globals_0x6c.html','');});
like_content()
: like.php
+like_puller()
+: conversation.php
+
limit_body_size()
: items.php
@@ -184,7 +187,7 @@ $(document).ready(function(){initNavTree('globals_0x6c.html','');});
: plugin.php
load_pconfig()
-: config.php
+: config.php
load_plugin()
: plugin.php
@@ -193,7 +196,7 @@ $(document).ready(function(){initNavTree('globals_0x6c.html','');});
: language.php
load_xconfig()
-: config.php
+: config.php
local_delivery()
: items.php
@@ -202,7 +205,7 @@ $(document).ready(function(){initNavTree('globals_0x6c.html','');});
: boot.php
localize_item()
-: conversation.php
+: conversation.php
lockview_content()
: lockview.php
diff --git a/doc/html/globals_0x70.html b/doc/html/globals_0x70.html
index 9d7cad995..8de09200d 100644
--- a/doc/html/globals_0x70.html
+++ b/doc/html/globals_0x70.html
@@ -302,6 +302,9 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
photos_post()
: photos.php
+php_init()
+: php.php
+
ping_init()
: ping.php
diff --git a/doc/html/globals_0x73.html b/doc/html/globals_0x73.html
index b68aa1632..001e9156c 100644
--- a/doc/html/globals_0x73.html
+++ b/doc/html/globals_0x73.html
@@ -208,10 +208,10 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
: config.php
settings_aside()
-: settings.php
+: settings.php
settings_post()
-: settings.php
+: settings.php
setup_content()
: setup.php
@@ -280,10 +280,10 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
: boot.php
status_editor()
-: conversation.php
+: conversation.php
store_item_tag()
-: text.php
+: taxonomy.php
stream_perms_api_uids()
: security.php
diff --git a/doc/html/globals_0x74.html b/doc/html/globals_0x74.html
index d37164056..54095872c 100644
--- a/doc/html/globals_0x74.html
+++ b/doc/html/globals_0x74.html
@@ -151,10 +151,10 @@ $(document).ready(function(){initNavTree('globals_0x74.html','');});
: items.php
tagadelic()
-: text.php
+: taxonomy.php
tagblock()
-: text.php
+: taxonomy.php
tagger_content()
: tagger.php
@@ -166,7 +166,7 @@ $(document).ready(function(){initNavTree('globals_0x74.html','');});
: tagrm.php
tags_sort()
-: text.php
+: taxonomy.php
template_escape()
: template_processor.php
@@ -186,21 +186,36 @@ $(document).ready(function(){initNavTree('globals_0x74.html','');});
TERM_MENTION
: boot.php
+TERM_OBJ_CHANNEL
+: boot.php
+
+TERM_OBJ_OBJECT
+: boot.php
+
TERM_OBJ_PHOTO
: boot.php
TERM_OBJ_POST
: boot.php
+TERM_OBJ_PROFILE
+: boot.php
+
+TERM_OBJ_THING
+: boot.php
+
TERM_PCATEGORY
: boot.php
term_query()
-: text.php
+: taxonomy.php
TERM_SAVEDSEARCH
: boot.php
+TERM_THING
+: boot.php
+
TERM_UNKNOWN
: boot.php
@@ -225,6 +240,12 @@ $(document).ready(function(){initNavTree('globals_0x74.html','');});
theme_status()
: admin.php
+thing_content()
+: thing.php
+
+thing_init()
+: thing.php
+
timesel()
: datetime.php
diff --git a/doc/html/globals_0x78.html b/doc/html/globals_0x78.html
index 9d44af342..9aebabfc9 100644
--- a/doc/html/globals_0x78.html
+++ b/doc/html/globals_0x78.html
@@ -157,7 +157,7 @@ $(document).ready(function(){initNavTree('globals_0x78.html','');});
: text.php
xchan_query()
-: text.php
+: text.php
xml2array()
: network.php
diff --git a/doc/html/globals_0x7a.html b/doc/html/globals_0x7a.html
index d780152ea..03c86723b 100644
--- a/doc/html/globals_0x7a.html
+++ b/doc/html/globals_0x7a.html
@@ -172,7 +172,7 @@ $(document).ready(function(){initNavTree('globals_0x7a.html','');});
: zfinger.php
zid()
-: boot.php
+: boot.php
zid_init()
: boot.php
diff --git a/doc/html/globals_func_0x62.html b/doc/html/globals_func_0x62.html
index 5d11d7a37..e93d9c120 100644
--- a/doc/html/globals_func_0x62.html
+++ b/doc/html/globals_func_0x62.html
@@ -180,7 +180,7 @@ $(document).ready(function(){initNavTree('globals_func_0x62.html','');});
: event.php
best_link_url()
-: conversation.php
+: conversation.php
breaklines()
: html2plain.php
@@ -188,6 +188,9 @@ $(document).ready(function(){initNavTree('globals_func_0x62.html','');});
build_querystring()
: boot.php
+build_sync_packet()
+: settings.php
+
diff --git a/doc/html/globals_func_0x63.html b/doc/html/globals_func_0x63.html
index ad60dd6bb..d56caaa8b 100644
--- a/doc/html/globals_func_0x63.html
+++ b/doc/html/globals_func_0x63.html
@@ -149,6 +149,9 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');});
call_hooks()
: plugin.php
+can_comment_on_post()
+: items.php
+
categories_widget()
: contact_widgets.php
@@ -290,6 +293,9 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');});
connections_aside()
: connections.php
+connections_clone()
+: connections.php
+
connections_content()
: connections.php
@@ -341,6 +347,9 @@ $(document).ready(function(){initNavTree('globals_func_0x63.html','');});
conv_sort()
: conversation.php
+conversation()
+: conversation.php
+
convert_xml_element_to_array()
: network.php
diff --git a/doc/html/globals_func_0x66.html b/doc/html/globals_func_0x66.html
index f09d0e013..3295b9919 100644
--- a/doc/html/globals_func_0x66.html
+++ b/doc/html/globals_func_0x66.html
@@ -174,28 +174,13 @@ $(document).ready(function(){initNavTree('globals_func_0x66.html','');});
: datetime.php
file_tag_decode()
-: text.php
+: taxonomy.php
file_tag_encode()
-: text.php
+: taxonomy.php
file_tag_file_query()
-: text.php
-
-file_tag_file_to_list()
-: text.php
-
-file_tag_list_to_file()
-: text.php
-
-file_tag_save_file()
-: text.php
-
-file_tag_unsave_file()
-: text.php
-
-file_tag_update_pconfig()
-: text.php
+: taxonomy.php
fileas_widget()
: contact_widgets.php
@@ -266,6 +251,9 @@ $(document).ready(function(){initNavTree('globals_func_0x66.html','');});
format_js_if_exists()
: plugin.php
+format_like()
+: conversation.php
+
format_location()
: conversation.php
@@ -273,7 +261,7 @@ $(document).ready(function(){initNavTree('globals_func_0x66.html','');});
: notify.php
format_term_for_display()
-: text.php
+: taxonomy.php
fsuggest_content()
: fsuggest.php
diff --git a/doc/html/globals_func_0x67.html b/doc/html/globals_func_0x67.html
index 21601815f..087e50b45 100644
--- a/doc/html/globals_func_0x67.html
+++ b/doc/html/globals_func_0x67.html
@@ -177,7 +177,10 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');});
: network.php
get_config()
-: config.php
+: config.php
+
+get_config_from_storage()
+: config.php
get_db_errno()
: setup.php
@@ -264,10 +267,10 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');});
: text.php
get_terms_oftype()
-: text.php
+: taxonomy.php
get_theme_config_file()
-: settings.php
+: settings.php
get_theme_info()
: plugin.php
@@ -276,7 +279,7 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');});
: plugin.php
get_xconfig()
-: config.php
+: config.php
goaway()
: boot.php
diff --git a/doc/html/globals_func_0x69.html b/doc/html/globals_func_0x69.html
index 2fe42b47b..7af02af1f 100644
--- a/doc/html/globals_func_0x69.html
+++ b/doc/html/globals_func_0x69.html
@@ -215,6 +215,9 @@ $(document).ready(function(){initNavTree('globals_func_0x69.html','');});
item_expire()
: items.php
+item_extract_images()
+: conversation.php
+
item_getfeedattach()
: items.php
@@ -227,12 +230,18 @@ $(document).ready(function(){initNavTree('globals_func_0x69.html','');});
item_permissions_sql()
: security.php
+item_photo_menu()
+: conversation.php
+
item_post()
: item.php
item_post_type()
: text.php
+item_redir_and_replace_images()
+: conversation.php
+
item_store()
: items.php
diff --git a/doc/html/globals_func_0x6c.html b/doc/html/globals_func_0x6c.html
index 7ca5167d6..e34907368 100644
--- a/doc/html/globals_func_0x6c.html
+++ b/doc/html/globals_func_0x6c.html
@@ -152,6 +152,9 @@ $(document).ready(function(){initNavTree('globals_func_0x6c.html','');});
like_content()
: like.php
+like_puller()
+: conversation.php
+
limit_body_size()
: items.php
@@ -177,7 +180,7 @@ $(document).ready(function(){initNavTree('globals_func_0x6c.html','');});
: plugin.php
load_pconfig()
-: config.php
+: config.php
load_plugin()
: plugin.php
@@ -186,7 +189,7 @@ $(document).ready(function(){initNavTree('globals_func_0x6c.html','');});
: language.php
load_xconfig()
-: config.php
+: config.php
local_delivery()
: items.php
@@ -195,7 +198,7 @@ $(document).ready(function(){initNavTree('globals_func_0x6c.html','');});
: boot.php
localize_item()
-: conversation.php
+: conversation.php
lockview_content()
: lockview.php
diff --git a/doc/html/globals_func_0x70.html b/doc/html/globals_func_0x70.html
index 91184b7af..15c8453d2 100644
--- a/doc/html/globals_func_0x70.html
+++ b/doc/html/globals_func_0x70.html
@@ -215,6 +215,9 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');});
photos_post()
: photos.php
+php_init()
+: php.php
+
ping_init()
: ping.php
diff --git a/doc/html/globals_func_0x73.html b/doc/html/globals_func_0x73.html
index ba316665b..e3ab8140d 100644
--- a/doc/html/globals_func_0x73.html
+++ b/doc/html/globals_func_0x73.html
@@ -207,10 +207,10 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');});
: config.php
settings_aside()
-: settings.php
+: settings.php
settings_post()
-: settings.php
+: settings.php
setup_content()
: setup.php
@@ -270,10 +270,10 @@ $(document).ready(function(){initNavTree('globals_func_0x73.html','');});
: boot.php
status_editor()
-: conversation.php
+: conversation.php
store_item_tag()
-: text.php
+: taxonomy.php
stream_perms_api_uids()
: security.php
diff --git a/doc/html/globals_func_0x74.html b/doc/html/globals_func_0x74.html
index 310fac3a2..464211b31 100644
--- a/doc/html/globals_func_0x74.html
+++ b/doc/html/globals_func_0x74.html
@@ -150,10 +150,10 @@ $(document).ready(function(){initNavTree('globals_func_0x74.html','');});
: items.php
tagadelic()
-: text.php
+: taxonomy.php
tagblock()
-: text.php
+: taxonomy.php
tagger_content()
: tagger.php
@@ -165,7 +165,7 @@ $(document).ready(function(){initNavTree('globals_func_0x74.html','');});
: tagrm.php
tags_sort()
-: text.php
+: taxonomy.php
template_escape()
: template_processor.php
@@ -174,7 +174,7 @@ $(document).ready(function(){initNavTree('globals_func_0x74.html','');});
: template_processor.php
term_query()
-: text.php
+: taxonomy.php
terminate_friendship()
: Contact.php
@@ -197,6 +197,12 @@ $(document).ready(function(){initNavTree('globals_func_0x74.html','');});
theme_status()
: admin.php
+thing_content()
+: thing.php
+
+thing_init()
+: thing.php
+
timesel()
: datetime.php
diff --git a/doc/html/globals_func_0x78.html b/doc/html/globals_func_0x78.html
index 295c5fccb..6df4adb06 100644
--- a/doc/html/globals_func_0x78.html
+++ b/doc/html/globals_func_0x78.html
@@ -153,7 +153,7 @@ $(document).ready(function(){initNavTree('globals_func_0x78.html','');});
: text.php
xchan_query()
-: text.php
+: text.php
xml2array()
: network.php
diff --git a/doc/html/globals_func_0x7a.html b/doc/html/globals_func_0x7a.html
index 069302f13..ff834a587 100644
--- a/doc/html/globals_func_0x7a.html
+++ b/doc/html/globals_func_0x7a.html
@@ -168,7 +168,7 @@ $(document).ready(function(){initNavTree('globals_func_0x7a.html','');});
: zfinger.php
zid()
-: boot.php
+: boot.php
zid_init()
: boot.php
diff --git a/doc/html/globals_vars_0x61.html b/doc/html/globals_vars_0x61.html
index 668b7834d..534297367 100644
--- a/doc/html/globals_vars_0x61.html
+++ b/doc/html/globals_vars_0x61.html
@@ -235,6 +235,9 @@ $(document).ready(function(){initNavTree('globals_vars_0x61.html','');});
ACTIVITY_OBJ_TAGTERM
: boot.php
+ACTIVITY_OBJ_THING
+: boot.php
+
ACTIVITY_POKE
: boot.php
diff --git a/doc/html/globals_vars_0x69.html b/doc/html/globals_vars_0x69.html
index 9b2895023..6f7b44e10 100644
--- a/doc/html/globals_vars_0x69.html
+++ b/doc/html/globals_vars_0x69.html
@@ -165,6 +165,9 @@ $(document).ready(function(){initNavTree('globals_vars_0x69.html','');});
ITEM_MODERATED
: boot.php
+ITEM_NOCOMMENT
+: boot.php
+
ITEM_NOTSHOWN
: boot.php
diff --git a/doc/html/globals_vars_0x74.html b/doc/html/globals_vars_0x74.html
index ee0b0e943..bc94bea8d 100644
--- a/doc/html/globals_vars_0x74.html
+++ b/doc/html/globals_vars_0x74.html
@@ -151,18 +151,33 @@ $(document).ready(function(){initNavTree('globals_vars_0x74.html','');});
TERM_MENTION
: boot.php
+TERM_OBJ_CHANNEL
+: boot.php
+
+TERM_OBJ_OBJECT
+: boot.php
+
TERM_OBJ_PHOTO
: boot.php
TERM_OBJ_POST
: boot.php
+TERM_OBJ_PROFILE
+: boot.php
+
+TERM_OBJ_THING
+: boot.php
+
TERM_PCATEGORY
: boot.php
TERM_SAVEDSEARCH
: boot.php
+TERM_THING
+: boot.php
+
TERM_UNKNOWN
: boot.php
diff --git a/doc/html/identity_8php.html b/doc/html/identity_8php.html
index 2af7e89f2..3b6b983bd 100644
--- a/doc/html/identity_8php.html
+++ b/doc/html/identity_8php.html
@@ -269,7 +269,7 @@ Functions
diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html
index b496b2542..7b633ec4c 100644
--- a/doc/html/include_2config_8php.html
+++ b/doc/html/include_2config_8php.html
@@ -114,24 +114,26 @@ $(document).ready(function(){initNavTree('include_2config_8php.html','');});
Functions
load_config ($family)
- get_config ($family, $key, $instore=false)
-
+ get_config ($family, $key)
+
+ get_config_from_storage ($family, $key)
+
set_config ($family, $key, $value)
del_config ($family, $key)
- load_pconfig ($uid, $family)
-
+ load_pconfig ($uid, $family= '')
+
get_pconfig ($uid, $family, $key, $instore=false)
set_pconfig ($uid, $family, $key, $value)
del_pconfig ($uid, $family, $key)
- load_xconfig ($xchan, $family)
-
- get_xconfig ($xchan, $family, $key, $instore=false)
-
+ load_xconfig ($xchan, $family= '')
+
+ get_xconfig ($xchan, $family, $key)
+
set_xconfig ($xchan, $family, $key, $value)
del_xconfig ($xchan, $family, $key)
@@ -230,7 +232,7 @@ Functions
-
+
@@ -244,13 +246,7 @@ Functions
- $key ,
-
-
-
-
-
- $instore = false
+ $key
@@ -260,7 +256,35 @@ 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() , 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() , events_content() , expire_run() , feed_init() , fetch_url() , fetch_xrd_links() , findpeople_widget() , Item\get_comment_box() , group_content() , hcard_init() , hostxrd_init() , photo_gd\imageString() , import_post() , import_xchan() , invite_content() , invite_post() , 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() , 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_reg_approval_email() , send_verification_email() , service_class_allows() , service_class_fetch() , set_config() , settings_post() , siteinfo_content() , smilies() , 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() , events_content() , expire_run() , feed_init() , fetch_url() , fetch_xrd_links() , findpeople_widget() , Item\get_comment_box() , group_content() , hcard_init() , hostxrd_init() , photo_gd\imageString() , import_post() , import_xchan() , invite_content() , invite_post() , 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() , 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_reg_approval_email() , send_verification_email() , service_class_allows() , service_class_fetch() , set_config() , settings_post() , siteinfo_content() , smilies() , 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() .
+
+
+
+
+
+
+
+
+ get_config_from_storage
+ (
+
+ $family ,
+
+
+
+
+
+ $key
+
+
+
+ )
+
+
+
+
@@ -300,11 +324,11 @@ Functions
-
Referenced by App\build_pagehead() , channel_aside() , channel_content() , community_content() , contact_block() , contact_remove() , feature_enabled() , file_tag_save_file() , file_tag_unsave_file() , file_tag_update_pconfig() , findpeople_widget() , Item\get_comment_box() , group_content() , intro_content() , invite_content() , invite_post() , item_expire() , item_store() , item_store_update() , items_fetch() , FKOAuth1\loginUser() , message_content() , network_content() , network_init() , notifications_content() , profile_activity() , profperm_content() , set_pconfig() , smilies() , tag_deliver() , and theme_content() .
+
Referenced by App\build_pagehead() , channel_aside() , channel_content() , community_content() , contact_block() , contact_remove() , conversation() , feature_enabled() , findpeople_widget() , Item\get_comment_box() , group_content() , intro_content() , invite_content() , invite_post() , item_expire() , item_store() , item_store_update() , items_fetch() , FKOAuth1\loginUser() , message_content() , network_content() , network_init() , notifications_content() , profile_activity() , profperm_content() , set_pconfig() , smilies() , tag_deliver() , and theme_content() .
-
+
@@ -324,13 +348,7 @@ Functions
- $key ,
-
-
-
-
-
- $instore = false
+ $key
@@ -360,11 +378,11 @@ Functions
Arbitrary configuration storage Note: Please do not store booleans - convert to 0/1 integer values The get_?config() functions return boolean false for keys that are unset, and this could lead to subtle bugs.
There are a few places in the code (such as the admin panel) where boolean configurations need to be fixed as of 10/08/2011.
-Referenced by api_statusnet_config() , check_config() , and cli_startup() .
+Referenced by api_statusnet_config() , check_config() , cli_startup() , and get_config() .
-
+
@@ -378,7 +396,7 @@ Functions
- $family
+ $family = ''
@@ -388,9 +406,11 @@ Functions
-
+
@@ -404,7 +424,7 @@ Functions
- $family
+ $family = ''
@@ -414,6 +434,8 @@ Functions
@@ -486,7 +508,7 @@ Functions
-
Referenced by file_tag_save_file() , file_tag_unsave_file() , file_tag_update_pconfig() , invite_post() , network_content() , register_post() , settings_post() , and theme_post() .
+
Referenced by invite_post() , network_content() , register_post() , settings_post() , and theme_post() .
diff --git a/doc/html/include_2config_8php.js b/doc/html/include_2config_8php.js
index bf2fb3cea..a9f05bed3 100644
--- a/doc/html/include_2config_8php.js
+++ b/doc/html/include_2config_8php.js
@@ -3,12 +3,13 @@ var include_2config_8php =
[ "del_config", "include_2config_8php.html#a549910227348003efc3c05c9105c42da", null ],
[ "del_pconfig", "include_2config_8php.html#a7ad2081c5f812ac4387fd76f3762d941", null ],
[ "del_xconfig", "include_2config_8php.html#a9c171def547deee16738dc58fdeb4b72", null ],
- [ "get_config", "include_2config_8php.html#a5d19130818ea4c6b8726ab62cd989c15", null ],
+ [ "get_config", "include_2config_8php.html#af02c96e6b37335774b548914ede1d22e", null ],
+ [ "get_config_from_storage", "include_2config_8php.html#af08b7adb63adfb2eda7c466fba0cce74", null ],
[ "get_pconfig", "include_2config_8php.html#ad58a4913937179adb13201c2ee3261ad", null ],
- [ "get_xconfig", "include_2config_8php.html#ae4269ab151d08b5dcb1581b2920a934b", null ],
+ [ "get_xconfig", "include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e", null ],
[ "load_config", "include_2config_8php.html#a27559f388c9b9af81c94e48d6889d1d1", null ],
- [ "load_pconfig", "include_2config_8php.html#ab012f852866a0aff9b5180daffa454f5", null ],
- [ "load_xconfig", "include_2config_8php.html#a913d4e1a6ee7acc1598c69b902c06fd2", null ],
+ [ "load_pconfig", "include_2config_8php.html#ac543813a980b3841cc5a277fcd4a24a6", null ],
+ [ "load_xconfig", "include_2config_8php.html#a55bbed9a014c9109c767486834f3ca33", null ],
[ "set_config", "include_2config_8php.html#ad6da879e4fb5b37d1e161d4e9be5c32a", null ],
[ "set_pconfig", "include_2config_8php.html#a61591371cb18764138655d67dc817ab2", null ],
[ "set_xconfig", "include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e", null ]
diff --git a/doc/html/include_2settings_8php.html b/doc/html/include_2settings_8php.html
new file mode 100644
index 000000000..c938f95cf
--- /dev/null
+++ b/doc/html/include_2settings_8php.html
@@ -0,0 +1,150 @@
+
+
+
+
+
+
+The Red Matrix: include/settings.php File Reference
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The Red Matrix
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ build_sync_packet
+ (
+
+ $uid = 0
,
+
+
+
+
+
+ $packet = null
+
+
+
+ )
+
+
+
+
+
Send a zot packet to all hubs where this channel is duplicated, refreshing such things as personal settings, channel permissions, address book updates, etc.
+
+
Referenced by connections_clone() , and settings_post() .
+
+
+
+
+
+
diff --git a/doc/html/include_2settings_8php.js b/doc/html/include_2settings_8php.js
new file mode 100644
index 000000000..9bca76f88
--- /dev/null
+++ b/doc/html/include_2settings_8php.js
@@ -0,0 +1,4 @@
+var include_2settings_8php =
+[
+ [ "build_sync_packet", "include_2settings_8php.html#ac34e479d27f32b82dd6b33542f81a6a7", null ]
+];
\ No newline at end of file
diff --git a/doc/html/items_8php.html b/doc/html/items_8php.html
index 7a8744588..9ddcc712c 100644
--- a/doc/html/items_8php.html
+++ b/doc/html/items_8php.html
@@ -114,6 +114,8 @@ $(document).ready(function(){initNavTree('items_8php.html','');});
Functions
collect_recipients ($item, &$private)
+ can_comment_on_post ($observer_xchan, $item)
+
red_zrl_callback ($matches)
post_activity_item ($arr)
@@ -372,6 +374,34 @@ Functions
Referenced by get_feed_for() .
+
+
+
+
+
+
+
+ can_comment_on_post
+ (
+
+ $observer_xchan ,
+
+
+
+
+
+ $item
+
+
+
+ )
+
+
+
+
@@ -1409,7 +1439,7 @@ Functions
@@ -1663,7 +1693,7 @@ Functions
diff --git a/doc/html/items_8php.js b/doc/html/items_8php.js
index 956414a8f..f68d04926 100644
--- a/doc/html/items_8php.js
+++ b/doc/html/items_8php.js
@@ -4,6 +4,7 @@ var items_8php =
[ "array_sanitise", "items_8php.html#abf7a1b73eb352d79acd36309b0dababd", null ],
[ "atom_author", "items_8php.html#a016dd86c827d08db89061ea81d15c6cb", null ],
[ "atom_entry", "items_8php.html#a275108c050f7eb18bcbb5018e6b81cf6", null ],
+ [ "can_comment_on_post", "items_8php.html#a1e75047cf175aaee8dd16aa761913ff9", null ],
[ "collect_recipients", "items_8php.html#a01e3cf44e082fa9bd06dcde5bf713d70", null ],
[ "compare_permissions", "items_8php.html#a0790a4550b829e85504af548623002ca", null ],
[ "construct_activity_object", "items_8php.html#aa9e99613d38a97b39c8cf5449699c2ee", null ],
diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html
index b5c57a94c..09e59b85d 100644
--- a/doc/html/language_8php.html
+++ b/doc/html/language_8php.html
@@ -180,7 +180,7 @@ Functions
translation support
-
Get the language setting directly from system variables, bypassing get_config() as database may not yet be configured.
+
Get the language setting directly from system variables, bypassing get_config() as database may not yet be configured.
If possible, we use the value from the browser.
Referenced by authenticate_success() , and get_best_language() .
@@ -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() , consume_feed() , contact_block() , contact_poll_interval() , contact_reputation() , 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() , events_content() , events_post() , fbrowser_content() , file_tag_save_file() , fileas_widget() , filer_content() , findpeople_widget() , fix_attached_photo_permissions() , follow_init() , follow_widget() , format_event_diaspora() , format_event_html() , 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_post() , item_post_type() , items_fetch() , lang_selector() , like_content() , load_database() , localize_item() , lockview_content() , login() , lostpass_content() , lostpass_post() , magic_init() , manage_content() , manual_config() , marital_selector() , match_content() , message_aside() , message_content() , message_post() , mini_group_select() , mood_content() , mood_init() , nav() , network_content() , network_init() , network_to_name() , new_channel_content() , new_channel_post() , new_contact() , new_follower() , nogroup_content() , notification() , notifications_content() , notifications_post() , notify_content() , 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() , tagger_content() , tagrm_content() , tagrm_post() , 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() , what_next() , 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() , connections_content() , connections_post() , construct_page() , consume_feed() , 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() , 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() , like_content() , load_database() , localize_item() , lockview_content() , login() , lostpass_content() , lostpass_post() , magic_init() , manage_content() , manual_config() , marital_selector() , match_content() , message_aside() , message_content() , message_post() , mini_group_select() , mood_content() , mood_init() , nav() , network_content() , network_init() , network_to_name() , new_channel_content() , new_channel_post() , new_contact() , new_follower() , nogroup_content() , notification() , notifications_content() , notifications_post() , notify_content() , 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() , tagger_content() , tagrm_content() , tagrm_post() , 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() , what_next() , xchan_content() , z_readdir() , and zfinger_init() .
diff --git a/doc/html/mod_2message_8php.html b/doc/html/mod_2message_8php.html
index 574f95f64..b4049e3f1 100644
--- a/doc/html/mod_2message_8php.html
+++ b/doc/html/mod_2message_8php.html
@@ -116,8 +116,8 @@ Functions
message_post (&$a)
-if (!function_exists('item_extract_images'))
-if (!function_exists('item_redir_and_replace_images')) message_content (&$a)
+if (!function_exists('item_extract_images '))
+if (!function_exists('item_redir_and_replace_images ')) message_content (&$a)
@@ -142,7 +142,7 @@ Functions
- if (!function_exists('item_extract_images')) if (!function_exists('item_redir_and_replace_images')) message_content
+ if (!function_exists('item_extract_images ')) if (!function_exists('item_redir_and_replace_images ')) message_content
(
&
$a )
diff --git a/doc/html/mod_2settings_8php.html b/doc/html/mod_2settings_8php.html
new file mode 100644
index 000000000..5ff804137
--- /dev/null
+++ b/doc/html/mod_2settings_8php.html
@@ -0,0 +1,175 @@
+
+
+
+
+
+
+The Red Matrix: mod/settings.php File Reference
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The Red Matrix
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ get_theme_config_file
+ (
+
+ $theme )
+
+
+
+
+
+
+
+
+
+
+ settings_aside
+ (
+ &
+ $a )
+
+
+
+
+
+
+
+
+
+
+
+
+ settings_post
+ (
+ &
+ $a )
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/html/mod_2settings_8php.js b/doc/html/mod_2settings_8php.js
new file mode 100644
index 000000000..b1dcb900e
--- /dev/null
+++ b/doc/html/mod_2settings_8php.js
@@ -0,0 +1,6 @@
+var mod_2settings_8php =
+[
+ [ "get_theme_config_file", "mod_2settings_8php.html#a39abc76ff5459c57e3b957664f273f18", null ],
+ [ "settings_aside", "mod_2settings_8php.html#ae5aebccb006bee1300078576baaf5582", null ],
+ [ "settings_post", "mod_2settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586", null ]
+];
\ No newline at end of file
diff --git a/doc/html/navtree.js b/doc/html/navtree.js
index 0c04635b6..bcfb2a5e0 100644
--- a/doc/html/navtree.js
+++ b/doc/html/navtree.js
@@ -36,12 +36,12 @@ var NAVTREE =
var NAVTREEINDEX =
[
"BaseObject_8php.html",
-"boot_8php.html#ab724491497ab2618b23a01d5da60aec0",
-"classProtoDriver.html#a1593f3abae050edbd9304f4f8bc4894a",
-"docblox__errorchecker_8php.html#a721c6ff80a6d3e4ad4ffa52a04c60085",
-"include_2attach_8php.html",
-"namespaces.html",
-"share_8php.html#afeb26046bdd02567ecd29ab5f188b249"
+"boot_8php.html#ab4bddb41a0cf407178ec5278b950c393",
+"classItem.html#acc32426c0f465391be8a99ad810c7b8e",
+"dirfind_8php.html",
+"include_2api_8php.html#ad2b0192f3006918bea895de8074bf8d2",
+"mod_2settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586",
+"session_8php.html#af0100a2642a5268594bbd5742a03d885"
];
var SYNCONMSG = 'click to disable panel synchronisation';
diff --git a/doc/html/navtreeindex0.js b/doc/html/navtreeindex0.js
index b72147c34..374429175 100644
--- a/doc/html/navtreeindex0.js
+++ b/doc/html/navtreeindex0.js
@@ -86,168 +86,168 @@ 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,120],
+"boot_8php.html#a009e6a0637cb65804ea8094ecc4450b0":[5,0,4,122],
"boot_8php.html#a01353c9abebc3544ea080ac161729632":[5,0,4,39],
-"boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[5,0,4,133],
-"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[5,0,4,213],
+"boot_8php.html#a022cea669f9f13ef7c6268b63884c57f":[5,0,4,135],
+"boot_8php.html#a02566ac9d891369a1d3ebb81a15722fc":[5,0,4,215],
"boot_8php.html#a032bbd6d0321e99e9117332c9ed2b1b8":[5,0,4,54],
-"boot_8php.html#a03d19251c245587de7ed959300b87bdf":[5,0,4,146],
+"boot_8php.html#a03d19251c245587de7ed959300b87bdf":[5,0,4,148],
"boot_8php.html#a0450389f24c632906fbc24347700a543":[5,0,4,50],
-"boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b":[5,0,4,100],
+"boot_8php.html#a0603d6ece8c5d37b4b7db697db053a4b":[5,0,4,101],
"boot_8php.html#a081307d681d7d04f17b9ced2076e7c85":[5,0,4,1],
-"boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[5,0,4,184],
+"boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3":[5,0,4,186],
"boot_8php.html#a0a98dd0110dc6c8e24cefc8ae74d5562":[5,0,4,66],
-"boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[5,0,4,150],
-"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[5,0,4,224],
+"boot_8php.html#a0b73e2548d6f9beb9c93211f488e336a":[5,0,4,152],
+"boot_8php.html#a0c59dde058efebbc66520d136cbd1631":[5,0,4,231],
+"boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe":[5,0,4,227],
+"boot_8php.html#a0d877df1e20bae765e1708be50f6b503":[5,0,4,230],
"boot_8php.html#a0e57f846e6d47a308feced0f7274f178":[5,0,4,58],
"boot_8php.html#a0e6db7e365f2b041a828b93786f694bc":[5,0,4,15],
-"boot_8php.html#a12c781cefc20167231e2e3fd5866b1b5":[5,0,4,79],
-"boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd":[5,0,4,76],
-"boot_8php.html#a14d44d4a00223dc3db4ea962325db192":[5,0,4,176],
+"boot_8php.html#a0fb63e51c2a9814941842ae8f2f4dff8":[5,0,4,76],
+"boot_8php.html#a12c781cefc20167231e2e3fd5866b1b5":[5,0,4,80],
+"boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd":[5,0,4,77],
+"boot_8php.html#a14d44d4a00223dc3db4ea962325db192":[5,0,4,178],
"boot_8php.html#a176664e78dcb9132e16be69418223eb2":[5,0,4,61],
-"boot_8php.html#a17b4ea23d9ecf628d9c8f53b7abcb805":[5,0,4,132],
-"boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[5,0,4,128],
-"boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[5,0,4,149],
-"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[5,0,4,227],
-"boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[5,0,4,153],
+"boot_8php.html#a17b4ea23d9ecf628d9c8f53b7abcb805":[5,0,4,134],
+"boot_8php.html#a17cf72338b040891781a4bcbdd9a8595":[5,0,4,130],
+"boot_8php.html#a181c111f4b6c14d091dfd3bf0d0a22cd":[5,0,4,151],
+"boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2":[5,0,4,234],
+"boot_8php.html#a1d6e7f4c08bb68e4a424326a811bdd86":[5,0,4,155],
"boot_8php.html#a1da180f961f49a11573cac4ff6c62c05":[5,0,4,75],
-"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[5,0,4,194],
+"boot_8php.html#a1db4f0009c9cb4e107eab0f914a3c8dc":[5,0,4,196],
"boot_8php.html#a1dfcb5146e9d1eca4528bc580ad5d273":[5,0,4,35],
-"boot_8php.html#a1f5906598e90b5ea2b4245f682be4348":[5,0,4,102],
-"boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[5,0,4,138],
-"boot_8php.html#a20f0eed431d25870b624b8937a07a59f":[5,0,4,169],
-"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[5,0,4,209],
+"boot_8php.html#a1f5906598e90b5ea2b4245f682be4348":[5,0,4,103],
+"boot_8php.html#a1fbb93cf030f07391f22cc2948744869":[5,0,4,140],
+"boot_8php.html#a20f0eed431d25870b624b8937a07a59f":[5,0,4,171],
+"boot_8php.html#a21cc29e0025943e7c28ff58cb4856ac3":[5,0,4,211],
"boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5":[5,0,4,45],
-"boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8":[5,0,4,98],
-"boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f":[5,0,4,90],
-"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[5,0,4,218],
-"boot_8php.html#a285732e7889fa7f333cbe431111e1029":[5,0,4,172],
-"boot_8php.html#a29528a2544373cc19a378f350040c6a1":[5,0,4,81],
-"boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[5,0,4,115],
-"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[5,0,4,192],
-"boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3":[5,0,4,103],
-"boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[5,0,4,168],
+"boot_8php.html#a25476eec71fceda237f7dc1d78b0adb8":[5,0,4,99],
+"boot_8php.html#a27299ecfb9e9a99826f17a1c14c6995f":[5,0,4,91],
+"boot_8php.html#a2750985ec445617d7e82ae3098c91e3f":[5,0,4,220],
+"boot_8php.html#a285732e7889fa7f333cbe431111e1029":[5,0,4,174],
+"boot_8php.html#a29528a2544373cc19a378f350040c6a1":[5,0,4,82],
+"boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221":[5,0,4,117],
+"boot_8php.html#a29e921c0c72412cc738e44cca6ca1f62":[5,0,4,194],
+"boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3":[5,0,4,104],
+"boot_8php.html#a2c65e925994566a63e6c03c381f1b4a0":[5,0,4,170],
"boot_8php.html#a2e90096fede6acce16abf0da8cb2febe":[5,0,4,67],
"boot_8php.html#a2f8f25b13480c37a5f22511f53da8bab":[5,0,4,72],
-"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[5,0,4,199],
-"boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[5,0,4,126],
+"boot_8php.html#a32df13fec0e43281da5979e1f5579aa8":[5,0,4,201],
+"boot_8php.html#a3475ff6c2e575f946ea0ee377e944173":[5,0,4,128],
"boot_8php.html#a34c756469ebed32e2fc987bcde62d382":[5,0,4,47],
-"boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[5,0,4,108],
-"boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[5,0,4,140],
-"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[5,0,4,229],
-"boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[5,0,4,157],
-"boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[5,0,4,104],
-"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[5,0,4,228],
-"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[5,0,4,190],
+"boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49":[5,0,4,109],
+"boot_8php.html#a35625dacd2158b9f1f1a8e77f9f081fd":[5,0,4,142],
+"boot_8php.html#a36b31575f992a10b5927b76efba9362e":[5,0,4,236],
+"boot_8php.html#a38f6c7fe33b5434a24b4314567753dfa":[5,0,4,159],
+"boot_8php.html#a3ad9cc5d4354be741fa1de12b96e9955":[5,0,4,105],
+"boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af":[5,0,4,235],
+"boot_8php.html#a3d6d4fc5fafcc9156811669158541caf":[5,0,4,192],
"boot_8php.html#a3e0930933fb2c0bf8211cc7ab4e1c3b4":[5,0,4,12],
"boot_8php.html#a3e2ea123d29a72012db1241f96280b0e":[5,0,4,59],
-"boot_8php.html#a3f40aa5bafff8c4eebdc62e5121daf77":[5,0,4,88],
+"boot_8php.html#a3f40aa5bafff8c4eebdc62e5121daf77":[5,0,4,89],
"boot_8php.html#a400519fa181591cd6fdbb8f25fbcba0a":[5,0,4,52],
-"boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb":[5,0,4,116],
-"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[5,0,4,186],
-"boot_8php.html#a43296b1b4398aacbf92a4b2d56bab91e":[5,0,4,167],
-"boot_8php.html#a43c6c7d84d880e9500bd4f8f8ecc5731":[5,0,4,87],
-"boot_8php.html#a444ce608ce34efb82ee11852f36e825f":[5,0,4,143],
+"boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb":[5,0,4,118],
+"boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b":[5,0,4,188],
+"boot_8php.html#a43296b1b4398aacbf92a4b2d56bab91e":[5,0,4,169],
+"boot_8php.html#a43c6c7d84d880e9500bd4f8f8ecc5731":[5,0,4,88],
+"boot_8php.html#a444ce608ce34efb82ee11852f36e825f":[5,0,4,145],
"boot_8php.html#a44d069c8a1cfcc6d2007c506a17ff28f":[5,0,4,70],
-"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[5,0,4,222],
+"boot_8php.html#a45b12aefab9675baffc7a07a09486db8":[5,0,4,228],
"boot_8php.html#a490972c02fdb638c52ec0e012a30bfd2":[5,0,4,19],
-"boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[5,0,4,155],
-"boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[5,0,4,101],
-"boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[5,0,4,154],
+"boot_8php.html#a49f2a70b3b43aa904223a8d19e986a47":[5,0,4,157],
+"boot_8php.html#a4a12ce5de39789b0361e308d89925a20":[5,0,4,102],
+"boot_8php.html#a4bfe22e163657690dfb6d5b1d04cb47e":[5,0,4,156],
"boot_8php.html#a4c02d88e66852a01bd5a1feecb7c3ce3":[5,0,4,6],
-"boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[5,0,4,185],
-"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[5,0,4,203],
-"boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[5,0,4,179],
-"boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[5,0,4,139],
+"boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6":[5,0,4,187],
+"boot_8php.html#a4fefd7486d3b888a05cfd3dc9575f115":[5,0,4,205],
+"boot_8php.html#a505410c7edc5f5bb5fa227b98359793e":[5,0,4,181],
+"boot_8php.html#a525ca93ff35d3535d1a2b8ba57876afa":[5,0,4,141],
"boot_8php.html#a52b599cd13e152ebc80d7e4413683195":[5,0,4,46],
-"boot_8php.html#a53e4bdb6f225da55115acb9277f75e53":[5,0,4,80],
+"boot_8php.html#a53e4bdb6f225da55115acb9277f75e53":[5,0,4,81],
"boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209":[5,0,4,36],
-"boot_8php.html#a56fd673eaa7014150297ce1162502db5":[5,0,4,171],
-"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[5,0,4,202],
+"boot_8php.html#a56fd673eaa7014150297ce1162502db5":[5,0,4,173],
+"boot_8php.html#a57eee7352714c004d36c26dda74af73e":[5,0,4,204],
"boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1":[5,0,4,22],
"boot_8php.html#a5ae728ac966ea1d3525a19e7fec59434":[5,0,4,60],
-"boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[5,0,4,161],
+"boot_8php.html#a5b043b7fdcfd4e8c9c3747574afc6caa":[5,0,4,163],
"boot_8php.html#a5b45d647da3743a7fc8c6223350b4d67":[5,0,4,32],
-"boot_8php.html#a5b7ce5c0a79796800883644c389dc87f":[5,0,4,43],
-"boot_8php.html#a5b8484922918946d041e5e0515dbe718":[5,0,4,182],
-"boot_8php.html#a5c3747e0f505f0d5271dc4c54e3feaf4":[5,0,4,77],
-"boot_8php.html#a5df5359090d1f8e898c36d7cf8878ad2":[5,0,4,141],
-"boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640":[5,0,4,183],
+"boot_8php.html#a5b815330f3d177ab383af37a6c12e532":[5,0,4,43],
+"boot_8php.html#a5b8484922918946d041e5e0515dbe718":[5,0,4,184],
+"boot_8php.html#a5c3747e0f505f0d5271dc4c54e3feaf4":[5,0,4,78],
+"boot_8php.html#a5df5359090d1f8e898c36d7cf8878ad2":[5,0,4,143],
+"boot_8php.html#a5e322a2a2d0f51924c0b2e874988e640":[5,0,4,185],
"boot_8php.html#a623e49c79943f3e7bdb770d021683cf7":[5,0,4,21],
"boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5":[5,0,4,74],
"boot_8php.html#a646123ebbb10eb6f5b6ff26f4288da9b":[5,0,4,34],
-"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[5,0,4,220],
-"boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[5,0,4,147],
-"boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[5,0,4,124],
+"boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd":[5,0,4,224],
+"boot_8php.html#a6626f383c3d2d459f731ab8b4f237d16":[5,0,4,149],
+"boot_8php.html#a6788e99021ec8ffb0fa94d651f22a322":[5,0,4,126],
"boot_8php.html#a680fbafc2db023c5b1309e0180e81315":[5,0,4,44],
-"boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11":[5,0,4,127],
+"boot_8php.html#a68d1d5bc9c7ccb663dc671b48c66df11":[5,0,4,129],
"boot_8php.html#a68eebe493e6f729ffd1aeda7a4b11155":[5,0,4,49],
-"boot_8php.html#a6969947145a139ec374ce098224d8e81":[5,0,4,130],
-"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[5,0,4,211],
-"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[5,0,4,206],
-"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[5,0,4,200],
-"boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd":[5,0,4,99],
-"boot_8php.html#a6c5e9e293c8242dcb9bc2c3ea2fee2c9":[5,0,4,91],
-"boot_8php.html#a6df1102664f64b274810db85197c2755":[5,0,4,188],
-"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[5,0,4,210],
+"boot_8php.html#a6969947145a139ec374ce098224d8e81":[5,0,4,132],
+"boot_8php.html#a69aac276ed82e010dc382b16ab4d59e1":[5,0,4,213],
+"boot_8php.html#a6b14a31a8aa9f3452a13383f413bffa2":[5,0,4,208],
+"boot_8php.html#a6b31dd451bc6c37fe7c9c766ff385aaf":[5,0,4,202],
+"boot_8php.html#a6b9909db6a7ec80ec6fdd40ba74014dd":[5,0,4,100],
+"boot_8php.html#a6c5e9e293c8242dcb9bc2c3ea2fee2c9":[5,0,4,92],
+"boot_8php.html#a6df1102664f64b274810db85197c2755":[5,0,4,190],
+"boot_8php.html#a7176c0f9f1c98421b97735d892cf6252":[5,0,4,212],
"boot_8php.html#a719c7f3972d5f9268f37a41c76cd4ef6":[5,0,4,27],
-"boot_8php.html#a7236b2cdcf59f02a42302e893a99013b":[5,0,4,162],
-"boot_8php.html#a749144d8dd9c1366596a0213c277d050":[5,0,4,118],
+"boot_8php.html#a7236b2cdcf59f02a42302e893a99013b":[5,0,4,164],
+"boot_8php.html#a749144d8dd9c1366596a0213c277d050":[5,0,4,120],
"boot_8php.html#a74bf27f7564c9a37975e7b37d973dcab":[5,0,4,71],
"boot_8php.html#a75a90b0eadd0df510f7e63210733634d":[5,0,4,2],
-"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[5,0,4,225],
+"boot_8php.html#a75fc600186b13c3b25e661afefb5eac8":[5,0,4,232],
"boot_8php.html#a768f00b7d66be0daf7ef4eea2e862006":[5,0,4,4],
"boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966":[5,0,4,73],
-"boot_8php.html#a781916f83fcc8ff1035649afa45f0292":[5,0,4,85],
+"boot_8php.html#a781916f83fcc8ff1035649afa45f0292":[5,0,4,86],
"boot_8php.html#a7aa57438db03834aaa0b468bdce773a6":[5,0,4,64],
-"boot_8php.html#a7af107fab8d62b9a73801713b774ed30":[5,0,4,117],
-"boot_8php.html#a7b8f8ad9dbe82711257d23891ef6b133":[5,0,4,142],
+"boot_8php.html#a7af107fab8d62b9a73801713b774ed30":[5,0,4,119],
+"boot_8php.html#a7b8f8ad9dbe82711257d23891ef6b133":[5,0,4,144],
"boot_8php.html#a7bff2278e68a71e524afd1c7c951e1e3":[5,0,4,68],
-"boot_8php.html#a7ed4581ab66ebcde97f6b3730856b028":[5,0,4,144],
-"boot_8php.html#a7f4264232dbb6c3b41f2617deecb1866":[5,0,4,82],
-"boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed":[5,0,4,180],
+"boot_8php.html#a7ed4581ab66ebcde97f6b3730856b028":[5,0,4,146],
+"boot_8php.html#a7f4264232dbb6c3b41f2617deecb1866":[5,0,4,83],
+"boot_8php.html#a8231d115060d41a9c2a677f2c86f10ed":[5,0,4,182],
"boot_8php.html#a84057c5bfa1bca5fba8497fe005ee4d8":[5,0,4,53],
-"boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[5,0,4,112],
-"boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[5,0,4,160],
-"boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[5,0,4,96],
-"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[5,0,4,204],
-"boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[5,0,4,114],
-"boot_8php.html#a8da836617174eed9fc2ac8054125354b":[5,0,4,110],
-"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[5,0,4,207],
+"boot_8php.html#a8663f32171568489dbb2a01dd00371f8":[5,0,4,114],
+"boot_8php.html#a882b666adfe21f035a0f8c02806066d6":[5,0,4,223],
+"boot_8php.html#a8892374789fd261eb32a7969d934a14a":[5,0,4,222],
+"boot_8php.html#a8905fde0a5b7882bdc083b20d9b34701":[5,0,4,162],
+"boot_8php.html#a8a60cc38bb567765fd926fef70205f16":[5,0,4,97],
+"boot_8php.html#a8bb0395933b5e886f086f6a2fb0bfa55":[5,0,4,206],
+"boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7":[5,0,4,116],
+"boot_8php.html#a8da836617174eed9fc2ac8054125354b":[5,0,4,111],
+"boot_8php.html#a8df201788c9dd0ca91384e3a14c08bce":[5,0,4,209],
"boot_8php.html#a9255af5ae9c887520091ea04763c1a88":[5,0,4,30],
"boot_8php.html#a926cad0b3d8b9d9ee5da1898fc063ba3":[5,0,4,11],
-"boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[5,0,4,131],
-"boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[5,0,4,113],
-"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[5,0,4,208],
+"boot_8php.html#a93823d15ae07548a4c49de88d325cd26":[5,0,4,133],
+"boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08":[5,0,4,115],
+"boot_8php.html#a949116d9a295b214293006c060ca4848":[5,0,4,113],
+"boot_8php.html#a96ad56755a21e1361dbd7bf93c9e7ff4":[5,0,4,210],
"boot_8php.html#a97769915c9f14adc4f8ab1ea2cecfd90":[5,0,4,18],
-"boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[5,0,4,174],
-"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[5,0,4,205],
+"boot_8php.html#a981d46380f9f23c308bac1f9cb00dc5b":[5,0,4,176],
+"boot_8php.html#a99a4a17cb644e7e6826ea07ecaf09777":[5,0,4,207],
"boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e":[5,0,4,5],
-"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[5,0,4,197],
-"boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[5,0,4,175],
-"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[5,0,4,221],
-"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[5,0,4,196],
-"boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[5,0,4,163],
+"boot_8php.html#a9cc986b4f9dd6558cbb2e25aadbfd964":[5,0,4,199],
+"boot_8php.html#a9d01ef178b72b145016cca1393415bc4":[5,0,4,177],
+"boot_8php.html#a9eeb8989272d5ff804a616898bb13659":[5,0,4,225],
+"boot_8php.html#a9ff652e5cb83cd11cbb0350844e7b28f":[5,0,4,198],
+"boot_8php.html#aa17a4f9c63f5cbc5c06f1066b6aebc42":[5,0,4,165],
"boot_8php.html#aa1e828bbbcba170265eb2668d8daf42e":[5,0,4,25],
-"boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[5,0,4,181],
+"boot_8php.html#aa275653b9c87abc7391bb8040c1c2de9":[5,0,4,183],
"boot_8php.html#aa3425e2de85b08f7041656d3a8502cb6":[5,0,4,48],
-"boot_8php.html#aa3679df31c8dad1b71816b0322d5baff":[5,0,4,137],
+"boot_8php.html#aa3679df31c8dad1b71816b0322d5baff":[5,0,4,139],
"boot_8php.html#aa4221641e5c21db69fa52c426b9017f5":[5,0,4,9],
"boot_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec":[5,0,4,20],
-"boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2":[5,0,4,135],
-"boot_8php.html#aa74438cf71e48e37bf7b440b94243985":[5,0,4,84],
-"boot_8php.html#aa8a2b61e70900139d1ca28e46f1da49d":[5,0,4,93],
-"boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[5,0,4,201],
-"boot_8php.html#aad33b494084f729b6ee3b0bc457718a1":[5,0,4,122],
+"boot_8php.html#aa544a6c078130d0967a1f4ed8ce0a2d2":[5,0,4,137],
+"boot_8php.html#aa74438cf71e48e37bf7b440b94243985":[5,0,4,85],
+"boot_8php.html#aa8a2b61e70900139d1ca28e46f1da49d":[5,0,4,94],
+"boot_8php.html#aa9244fc9cc221980c07a20cc534111be":[5,0,4,203],
+"boot_8php.html#aad33b494084f729b6ee3b0bc457718a1":[5,0,4,124],
"boot_8php.html#aaf9b76832ee5f85e56466af162ba8a14":[5,0,4,65],
-"boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[5,0,4,166],
-"boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[5,0,4,106],
-"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[5,0,4,187],
-"boot_8php.html#ab346a2ece14993861f3e4206befa94f0":[5,0,4,31],
-"boot_8php.html#ab4bddb41a0cf407178ec5278b950c393":[5,0,4,159],
-"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[5,0,4,191],
-"boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764":[5,0,4,105],
-"boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[5,0,4,123],
-"boot_8php.html#ab55e545b72ec8c097e052ea7d373491f":[5,0,4,40],
-"boot_8php.html#ab5ddbe69d3d03acd06e1fb281488cb78":[5,0,4,55]
+"boot_8php.html#ab21fb0f3e6b962419955c6fc7f26734f":[5,0,4,168],
+"boot_8php.html#ab28dc518fa90b6f617dd8c564eb4f35f":[5,0,4,107],
+"boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6":[5,0,4,189],
+"boot_8php.html#ab346a2ece14993861f3e4206befa94f0":[5,0,4,31]
};
diff --git a/doc/html/navtreeindex1.js b/doc/html/navtreeindex1.js
index dfa09025a..e88c79af5 100644
--- a/doc/html/navtreeindex1.js
+++ b/doc/html/navtreeindex1.js
@@ -1,70 +1,77 @@
var NAVTREEINDEX1 =
{
-"boot_8php.html#ab724491497ab2618b23a01d5da60aec0":[5,0,4,177],
+"boot_8php.html#ab4bddb41a0cf407178ec5278b950c393":[5,0,4,161],
+"boot_8php.html#ab51965fabe54dc031e9a0ce1142ee83e":[5,0,4,193],
+"boot_8php.html#ab54b24cc302e1a42a67a49d788b6b764":[5,0,4,106],
+"boot_8php.html#ab55b16ae7fc19fafe5afaedd49163bbf":[5,0,4,125],
+"boot_8php.html#ab55e545b72ec8c097e052ea7d373491f":[5,0,4,40],
+"boot_8php.html#ab5ddbe69d3d03acd06e1fb281488cb78":[5,0,4,55],
+"boot_8php.html#ab724491497ab2618b23a01d5da60aec0":[5,0,4,179],
"boot_8php.html#ab79b8b4555cae20d03f8200666d89d63":[5,0,4,7],
-"boot_8php.html#ab7d65a7e7417825a4db62906bb600729":[5,0,4,95],
+"boot_8php.html#ab7d65a7e7417825a4db62906bb600729":[5,0,4,96],
"boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda":[5,0,4,41],
"boot_8php.html#abc0a90a1a77f5b668aa7e4b57d1776a7":[5,0,4,3],
-"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[5,0,4,223],
+"boot_8php.html#abd7bb40da9cc073297e49736b338ca07":[5,0,4,229],
"boot_8php.html#abdcdfc873ace4e0902177bad934de0c0":[5,0,4,63],
-"boot_8php.html#abedd940e664017c61b48c6efa31d0cb8":[5,0,4,94],
-"boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450":[5,0,4,111],
+"boot_8php.html#abedd940e664017c61b48c6efa31d0cb8":[5,0,4,95],
+"boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450":[5,0,4,112],
"boot_8php.html#ac17fc8a416ea79e9d5cb4dc9a8ff8c5c":[5,0,4,24],
-"boot_8php.html#ac195fc9003298923ea81f144388e24b1":[5,0,4,145],
-"boot_8php.html#ac59a18a4838710d6c2de37aed6b21f03":[5,0,4,92],
+"boot_8php.html#ac195fc9003298923ea81f144388e24b1":[5,0,4,147],
+"boot_8php.html#ac59a18a4838710d6c2de37aed6b21f03":[5,0,4,93],
"boot_8php.html#ac608a34f3bc180e7724192e0fd31f9b0":[5,0,4,38],
"boot_8php.html#ac8400313df2c831653f9036f71ebd86d":[5,0,4,56],
-"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[5,0,4,226],
-"boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20":[5,0,4,107],
-"boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[5,0,4,109],
-"boot_8php.html#aca08bc4f1554ba877500f6abcc99e1e8":[5,0,4,173],
+"boot_8php.html#ac86615ddc0763a00f5311c90e991730c":[5,0,4,233],
+"boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20":[5,0,4,108],
+"boot_8php.html#ac99fc4d040764eac1736bec6973556fe":[5,0,4,110],
+"boot_8php.html#aca08bc4f1554ba877500f6abcc99e1e8":[5,0,4,175],
"boot_8php.html#aca47505b8732177f52bb2d647eb2741c":[5,0,4,37],
"boot_8php.html#aca5e42678e178c6b9034610d66666fd7":[5,0,4,13],
"boot_8php.html#acc4e0c910af066148b810e5fde55fff1":[5,0,4,8],
-"boot_8php.html#acca19aae62e1a6951a856b945de20d67":[5,0,4,148],
-"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[5,0,4,198],
+"boot_8php.html#acca19aae62e1a6951a856b945de20d67":[5,0,4,150],
+"boot_8php.html#acd877c405b06b348b37b6f7e62a211e9":[5,0,4,200],
"boot_8php.html#aced60c7285192e80b7c4757e45a7f1e3":[5,0,4,62],
-"boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8":[5,0,4,134],
+"boot_8php.html#ad0876e837cf3fad8a26417e315f6e2c8":[5,0,4,136],
"boot_8php.html#ad206598b909e8eb67eb0e0bb5ef69c13":[5,0,4,10],
"boot_8php.html#ad2c97627a313d53df1a1c7b4215ddb51":[5,0,4,16],
"boot_8php.html#ad302cb26b838898d475f57f61b0fcc9f":[5,0,4,69],
-"boot_8php.html#ad34c1547020a305915bcc39707744690":[5,0,4,83],
+"boot_8php.html#ad34c1547020a305915bcc39707744690":[5,0,4,84],
"boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44":[5,0,4,28],
-"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[5,0,4,193],
-"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[5,0,4,212],
-"boot_8php.html#ada72d88ae39a7e3b45baea201cb49a29":[5,0,4,89],
-"boot_8php.html#adaeb4f590c56326b2dca3b19f31b6272":[5,0,4,119],
-"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[5,0,4,215],
+"boot_8php.html#ad789aef3cb95fc1eb36be7c4283d0137":[5,0,4,195],
+"boot_8php.html#ad8887b49bbb02dd30b4eb9f6c7773c63":[5,0,4,214],
+"boot_8php.html#ada72d88ae39a7e3b45baea201cb49a29":[5,0,4,90],
+"boot_8php.html#adaeb4f590c56326b2dca3b19f31b6272":[5,0,4,121],
+"boot_8php.html#adca48aee78465ae3064ca4432c0d87b5":[5,0,4,217],
"boot_8php.html#add517a0958ac684792c62142a3877f81":[5,0,4,42],
"boot_8php.html#adfb2fc7be5a4226c0a8e24131da9d498":[5,0,4,23],
-"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[5,0,4,219],
+"boot_8php.html#ae37444eaa42705185080ccf3e670cbc2":[5,0,4,221],
"boot_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312":[5,0,4,17],
-"boot_8php.html#ae3cef7b63e25e7bafea3fcf6b99fad0e":[5,0,4,156],
-"boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[5,0,4,136],
-"boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[5,0,4,164],
+"boot_8php.html#ae3cef7b63e25e7bafea3fcf6b99fad0e":[5,0,4,158],
+"boot_8php.html#ae4861de36017fe399c1839f778bad9f5":[5,0,4,138],
+"boot_8php.html#ae94f7c7c0909629a75aed1c41f10bc95":[5,0,4,166],
"boot_8php.html#aea7fc57a4d8e9dcb42f2601b0b9b761c":[5,0,4,26],
+"boot_8php.html#aead84fa27d7516b855220fe004964a45":[5,0,4,226],
"boot_8php.html#aebc5ed38c73ade57f360471da712ded2":[5,0,4,33],
-"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[5,0,4,195],
-"boot_8php.html#aedfb9501ed408278667995524e0d15cf":[5,0,4,97],
-"boot_8php.html#aee324eca9de4e0fedf01ab5f92e27c67":[5,0,4,151],
-"boot_8php.html#aef4b6c558c68c88c10f13c5a00c20e3d":[5,0,4,165],
-"boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[5,0,4,121],
+"boot_8php.html#aec36f8fcd4cb14a52934590b3d6666b4":[5,0,4,197],
+"boot_8php.html#aedfb9501ed408278667995524e0d15cf":[5,0,4,98],
+"boot_8php.html#aee324eca9de4e0fedf01ab5f92e27c67":[5,0,4,153],
+"boot_8php.html#aef4b6c558c68c88c10f13c5a00c20e3d":[5,0,4,167],
+"boot_8php.html#aefba06f1c0842036329033e7567ecf6d":[5,0,4,123],
"boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4":[5,0,4,29],
-"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[5,0,4,216],
-"boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[5,0,4,158],
+"boot_8php.html#af33d1b2e98a1e21af672005525d46dfe":[5,0,4,218],
+"boot_8php.html#af3905ea8f8568d0236db13fca40514e3":[5,0,4,160],
"boot_8php.html#af3a4271630aabd8be592213f925d6a36":[5,0,4,57],
"boot_8php.html#af3bdfc20979c16f15bb9c60446a480f9":[5,0,4,51],
-"boot_8php.html#af489d0c3166551b93e63a79ff2c9be35":[5,0,4,125],
-"boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461":[5,0,4,178],
-"boot_8php.html#af6f6f6f40139f12fc09ec47373b30919":[5,0,4,86],
-"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[5,0,4,214],
-"boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d":[5,0,4,170],
-"boot_8php.html#afaf93b7026f784b113b4f8921745891e":[5,0,4,152],
-"boot_8php.html#afb97615e985a013799839b68b99018d7":[5,0,4,217],
-"boot_8php.html#afe084c30a1810c10442edb4fbcbc0086":[5,0,4,78],
-"boot_8php.html#afe63ae69ba55299f813766e54df06ede":[5,0,4,129],
+"boot_8php.html#af489d0c3166551b93e63a79ff2c9be35":[5,0,4,127],
+"boot_8php.html#af6937db5f581d006bf4a5c3d9c7e0461":[5,0,4,180],
+"boot_8php.html#af6f6f6f40139f12fc09ec47373b30919":[5,0,4,87],
+"boot_8php.html#af86c651547aa8f9e549ee40a09455549":[5,0,4,216],
+"boot_8php.html#af8c0cb0744c9a6b5d6d3baafb1f1e71d":[5,0,4,172],
+"boot_8php.html#afaf93b7026f784b113b4f8921745891e":[5,0,4,154],
+"boot_8php.html#afb97615e985a013799839b68b99018d7":[5,0,4,219],
+"boot_8php.html#afe084c30a1810c10442edb4fbcbc0086":[5,0,4,79],
+"boot_8php.html#afe63ae69ba55299f813766e54df06ede":[5,0,4,131],
"boot_8php.html#afe88b920aa285982edb817a0dd44eb37":[5,0,4,14],
-"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[5,0,4,189],
+"boot_8php.html#aff210e8403dd72368522b17fb6e5d4e7":[5,0,4,191],
"cache_8php.html":[5,0,0,11],
"channel_8php.html":[5,0,1,7],
"channel_8php.html#a9c6a6179e0e626398ebecc6151905ef1":[5,0,1,7,1],
@@ -242,12 +249,5 @@ var NAVTREEINDEX1 =
"classItem.html#ac04525a8be24c12b0a2ae4ca1ba4b967":[4,0,17,19],
"classItem.html#ac0f27e58532612f6e7a54c8a621b9b92":[4,0,17,11],
"classItem.html#ac6f1c96cc82a0dfb7e881fc70309ea3c":[4,0,17,10],
-"classItem.html#aca1e66988ed00cd627b2a359b72cd0ae":[4,0,17,3],
-"classItem.html#acc32426c0f465391be8a99ad810c7b8e":[4,0,17,29],
-"classItem.html#ad3638f93065693c1f69eb349feb1b7aa":[4,0,17,9],
-"classItem.html#ad5dcbe0b94cb2d5719bc5b6bd8ad60c8":[4,0,17,18],
-"classItem.html#aec24e233f9098f902b1e57e60dcb2019":[4,0,17,34],
-"classItem.html#af514e893765deda92125ce84024d3ad5":[4,0,17,46],
-"classItem.html#afa54851df82962c7c42dea3cc9f5c92c":[4,0,17,38],
-"classProtoDriver.html":[4,0,22]
+"classItem.html#aca1e66988ed00cd627b2a359b72cd0ae":[4,0,17,3]
};
diff --git a/doc/html/navtreeindex2.js b/doc/html/navtreeindex2.js
index e7ddca047..4c3697a9c 100644
--- a/doc/html/navtreeindex2.js
+++ b/doc/html/navtreeindex2.js
@@ -1,5 +1,12 @@
var NAVTREEINDEX2 =
{
+"classItem.html#acc32426c0f465391be8a99ad810c7b8e":[4,0,17,29],
+"classItem.html#ad3638f93065693c1f69eb349feb1b7aa":[4,0,17,9],
+"classItem.html#ad5dcbe0b94cb2d5719bc5b6bd8ad60c8":[4,0,17,18],
+"classItem.html#aec24e233f9098f902b1e57e60dcb2019":[4,0,17,34],
+"classItem.html#af514e893765deda92125ce84024d3ad5":[4,0,17,46],
+"classItem.html#afa54851df82962c7c42dea3cc9f5c92c":[4,0,17,38],
+"classProtoDriver.html":[4,0,22],
"classProtoDriver.html#a1593f3abae050edbd9304f4f8bc4894a":[4,0,22,0],
"classProtoDriver.html#a2ba1758f0f9e3564580b6ff85292804d":[4,0,22,2],
"classProtoDriver.html#a34b97ca5ef2165f2e16eb2fe59ff6c67":[4,0,22,1],
@@ -128,9 +135,10 @@ var NAVTREEINDEX2 =
"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,3],
-"connections_8php.html#a1f23623f802af7bd35e95b0e94e5d558":[5,0,1,11,2],
-"connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c":[5,0,1,11,1],
+"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],
"contact__selectors_8php.html":[5,0,0,15],
"contact__selectors_8php.html#a9839e8fdaac7ffb37bf1420493f5c28f":[5,0,0,15,0],
@@ -146,22 +154,28 @@ var NAVTREEINDEX2 =
"contactgroup_8php.html":[5,0,1,12],
"contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3":[5,0,1,12,0],
"conversation_8php.html":[5,0,0,17],
-"conversation_8php.html#a0891aaa4492cba2b51eda12fe01957f3":[5,0,0,17,5],
-"conversation_8php.html#a32e7750ae6adbfdd1f227f6e89221ce3":[5,0,0,17,1],
-"conversation_8php.html#a40b9b5e7825bc73932a32e667f05e6f2":[5,0,0,17,9],
-"conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c":[5,0,0,17,8],
-"conversation_8php.html#a7eeaaf44506815576f3bd80053ef52c3":[5,0,0,17,15],
-"conversation_8php.html#a7f6ef0dfa554bacf620e84c18d386e67":[5,0,0,17,6],
-"conversation_8php.html#a9cc2a679606da9e535a06433f9f553a0":[5,0,0,17,13],
-"conversation_8php.html#a9f909b8885259b79c6ac8da93afd8f11":[5,0,0,17,11],
-"conversation_8php.html#ab2383dff4f823e580399ff469d90ab19":[5,0,0,17,3],
+"conversation_8php.html#a0891aaa4492cba2b51eda12fe01957f3":[5,0,0,17,7],
+"conversation_8php.html#a0ee05f15255fb1cc3d89f30bc378a654":[5,0,0,17,9],
+"conversation_8php.html#a1e97305a441dc143edbe09e17d1ceda1":[5,0,0,17,3],
+"conversation_8php.html#a2a7d541854bba755eb8ada59af7dcb1a":[5,0,0,17,20],
+"conversation_8php.html#a3d8e30cc94f9a175054c021305d3aca3":[5,0,0,17,6],
+"conversation_8php.html#a40b9b5e7825bc73932a32e667f05e6f2":[5,0,0,17,15],
+"conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c":[5,0,0,17,14],
+"conversation_8php.html#a7eeaaf44506815576f3bd80053ef52c3":[5,0,0,17,21],
+"conversation_8php.html#a7f6ef0dfa554bacf620e84c18d386e67":[5,0,0,17,8],
+"conversation_8php.html#a9bd7f9fb6678736c581bcba3b17f471c":[5,0,0,17,13],
+"conversation_8php.html#a9cc2a679606da9e535a06433f9f553a0":[5,0,0,17,19],
+"conversation_8php.html#a9f909b8885259b79c6ac8da93afd8f11":[5,0,0,17,17],
+"conversation_8php.html#aacbb12d372d5e9c3ab0735b4aea48fb3":[5,0,0,17,10],
+"conversation_8php.html#ab2383dff4f823e580399ff469d90ab19":[5,0,0,17,4],
"conversation_8php.html#abed85a41f1160598de880b84021c9cf7":[5,0,0,17,2],
-"conversation_8php.html#ac55e070f65f46fcc8e269f7896be4c7d":[5,0,0,17,12],
+"conversation_8php.html#ac55e070f65f46fcc8e269f7896be4c7d":[5,0,0,17,18],
"conversation_8php.html#ad3e1d4b15e7d6d026ee182edd58f692b":[5,0,0,17,0],
-"conversation_8php.html#ae59703b07ce2ddf627b4172ff26058b6":[5,0,0,17,4],
-"conversation_8php.html#ae996eb116d397a2c6396c312d7b98664":[5,0,0,17,10],
-"conversation_8php.html#aedf008b9eac87f693d7dcc1a01404d85":[5,0,0,17,14],
-"conversation_8php.html#afea815dd1768e8417d2b30be53e9e0b4":[5,0,0,17,7],
+"conversation_8php.html#ad470fc7766f0db66d138fa1916c7a8b7":[5,0,0,17,1],
+"conversation_8php.html#adda79b75bf1ccf6ce9503aa310953533":[5,0,0,17,11],
+"conversation_8php.html#ae59703b07ce2ddf627b4172ff26058b6":[5,0,0,17,5],
+"conversation_8php.html#ae996eb116d397a2c6396c312d7b98664":[5,0,0,17,16],
+"conversation_8php.html#afe5b2f38d8b803edb0d7ec5fa2868db0":[5,0,0,17,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],
@@ -235,19 +249,5 @@ var NAVTREEINDEX2 =
"dir_b2f003339c516cc00c8cadcafbe82f13.html":[5,0,3],
"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],
-"docblox__errorchecker_8php.html":[5,0,2,2],
-"docblox__errorchecker_8php.html#a1659f0a629d408e0f849dbe4ee061e62":[5,0,2,2,3],
-"docblox__errorchecker_8php.html#a21b4bbe5aae2d85db33affc7126a67ec":[5,0,2,2,2],
-"docblox__errorchecker_8php.html#a2b767cfc461fdd5061fffc9e4a806d5b":[5,0,2,2,0],
-"docblox__errorchecker_8php.html#a49a8a4009b02e49717caa88b128affc5":[5,0,2,2,8],
-"docblox__errorchecker_8php.html#a648a570b0f9f6e0e51b7267647c4b09b":[5,0,2,2,5]
+"dir_d795dfe8933002397556cc7aa16eca15.html":[5,0,3,1,1]
};
diff --git a/doc/html/navtreeindex3.js b/doc/html/navtreeindex3.js
index e637458eb..c9e3d662a 100644
--- a/doc/html/navtreeindex3.js
+++ b/doc/html/navtreeindex3.js
@@ -1,5 +1,19 @@
var NAVTREEINDEX3 =
{
+"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],
+"docblox__errorchecker_8php.html":[5,0,2,2],
+"docblox__errorchecker_8php.html#a1659f0a629d408e0f849dbe4ee061e62":[5,0,2,2,3],
+"docblox__errorchecker_8php.html#a21b4bbe5aae2d85db33affc7126a67ec":[5,0,2,2,2],
+"docblox__errorchecker_8php.html#a2b767cfc461fdd5061fffc9e4a806d5b":[5,0,2,2,0],
+"docblox__errorchecker_8php.html#a49a8a4009b02e49717caa88b128affc5":[5,0,2,2,8],
+"docblox__errorchecker_8php.html#a648a570b0f9f6e0e51b7267647c4b09b":[5,0,2,2,5],
"docblox__errorchecker_8php.html#a721c6ff80a6d3e4ad4ffa52a04c60085":[5,0,2,2,9],
"docblox__errorchecker_8php.html#a83018d9153d17d91fbcf3bc10158d34f":[5,0,2,2,6],
"docblox__errorchecker_8php.html#a852004caba0a34390297a079f4aaac73":[5,0,2,2,7],
@@ -65,8 +79,8 @@ var NAVTREEINDEX3 =
"fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998":[5,0,1,26,0],
"full_8php.html":[5,0,3,0,1],
"full_8php.html#a6fac1b4b8cdfde06ea1b7713479e92db":[5,0,3,0,1,0],
-"functions.html":[4,3,0,0],
"functions.html":[4,3,0],
+"functions.html":[4,3,0,0],
"functions_0x5f.html":[4,3,0,1],
"functions_0x61.html":[4,3,0,2],
"functions_0x62.html":[4,3,0,3],
@@ -87,8 +101,8 @@ var NAVTREEINDEX3 =
"functions_0x76.html":[4,3,0,18],
"functions_func.html":[4,3,1],
"functions_vars.html":[4,3,2],
-"globals.html":[5,1,0],
"globals.html":[5,1,0,0],
+"globals.html":[5,1,0],
"globals_0x5f.html":[5,1,0,1],
"globals_0x61.html":[5,1,0,2],
"globals_0x62.html":[5,1,0,3],
@@ -115,8 +129,8 @@ var NAVTREEINDEX3 =
"globals_0x77.html":[5,1,0,24],
"globals_0x78.html":[5,1,0,25],
"globals_0x7a.html":[5,1,0,26],
-"globals_func.html":[5,1,1],
"globals_func.html":[5,1,1,0],
+"globals_func.html":[5,1,1],
"globals_func_0x61.html":[5,1,1,1],
"globals_func_0x62.html":[5,1,1,2],
"globals_func_0x63.html":[5,1,1,3],
@@ -235,19 +249,5 @@ var NAVTREEINDEX3 =
"include_2api_8php.html#ac2c2b18c426d697d11a830bca146be8a":[5,0,0,5,30],
"include_2api_8php.html#ac5a64cc81d70ff3cf866093ea9721d23":[5,0,0,5,24],
"include_2api_8php.html#acafd2899309a005fcb725289173dc7fe":[5,0,0,5,22],
-"include_2api_8php.html#ad24ce1bf20867add4c9211a8eaf93f22":[5,0,0,5,40],
-"include_2api_8php.html#ad2b0192f3006918bea895de8074bf8d2":[5,0,0,5,11],
-"include_2api_8php.html#ad4c29f43418f6110f85a6b3998239ab4":[5,0,0,5,33],
-"include_2api_8php.html#ad4d1634df6b35126552324683caaffa2":[5,0,0,5,43],
-"include_2api_8php.html#ade742525b2e41c82b090799ef3c51d5e":[5,0,0,5,36],
-"include_2api_8php.html#adfc035ee6303c1d8ba5336a4ead2bd53":[5,0,0,5,14],
-"include_2api_8php.html#ae0fa388479cace9c5a7a45b571ab42f8":[5,0,0,5,41],
-"include_2api_8php.html#ae82608c317421f27446465aa6724733d":[5,0,0,5,20],
-"include_2api_8php.html#ae8f5863e18d69421005c71441c9d99a5":[5,0,0,5,1],
-"include_2api_8php.html#aea2dda92a155f2843a0ca188d8dfdf25":[5,0,0,5,7],
-"include_2api_8php.html#aeb2e7ad00ea666b4b6dfcf82008194f8":[5,0,0,5,50],
-"include_2api_8php.html#af6f1d89cdb0a0621025efbec1597bc63":[5,0,0,5,42],
-"include_2api_8php.html#afb99daa6b731bf497b81f2128084852c":[5,0,0,5,47],
-"include_2api_8php.html#afe534f826e4282b72d66e8cadca7bb73":[5,0,0,5,26],
-"include_2api_8php.html#aff322705cc6084b329003fc8eab0aad0":[5,0,0,5,27]
+"include_2api_8php.html#ad24ce1bf20867add4c9211a8eaf93f22":[5,0,0,5,40]
};
diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js
index 5d12f8dc0..ecff11bed 100644
--- a/doc/html/navtreeindex4.js
+++ b/doc/html/navtreeindex4.js
@@ -1,5 +1,19 @@
var NAVTREEINDEX4 =
{
+"include_2api_8php.html#ad2b0192f3006918bea895de8074bf8d2":[5,0,0,5,11],
+"include_2api_8php.html#ad4c29f43418f6110f85a6b3998239ab4":[5,0,0,5,33],
+"include_2api_8php.html#ad4d1634df6b35126552324683caaffa2":[5,0,0,5,43],
+"include_2api_8php.html#ade742525b2e41c82b090799ef3c51d5e":[5,0,0,5,36],
+"include_2api_8php.html#adfc035ee6303c1d8ba5336a4ead2bd53":[5,0,0,5,14],
+"include_2api_8php.html#ae0fa388479cace9c5a7a45b571ab42f8":[5,0,0,5,41],
+"include_2api_8php.html#ae82608c317421f27446465aa6724733d":[5,0,0,5,20],
+"include_2api_8php.html#ae8f5863e18d69421005c71441c9d99a5":[5,0,0,5,1],
+"include_2api_8php.html#aea2dda92a155f2843a0ca188d8dfdf25":[5,0,0,5,7],
+"include_2api_8php.html#aeb2e7ad00ea666b4b6dfcf82008194f8":[5,0,0,5,50],
+"include_2api_8php.html#af6f1d89cdb0a0621025efbec1597bc63":[5,0,0,5,42],
+"include_2api_8php.html#afb99daa6b731bf497b81f2128084852c":[5,0,0,5,47],
+"include_2api_8php.html#afe534f826e4282b72d66e8cadca7bb73":[5,0,0,5,26],
+"include_2api_8php.html#aff322705cc6084b329003fc8eab0aad0":[5,0,0,5,27],
"include_2attach_8php.html":[5,0,0,6],
"include_2attach_8php.html#a0d07c5b83d3d54e186f752e571847b36":[5,0,0,6,0],
"include_2attach_8php.html#a3634af95f11a023dd8e882c3c7a3600d":[5,0,0,6,3],
@@ -9,18 +23,19 @@ var NAVTREEINDEX4 =
"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,13],
-"include_2config_8php.html#a27559f388c9b9af81c94e48d6889d1d1":[5,0,0,13,6],
+"include_2config_8php.html#a27559f388c9b9af81c94e48d6889d1d1":[5,0,0,13,7],
"include_2config_8php.html#a549910227348003efc3c05c9105c42da":[5,0,0,13,0],
-"include_2config_8php.html#a5d19130818ea4c6b8726ab62cd989c15":[5,0,0,13,3],
-"include_2config_8php.html#a61591371cb18764138655d67dc817ab2":[5,0,0,13,10],
+"include_2config_8php.html#a55bbed9a014c9109c767486834f3ca33":[5,0,0,13,9],
+"include_2config_8php.html#a61591371cb18764138655d67dc817ab2":[5,0,0,13,11],
"include_2config_8php.html#a7ad2081c5f812ac4387fd76f3762d941":[5,0,0,13,1],
-"include_2config_8php.html#a913d4e1a6ee7acc1598c69b902c06fd2":[5,0,0,13,8],
"include_2config_8php.html#a9c171def547deee16738dc58fdeb4b72":[5,0,0,13,2],
-"include_2config_8php.html#ab012f852866a0aff9b5180daffa454f5":[5,0,0,13,7],
-"include_2config_8php.html#ad58a4913937179adb13201c2ee3261ad":[5,0,0,13,4],
-"include_2config_8php.html#ad6da879e4fb5b37d1e161d4e9be5c32a":[5,0,0,13,9],
-"include_2config_8php.html#ae4269ab151d08b5dcb1581b2920a934b":[5,0,0,13,5],
-"include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e":[5,0,0,13,11],
+"include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e":[5,0,0,13,6],
+"include_2config_8php.html#ac543813a980b3841cc5a277fcd4a24a6":[5,0,0,13,8],
+"include_2config_8php.html#ad58a4913937179adb13201c2ee3261ad":[5,0,0,13,5],
+"include_2config_8php.html#ad6da879e4fb5b37d1e161d4e9be5c32a":[5,0,0,13,10],
+"include_2config_8php.html#af02c96e6b37335774b548914ede1d22e":[5,0,0,13,3],
+"include_2config_8php.html#af08b7adb63adfb2eda7c466fba0cce74":[5,0,0,13,4],
+"include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e":[5,0,0,13,12],
"include_2directory_8php.html":[5,0,0,24],
"include_2directory_8php.html#aa75d3b0697ca1456aaabdb37a74aa0f0":[5,0,0,24,0],
"include_2follow_8php.html":[5,0,0,29],
@@ -91,6 +106,8 @@ var NAVTREEINDEX4 =
"include_2photos_8php.html#ad648c0c5544fe9263409b6f6e57c6274":[5,0,0,49,6],
"include_2photos_8php.html#aedccaf18282b26899d9549c29bd9d1b9":[5,0,0,49,5],
"include_2photos_8php.html#af24c6aeed28ecc31ec39e7d9a1804979":[5,0,0,49,4],
+"include_2settings_8php.html":[5,0,0,59],
+"include_2settings_8php.html#ac34e479d27f32b82dd6b33542f81a6a7":[5,0,0,59,0],
"index.html":[],
"interfaceITemplateEngine.html":[4,0,18],
"interfaceITemplateEngine.html#aaa7381c8becc3d1c1790b53988a0f243":[4,0,18,1],
@@ -109,63 +126,64 @@ var NAVTREEINDEX4 =
"item_8php.html#a7b63a9d0cd02096e17dcf11f4afa7c10":[5,0,1,35,1],
"item_8php.html#abd0e603a6696051af16476eb968d52e7":[5,0,1,35,2],
"items_8php.html":[5,0,0,38],
-"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[5,0,0,38,56],
+"items_8php.html#a004e89d86b0f29b2c4da20108ecc4091":[5,0,0,38,57],
"items_8php.html#a016dd86c827d08db89061ea81d15c6cb":[5,0,0,38,2],
-"items_8php.html#a01e3cf44e082fa9bd06dcde5bf713d70":[5,0,0,38,4],
-"items_8php.html#a04a35b610acfe54434df08adec39c0c7":[5,0,0,38,26],
-"items_8php.html#a0790a4550b829e85504af548623002ca":[5,0,0,38,5],
-"items_8php.html#a079e099e15d88d47aeb6ca6d60da7107":[5,0,0,38,31],
-"items_8php.html#a09d425596b9f8663472cf7474ad36d96":[5,0,0,38,35],
-"items_8php.html#a0cf98bb619f07dd18f602683a55a5f59":[5,0,0,38,23],
-"items_8php.html#a251343637ff40a50cca93452cd530c26":[5,0,0,38,30],
+"items_8php.html#a01e3cf44e082fa9bd06dcde5bf713d70":[5,0,0,38,5],
+"items_8php.html#a04a35b610acfe54434df08adec39c0c7":[5,0,0,38,27],
+"items_8php.html#a0790a4550b829e85504af548623002ca":[5,0,0,38,6],
+"items_8php.html#a079e099e15d88d47aeb6ca6d60da7107":[5,0,0,38,32],
+"items_8php.html#a09d425596b9f8663472cf7474ad36d96":[5,0,0,38,36],
+"items_8php.html#a0cf98bb619f07dd18f602683a55a5f59":[5,0,0,38,24],
+"items_8php.html#a1e75047cf175aaee8dd16aa761913ff9":[5,0,0,38,4],
+"items_8php.html#a251343637ff40a50cca93452cd530c26":[5,0,0,38,31],
"items_8php.html#a275108c050f7eb18bcbb5018e6b81cf6":[5,0,0,38,3],
-"items_8php.html#a2b56a4c01bd22a648d52ec9af1a04259":[5,0,0,38,11],
-"items_8php.html#a2d840c74ed23d1b6c7daee05cf89dda7":[5,0,0,38,19],
-"items_8php.html#a2dc4fb9347f6fb804da4f32c107afb53":[5,0,0,38,38],
+"items_8php.html#a2b56a4c01bd22a648d52ec9af1a04259":[5,0,0,38,12],
+"items_8php.html#a2d840c74ed23d1b6c7daee05cf89dda7":[5,0,0,38,20],
+"items_8php.html#a2dc4fb9347f6fb804da4f32c107afb53":[5,0,0,38,39],
"items_8php.html#a36e656667193c83aa2cc03a024fc131b":[5,0,0,38,0],
-"items_8php.html#a3a218d5e8ffbe261f773225ecded86a2":[5,0,0,38,43],
-"items_8php.html#a410f9c743877c125ca06312373346903":[5,0,0,38,47],
-"items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b":[5,0,0,38,50],
-"items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361":[5,0,0,38,28],
-"items_8php.html#a53eb3d27e1c55083be93a32f392d54e7":[5,0,0,38,46],
-"items_8php.html#a566c601726697e044e75284af7fb6f17":[5,0,0,38,18],
-"items_8php.html#a56b2a4abcadfac71175cd50555528cc3":[5,0,0,38,10],
-"items_8php.html#a5f690fc2484abec07840b4f9dd525bd9":[5,0,0,38,16],
-"items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7":[5,0,0,38,36],
-"items_8php.html#a668ece2c37f05cc3abe538eb0dabfe55":[5,0,0,38,14],
-"items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc":[5,0,0,38,34],
-"items_8php.html#a756738301f2ed96be50232500677d58a":[5,0,0,38,39],
-"items_8php.html#a77051724d1784074ff187e73a4db93fe":[5,0,0,38,32],
-"items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[5,0,0,38,44],
-"items_8php.html#a82955cc578f0fa600acec84475026194":[5,0,0,38,15],
-"items_8php.html#a8395d189a36abfa0dfff81a2b0e70669":[5,0,0,38,12],
-"items_8php.html#a8794863cdf8ce1333040933d3a3f66bd":[5,0,0,38,9],
-"items_8php.html#a88c6cf7649ac836fbbed82a7a0315110":[5,0,0,38,54],
-"items_8php.html#a896c1809d58f2d7a42cfe14577958ddf":[5,0,0,38,25],
-"items_8php.html#a8ef003b2bc2dc4816bdcf5800aec1049":[5,0,0,38,37],
-"items_8php.html#a8f3c85c584ccd2b98c3ca440e45b40f8":[5,0,0,38,8],
-"items_8php.html#a94ddb1d6c8fa21dd7433677e85168037":[5,0,0,38,29],
-"items_8php.html#aa371905f0a211b307cb3f7188c6cba04":[5,0,0,38,55],
-"items_8php.html#aa579bc4445d60098b1410961ca8e96b7":[5,0,0,38,7],
-"items_8php.html#aa723c0571e314a1853a24c5854b4f54f":[5,0,0,38,20],
-"items_8php.html#aa9e99613d38a97b39c8cf5449699c2ee":[5,0,0,38,6],
-"items_8php.html#aab9c6bae4c40799867596bdaae9829fd":[5,0,0,38,27],
-"items_8php.html#aab9e0c58247427126de0699c729c3b6c":[5,0,0,38,51],
-"items_8php.html#ab1bce4261bcf75ad62753b498a144d17":[5,0,0,38,52],
-"items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87":[5,0,0,38,24],
-"items_8php.html#abe695dd89e1e10ed042c26b80114f0ed":[5,0,0,38,48],
+"items_8php.html#a3a218d5e8ffbe261f773225ecded86a2":[5,0,0,38,44],
+"items_8php.html#a410f9c743877c125ca06312373346903":[5,0,0,38,48],
+"items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b":[5,0,0,38,51],
+"items_8php.html#a536d0313b6ffe33b9d2490c4e25c5361":[5,0,0,38,29],
+"items_8php.html#a53eb3d27e1c55083be93a32f392d54e7":[5,0,0,38,47],
+"items_8php.html#a566c601726697e044e75284af7fb6f17":[5,0,0,38,19],
+"items_8php.html#a56b2a4abcadfac71175cd50555528cc3":[5,0,0,38,11],
+"items_8php.html#a5f690fc2484abec07840b4f9dd525bd9":[5,0,0,38,17],
+"items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7":[5,0,0,38,37],
+"items_8php.html#a668ece2c37f05cc3abe538eb0dabfe55":[5,0,0,38,15],
+"items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc":[5,0,0,38,35],
+"items_8php.html#a756738301f2ed96be50232500677d58a":[5,0,0,38,40],
+"items_8php.html#a77051724d1784074ff187e73a4db93fe":[5,0,0,38,33],
+"items_8php.html#a77da7ce9a117601d49ac4a67c71b514f":[5,0,0,38,45],
+"items_8php.html#a82955cc578f0fa600acec84475026194":[5,0,0,38,16],
+"items_8php.html#a8395d189a36abfa0dfff81a2b0e70669":[5,0,0,38,13],
+"items_8php.html#a8794863cdf8ce1333040933d3a3f66bd":[5,0,0,38,10],
+"items_8php.html#a88c6cf7649ac836fbbed82a7a0315110":[5,0,0,38,55],
+"items_8php.html#a896c1809d58f2d7a42cfe14577958ddf":[5,0,0,38,26],
+"items_8php.html#a8ef003b2bc2dc4816bdcf5800aec1049":[5,0,0,38,38],
+"items_8php.html#a8f3c85c584ccd2b98c3ca440e45b40f8":[5,0,0,38,9],
+"items_8php.html#a94ddb1d6c8fa21dd7433677e85168037":[5,0,0,38,30],
+"items_8php.html#aa371905f0a211b307cb3f7188c6cba04":[5,0,0,38,56],
+"items_8php.html#aa579bc4445d60098b1410961ca8e96b7":[5,0,0,38,8],
+"items_8php.html#aa723c0571e314a1853a24c5854b4f54f":[5,0,0,38,21],
+"items_8php.html#aa9e99613d38a97b39c8cf5449699c2ee":[5,0,0,38,7],
+"items_8php.html#aab9c6bae4c40799867596bdaae9829fd":[5,0,0,38,28],
+"items_8php.html#aab9e0c58247427126de0699c729c3b6c":[5,0,0,38,52],
+"items_8php.html#ab1bce4261bcf75ad62753b498a144d17":[5,0,0,38,53],
+"items_8php.html#aba98fcbbcd7044a7e9ea34edabc14c87":[5,0,0,38,25],
+"items_8php.html#abe695dd89e1e10ed042c26b80114f0ed":[5,0,0,38,49],
"items_8php.html#abf7a1b73eb352d79acd36309b0dababd":[5,0,0,38,1],
-"items_8php.html#ac1fcf621dce7370515b420a7753f4726":[5,0,0,38,45],
-"items_8php.html#ac6673627d289ee4f547de0fe3b7acd0a":[5,0,0,38,17],
-"items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0":[5,0,0,38,49],
-"items_8php.html#ad34827ed330898456783fb14c7b46154":[5,0,0,38,53],
-"items_8php.html#ade53043e7bc5ab9cc9ef1e4fed6569d4":[5,0,0,38,42],
-"items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9":[5,0,0,38,22],
-"items_8php.html#ae1c27d1a6379231ac7c0435c8a791d45":[5,0,0,38,41],
-"items_8php.html#ae73794179b62d39bb597ff670ab1c1e5":[5,0,0,38,33],
-"items_8php.html#af94c281016c6c912d06e064113336c5c":[5,0,0,38,40],
-"items_8php.html#afa1db13c2a8b73b5b17b97f17e5a19d1":[5,0,0,38,13],
-"items_8php.html#afbcf26dfcf8a83fff952aa858c1b7b67":[5,0,0,38,21],
+"items_8php.html#ac1fcf621dce7370515b420a7753f4726":[5,0,0,38,46],
+"items_8php.html#ac6673627d289ee4f547de0fe3b7acd0a":[5,0,0,38,18],
+"items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0":[5,0,0,38,50],
+"items_8php.html#ad34827ed330898456783fb14c7b46154":[5,0,0,38,54],
+"items_8php.html#ade53043e7bc5ab9cc9ef1e4fed6569d4":[5,0,0,38,43],
+"items_8php.html#adf980098b6de9c3993bc3ff26a8dd6f9":[5,0,0,38,23],
+"items_8php.html#ae1c27d1a6379231ac7c0435c8a791d45":[5,0,0,38,42],
+"items_8php.html#ae73794179b62d39bb597ff670ab1c1e5":[5,0,0,38,34],
+"items_8php.html#af94c281016c6c912d06e064113336c5c":[5,0,0,38,41],
+"items_8php.html#afa1db13c2a8b73b5b17b97f17e5a19d1":[5,0,0,38,14],
+"items_8php.html#afbcf26dfcf8a83fff952aa858c1b7b67":[5,0,0,38,22],
"language_8php.html":[5,0,0,39],
"language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0":[5,0,0,39,6],
"language_8php.html#a632da17c7ac0d2dc1a00a4706870194b":[5,0,0,39,0],
@@ -230,24 +248,6 @@ var NAVTREEINDEX4 =
"mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080":[5,0,1,57,2],
"mod_2photos_8php.html#aa87382611a66ec5effdb2d78f13f5812":[5,0,1,57,0],
"mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014":[5,0,1,57,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,44],
-"mood_8php.html#a721b9b6703b3234a005641c92d409b8f":[5,0,1,44,0],
-"mood_8php.html#a7ae136dd7476865b4828136175db5022":[5,0,1,44,1],
-"msearch_8php.html":[5,0,1,45],
-"msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[5,0,1,45,0],
-"namespaceFriendica.html":[3,0,1],
-"namespaceFriendica.html":[4,0,1],
-"namespaceacl__selectors.html":[3,0,0],
-"namespaceacl__selectors.html":[4,0,0],
-"namespacefriendica-to-smarty-tpl.html":[4,0,2],
-"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]
+"mod_2settings_8php.html":[5,0,1,79],
+"mod_2settings_8php.html#a39abc76ff5459c57e3b957664f273f18":[5,0,1,79,0]
};
diff --git a/doc/html/navtreeindex5.js b/doc/html/navtreeindex5.js
index e85c4b836..e297764bd 100644
--- a/doc/html/navtreeindex5.js
+++ b/doc/html/navtreeindex5.js
@@ -1,10 +1,32 @@
var NAVTREEINDEX5 =
{
+"mod_2settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586":[5,0,1,79,2],
+"mod_2settings_8php.html#ae5aebccb006bee1300078576baaf5582":[5,0,1,79,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,44],
+"mood_8php.html#a721b9b6703b3234a005641c92d409b8f":[5,0,1,44,0],
+"mood_8php.html#a7ae136dd7476865b4828136175db5022":[5,0,1,44,1],
+"msearch_8php.html":[5,0,1,45],
+"msearch_8php.html#ac80d2a6c0a92e79eec7efbbccd74d9a8":[5,0,1,45,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],
+"namespacefriendica-to-smarty-tpl.html":[3,0,2],
+"namespacemembers.html":[3,1,0],
+"namespacemembers_func.html":[3,1,1],
+"namespacemembers_vars.html":[3,1,2],
"namespaces.html":[3,0],
-"namespaceupdatetpl.html":[3,0,3],
"namespaceupdatetpl.html":[4,0,3],
-"namespaceutil.html":[4,0,4],
+"namespaceupdatetpl.html":[3,0,3],
"namespaceutil.html":[3,0,4],
+"namespaceutil.html":[4,0,4],
"nav_8php.html":[5,0,0,41],
"nav_8php.html#a43be0df73b90647ea70947ce004e231e":[5,0,0,41,0],
"nav_8php.html#ac3c920ce3ea5b0d9e0678ee37155f06a":[5,0,0,41,1],
@@ -64,8 +86,10 @@ var NAVTREEINDEX5 =
"php_2default_8php.html":[5,0,3,0,0],
"php_2default_8php.html#a2a9b3d213aeeef28c4393ba8f7b408a4":[5,0,3,0,0,0],
"php_2theme__init_8php.html":[5,0,3,0,6],
-"ping_8php.html":[5,0,1,58],
-"ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[5,0,1,58,0],
+"php_8php.html":[5,0,1,58],
+"php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6":[5,0,1,58,0],
+"ping_8php.html":[5,0,1,59],
+"ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1":[5,0,1,59,0],
"plugin_8php.html":[5,0,0,50],
"plugin_8php.html#a030cec6793b909c439c0336ba39b1571":[5,0,0,50,17],
"plugin_8php.html#a093a9cb98f51e3643634bd8bc6ed6e76":[5,0,0,50,20],
@@ -95,52 +119,52 @@ var NAVTREEINDEX5 =
"plugin_8php.html#aff0178bd8d0b34a94d5efddc883edd35":[5,0,0,50,5],
"po2php_8php.html":[5,0,2,6],
"po2php_8php.html#a3b75e36f913198299e99559b175cd8b4":[5,0,2,6,0],
-"poco_8php.html":[5,0,1,59],
-"poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498":[5,0,1,59,0],
-"poke_8php.html":[5,0,1,60],
-"poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b":[5,0,1,60,1],
-"poke_8php.html#ac9190563a8da9c07a16f9dcd71cf6993":[5,0,1,60,0],
+"poco_8php.html":[5,0,1,60],
+"poco_8php.html#a53def16f75e3d41f1d2bb7cfa4905498":[5,0,1,60,0],
+"poke_8php.html":[5,0,1,61],
+"poke_8php.html#a9725aab97b3983e6a98bd81c4efe7d3b":[5,0,1,61,1],
+"poke_8php.html#ac9190563a8da9c07a16f9dcd71cf6993":[5,0,1,61,0],
"poller_8php.html":[5,0,0,51],
"poller_8php.html#a5f12df3a4738124b6c039971e87e76da":[5,0,0,51,0],
-"post_8php.html":[5,0,1,61],
-"post_8php.html#af4b48181ce773ef0cdfc972441445c34":[5,0,1,61,0],
-"post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[5,0,1,61,1],
-"pretheme_8php.html":[5,0,1,62],
-"pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[5,0,1,62,0],
-"probe_8php.html":[5,0,1,63],
-"probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[5,0,1,63,0],
-"profile_8php.html":[5,0,1,64],
-"profile_8php.html#a1a2482b775476f2f64ea5e8f4fc3fd1e":[5,0,1,64,0],
-"profile_8php.html#a3775cf6eef6587e5143133356a7b76c0":[5,0,1,64,1],
-"profile_8php.html#ab5d0246be0552e2182a585c1206d22a5":[5,0,1,64,2],
+"post_8php.html":[5,0,1,62],
+"post_8php.html#af4b48181ce773ef0cdfc972441445c34":[5,0,1,62,0],
+"post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75":[5,0,1,62,1],
+"pretheme_8php.html":[5,0,1,63],
+"pretheme_8php.html#af5660943ee99db5fd75182316522eafe":[5,0,1,63,0],
+"probe_8php.html":[5,0,1,64],
+"probe_8php.html#a1f1db3fa6038e451e737964c94bf5e99":[5,0,1,64,0],
+"profile_8php.html":[5,0,1,65],
+"profile_8php.html#a1a2482b775476f2f64ea5e8f4fc3fd1e":[5,0,1,65,0],
+"profile_8php.html#a3775cf6eef6587e5143133356a7b76c0":[5,0,1,65,1],
+"profile_8php.html#ab5d0246be0552e2182a585c1206d22a5":[5,0,1,65,2],
"profile__advanced_8php.html":[5,0,0,52],
"profile__advanced_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4":[5,0,0,52,0],
-"profile__photo_8php.html":[5,0,1,65],
-"profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02":[5,0,1,65,1],
-"profile__photo_8php.html#a4b80234074bd603221aa5364f330e479":[5,0,1,65,2],
-"profile__photo_8php.html#ac9cd968a767e2ae1b88383b6cdd6dbe3":[5,0,1,65,0],
+"profile__photo_8php.html":[5,0,1,66],
+"profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02":[5,0,1,66,1],
+"profile__photo_8php.html#a4b80234074bd603221aa5364f330e479":[5,0,1,66,2],
+"profile__photo_8php.html#ac9cd968a767e2ae1b88383b6cdd6dbe3":[5,0,1,66,0],
"profile__selectors_8php.html":[5,0,0,53],
"profile__selectors_8php.html#a3b50b3ea4ea4bdbebebfffc5d1b157c7":[5,0,0,53,2],
"profile__selectors_8php.html#a7473dd095987e1cdcc79d4f0bb5e6798":[5,0,0,53,1],
"profile__selectors_8php.html#ae2b2c087e6530c61c0b256fd26d52355":[5,0,0,53,0],
-"profiles_8php.html":[5,0,1,66],
-"profiles_8php.html#a2a3ac90f51941ff78b85e9389304969c":[5,0,1,66,0],
-"profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e":[5,0,1,66,2],
-"profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00":[5,0,1,66,1],
-"profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04":[5,0,1,66,3],
-"profperm_8php.html":[5,0,1,67],
-"profperm_8php.html#a17fb64ec05edee1dc94d95438807d6c6":[5,0,1,67,2],
-"profperm_8php.html#a77fd398ae7c25142e1d9ad724ec347cc":[5,0,1,67,0],
-"profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023":[5,0,1,67,1],
-"qsearch_8php.html":[5,0,1,68],
-"qsearch_8php.html#a0501887b95bd8fa21018b2936a668894":[5,0,1,68,0],
+"profiles_8php.html":[5,0,1,67],
+"profiles_8php.html#a2a3ac90f51941ff78b85e9389304969c":[5,0,1,67,0],
+"profiles_8php.html#a36f71405ad536228f8bb84a551b23f7e":[5,0,1,67,2],
+"profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00":[5,0,1,67,1],
+"profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04":[5,0,1,67,3],
+"profperm_8php.html":[5,0,1,68],
+"profperm_8php.html#a17fb64ec05edee1dc94d95438807d6c6":[5,0,1,68,2],
+"profperm_8php.html#a77fd398ae7c25142e1d9ad724ec347cc":[5,0,1,68,0],
+"profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023":[5,0,1,68,1],
+"qsearch_8php.html":[5,0,1,69],
+"qsearch_8php.html#a0501887b95bd8fa21018b2936a668894":[5,0,1,69,0],
"queue_8php.html":[5,0,0,55],
"queue_8php.html#af8c93de86d866c3200174c8450a0f341":[5,0,0,55,0],
"queue__fn_8php.html":[5,0,0,56],
"queue__fn_8php.html#a4c2876181f75a4a61e85b7f00dfdbba1":[5,0,0,56,1],
"queue__fn_8php.html#a8fe71e981399bbf5d000a6ca42f57b24":[5,0,0,56,0],
-"randprof_8php.html":[5,0,1,69],
-"randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[5,0,1,69,0],
+"randprof_8php.html":[5,0,1,70],
+"randprof_8php.html#abf5dba3c608b9304cbf68327cd31b090":[5,0,1,70,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,13],
"redbasic_2php_2style_8php.html#a03a72942b7428fd9af1224770d20a8ba":[5,0,3,1,0,0,1,5],
@@ -161,8 +185,8 @@ var NAVTREEINDEX5 =
"redbasic_2php_2style_8php.html#aef266cfcb27c6ddb3292584c945bab33":[5,0,3,1,0,0,1,7],
"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,70],
-"redir_8php.html#a9ac266c3f5cf0d94ef63e6d0f2edf1f5":[5,0,1,70,0],
+"redir_8php.html":[5,0,1,71],
+"redir_8php.html#a9ac266c3f5cf0d94ef63e6d0f2edf1f5":[5,0,1,71,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],
@@ -183,28 +207,28 @@ var NAVTREEINDEX5 =
"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,71],
-"register_8php.html#a0e91f57f111407ea8d3223a05022bb2a":[5,0,1,71,0],
-"register_8php.html#a51731dcc1917c58a790eb1c0f6132271":[5,0,1,71,2],
-"register_8php.html#ae20c0cd40f738d6295de58b9202c83d5":[5,0,1,71,1],
-"regmod_8php.html":[5,0,1,72],
-"regmod_8php.html#a7953df4e32e63946565e90cdd5d50409":[5,0,1,72,0],
-"removeme_8php.html":[5,0,1,73],
-"removeme_8php.html#a065a589caa2aa84c60f7073a28f0ad9c":[5,0,1,73,0],
-"removeme_8php.html#a7be08738beca44bb98a79e01cdb2ee88":[5,0,1,73,1],
-"rmagic_8php.html":[5,0,1,74],
-"rmagic_8php.html#a3e28db1e5cfa7e5c2617f90222c1caef":[5,0,1,74,0],
-"rmagic_8php.html#a869de069d081b3c4e98b957d06bbf08f":[5,0,1,74,2],
-"rmagic_8php.html#a95455edd43f1bff39446a57388cdde16":[5,0,1,74,1],
-"rsd__xml_8php.html":[5,0,1,75],
-"rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82":[5,0,1,75,0],
-"search_8php.html":[5,0,1,76],
-"search_8php.html#a230ec9681ddee3b5b8b40c8d550f32f7":[5,0,1,76,2],
-"search_8php.html#aa911f7c7f0cdb0284e35d0ed610f19c6":[5,0,1,76,3],
-"search_8php.html#ab2568591359edde5b483a6cd9a24b2cc":[5,0,1,76,0],
-"search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[5,0,1,76,1],
-"search__ac_8php.html":[5,0,1,77],
-"search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[5,0,1,77,0],
+"register_8php.html":[5,0,1,72],
+"register_8php.html#a0e91f57f111407ea8d3223a05022bb2a":[5,0,1,72,0],
+"register_8php.html#a51731dcc1917c58a790eb1c0f6132271":[5,0,1,72,2],
+"register_8php.html#ae20c0cd40f738d6295de58b9202c83d5":[5,0,1,72,1],
+"regmod_8php.html":[5,0,1,73],
+"regmod_8php.html#a7953df4e32e63946565e90cdd5d50409":[5,0,1,73,0],
+"removeme_8php.html":[5,0,1,74],
+"removeme_8php.html#a065a589caa2aa84c60f7073a28f0ad9c":[5,0,1,74,0],
+"removeme_8php.html#a7be08738beca44bb98a79e01cdb2ee88":[5,0,1,74,1],
+"rmagic_8php.html":[5,0,1,75],
+"rmagic_8php.html#a3e28db1e5cfa7e5c2617f90222c1caef":[5,0,1,75,0],
+"rmagic_8php.html#a869de069d081b3c4e98b957d06bbf08f":[5,0,1,75,2],
+"rmagic_8php.html#a95455edd43f1bff39446a57388cdde16":[5,0,1,75,1],
+"rsd__xml_8php.html":[5,0,1,76],
+"rsd__xml_8php.html#a740cd02fa15e5a53f8547fac73f0ab82":[5,0,1,76,0],
+"search_8php.html":[5,0,1,77],
+"search_8php.html#a230ec9681ddee3b5b8b40c8d550f32f7":[5,0,1,77,2],
+"search_8php.html#aa911f7c7f0cdb0284e35d0ed610f19c6":[5,0,1,77,3],
+"search_8php.html#ab2568591359edde5b483a6cd9a24b2cc":[5,0,1,77,0],
+"search_8php.html#acf19fd30f07f495781ca0d7a0a08b435":[5,0,1,77,1],
+"search__ac_8php.html":[5,0,1,78],
+"search__ac_8php.html#a14f90c83a3f2be095e9e2992a8d66138":[5,0,1,78,0],
"security_8php.html":[5,0,0,57],
"security_8php.html#a20f8b9851f23ee8894b8925584ef6821":[5,0,0,57,2],
"security_8php.html#a444ac867dfa8c37cf0a7a226412bee28":[5,0,0,57,4],
@@ -225,29 +249,5 @@ var NAVTREEINDEX5 =
"session_8php.html#a7f0f50576360d9ba52d29364e0b83a8e":[5,0,0,58,5],
"session_8php.html#a96b09cc763572f45280786a7b33feb7e":[5,0,0,58,7],
"session_8php.html#ac4461c1984543d3553e73dba2771568f":[5,0,0,58,6],
-"session_8php.html#ac95373f4966862a028033dd2f94d4da1":[5,0,0,58,3],
-"session_8php.html#af0100a2642a5268594bbd5742a03d885":[5,0,0,58,9],
-"session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052":[5,0,0,58,2],
-"settings_8php.html":[5,0,1,78],
-"settings_8php.html#a39abc76ff5459c57e3b957664f273f18":[5,0,1,78,0],
-"settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586":[5,0,1,78,2],
-"settings_8php.html#ae5aebccb006bee1300078576baaf5582":[5,0,1,78,1],
-"setup_8php.html":[5,0,1,79],
-"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[5,0,1,79,2],
-"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[5,0,1,79,13],
-"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[5,0,1,79,5],
-"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[5,0,1,79,12],
-"setup_8php.html#a2b375ddc555140236fc500135de99371":[5,0,1,79,9],
-"setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f":[5,0,1,79,3],
-"setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e":[5,0,1,79,1],
-"setup_8php.html#a8652788e8589778c5f81634a9d5b9429":[5,0,1,79,7],
-"setup_8php.html#a88247384a96e14516f474d7af6a465c1":[5,0,1,79,11],
-"setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76":[5,0,1,79,4],
-"setup_8php.html#abe405d227ba7232971964a706d4f3bce":[5,0,1,79,10],
-"setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a":[5,0,1,79,8],
-"setup_8php.html#addb24714bc2542aa4f4215e98fe48432":[5,0,1,79,15],
-"setup_8php.html#ae8e4d9279a61de74d5f39962cb7b6ca1":[5,0,1,79,0],
-"setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58":[5,0,1,79,14],
-"setup_8php.html#afd8b0b3ade1507c45325caf377bf459d":[5,0,1,79,6],
-"share_8php.html":[5,0,1,80]
+"session_8php.html#ac95373f4966862a028033dd2f94d4da1":[5,0,0,58,3]
};
diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js
index 98733e5d9..2509fd8ca 100644
--- a/doc/html/navtreeindex6.js
+++ b/doc/html/navtreeindex6.js
@@ -1,139 +1,158 @@
var NAVTREEINDEX6 =
{
-"share_8php.html#afeb26046bdd02567ecd29ab5f188b249":[5,0,1,80,0],
-"siteinfo_8php.html":[5,0,1,81],
-"siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[5,0,1,81,1],
-"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[5,0,1,81,0],
-"smilies_8php.html":[5,0,1,82],
-"smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[5,0,1,82,0],
-"socgraph_8php.html":[5,0,0,59],
-"socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586":[5,0,0,59,0],
-"socgraph_8php.html#a76e6fca3d2bc842dcd9e710bb87c8329":[5,0,0,59,7],
-"socgraph_8php.html#a790690bb1a1d02483fe31632a160144d":[5,0,0,59,8],
-"socgraph_8php.html#a7d34cd58025bcd9e575282f44db75918":[5,0,0,59,1],
-"socgraph_8php.html#a887d576f21fd708132a06d0f72f90f84":[5,0,0,59,4],
-"socgraph_8php.html#aad9ee2421fd1ca405b241e8ed72d9aca":[5,0,0,59,6],
-"socgraph_8php.html#ac343a846241d36cdf046b08f3396cfe9":[5,0,0,59,2],
-"socgraph_8php.html#af175807406d94407a5e11742a3287746":[5,0,0,59,5],
-"socgraph_8php.html#af29d056beec10b4e38e5209c92452894":[5,0,0,59,3],
-"starred_8php.html":[5,0,1,83],
-"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[5,0,1,83,0],
-"subthread_8php.html":[5,0,1,84],
-"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[5,0,1,84,0],
-"suggest_8php.html":[5,0,1,85],
-"suggest_8php.html#a4df91c84594d51ba56b5918de414230d":[5,0,1,85,0],
-"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[5,0,1,85,1],
-"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[5,0,1,85,2],
-"system__unavailable_8php.html":[5,0,0,60],
-"system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa":[5,0,0,60,0],
-"tagger_8php.html":[5,0,1,86],
-"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[5,0,1,86,0],
-"tagrm_8php.html":[5,0,1,87],
-"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[5,0,1,87,1],
-"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[5,0,1,87,0],
-"template__processor_8php.html":[5,0,0,61],
-"template__processor_8php.html#a797745996c7839a93b2ab1af456631ab":[5,0,0,61,3],
-"template__processor_8php.html#ab2bcd8738f20f293636a6ae8e1099db5":[5,0,0,61,1],
-"template__processor_8php.html#ac635bb19a5f6eadd6b0cddefdd537c1e":[5,0,0,61,2],
-"text_8php.html":[5,0,0,62],
-"text_8php.html#a030fa5ecc64168af0c4f44897a9bce63":[5,0,0,62,49],
-"text_8php.html#a05b7f26dc2df78681f57eeade53040c6":[5,0,0,62,34],
-"text_8php.html#a070384ec000fd65043fce11d5392d241":[5,0,0,62,6],
-"text_8php.html#a08df5164926d2b31b8e9fcfe919de2b6":[5,0,0,62,20],
-"text_8php.html#a0a1f7c0e97f9ecbebf3e5834582b014c":[5,0,0,62,15],
-"text_8php.html#a0c65597bb4aed3a039eb795ff540e5e3":[5,0,0,62,11],
-"text_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1":[5,0,0,62,38],
-"text_8php.html#a11255c8c4e5245b6c24f97684826aa54":[5,0,0,62,48],
-"text_8php.html#a13286f8a95d2de6b102966ecc270c8d6":[5,0,0,62,5],
-"text_8php.html#a1360fed7f918d859daaca1c9f384f9af":[5,0,0,62,83],
-"text_8php.html#a138a3a611fa7f4f3630674145fc826bf":[5,0,0,62,39],
-"text_8php.html#a1557112a774ec00fa06ed6b6f6495506":[5,0,0,62,41],
-"text_8php.html#a163b5131f388080b0fc82398d3a32fe1":[5,0,0,62,22],
-"text_8php.html#a1af49756c8c71902a66c7e329c462beb":[5,0,0,62,55],
-"text_8php.html#a1e510c53624933ce9b7d6715784894db":[5,0,0,62,50],
-"text_8php.html#a24b2b69b9162da789ab6514e0e09a37c":[5,0,0,62,86],
-"text_8php.html#a24d441d30df4b8e6bf6780bf62a5e2c6":[5,0,0,62,51],
-"text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728":[5,0,0,62,46],
-"text_8php.html#a27cd2c1b3bcb49a0cfb7249e851725ca":[5,0,0,62,4],
-"text_8php.html#a29988052f3944111def3b6aaf2c7a8f6":[5,0,0,62,90],
-"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[5,0,0,62,81],
-"text_8php.html#a2a902f5fdba8646333e997898ac45ea3":[5,0,0,62,52],
-"text_8php.html#a2e8d6c402603be3a1256a16605e09c2a":[5,0,0,62,10],
-"text_8php.html#a2ffd79c60cc87cec24ef76447b905187":[5,0,0,62,92],
-"text_8php.html#a30311fd46e05be0e2cc466118641a4ed":[5,0,0,62,25],
-"text_8php.html#a3299482ac20e9d79453048dd52881d37":[5,0,0,62,21],
-"text_8php.html#a3972701c5c83624ec4e2d06242f614e7":[5,0,0,62,36],
-"text_8php.html#a3d225b253bb9e0f2498c11647d927b0b":[5,0,0,62,74],
-"text_8php.html#a3d2793d66db3345fd290b71e2eadf98e":[5,0,0,62,7],
-"text_8php.html#a405afe814a23f3bd94d826101aa168ab":[5,0,0,62,88],
-"text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a":[5,0,0,62,40],
-"text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6":[5,0,0,62,73],
-"text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623":[5,0,0,62,37],
-"text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285":[5,0,0,62,47],
-"text_8php.html#a4841df5beabdd1bdd1ed56781a915d61":[5,0,0,62,64],
-"text_8php.html#a48f6d04513d26270e10e9b7d153f7526":[5,0,0,62,26],
-"text_8php.html#a4ba1339b2a7054971178ce194e4440fd":[5,0,0,62,75],
-"text_8php.html#a4bbb7d00c05cd20b4e043424f322388f":[5,0,0,62,53],
-"text_8php.html#a4e7698aca48982512594b274543c3b9b":[5,0,0,62,63],
-"text_8php.html#a4f3605ee8de717a401ea9df2401b59f6":[5,0,0,62,78],
-"text_8php.html#a543447c5ed766535221e2d9636b379ee":[5,0,0,62,85],
-"text_8php.html#a544fc13c1798371e5a5984b5482108f8":[5,0,0,62,23],
-"text_8php.html#a55ab893be57feda59c2a7ba1e58ff2d0":[5,0,0,62,9],
-"text_8php.html#a63fb21c0bed2fc72eef2c1471ac42b63":[5,0,0,62,14],
-"text_8php.html#a6a3d80a6c6fb234fd0bac44203b828eb":[5,0,0,62,84],
-"text_8php.html#a71f6952243d3fe1c5a8154f78027e29c":[5,0,0,62,45],
-"text_8php.html#a736db13a966b8abaf8c9198faa35911a":[5,0,0,62,33],
-"text_8php.html#a740ad03e00459039a2c0992246c4e727":[5,0,0,62,82],
-"text_8php.html#a75c243e06341ec16bd5a44b9b1cacd85":[5,0,0,62,1],
-"text_8php.html#a76d1b3435c067978d7b484c45f56472b":[5,0,0,62,32],
-"text_8php.html#a7a913d19c77610da689be48fbbf6734c":[5,0,0,62,80],
-"text_8php.html#a85e3a4851c16674834010d8419a5d7ca":[5,0,0,62,8],
-"text_8php.html#a876e94892867019935b348b573299352":[5,0,0,62,71],
-"text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13":[5,0,0,62,76],
-"text_8php.html#a89929fa6f70a8ba54d5273fcf622b665":[5,0,0,62,19],
-"text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6":[5,0,0,62,62],
-"text_8php.html#a8d8c4a11e53461caca21181ebd72daca":[5,0,0,62,18],
-"text_8php.html#a95fd2f8f23a1948414a03ebc963bac57":[5,0,0,62,3],
-"text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee":[5,0,0,62,57],
-"text_8php.html#a9c6ce4e12a4ac883c5e3f36fed6e1e09":[5,0,0,62,68],
-"text_8php.html#a9d6a5ee1290de7a8b483fe78585daade":[5,0,0,62,66],
-"text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c":[5,0,0,62,70],
-"text_8php.html#aa46f941155c2ac1155f2f17ffb0adb66":[5,0,0,62,35],
-"text_8php.html#aa5148a0dfea2a1ca64c3d52f10aa2d64":[5,0,0,62,16],
-"text_8php.html#aa5528f41533927e1bd2da3618a74a6d7":[5,0,0,62,58],
-"text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e":[5,0,0,62,42],
-"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[5,0,0,62,91],
-"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[5,0,0,62,87],
-"text_8php.html#aaeded36bcc983b35d9205fe5b6c18c43":[5,0,0,62,79],
-"text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4":[5,0,0,62,89],
-"text_8php.html#abb55ec0142207aeec3d90b25ed4d7266":[5,0,0,62,24],
-"text_8php.html#abbe4894b4e746e47e1f91c7df27f6e81":[5,0,0,62,27],
-"text_8php.html#ac19d2b33a58372a357a43d51eed19162":[5,0,0,62,59],
-"text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e":[5,0,0,62,43],
-"text_8php.html#aca0f589be74fab1a460c57e88dad9779":[5,0,0,62,72],
-"text_8php.html#ace3c98538c63e09b70a363210b414112":[5,0,0,62,28],
-"text_8php.html#acedb584f65114a33f389efb796172a91":[5,0,0,62,2],
-"text_8php.html#ad6432621d0fafcbcf3d3b9b49bef7784":[5,0,0,62,13],
-"text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2":[5,0,0,62,67],
-"text_8php.html#adba17ec946f4285285dc100f7860bf51":[5,0,0,62,54],
-"text_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1":[5,0,0,62,30],
-"text_8php.html#ae17b39d5e321debd3ad16dcbbde842b8":[5,0,0,62,44],
-"text_8php.html#ae2126da85966da0e79c6bcbac63b0bda":[5,0,0,62,69],
-"text_8php.html#ae4282a39492caa23ccbc2ce98e54f110":[5,0,0,62,17],
-"text_8php.html#ae4f6881d7e13623f8eded6277595112a":[5,0,0,62,31],
-"text_8php.html#af3a7139d40ea758f315c2acf2ccc1b1c":[5,0,0,62,60],
-"text_8php.html#af8a3e3a66a7b862d4510f145d2e13186":[5,0,0,62,0],
-"text_8php.html#afc998d2796a6b2a08e96f7cc061e7221":[5,0,0,62,65],
-"text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28":[5,0,0,62,29],
-"text_8php.html#afe18627c4983ee5f7c940a0992818cd5":[5,0,0,62,12],
-"text_8php.html#afe44c30f1d0f8cb3ca097d4e189d852d":[5,0,0,62,77],
-"text_8php.html#afe54312607d92f7ce9593f5760831f80":[5,0,0,62,61],
-"text_8php.html#afe9f178d264d44a94dc1292aaf0fd585":[5,0,0,62,56],
+"session_8php.html#af0100a2642a5268594bbd5742a03d885":[5,0,0,58,9],
+"session_8php.html#af230b86bfff7db66c3bdd7e0bbc24052":[5,0,0,58,2],
+"setup_8php.html":[5,0,1,80],
+"setup_8php.html#a0c3f3b671381f6dccd924b8ecdfc56c4":[5,0,1,80,2],
+"setup_8php.html#a13cf286774149a0a7bd8adb8179cec75":[5,0,1,80,13],
+"setup_8php.html#a14d208682a88632290c895d20da6e7d6":[5,0,1,80,5],
+"setup_8php.html#a267555abd17290e659b4bf44b885e4e0":[5,0,1,80,12],
+"setup_8php.html#a2b375ddc555140236fc500135de99371":[5,0,1,80,9],
+"setup_8php.html#a5ad92c0857d1dadd6b60a9a557159c9f":[5,0,1,80,3],
+"setup_8php.html#a69a450e06dd3771fb51d3e4b0266a35e":[5,0,1,80,1],
+"setup_8php.html#a8652788e8589778c5f81634a9d5b9429":[5,0,1,80,7],
+"setup_8php.html#a88247384a96e14516f474d7af6a465c1":[5,0,1,80,11],
+"setup_8php.html#aa3bbb111780da70ba35cc23a306f2c76":[5,0,1,80,4],
+"setup_8php.html#abe405d227ba7232971964a706d4f3bce":[5,0,1,80,10],
+"setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a":[5,0,1,80,8],
+"setup_8php.html#addb24714bc2542aa4f4215e98fe48432":[5,0,1,80,15],
+"setup_8php.html#ae8e4d9279a61de74d5f39962cb7b6ca1":[5,0,1,80,0],
+"setup_8php.html#aea1ebdda58ec938f4e7b31aa5c5f6b58":[5,0,1,80,14],
+"setup_8php.html#afd8b0b3ade1507c45325caf377bf459d":[5,0,1,80,6],
+"share_8php.html":[5,0,1,81],
+"share_8php.html#afeb26046bdd02567ecd29ab5f188b249":[5,0,1,81,0],
+"siteinfo_8php.html":[5,0,1,82],
+"siteinfo_8php.html#a3efbd0bd6564af19ec0a9ce0294e59d0":[5,0,1,82,1],
+"siteinfo_8php.html#a70c09bfb6dd1c86a125a35f62ed53656":[5,0,1,82,0],
+"smilies_8php.html":[5,0,1,83],
+"smilies_8php.html#ab43b1e9f33a700a830aff14c7b3a617f":[5,0,1,83,0],
+"socgraph_8php.html":[5,0,0,60],
+"socgraph_8php.html#a16ac51c505d72987ed8d6d6aed0e8586":[5,0,0,60,0],
+"socgraph_8php.html#a76e6fca3d2bc842dcd9e710bb87c8329":[5,0,0,60,7],
+"socgraph_8php.html#a790690bb1a1d02483fe31632a160144d":[5,0,0,60,8],
+"socgraph_8php.html#a7d34cd58025bcd9e575282f44db75918":[5,0,0,60,1],
+"socgraph_8php.html#a887d576f21fd708132a06d0f72f90f84":[5,0,0,60,4],
+"socgraph_8php.html#aad9ee2421fd1ca405b241e8ed72d9aca":[5,0,0,60,6],
+"socgraph_8php.html#ac343a846241d36cdf046b08f3396cfe9":[5,0,0,60,2],
+"socgraph_8php.html#af175807406d94407a5e11742a3287746":[5,0,0,60,5],
+"socgraph_8php.html#af29d056beec10b4e38e5209c92452894":[5,0,0,60,3],
+"starred_8php.html":[5,0,1,84],
+"starred_8php.html#a63024fb418c678e49fd535e3752d349a":[5,0,1,84,0],
+"subthread_8php.html":[5,0,1,85],
+"subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3":[5,0,1,85,0],
+"suggest_8php.html":[5,0,1,86],
+"suggest_8php.html#a4df91c84594d51ba56b5918de414230d":[5,0,1,86,0],
+"suggest_8php.html#a58748a8235d4523f8333847f3e42dd91":[5,0,1,86,1],
+"suggest_8php.html#a696acf1dd8070e479adcc80c63c6718c":[5,0,1,86,2],
+"system__unavailable_8php.html":[5,0,0,61],
+"system__unavailable_8php.html#a73751a6bcc17ad3ca503496e2fb020fa":[5,0,0,61,0],
+"tagger_8php.html":[5,0,1,87],
+"tagger_8php.html#a0e4a3eb177d1684553c547503d67161c":[5,0,1,87,0],
+"tagrm_8php.html":[5,0,1,88],
+"tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78":[5,0,1,88,1],
+"tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a":[5,0,1,88,0],
+"taxonomy_8php.html":[5,0,0,62],
+"taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6":[5,0,0,62,0],
+"taxonomy_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1":[5,0,0,62,4],
+"taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1":[5,0,0,62,2],
+"taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37":[5,0,0,62,1],
+"taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd":[5,0,0,62,5],
+"taxonomy_8php.html#a4f3605ee8de717a401ea9df2401b59f6":[5,0,0,62,7],
+"taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c":[5,0,0,62,9],
+"taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43":[5,0,0,62,8],
+"taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1":[5,0,0,62,3],
+"taxonomy_8php.html#afe44c30f1d0f8cb3ca097d4e189d852d":[5,0,0,62,6],
+"template__processor_8php.html":[5,0,0,63],
+"template__processor_8php.html#a797745996c7839a93b2ab1af456631ab":[5,0,0,63,3],
+"template__processor_8php.html#ab2bcd8738f20f293636a6ae8e1099db5":[5,0,0,63,1],
+"template__processor_8php.html#ac635bb19a5f6eadd6b0cddefdd537c1e":[5,0,0,63,2],
+"text_8php.html":[5,0,0,64],
+"text_8php.html#a030fa5ecc64168af0c4f44897a9bce63":[5,0,0,64,39],
+"text_8php.html#a05b7f26dc2df78681f57eeade53040c6":[5,0,0,64,25],
+"text_8php.html#a070384ec000fd65043fce11d5392d241":[5,0,0,64,6],
+"text_8php.html#a0a1f7c0e97f9ecbebf3e5834582b014c":[5,0,0,64,15],
+"text_8php.html#a0c65597bb4aed3a039eb795ff540e5e3":[5,0,0,64,11],
+"text_8php.html#a11255c8c4e5245b6c24f97684826aa54":[5,0,0,64,38],
+"text_8php.html#a13286f8a95d2de6b102966ecc270c8d6":[5,0,0,64,5],
+"text_8php.html#a1360fed7f918d859daaca1c9f384f9af":[5,0,0,64,68],
+"text_8php.html#a138a3a611fa7f4f3630674145fc826bf":[5,0,0,64,29],
+"text_8php.html#a1557112a774ec00fa06ed6b6f6495506":[5,0,0,64,31],
+"text_8php.html#a1af49756c8c71902a66c7e329c462beb":[5,0,0,64,45],
+"text_8php.html#a1e510c53624933ce9b7d6715784894db":[5,0,0,64,40],
+"text_8php.html#a24d441d30df4b8e6bf6780bf62a5e2c6":[5,0,0,64,41],
+"text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728":[5,0,0,64,36],
+"text_8php.html#a27cd2c1b3bcb49a0cfb7249e851725ca":[5,0,0,64,4],
+"text_8php.html#a29988052f3944111def3b6aaf2c7a8f6":[5,0,0,64,75],
+"text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7":[5,0,0,64,66],
+"text_8php.html#a2a902f5fdba8646333e997898ac45ea3":[5,0,0,64,42],
+"text_8php.html#a2e8d6c402603be3a1256a16605e09c2a":[5,0,0,64,10],
+"text_8php.html#a2ffd79c60cc87cec24ef76447b905187":[5,0,0,64,77],
+"text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f":[5,0,0,64,71],
+"text_8php.html#a3972701c5c83624ec4e2d06242f614e7":[5,0,0,64,27],
+"text_8php.html#a3d225b253bb9e0f2498c11647d927b0b":[5,0,0,64,64],
+"text_8php.html#a3d2793d66db3345fd290b71e2eadf98e":[5,0,0,64,7],
+"text_8php.html#a405afe814a23f3bd94d826101aa168ab":[5,0,0,64,73],
+"text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a":[5,0,0,64,30],
+"text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6":[5,0,0,64,63],
+"text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623":[5,0,0,64,28],
+"text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285":[5,0,0,64,37],
+"text_8php.html#a4841df5beabdd1bdd1ed56781a915d61":[5,0,0,64,54],
+"text_8php.html#a4bbb7d00c05cd20b4e043424f322388f":[5,0,0,64,43],
+"text_8php.html#a4e7698aca48982512594b274543c3b9b":[5,0,0,64,53],
+"text_8php.html#a543447c5ed766535221e2d9636b379ee":[5,0,0,64,70],
+"text_8php.html#a55ab893be57feda59c2a7ba1e58ff2d0":[5,0,0,64,9],
+"text_8php.html#a63fb21c0bed2fc72eef2c1471ac42b63":[5,0,0,64,14],
+"text_8php.html#a6a3d80a6c6fb234fd0bac44203b828eb":[5,0,0,64,69],
+"text_8php.html#a71f6952243d3fe1c5a8154f78027e29c":[5,0,0,64,35],
+"text_8php.html#a736db13a966b8abaf8c9198faa35911a":[5,0,0,64,24],
+"text_8php.html#a740ad03e00459039a2c0992246c4e727":[5,0,0,64,67],
+"text_8php.html#a75c243e06341ec16bd5a44b9b1cacd85":[5,0,0,64,1],
+"text_8php.html#a76d1b3435c067978d7b484c45f56472b":[5,0,0,64,23],
+"text_8php.html#a85e3a4851c16674834010d8419a5d7ca":[5,0,0,64,8],
+"text_8php.html#a876e94892867019935b348b573299352":[5,0,0,64,61],
+"text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13":[5,0,0,64,65],
+"text_8php.html#a89929fa6f70a8ba54d5273fcf622b665":[5,0,0,64,19],
+"text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6":[5,0,0,64,52],
+"text_8php.html#a8d8c4a11e53461caca21181ebd72daca":[5,0,0,64,18],
+"text_8php.html#a95fd2f8f23a1948414a03ebc963bac57":[5,0,0,64,3],
+"text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee":[5,0,0,64,47],
+"text_8php.html#a9c6ce4e12a4ac883c5e3f36fed6e1e09":[5,0,0,64,58],
+"text_8php.html#a9d6a5ee1290de7a8b483fe78585daade":[5,0,0,64,56],
+"text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c":[5,0,0,64,60],
+"text_8php.html#aa46f941155c2ac1155f2f17ffb0adb66":[5,0,0,64,26],
+"text_8php.html#aa5148a0dfea2a1ca64c3d52f10aa2d64":[5,0,0,64,16],
+"text_8php.html#aa5528f41533927e1bd2da3618a74a6d7":[5,0,0,64,48],
+"text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e":[5,0,0,64,32],
+"text_8php.html#aad557c054cf2ed915633701018fc7e3f":[5,0,0,64,76],
+"text_8php.html#aaed4413ed8918838b517e3b2fafaea0d":[5,0,0,64,72],
+"text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4":[5,0,0,64,74],
+"text_8php.html#ac19d2b33a58372a357a43d51eed19162":[5,0,0,64,49],
+"text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e":[5,0,0,64,33],
+"text_8php.html#aca0f589be74fab1a460c57e88dad9779":[5,0,0,64,62],
+"text_8php.html#ace3c98538c63e09b70a363210b414112":[5,0,0,64,20],
+"text_8php.html#acedb584f65114a33f389efb796172a91":[5,0,0,64,2],
+"text_8php.html#ad6432621d0fafcbcf3d3b9b49bef7784":[5,0,0,64,13],
+"text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2":[5,0,0,64,57],
+"text_8php.html#adba17ec946f4285285dc100f7860bf51":[5,0,0,64,44],
+"text_8php.html#ae17b39d5e321debd3ad16dcbbde842b8":[5,0,0,64,34],
+"text_8php.html#ae2126da85966da0e79c6bcbac63b0bda":[5,0,0,64,59],
+"text_8php.html#ae4282a39492caa23ccbc2ce98e54f110":[5,0,0,64,17],
+"text_8php.html#ae4f6881d7e13623f8eded6277595112a":[5,0,0,64,22],
+"text_8php.html#af3a7139d40ea758f315c2acf2ccc1b1c":[5,0,0,64,50],
+"text_8php.html#af8a3e3a66a7b862d4510f145d2e13186":[5,0,0,64,0],
+"text_8php.html#afc998d2796a6b2a08e96f7cc061e7221":[5,0,0,64,55],
+"text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28":[5,0,0,64,21],
+"text_8php.html#afe18627c4983ee5f7c940a0992818cd5":[5,0,0,64,12],
+"text_8php.html#afe54312607d92f7ce9593f5760831f80":[5,0,0,64,51],
+"text_8php.html#afe9f178d264d44a94dc1292aaf0fd585":[5,0,0,64,46],
"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],
-"toggle__mobile_8php.html":[5,0,1,88],
-"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[5,0,1,88,0],
+"thing_8php.html":[5,0,1,89],
+"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[5,0,1,89,0],
+"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[5,0,1,89,1],
+"toggle__mobile_8php.html":[5,0,1,90],
+"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[5,0,1,90,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],
@@ -147,18 +166,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,89],
-"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[5,0,1,89,0],
-"update__channel_8php.html":[5,0,1,90],
-"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[5,0,1,90,0],
-"update__community_8php.html":[5,0,1,91],
-"update__community_8php.html#abdcc5c4ecebbe0b5fcba2755c69cb3b1":[5,0,1,91,0],
-"update__display_8php.html":[5,0,1,92],
-"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[5,0,1,92,0],
-"update__network_8php.html":[5,0,1,93],
-"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[5,0,1,93,0],
-"update__search_8php.html":[5,0,1,94],
-"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[5,0,1,94,0],
+"uexport_8php.html":[5,0,1,91],
+"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[5,0,1,91,0],
+"update__channel_8php.html":[5,0,1,92],
+"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[5,0,1,92,0],
+"update__community_8php.html":[5,0,1,93],
+"update__community_8php.html#abdcc5c4ecebbe0b5fcba2755c69cb3b1":[5,0,1,93,0],
+"update__display_8php.html":[5,0,1,94],
+"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[5,0,1,94,0],
+"update__network_8php.html":[5,0,1,95],
+"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[5,0,1,95,0],
+"update__search_8php.html":[5,0,1,96],
+"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[5,0,1,96,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],
@@ -174,51 +193,51 @@ 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,95],
-"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[5,0,1,95,0],
-"viewconnections_8php.html":[5,0,1,96],
-"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[5,0,1,96,2],
-"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[5,0,1,96,1],
-"viewconnections_8php.html#ae330cea4cddd091559659f8b469617b6":[5,0,1,96,0],
-"viewsrc_8php.html":[5,0,1,97],
-"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[5,0,1,97,0],
-"wall__attach_8php.html":[5,0,1,98],
-"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[5,0,1,98,0],
-"wall__upload_8php.html":[5,0,1,99],
-"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[5,0,1,99,0],
-"webfinger_8php.html":[5,0,1,100],
-"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[5,0,1,100,0],
-"wfinger_8php.html":[5,0,1,101],
-"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[5,0,1,101,0],
-"xchan_8php.html":[5,0,1,102],
-"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[5,0,1,102,0],
-"xrd_8php.html":[5,0,1,103],
-"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[5,0,1,103,0],
-"zfinger_8php.html":[5,0,1,104],
-"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[5,0,1,104,0],
-"zot_8php.html":[5,0,0,63],
-"zot_8php.html#a083aec6c900d244e1bfc1406f9461465":[5,0,0,63,8],
-"zot_8php.html#a22e3f9b97b7969ddbe43ccf0db93a19c":[5,0,0,63,16],
-"zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df":[5,0,0,63,9],
-"zot_8php.html#a37ec13b18057634eadb071f05297f5e1":[5,0,0,63,5],
-"zot_8php.html#a3862b3161b2c8557dc1a95020179bd81":[5,0,0,63,11],
-"zot_8php.html#a3bf11286c2619b4ca28e49d5b5ab374a":[5,0,0,63,2],
-"zot_8php.html#a3c9e0b243ba29a7b0c050bd0b86eee32":[5,0,0,63,3],
-"zot_8php.html#a55056e863a7860bc0cf922e78fcce073":[5,0,0,63,15],
-"zot_8php.html#a5bcdfef419b16075a0eca990956223dc":[5,0,0,63,20],
-"zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea":[5,0,0,63,12],
-"zot_8php.html#a666d3efcac00ec1b4a4537a60655f2ab":[5,0,0,63,10],
-"zot_8php.html#a703f528ade8382cf374e4119bd6f7859":[5,0,0,63,0],
-"zot_8php.html#a77720d6b59894e9b609af89c310c8a4d":[5,0,0,63,13],
-"zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d":[5,0,0,63,19],
-"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[5,0,0,63,18],
-"zot_8php.html#a9a57b40669351c9791126b925cb7ef3b":[5,0,0,63,7],
-"zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc":[5,0,0,63,6],
-"zot_8php.html#ab0227978011d8601494a7651fa26acf0":[5,0,0,63,4],
-"zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7":[5,0,0,63,17],
-"zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142":[5,0,0,63,21],
-"zot_8php.html#acdea9362d78a63dce948fdf0ea73ef0e":[5,0,0,63,14],
-"zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72":[5,0,0,63,1],
-"zotfeed_8php.html":[5,0,1,105],
-"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,105,0]
+"view_8php.html":[5,0,1,97],
+"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[5,0,1,97,0],
+"viewconnections_8php.html":[5,0,1,98],
+"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[5,0,1,98,2],
+"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[5,0,1,98,1],
+"viewconnections_8php.html#ae330cea4cddd091559659f8b469617b6":[5,0,1,98,0],
+"viewsrc_8php.html":[5,0,1,99],
+"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[5,0,1,99,0],
+"wall__attach_8php.html":[5,0,1,100],
+"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[5,0,1,100,0],
+"wall__upload_8php.html":[5,0,1,101],
+"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[5,0,1,101,0],
+"webfinger_8php.html":[5,0,1,102],
+"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[5,0,1,102,0],
+"wfinger_8php.html":[5,0,1,103],
+"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[5,0,1,103,0],
+"xchan_8php.html":[5,0,1,104],
+"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[5,0,1,104,0],
+"xrd_8php.html":[5,0,1,105],
+"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[5,0,1,105,0],
+"zfinger_8php.html":[5,0,1,106],
+"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[5,0,1,106,0],
+"zot_8php.html":[5,0,0,65],
+"zot_8php.html#a083aec6c900d244e1bfc1406f9461465":[5,0,0,65,8],
+"zot_8php.html#a22e3f9b97b7969ddbe43ccf0db93a19c":[5,0,0,65,16],
+"zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df":[5,0,0,65,9],
+"zot_8php.html#a37ec13b18057634eadb071f05297f5e1":[5,0,0,65,5],
+"zot_8php.html#a3862b3161b2c8557dc1a95020179bd81":[5,0,0,65,11],
+"zot_8php.html#a3bf11286c2619b4ca28e49d5b5ab374a":[5,0,0,65,2],
+"zot_8php.html#a3c9e0b243ba29a7b0c050bd0b86eee32":[5,0,0,65,3],
+"zot_8php.html#a55056e863a7860bc0cf922e78fcce073":[5,0,0,65,15],
+"zot_8php.html#a5bcdfef419b16075a0eca990956223dc":[5,0,0,65,20],
+"zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea":[5,0,0,65,12],
+"zot_8php.html#a666d3efcac00ec1b4a4537a60655f2ab":[5,0,0,65,10],
+"zot_8php.html#a703f528ade8382cf374e4119bd6f7859":[5,0,0,65,0],
+"zot_8php.html#a77720d6b59894e9b609af89c310c8a4d":[5,0,0,65,13],
+"zot_8php.html#a7b23bfb31d4491231e1e73bdc077240d":[5,0,0,65,19],
+"zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03":[5,0,0,65,18],
+"zot_8php.html#a9a57b40669351c9791126b925cb7ef3b":[5,0,0,65,7],
+"zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc":[5,0,0,65,6],
+"zot_8php.html#ab0227978011d8601494a7651fa26acf0":[5,0,0,65,4],
+"zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7":[5,0,0,65,17],
+"zot_8php.html#ab3e9b99ddb11353f37f265a05bb42142":[5,0,0,65,21],
+"zot_8php.html#acdea9362d78a63dce948fdf0ea73ef0e":[5,0,0,65,14],
+"zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72":[5,0,0,65,1],
+"zotfeed_8php.html":[5,0,1,107],
+"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[5,0,1,107,0]
};
diff --git a/doc/html/permissions_8php.html b/doc/html/permissions_8php.html
index 4ced96ff4..a847fde8b 100644
--- a/doc/html/permissions_8php.html
+++ b/doc/html/permissions_8php.html
@@ -246,7 +246,7 @@ Functions
-
Referenced by Item\__construct() , api_statuses_home_timeline() , api_statuses_repeat() , attach_by_hash() , attach_by_hash_nodata() , attach_count_files() , attach_list_files() , attach_store() , check_list_permissions() , common_content() , common_friends_visitor_widget() , get_feed_for() , item_post() , like_content() , photo_init() , photo_upload() , photos_album_widget() , photos_albums_list() , photos_list_photos() , photos_post() , poco_init() , post_activity_item() , process_delivery() , process_mail_delivery() , profile_load() , profile_sidebar() , Conversation\set_mode() , subthread_content() , syncdirs() , tag_deliver() , viewconnections_content() , z_readdir() , and zot_feed() .
+
Referenced by api_statuses_home_timeline() , api_statuses_repeat() , attach_by_hash() , attach_by_hash_nodata() , attach_count_files() , attach_list_files() , attach_store() , check_list_permissions() , common_content() , common_friends_visitor_widget() , get_feed_for() , item_post() , like_content() , photo_init() , photo_upload() , photos_album_widget() , photos_albums_list() , photos_list_photos() , photos_post() , poco_init() , post_activity_item() , process_delivery() , process_mail_delivery() , profile_load() , profile_sidebar() , Conversation\set_mode() , subthread_content() , syncdirs() , tag_deliver() , tgroup_check() , viewconnections_content() , z_readdir() , and zot_feed() .
diff --git a/doc/html/php2po_8php.html b/doc/html/php2po_8php.html
index 8bd99045f..79bf9779d 100644
--- a/doc/html/php2po_8php.html
+++ b/doc/html/php2po_8php.html
@@ -168,7 +168,7 @@ Variables
-
Referenced by App\__construct() , Template\_get_var() , Template\_replcb_for() , activity_sanitise() , aes_encapsulate() , aes_unencapsulate() , connections_content() , connections_post() , contact_poll_interval() , contact_reputation() , get_plugin_info() , get_theme_info() , guess_image_type() , import_directory_profile() , item_store_update() , load_config() , load_pconfig() , load_xconfig() , message_post() , mood_content() , network_init() , new_contact() , FKOAuthDataStore\new_request_token() , photos_albums_list() , po2php_run() , poco_init() , poke_content() , private_messages_fetch_conversation() , private_messages_fetch_message() , private_messages_list() , 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() , 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() , photos_albums_list() , po2php_run() , poco_init() , poke_content() , private_messages_fetch_conversation() , private_messages_fetch_message() , private_messages_list() , requestdata() , App\set_widget() , settings_post() , startup() , syncdirs() , tt() , x() , zfinger_init() , and zot_refresh() .
diff --git a/doc/html/php_8php.html b/doc/html/php_8php.html
new file mode 100644
index 000000000..fcc7e84e4
--- /dev/null
+++ b/doc/html/php_8php.html
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+The Red Matrix: mod/php.php File Reference
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The Red Matrix
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ php_init
+ (
+ &
+ $a )
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/html/php_8php.js b/doc/html/php_8php.js
new file mode 100644
index 000000000..77a9c0ac8
--- /dev/null
+++ b/doc/html/php_8php.js
@@ -0,0 +1,4 @@
+var php_8php =
+[
+ [ "php_init", "php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6", null ]
+];
\ No newline at end of file
diff --git a/doc/html/plugin_8php.html b/doc/html/plugin_8php.html
index f1ac73e90..3f164552e 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() , create_identity() , cronhooks_run() , directory_content() , editpost_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() , 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() , 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() , connections_content() , connections_post() , contact_block() , contact_select() , conversation() , create_identity() , cronhooks_run() , directory_content() , editpost_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() , 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() , 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() , crepair_content() , delegate_content() , directory_content() , dirfind_content() , display_content() , editpost_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() , login() , lostpass_content() , manage_content() , match_content() , message_aside() , message_content() , micropro() , mini_group_select() , mood_content() , nav() , network_content() , new_channel_content() , nogroup_content() , notification() , notifications_content() , notify_content() , oembed_format_object() , oexchange_init() , opensearch_init() , 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() , vcard_from_xchan() , viewconnections_content() , 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() , connections_content() , construct_page() , contact_block() , conversation() , crepair_content() , delegate_content() , directory_content() , dirfind_content() , display_content() , editpost_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() , login() , lostpass_content() , manage_content() , match_content() , message_aside() , message_content() , micropro() , mini_group_select() , mood_content() , nav() , network_content() , new_channel_content() , nogroup_content() , notification() , notifications_content() , notify_content() , oembed_format_object() , oexchange_init() , opensearch_init() , 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() , vcard_from_xchan() , viewconnections_content() , and xrd_init() .
diff --git a/doc/html/redbasic_2php_2style_8php.html b/doc/html/redbasic_2php_2style_8php.html
index cd36a4d84..1298fcded 100644
--- a/doc/html/redbasic_2php_2style_8php.html
+++ b/doc/html/redbasic_2php_2style_8php.html
@@ -138,11 +138,11 @@ Variables
$shiny = false
- $site_line_height = get_config ("redbasic","line_height")
+ $site_line_height = get_config ("redbasic","line_height")
- $site_redbasic_font_size = get_config ("redbasic", "font_size" )
+ $site_redbasic_font_size = get_config ("redbasic", "font_size" )
- $site_colour = get_config ("redbasic", "colour" )
+ $site_colour = get_config ("redbasic", "colour" )
if(local_user ()) if(!feature_enabled (local_user (),'expert'))
if($line_height===false) if($line_height===false)
@@ -330,7 +330,7 @@ if($navcolour==="black")
- $site_colour = get_config ("redbasic", "colour" )
+ $site_colour = get_config ("redbasic", "colour" )
@@ -342,7 +342,7 @@ if($navcolour==="black")
- $site_line_height = get_config ("redbasic","line_height")
+ $site_line_height = get_config ("redbasic","line_height")
@@ -354,7 +354,7 @@ if($navcolour==="black")
- $site_redbasic_font_size = get_config ("redbasic", "font_size" )
+ $site_redbasic_font_size = get_config ("redbasic", "font_size" )
diff --git a/doc/html/redstrap_2php_2style_8php.html b/doc/html/redstrap_2php_2style_8php.html
index 236a3d93b..e4501c0c5 100644
--- a/doc/html/redstrap_2php_2style_8php.html
+++ b/doc/html/redstrap_2php_2style_8php.html
@@ -138,11 +138,11 @@ Variables
$shiny = false
- $site_line_height = get_config ("redbasic","line_height")
+ $site_line_height = get_config ("redbasic","line_height")
- $site_redbasic_font_size = get_config ("redbasic", "font_size" )
+ $site_redbasic_font_size = get_config ("redbasic", "font_size" )
- $site_colour = get_config ("redbasic", "colour" )
+ $site_colour = get_config ("redbasic", "colour" )
if(local_user ()) if($line_height===false)
if($line_height===false) if($redbasic_font_size===false)
@@ -313,7 +313,7 @@ if($navcolour==="black")
- $site_colour = get_config ("redbasic", "colour" )
+ $site_colour = get_config ("redbasic", "colour" )
@@ -325,7 +325,7 @@ if($navcolour==="black")
- $site_line_height = get_config ("redbasic","line_height")
+ $site_line_height = get_config ("redbasic","line_height")
@@ -337,7 +337,7 @@ if($navcolour==="black")
- $site_redbasic_font_size = get_config ("redbasic", "font_size" )
+ $site_redbasic_font_size = get_config ("redbasic", "font_size" )
diff --git a/doc/html/search/all_61.js b/doc/html/search/all_61.js
index dfe3e75dd..6c4bd6b16 100644
--- a/doc/html/search/all_61.js
+++ b/doc/html/search/all_61.js
@@ -46,6 +46,7 @@ var searchData=
['activity_5fobj_5fphoto',['ACTIVITY_OBJ_PHOTO',['../boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966',1,'boot.php']]],
['activity_5fobj_5fprofile',['ACTIVITY_OBJ_PROFILE',['../boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5',1,'boot.php']]],
['activity_5fobj_5ftagterm',['ACTIVITY_OBJ_TAGTERM',['../boot_8php.html#a1da180f961f49a11573cac4ff6c62c05',1,'boot.php']]],
+ ['activity_5fobj_5fthing',['ACTIVITY_OBJ_THING',['../boot_8php.html#a0fb63e51c2a9814941842ae8f2f4dff8',1,'boot.php']]],
['activity_5fpoke',['ACTIVITY_POKE',['../boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd',1,'boot.php']]],
['activity_5fpost',['ACTIVITY_POST',['../boot_8php.html#a5c3747e0f505f0d5271dc4c54e3feaf4',1,'boot.php']]],
['activity_5freq_5ffriend',['ACTIVITY_REQ_FRIEND',['../boot_8php.html#afe084c30a1810c10442edb4fbcbc0086',1,'boot.php']]],
diff --git a/doc/html/search/all_62.js b/doc/html/search/all_62.js
index 49da6d91a..01317772b 100644
--- a/doc/html/search/all_62.js
+++ b/doc/html/search/all_62.js
@@ -16,9 +16,10 @@ var searchData=
['bbcode_2ephp',['bbcode.php',['../bbcode_8php.html',1,'']]],
['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#a32e7750ae6adbfdd1f227f6e89221ce3',1,'conversation.php']]],
+ ['best_5flink_5furl',['best_link_url',['../conversation_8php.html#ad470fc7766f0db66d138fa1916c7a8b7',1,'conversation.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']]],
- ['build_5fquerystring',['build_querystring',['../boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e',1,'boot.php']]]
+ ['build_5fquerystring',['build_querystring',['../boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e',1,'boot.php']]],
+ ['build_5fsync_5fpacket',['build_sync_packet',['../include_2settings_8php.html#ac34e479d27f32b82dd6b33542f81a6a7',1,'settings.php']]]
];
diff --git a/doc/html/search/all_63.js b/doc/html/search/all_63.js
index c20ca9b39..8809b5b7d 100644
--- a/doc/html/search/all_63.js
+++ b/doc/html/search/all_63.js
@@ -4,6 +4,7 @@ var searchData=
['cache_2ephp',['cache.php',['../cache_8php.html',1,'']]],
['cal',['cal',['../datetime_8php.html#aea356409ba69f9de412298c998595dd2',1,'datetime.php']]],
['call_5fhooks',['call_hooks',['../plugin_8php.html#a7f05de16c0a32602853b09b99dd85e7c',1,'plugin.php']]],
+ ['can_5fcomment_5fon_5fpost',['can_comment_on_post',['../items_8php.html#a1e75047cf175aaee8dd16aa761913ff9',1,'items.php']]],
['categories_5fwidget',['categories_widget',['../contact__widgets_8php.html#a165eb021e61c4dcab2a552f28628d353',1,'contact_widgets.php']]],
['change_5fchannel',['change_channel',['../security_8php.html#a8d23d2597aae380a3341872fe9513380',1,'security.php']]],
['change_5fpermissions',['change_permissions',['../classProtoDriver.html#a34b97ca5ef2165f2e16eb2fe59ff6c67',1,'ProtoDriver\change_permissions()'],['../classZotDriver.html#a6776935156accb0f170e2e24577133db',1,'ZotDriver\change_permissions()']]],
@@ -71,6 +72,7 @@ var searchData=
['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()']]],
['connections_2ephp',['connections.php',['../connections_8php.html',1,'']]],
['connections_5faside',['connections_aside',['../connections_8php.html#af48f7ad20914760ba9874c090384e35a',1,'connections.php']]],
+ ['connections_5fclone',['connections_clone',['../connections_8php.html#a15af118efee9c948b6f8294e54a73bb2',1,'connections.php']]],
['connections_5fcontent',['connections_content',['../connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c',1,'connections.php']]],
['connections_5finit',['connections_init',['../connections_8php.html#a1f23623f802af7bd35e95b0e94e5d558',1,'connections.php']]],
['connections_5fpost',['connections_post',['../connections_8php.html#a1224058db8e3fb56463eb312f98e561d',1,'connections.php']]],
@@ -95,7 +97,7 @@ var searchData=
['contactgroup_5fcontent',['contactgroup_content',['../contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3',1,'contactgroup.php']]],
['contacts_5fnot_5fgrouped',['contacts_not_grouped',['../Contact_8php.html#a228fc01f90ae9bfdde4c2ad0772bd7dc',1,'Contact.php']]],
['conv_5fsort',['conv_sort',['../conversation_8php.html#abed85a41f1160598de880b84021c9cf7',1,'conversation.php']]],
- ['conversation',['Conversation',['../classConversation.html',1,'']]],
+ ['conversation',['Conversation',['../classConversation.html',1,'Conversation'],['../conversation_8php.html#a1e97305a441dc143edbe09e17d1ceda1',1,'conversation(&$a, $items, $mode, $update, $page_mode= 'traditional'): conversation.php']]],
['conversation_2ephp',['conversation.php',['../conversation_8php.html',1,'']]],
['conversationobject_2ephp',['ConversationObject.php',['../ConversationObject_8php.html',1,'']]],
['convert',['convert',['../namespacefriendica-to-smarty-tpl.html#a38503e37fe68ac27c88cce91a9ac9efa',1,'friendica-to-smarty-tpl']]],
diff --git a/doc/html/search/all_66.js b/doc/html/search/all_66.js
index 712a915e0..f1cd4b7f2 100644
--- a/doc/html/search/all_66.js
+++ b/doc/html/search/all_66.js
@@ -14,14 +14,9 @@ var searchData=
['fetch_5furl',['fetch_url',['../include_2network_8php.html#a37ddeb88a3fd1dee9e8339723f9edf9a',1,'network.php']]],
['fetch_5fxrd_5flinks',['fetch_xrd_links',['../include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d',1,'network.php']]],
['field_5ftimezone',['field_timezone',['../datetime_8php.html#a03900dcf0f9e3c58793a031673a70326',1,'datetime.php']]],
- ['file_5ftag_5fdecode',['file_tag_decode',['../text_8php.html#a08df5164926d2b31b8e9fcfe919de2b6',1,'text.php']]],
- ['file_5ftag_5fencode',['file_tag_encode',['../text_8php.html#a3299482ac20e9d79453048dd52881d37',1,'text.php']]],
- ['file_5ftag_5ffile_5fquery',['file_tag_file_query',['../text_8php.html#a163b5131f388080b0fc82398d3a32fe1',1,'text.php']]],
- ['file_5ftag_5ffile_5fto_5flist',['file_tag_file_to_list',['../text_8php.html#a544fc13c1798371e5a5984b5482108f8',1,'text.php']]],
- ['file_5ftag_5flist_5fto_5ffile',['file_tag_list_to_file',['../text_8php.html#abb55ec0142207aeec3d90b25ed4d7266',1,'text.php']]],
- ['file_5ftag_5fsave_5ffile',['file_tag_save_file',['../text_8php.html#a30311fd46e05be0e2cc466118641a4ed',1,'text.php']]],
- ['file_5ftag_5funsave_5ffile',['file_tag_unsave_file',['../text_8php.html#a48f6d04513d26270e10e9b7d153f7526',1,'text.php']]],
- ['file_5ftag_5fupdate_5fpconfig',['file_tag_update_pconfig',['../text_8php.html#abbe4894b4e746e47e1f91c7df27f6e81',1,'text.php']]],
+ ['file_5ftag_5fdecode',['file_tag_decode',['../taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6',1,'taxonomy.php']]],
+ ['file_5ftag_5fencode',['file_tag_encode',['../taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37',1,'taxonomy.php']]],
+ ['file_5ftag_5ffile_5fquery',['file_tag_file_query',['../taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1',1,'taxonomy.php']]],
['fileas_5fwidget',['fileas_widget',['../contact__widgets_8php.html#a1eda66319d170f60a8d07c7ece95533b',1,'contact_widgets.php']]],
['filename',['filename',['../namespacefriendica-to-smarty-tpl.html#a5f9bf7a67d955c0d6be70a82097611c5',1,'friendica-to-smarty-tpl']]],
['filer_2ephp',['filer.php',['../filer_8php.html',1,'']]],
@@ -46,8 +41,8 @@ var searchData=
['fkoauthdatastore',['FKOAuthDataStore',['../classFKOAuthDataStore.html',1,'']]],
['flip',['flip',['../classphoto__driver.html#a2b2a99021fc63ed6465d703ddddcb832',1,'photo_driver\flip()'],['../classphoto__gd.html#a44cedef376044018702d9355ddc813ce',1,'photo_gd\flip()'],['../classphoto__imagick.html#aff6bcdbab18593a3fc5a480db8509393',1,'photo_imagick\flip()']]],
['fnull',['fnull',['../namespaceupdatetpl.html#a79c20eb62d568c999b56eb08530355d3',1,'updatetpl']]],
- ['follow_2ephp',['follow.php',['../include_2follow_8php.html',1,'']]],
['follow_2ephp',['follow.php',['../mod_2follow_8php.html',1,'']]],
+ ['follow_2ephp',['follow.php',['../include_2follow_8php.html',1,'']]],
['follow_5fcontent',['follow_content',['../mod_2follow_8php.html#a4c540ea4e9f5c581c1a53516ac585592',1,'follow.php']]],
['follow_5finit',['follow_init',['../mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a',1,'follow.php']]],
['follow_5fwidget',['follow_widget',['../contact__widgets_8php.html#af24e693532a045954caab515942cfc6f',1,'contact_widgets.php']]],
@@ -57,9 +52,10 @@ var searchData=
['format_5fevent_5fdiaspora',['format_event_diaspora',['../bb2diaspora_8php.html#a29a2ad41f5826f3975fa9a49934ff863',1,'bb2diaspora.php']]],
['format_5fevent_5fhtml',['format_event_html',['../event_8php.html#a2ac9f1b08de03250ecd794f705781d17',1,'event.php']]],
['format_5fjs_5fif_5fexists',['format_js_if_exists',['../plugin_8php.html#ad9ff8ba554576383c5911a4bce068c1f',1,'plugin.php']]],
+ ['format_5flike',['format_like',['../conversation_8php.html#a3d8e30cc94f9a175054c021305d3aca3',1,'conversation.php']]],
['format_5flocation',['format_location',['../conversation_8php.html#a0891aaa4492cba2b51eda12fe01957f3',1,'conversation.php']]],
['format_5fnotification',['format_notification',['../include_2notify_8php.html#a0e61728e487df50c72e6434f911a57d3',1,'notify.php']]],
- ['format_5fterm_5ffor_5fdisplay',['format_term_for_display',['../text_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1',1,'text.php']]],
+ ['format_5fterm_5ffor_5fdisplay',['format_term_for_display',['../taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1',1,'taxonomy.php']]],
['fpostit_2ephp',['fpostit.php',['../fpostit_8php.html',1,'']]],
['fresh_2emd',['fresh.md',['../fresh_8md.html',1,'']]],
['friendica',['Friendica',['../namespaceFriendica.html',1,'']]],
diff --git a/doc/html/search/all_67.js b/doc/html/search/all_67.js
index 4f0861f92..2a5f15c19 100644
--- a/doc/html/search/all_67.js
+++ b/doc/html/search/all_67.js
@@ -21,7 +21,8 @@ var searchData=
['get_5fchildren',['get_children',['../classItem.html#aa0ee775ec94abccec6c798428835d001',1,'Item']]],
['get_5fcomment_5fbox',['get_comment_box',['../classItem.html#a3ee7667c2ec6cd7657328e27848c0bdf',1,'Item']]],
['get_5fcomment_5fbox_5ftemplate',['get_comment_box_template',['../classItem.html#a904421c7a427411bb2ab473bca872f63',1,'Item']]],
- ['get_5fconfig',['get_config',['../include_2config_8php.html#a5d19130818ea4c6b8726ab62cd989c15',1,'config.php']]],
+ ['get_5fconfig',['get_config',['../include_2config_8php.html#af02c96e6b37335774b548914ede1d22e',1,'config.php']]],
+ ['get_5fconfig_5ffrom_5fstorage',['get_config_from_storage',['../include_2config_8php.html#af08b7adb63adfb2eda7c466fba0cce74',1,'config.php']]],
['get_5fconversation',['get_conversation',['../classItem.html#a0c301aaed2b7d682728d18db3a22afa3',1,'Item']]],
['get_5fcurl_5fcode',['get_curl_code',['../classApp.html#ab410451f132910773d0a02e35d0dced9',1,'App']]],
['get_5fcurl_5fheaders',['get_curl_headers',['../classApp.html#abaf2173711e861ae4aebf43a7f70157e',1,'App']]],
@@ -73,13 +74,13 @@ var searchData=
['get_5ftemplate_5fengine',['get_template_engine',['../classApp.html#acb27e607fe4c82603444676e25c36b70',1,'App']]],
['get_5ftemplate_5fldelim',['get_template_ldelim',['../classApp.html#a2eb832a8577dee7d40b93abdf6d1d35a',1,'App']]],
['get_5ftemplate_5frdelim',['get_template_rdelim',['../classApp.html#aab23c59172310fd30f2d60dc039d3eea',1,'App']]],
- ['get_5fterms_5foftype',['get_terms_oftype',['../text_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1',1,'text.php']]],
- ['get_5ftheme_5fconfig_5ffile',['get_theme_config_file',['../settings_8php.html#a39abc76ff5459c57e3b957664f273f18',1,'settings.php']]],
+ ['get_5fterms_5foftype',['get_terms_oftype',['../taxonomy_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1',1,'taxonomy.php']]],
+ ['get_5ftheme_5fconfig_5ffile',['get_theme_config_file',['../mod_2settings_8php.html#a39abc76ff5459c57e3b957664f273f18',1,'settings.php']]],
['get_5ftheme_5finfo',['get_theme_info',['../plugin_8php.html#ad48de9c0fb7f19413a2aa49250d00405',1,'plugin.php']]],
['get_5ftheme_5fscreenshot',['get_theme_screenshot',['../plugin_8php.html#a48047edfbef770125a5508dcc2f9282f',1,'plugin.php']]],
['get_5fthread',['get_thread',['../classConversation.html#a4cff75d8c46b517e7133e4d0da6fc1c8',1,'Conversation']]],
['get_5fwidgets',['get_widgets',['../classApp.html#a871898becd0697d778f36d9336253ae8',1,'App']]],
- ['get_5fxconfig',['get_xconfig',['../include_2config_8php.html#ae4269ab151d08b5dcb1581b2920a934b',1,'config.php']]],
+ ['get_5fxconfig',['get_xconfig',['../include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e',1,'config.php']]],
['getext',['getExt',['../classphoto__driver.html#aa2efb5b2a6af3fd67e3f1c2b9852a5ba',1,'photo_driver']]],
['getheight',['getHeight',['../classphoto__driver.html#af769e9abb144e57002c59aa2aa8f3468',1,'photo_driver']]],
['getimage',['getImage',['../classphoto__driver.html#ab98da263bd7341fc132c4fb6fc76e8d5',1,'photo_driver\getImage()'],['../classphoto__gd.html#a86757ba021fd80d1a5cf8c2f766a8484',1,'photo_gd\getImage()'],['../classphoto__imagick.html#ad07288e0eb3922cb08cc9d33a163decc',1,'photo_imagick\getImage()']]],
@@ -91,8 +92,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#a0a515d42ec78aa0066aac4c278ead5b0',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 635e8be89..d63d5a05a 100644
--- a/doc/html/search/all_69.js
+++ b/doc/html/search/all_69.js
@@ -44,18 +44,22 @@ var searchData=
['item_5fdelayed_5fpublish',['ITEM_DELAYED_PUBLISH',['../boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20',1,'boot.php']]],
['item_5fdeleted',['ITEM_DELETED',['../boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49',1,'boot.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']]],
['item_5fgetfeedattach',['item_getfeedattach',['../items_8php.html#a09d425596b9f8663472cf7474ad36d96',1,'items.php']]],
['item_5fgetfeedtags',['item_getfeedtags',['../items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7',1,'items.php']]],
['item_5fhidden',['ITEM_HIDDEN',['../boot_8php.html#ac99fc4d040764eac1736bec6973556fe',1,'boot.php']]],
['item_5fmentionsme',['ITEM_MENTIONSME',['../boot_8php.html#a8da836617174eed9fc2ac8054125354b',1,'boot.php']]],
['item_5fmessage_5fid',['item_message_id',['../text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e',1,'text.php']]],
['item_5fmoderated',['ITEM_MODERATED',['../boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450',1,'boot.php']]],
+ ['item_5fnocomment',['ITEM_NOCOMMENT',['../boot_8php.html#a949116d9a295b214293006c060ca4848',1,'boot.php']]],
['item_5fnotshown',['ITEM_NOTSHOWN',['../boot_8php.html#a8663f32171568489dbb2a01dd00371f8',1,'boot.php']]],
['item_5fnsfw',['ITEM_NSFW',['../boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08',1,'boot.php']]],
['item_5forigin',['ITEM_ORIGIN',['../boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7',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']]],
['item_5fpost_5ftype',['item_post_type',['../text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e',1,'text.php']]],
+ ['item_5fredir_5fand_5freplace_5fimages',['item_redir_and_replace_images',['../conversation_8php.html#adda79b75bf1ccf6ce9503aa310953533',1,'conversation.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/all_6c.js b/doc/html/search/all_6c.js
index 258e43f4e..4e54ba411 100644
--- a/doc/html/search/all_6c.js
+++ b/doc/html/search/all_6c.js
@@ -8,6 +8,7 @@ var searchData=
['legal_5fwebbie',['legal_webbie',['../text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728',1,'text.php']]],
['like_2ephp',['like.php',['../like_8php.html',1,'']]],
['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']]],
@@ -17,13 +18,13 @@ var searchData=
['load_5fdatabase',['load_database',['../setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a',1,'setup.php']]],
['load_5fdatabase_5frem',['load_database_rem',['../setup_8php.html#a2b375ddc555140236fc500135de99371',1,'setup.php']]],
['load_5fhooks',['load_hooks',['../plugin_8php.html#a326365e48ef94f0b9a0a771b8d75e813',1,'plugin.php']]],
- ['load_5fpconfig',['load_pconfig',['../include_2config_8php.html#ab012f852866a0aff9b5180daffa454f5',1,'config.php']]],
+ ['load_5fpconfig',['load_pconfig',['../include_2config_8php.html#ac543813a980b3841cc5a277fcd4a24a6',1,'config.php']]],
['load_5fplugin',['load_plugin',['../plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d',1,'plugin.php']]],
['load_5ftranslation_5ftable',['load_translation_table',['../language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05',1,'language.php']]],
- ['load_5fxconfig',['load_xconfig',['../include_2config_8php.html#a913d4e1a6ee7acc1598c69b902c06fd2',1,'config.php']]],
+ ['load_5fxconfig',['load_xconfig',['../include_2config_8php.html#a55bbed9a014c9109c767486834f3ca33',1,'config.php']]],
['local_5fdelivery',['local_delivery',['../items_8php.html#ae1c27d1a6379231ac7c0435c8a791d45',1,'items.php']]],
['local_5fuser',['local_user',['../boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44',1,'boot.php']]],
- ['localize_5fitem',['localize_item',['../conversation_8php.html#afea815dd1768e8417d2b30be53e9e0b4',1,'conversation.php']]],
+ ['localize_5fitem',['localize_item',['../conversation_8php.html#a9bd7f9fb6678736c581bcba3b17f471c',1,'conversation.php']]],
['lockview_2ephp',['lockview.php',['../lockview_8php.html',1,'']]],
['lockview_5fcontent',['lockview_content',['../lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44',1,'lockview.php']]],
['logger',['logger',['../text_8php.html#a030fa5ecc64168af0c4f44897a9bce63',1,'text.php']]],
diff --git a/doc/html/search/all_70.js b/doc/html/search/all_70.js
index 8b90ca80f..2d5ae73fa 100644
--- a/doc/html/search/all_70.js
+++ b/doc/html/search/all_70.js
@@ -66,7 +66,9 @@ var searchData=
['photos_5finit',['photos_init',['../mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014',1,'photos.php']]],
['photos_5flist_5fphotos',['photos_list_photos',['../include_2photos_8php.html#aa27b9e435dcc34e1009f56dc02c7ca51',1,'photos.php']]],
['photos_5fpost',['photos_post',['../mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080',1,'photos.php']]],
+ ['php_2ephp',['php.php',['../php_8php.html',1,'']]],
['php2po_2ephp',['php2po.php',['../php2po_8php.html',1,'']]],
+ ['php_5finit',['php_init',['../php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6',1,'php.php']]],
['php_5ftpl',['php_tpl',['../namespacefriendica-to-smarty-tpl.html#a5dfc21ab8282dda8e3a7dff43cd0e283',1,'friendica-to-smarty-tpl']]],
['ping_2ephp',['ping.php',['../ping_8php.html',1,'']]],
['ping_5finit',['ping_init',['../ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1',1,'ping.php']]],
diff --git a/doc/html/search/all_73.js b/doc/html/search/all_73.js
index 0f04a98ed..58f244ebe 100644
--- a/doc/html/search/all_73.js
+++ b/doc/html/search/all_73.js
@@ -52,9 +52,10 @@ var searchData=
['set_5fwidget',['set_widget',['../classApp.html#a123b903dfe5d3488cc68db3471d36fd2',1,'App']]],
['set_5fxconfig',['set_xconfig',['../include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e',1,'config.php']]],
['setdimensions',['setDimensions',['../classphoto__driver.html#ae663867d2c4eaa2fae50d60670920143',1,'photo_driver\setDimensions()'],['../classphoto__gd.html#a1c75304bd15f3b9986f0b315fb59271e',1,'photo_gd\setDimensions()'],['../classphoto__imagick.html#af92901d252c1e6ab5b54eebedbed23bb',1,'photo_imagick\setDimensions()']]],
- ['settings_2ephp',['settings.php',['../settings_8php.html',1,'']]],
- ['settings_5faside',['settings_aside',['../settings_8php.html#ae5aebccb006bee1300078576baaf5582',1,'settings.php']]],
- ['settings_5fpost',['settings_post',['../settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586',1,'settings.php']]],
+ ['settings_2ephp',['settings.php',['../include_2settings_8php.html',1,'']]],
+ ['settings_2ephp',['settings.php',['../mod_2settings_8php.html',1,'']]],
+ ['settings_5faside',['settings_aside',['../mod_2settings_8php.html#ae5aebccb006bee1300078576baaf5582',1,'settings.php']]],
+ ['settings_5fpost',['settings_post',['../mod_2settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586',1,'settings.php']]],
['setup_2ephp',['setup.php',['../setup_8php.html',1,'']]],
['setup_5fcontent',['setup_content',['../setup_8php.html#a88247384a96e14516f474d7af6a465c1',1,'setup.php']]],
['setup_5finit',['setup_init',['../setup_8php.html#a267555abd17290e659b4bf44b885e4e0',1,'setup.php']]],
@@ -83,15 +84,15 @@ var searchData=
['starred_2ephp',['starred.php',['../starred_8php.html',1,'']]],
['starred_5finit',['starred_init',['../starred_8php.html#a63024fb418c678e49fd535e3752d349a',1,'starred.php']]],
['startup',['startup',['../boot_8php.html#aca47505b8732177f52bb2d647eb2741c',1,'boot.php']]],
- ['status_5feditor',['status_editor',['../conversation_8php.html#aedf008b9eac87f693d7dcc1a01404d85',1,'conversation.php']]],
+ ['status_5feditor',['status_editor',['../conversation_8php.html#a2a7d541854bba755eb8ada59af7dcb1a',1,'conversation.php']]],
['store',['store',['../classphoto__driver.html#a642a8d0c4ad5f887c99c6af77cee287b',1,'photo_driver']]],
- ['store_5fitem_5ftag',['store_item_tag',['../text_8php.html#a4ba1339b2a7054971178ce194e4440fd',1,'text.php']]],
+ ['store_5fitem_5ftag',['store_item_tag',['../taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd',1,'taxonomy.php']]],
['stream_5fperms_5fapi_5fuids',['stream_perms_api_uids',['../security_8php.html#ae92c5c1a1cbbc49ddbb8b3265d2db809',1,'security.php']]],
['string_5fplural_5fselect_5fdefault',['string_plural_select_default',['../language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0',1,'language.php']]],
['stringify_5farray_5felms',['stringify_array_elms',['../text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13',1,'text.php']]],
['stripdcode_5fbr_5fcb',['stripdcode_br_cb',['../bb2diaspora_8php.html#a180b0e3a7d702998be19e3c3b44b0e93',1,'bb2diaspora.php']]],
- ['style_2ephp',['style.php',['../redbasic_2php_2style_8php.html',1,'']]],
['style_2ephp',['style.php',['../redstrap_2php_2style_8php.html',1,'']]],
+ ['style_2ephp',['style.php',['../redbasic_2php_2style_8php.html',1,'']]],
['subthread_2ephp',['subthread.php',['../subthread_8php.html',1,'']]],
['subthread_5fcontent',['subthread_content',['../subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3',1,'subthread.php']]],
['suggest_2ephp',['suggest.php',['../suggest_8php.html',1,'']]],
diff --git a/doc/html/search/all_74.js b/doc/html/search/all_74.js
index f57bf33ee..90fb7f934 100644
--- a/doc/html/search/all_74.js
+++ b/doc/html/search/all_74.js
@@ -2,14 +2,15 @@ var searchData=
[
['t',['t',['../language_8php.html#aae0c3638fb476ae1e31f8d242f5dac04',1,'language.php']]],
['tag_5fdeliver',['tag_deliver',['../items_8php.html#ab1bce4261bcf75ad62753b498a144d17',1,'items.php']]],
- ['tagadelic',['tagadelic',['../text_8php.html#afe44c30f1d0f8cb3ca097d4e189d852d',1,'text.php']]],
- ['tagblock',['tagblock',['../text_8php.html#a4f3605ee8de717a401ea9df2401b59f6',1,'text.php']]],
+ ['tagadelic',['tagadelic',['../taxonomy_8php.html#afe44c30f1d0f8cb3ca097d4e189d852d',1,'taxonomy.php']]],
+ ['tagblock',['tagblock',['../taxonomy_8php.html#a4f3605ee8de717a401ea9df2401b59f6',1,'taxonomy.php']]],
['tagger_2ephp',['tagger.php',['../tagger_8php.html',1,'']]],
['tagger_5fcontent',['tagger_content',['../tagger_8php.html#a0e4a3eb177d1684553c547503d67161c',1,'tagger.php']]],
['tagrm_2ephp',['tagrm.php',['../tagrm_8php.html',1,'']]],
['tagrm_5fcontent',['tagrm_content',['../tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a',1,'tagrm.php']]],
['tagrm_5fpost',['tagrm_post',['../tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78',1,'tagrm.php']]],
- ['tags_5fsort',['tags_sort',['../text_8php.html#aaeded36bcc983b35d9205fe5b6c18c43',1,'text.php']]],
+ ['tags_5fsort',['tags_sort',['../taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43',1,'taxonomy.php']]],
+ ['taxonomy_2ephp',['taxonomy.php',['../taxonomy_8php.html',1,'']]],
['template',['Template',['../classTemplate.html',1,'']]],
['template_5fengine',['template_engine',['../classApp.html#a94a1ed2dc493c58612d17035b74ae736',1,'App']]],
['template_5fescape',['template_escape',['../template__processor_8php.html#ab2bcd8738f20f293636a6ae8e1099db5',1,'template_processor.php']]],
@@ -19,11 +20,16 @@ var searchData=
['term_5ffile',['TERM_FILE',['../boot_8php.html#afb97615e985a013799839b68b99018d7',1,'boot.php']]],
['term_5fhashtag',['TERM_HASHTAG',['../boot_8php.html#a2750985ec445617d7e82ae3098c91e3f',1,'boot.php']]],
['term_5fmention',['TERM_MENTION',['../boot_8php.html#ae37444eaa42705185080ccf3e670cbc2',1,'boot.php']]],
+ ['term_5fobj_5fchannel',['TERM_OBJ_CHANNEL',['../boot_8php.html#a8892374789fd261eb32a7969d934a14a',1,'boot.php']]],
+ ['term_5fobj_5fobject',['TERM_OBJ_OBJECT',['../boot_8php.html#a882b666adfe21f035a0f8c02806066d6',1,'boot.php']]],
['term_5fobj_5fphoto',['TERM_OBJ_PHOTO',['../boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd',1,'boot.php']]],
['term_5fobj_5fpost',['TERM_OBJ_POST',['../boot_8php.html#a9eeb8989272d5ff804a616898bb13659',1,'boot.php']]],
+ ['term_5fobj_5fprofile',['TERM_OBJ_PROFILE',['../boot_8php.html#aead84fa27d7516b855220fe004964a45',1,'boot.php']]],
+ ['term_5fobj_5fthing',['TERM_OBJ_THING',['../boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe',1,'boot.php']]],
['term_5fpcategory',['TERM_PCATEGORY',['../boot_8php.html#a45b12aefab9675baffc7a07a09486db8',1,'boot.php']]],
- ['term_5fquery',['term_query',['../text_8php.html#a7a913d19c77610da689be48fbbf6734c',1,'text.php']]],
+ ['term_5fquery',['term_query',['../taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c',1,'taxonomy.php']]],
['term_5fsavedsearch',['TERM_SAVEDSEARCH',['../boot_8php.html#abd7bb40da9cc073297e49736b338ca07',1,'boot.php']]],
+ ['term_5fthing',['TERM_THING',['../boot_8php.html#a0d877df1e20bae765e1708be50f6b503',1,'boot.php']]],
['term_5funknown',['TERM_UNKNOWN',['../boot_8php.html#a0c59dde058efebbc66520d136cbd1631',1,'boot.php']]],
['terminate_5ffriendship',['terminate_friendship',['../Contact_8php.html#a38daa1c210b78385307123450ca9a1fc',1,'Contact.php']]],
['termtype',['termtype',['../items_8php.html#ad34827ed330898456783fb14c7b46154',1,'items.php']]],
@@ -37,6 +43,9 @@ var searchData=
['theme_5finit_2ephp',['theme_init.php',['../theme_2redstrap_2php_2theme__init_8php.html',1,'']]],
['theme_5fpost',['theme_post',['../view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6',1,'theme_post(&$a): config.php'],['../view_2theme_2redstrap_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6',1,'theme_post(&$a): config.php']]],
['theme_5fstatus',['theme_status',['../admin_8php.html#ad4f74f33944a98b56d2c8c7601f124a4',1,'admin.php']]],
+ ['thing_2ephp',['thing.php',['../thing_8php.html',1,'']]],
+ ['thing_5fcontent',['thing_content',['../thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b',1,'thing.php']]],
+ ['thing_5finit',['thing_init',['../thing_8php.html#a8be23b1d475ec3d9291999221c674c80',1,'thing.php']]],
['timesel',['timesel',['../datetime_8php.html#a36d3d6dff8d76b5f295bb3d9c535a5b1',1,'datetime.php']]],
['timezone_5fcmp',['timezone_cmp',['../datetime_8php.html#aa51b5a7ea4f931b23acbdfcea46e9865',1,'datetime.php']]],
['title_5fis_5fbody',['title_is_body',['../items_8php.html#aa371905f0a211b307cb3f7188c6cba04',1,'items.php']]],
diff --git a/doc/html/search/all_78.js b/doc/html/search/all_78.js
index e19f1266e..786ddeb99 100644
--- a/doc/html/search/all_78.js
+++ b/doc/html/search/all_78.js
@@ -5,7 +5,7 @@ var searchData=
['xchan_5fcontent',['xchan_content',['../xchan_8php.html#a9853348bf1a35c644460221ba75edc2d',1,'xchan.php']]],
['xchan_5fflags_5fhidden',['XCHAN_FLAGS_HIDDEN',['../boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2',1,'boot.php']]],
['xchan_5fmail_5fquery',['xchan_mail_query',['../text_8php.html#a543447c5ed766535221e2d9636b379ee',1,'text.php']]],
- ['xchan_5fquery',['xchan_query',['../text_8php.html#a24b2b69b9162da789ab6514e0e09a37c',1,'text.php']]],
+ ['xchan_5fquery',['xchan_query',['../text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f',1,'text.php']]],
['xml2array',['xml2array',['../include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff',1,'network.php']]],
['xml_5fstatus',['xml_status',['../include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6',1,'network.php']]],
['xmlify',['xmlify',['../text_8php.html#aaed4413ed8918838b517e3b2fafaea0d',1,'text.php']]],
diff --git a/doc/html/search/all_7a.js b/doc/html/search/all_7a.js
index 6ee67ec82..20e3146f1 100644
--- a/doc/html/search/all_7a.js
+++ b/doc/html/search/all_7a.js
@@ -10,7 +10,7 @@ var searchData=
['zcurl_5ftimeout',['ZCURL_TIMEOUT',['../boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af',1,'boot.php']]],
['zfinger_2ephp',['zfinger.php',['../zfinger_8php.html',1,'']]],
['zfinger_5finit',['zfinger_init',['../zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0',1,'zfinger.php']]],
- ['zid',['zid',['../boot_8php.html#a5b7ce5c0a79796800883644c389dc87f',1,'boot.php']]],
+ ['zid',['zid',['../boot_8php.html#a5b815330f3d177ab383af37a6c12e532',1,'boot.php']]],
['zid_5finit',['zid_init',['../boot_8php.html#a680fbafc2db023c5b1309e0180e81315',1,'boot.php']]],
['zidify_5fcallback',['zidify_callback',['../text_8php.html#a405afe814a23f3bd94d826101aa168ab',1,'text.php']]],
['zidify_5fimg_5fcallback',['zidify_img_callback',['../text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4',1,'text.php']]],
diff --git a/doc/html/search/files_70.js b/doc/html/search/files_70.js
index 70f2312e2..3559e86e1 100644
--- a/doc/html/search/files_70.js
+++ b/doc/html/search/files_70.js
@@ -9,6 +9,7 @@ var searchData=
['photo_5fimagick_2ephp',['photo_imagick.php',['../photo__imagick_8php.html',1,'']]],
['photos_2ephp',['photos.php',['../mod_2photos_8php.html',1,'']]],
['photos_2ephp',['photos.php',['../include_2photos_8php.html',1,'']]],
+ ['php_2ephp',['php.php',['../php_8php.html',1,'']]],
['php2po_2ephp',['php2po.php',['../php2po_8php.html',1,'']]],
['ping_2ephp',['ping.php',['../ping_8php.html',1,'']]],
['plugin_2ephp',['plugin.php',['../plugin_8php.html',1,'']]],
diff --git a/doc/html/search/files_73.js b/doc/html/search/files_73.js
index 637791c44..2be1083e1 100644
--- a/doc/html/search/files_73.js
+++ b/doc/html/search/files_73.js
@@ -4,15 +4,16 @@ var searchData=
['search_5fac_2ephp',['search_ac.php',['../search__ac_8php.html',1,'']]],
['security_2ephp',['security.php',['../security_8php.html',1,'']]],
['session_2ephp',['session.php',['../session_8php.html',1,'']]],
- ['settings_2ephp',['settings.php',['../settings_8php.html',1,'']]],
+ ['settings_2ephp',['settings.php',['../include_2settings_8php.html',1,'']]],
+ ['settings_2ephp',['settings.php',['../mod_2settings_8php.html',1,'']]],
['setup_2ephp',['setup.php',['../setup_8php.html',1,'']]],
['share_2ephp',['share.php',['../share_8php.html',1,'']]],
['siteinfo_2ephp',['siteinfo.php',['../siteinfo_8php.html',1,'']]],
['smilies_2ephp',['smilies.php',['../smilies_8php.html',1,'']]],
['socgraph_2ephp',['socgraph.php',['../socgraph_8php.html',1,'']]],
['starred_2ephp',['starred.php',['../starred_8php.html',1,'']]],
- ['style_2ephp',['style.php',['../redstrap_2php_2style_8php.html',1,'']]],
['style_2ephp',['style.php',['../redbasic_2php_2style_8php.html',1,'']]],
+ ['style_2ephp',['style.php',['../redstrap_2php_2style_8php.html',1,'']]],
['subthread_2ephp',['subthread.php',['../subthread_8php.html',1,'']]],
['suggest_2ephp',['suggest.php',['../suggest_8php.html',1,'']]],
['system_5funavailable_2ephp',['system_unavailable.php',['../system__unavailable_8php.html',1,'']]]
diff --git a/doc/html/search/files_74.js b/doc/html/search/files_74.js
index 0a8c1e445..8c09d38e2 100644
--- a/doc/html/search/files_74.js
+++ b/doc/html/search/files_74.js
@@ -2,12 +2,14 @@ var searchData=
[
['tagger_2ephp',['tagger.php',['../tagger_8php.html',1,'']]],
['tagrm_2ephp',['tagrm.php',['../tagrm_8php.html',1,'']]],
+ ['taxonomy_2ephp',['taxonomy.php',['../taxonomy_8php.html',1,'']]],
['template_5fprocessor_2ephp',['template_processor.php',['../template__processor_8php.html',1,'']]],
['text_2ephp',['text.php',['../text_8php.html',1,'']]],
['theme_2ephp',['theme.php',['../redbasic_2php_2theme_8php.html',1,'']]],
['theme_2ephp',['theme.php',['../redstrap_2php_2theme_8php.html',1,'']]],
- ['theme_5finit_2ephp',['theme_init.php',['../php_2theme__init_8php.html',1,'']]],
['theme_5finit_2ephp',['theme_init.php',['../theme_2redstrap_2php_2theme__init_8php.html',1,'']]],
+ ['theme_5finit_2ephp',['theme_init.php',['../php_2theme__init_8php.html',1,'']]],
+ ['thing_2ephp',['thing.php',['../thing_8php.html',1,'']]],
['toggle_5fmobile_2ephp',['toggle_mobile.php',['../toggle__mobile_8php.html',1,'']]],
['tpldebug_2ephp',['tpldebug.php',['../tpldebug_8php.html',1,'']]],
['typo_2ephp',['typo.php',['../typo_8php.html',1,'']]],
diff --git a/doc/html/search/functions_62.js b/doc/html/search/functions_62.js
index 3d7feb1aa..2d082bf9c 100644
--- a/doc/html/search/functions_62.js
+++ b/doc/html/search/functions_62.js
@@ -12,8 +12,9 @@ var searchData=
['bbcode',['bbcode',['../bbcode_8php.html#a009f61aaf78771737ed0765c8463911b',1,'bbcode.php']]],
['bbtoevent',['bbtoevent',['../event_8php.html#a180cccd63c2a2f00ff432b03113531f3',1,'event.php']]],
['bbtovcal',['bbtovcal',['../event_8php.html#a184d6b9690e5b6dee35a0aa9edd47279',1,'event.php']]],
- ['best_5flink_5furl',['best_link_url',['../conversation_8php.html#a32e7750ae6adbfdd1f227f6e89221ce3',1,'conversation.php']]],
+ ['best_5flink_5furl',['best_link_url',['../conversation_8php.html#ad470fc7766f0db66d138fa1916c7a8b7',1,'conversation.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']]]
+ ['build_5fquerystring',['build_querystring',['../boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e',1,'boot.php']]],
+ ['build_5fsync_5fpacket',['build_sync_packet',['../include_2settings_8php.html#ac34e479d27f32b82dd6b33542f81a6a7',1,'settings.php']]]
];
diff --git a/doc/html/search/functions_63.js b/doc/html/search/functions_63.js
index cd8d23934..19525a84d 100644
--- a/doc/html/search/functions_63.js
+++ b/doc/html/search/functions_63.js
@@ -2,6 +2,7 @@ var searchData=
[
['cal',['cal',['../datetime_8php.html#aea356409ba69f9de412298c998595dd2',1,'datetime.php']]],
['call_5fhooks',['call_hooks',['../plugin_8php.html#a7f05de16c0a32602853b09b99dd85e7c',1,'plugin.php']]],
+ ['can_5fcomment_5fon_5fpost',['can_comment_on_post',['../items_8php.html#a1e75047cf175aaee8dd16aa761913ff9',1,'items.php']]],
['categories_5fwidget',['categories_widget',['../contact__widgets_8php.html#a165eb021e61c4dcab2a552f28628d353',1,'contact_widgets.php']]],
['change_5fchannel',['change_channel',['../security_8php.html#a8d23d2597aae380a3341872fe9513380',1,'security.php']]],
['change_5fpermissions',['change_permissions',['../classProtoDriver.html#a34b97ca5ef2165f2e16eb2fe59ff6c67',1,'ProtoDriver\change_permissions()'],['../classZotDriver.html#a6776935156accb0f170e2e24577133db',1,'ZotDriver\change_permissions()']]],
@@ -56,6 +57,7 @@ var searchData=
['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()']]],
['connections_5faside',['connections_aside',['../connections_8php.html#af48f7ad20914760ba9874c090384e35a',1,'connections.php']]],
+ ['connections_5fclone',['connections_clone',['../connections_8php.html#a15af118efee9c948b6f8294e54a73bb2',1,'connections.php']]],
['connections_5fcontent',['connections_content',['../connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c',1,'connections.php']]],
['connections_5finit',['connections_init',['../connections_8php.html#a1f23623f802af7bd35e95b0e94e5d558',1,'connections.php']]],
['connections_5fpost',['connections_post',['../connections_8php.html#a1224058db8e3fb56463eb312f98e561d',1,'connections.php']]],
@@ -73,6 +75,7 @@ var searchData=
['contactgroup_5fcontent',['contactgroup_content',['../contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3',1,'contactgroup.php']]],
['contacts_5fnot_5fgrouped',['contacts_not_grouped',['../Contact_8php.html#a228fc01f90ae9bfdde4c2ad0772bd7dc',1,'Contact.php']]],
['conv_5fsort',['conv_sort',['../conversation_8php.html#abed85a41f1160598de880b84021c9cf7',1,'conversation.php']]],
+ ['conversation',['conversation',['../conversation_8php.html#a1e97305a441dc143edbe09e17d1ceda1',1,'conversation.php']]],
['convert',['convert',['../namespacefriendica-to-smarty-tpl.html#a38503e37fe68ac27c88cce91a9ac9efa',1,'friendica-to-smarty-tpl']]],
['convert_5fxml_5felement_5fto_5farray',['convert_xml_element_to_array',['../include_2network_8php.html#ad4056d3ce69988f5c1a997a79f503246',1,'network.php']]],
['count_5fall_5ffriends',['count_all_friends',['../socgraph_8php.html#af29d056beec10b4e38e5209c92452894',1,'socgraph.php']]],
diff --git a/doc/html/search/functions_66.js b/doc/html/search/functions_66.js
index 75f63ac03..602d5373b 100644
--- a/doc/html/search/functions_66.js
+++ b/doc/html/search/functions_66.js
@@ -10,14 +10,9 @@ var searchData=
['fetch_5furl',['fetch_url',['../include_2network_8php.html#a37ddeb88a3fd1dee9e8339723f9edf9a',1,'network.php']]],
['fetch_5fxrd_5flinks',['fetch_xrd_links',['../include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d',1,'network.php']]],
['field_5ftimezone',['field_timezone',['../datetime_8php.html#a03900dcf0f9e3c58793a031673a70326',1,'datetime.php']]],
- ['file_5ftag_5fdecode',['file_tag_decode',['../text_8php.html#a08df5164926d2b31b8e9fcfe919de2b6',1,'text.php']]],
- ['file_5ftag_5fencode',['file_tag_encode',['../text_8php.html#a3299482ac20e9d79453048dd52881d37',1,'text.php']]],
- ['file_5ftag_5ffile_5fquery',['file_tag_file_query',['../text_8php.html#a163b5131f388080b0fc82398d3a32fe1',1,'text.php']]],
- ['file_5ftag_5ffile_5fto_5flist',['file_tag_file_to_list',['../text_8php.html#a544fc13c1798371e5a5984b5482108f8',1,'text.php']]],
- ['file_5ftag_5flist_5fto_5ffile',['file_tag_list_to_file',['../text_8php.html#abb55ec0142207aeec3d90b25ed4d7266',1,'text.php']]],
- ['file_5ftag_5fsave_5ffile',['file_tag_save_file',['../text_8php.html#a30311fd46e05be0e2cc466118641a4ed',1,'text.php']]],
- ['file_5ftag_5funsave_5ffile',['file_tag_unsave_file',['../text_8php.html#a48f6d04513d26270e10e9b7d153f7526',1,'text.php']]],
- ['file_5ftag_5fupdate_5fpconfig',['file_tag_update_pconfig',['../text_8php.html#abbe4894b4e746e47e1f91c7df27f6e81',1,'text.php']]],
+ ['file_5ftag_5fdecode',['file_tag_decode',['../taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6',1,'taxonomy.php']]],
+ ['file_5ftag_5fencode',['file_tag_encode',['../taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37',1,'taxonomy.php']]],
+ ['file_5ftag_5ffile_5fquery',['file_tag_file_query',['../taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1',1,'taxonomy.php']]],
['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']]],
@@ -43,9 +38,10 @@ var searchData=
['format_5fevent_5fdiaspora',['format_event_diaspora',['../bb2diaspora_8php.html#a29a2ad41f5826f3975fa9a49934ff863',1,'bb2diaspora.php']]],
['format_5fevent_5fhtml',['format_event_html',['../event_8php.html#a2ac9f1b08de03250ecd794f705781d17',1,'event.php']]],
['format_5fjs_5fif_5fexists',['format_js_if_exists',['../plugin_8php.html#ad9ff8ba554576383c5911a4bce068c1f',1,'plugin.php']]],
+ ['format_5flike',['format_like',['../conversation_8php.html#a3d8e30cc94f9a175054c021305d3aca3',1,'conversation.php']]],
['format_5flocation',['format_location',['../conversation_8php.html#a0891aaa4492cba2b51eda12fe01957f3',1,'conversation.php']]],
['format_5fnotification',['format_notification',['../include_2notify_8php.html#a0e61728e487df50c72e6434f911a57d3',1,'notify.php']]],
- ['format_5fterm_5ffor_5fdisplay',['format_term_for_display',['../text_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1',1,'text.php']]],
+ ['format_5fterm_5ffor_5fdisplay',['format_term_for_display',['../taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1',1,'taxonomy.php']]],
['fsuggest_5fcontent',['fsuggest_content',['../fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998',1,'fsuggest.php']]],
['fsuggest_5fpost',['fsuggest_post',['../fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d',1,'fsuggest.php']]],
['ftosmarty',['fToSmarty',['../namespacefriendica-to-smarty-tpl.html#a89388ea9b2826e8218ed480e917d8105',1,'friendica-to-smarty-tpl']]]
diff --git a/doc/html/search/functions_67.js b/doc/html/search/functions_67.js
index 6098afe23..05187723d 100644
--- a/doc/html/search/functions_67.js
+++ b/doc/html/search/functions_67.js
@@ -21,7 +21,8 @@ var searchData=
['get_5fchildren',['get_children',['../classItem.html#aa0ee775ec94abccec6c798428835d001',1,'Item']]],
['get_5fcomment_5fbox',['get_comment_box',['../classItem.html#a3ee7667c2ec6cd7657328e27848c0bdf',1,'Item']]],
['get_5fcomment_5fbox_5ftemplate',['get_comment_box_template',['../classItem.html#a904421c7a427411bb2ab473bca872f63',1,'Item']]],
- ['get_5fconfig',['get_config',['../include_2config_8php.html#a5d19130818ea4c6b8726ab62cd989c15',1,'config.php']]],
+ ['get_5fconfig',['get_config',['../include_2config_8php.html#af02c96e6b37335774b548914ede1d22e',1,'config.php']]],
+ ['get_5fconfig_5ffrom_5fstorage',['get_config_from_storage',['../include_2config_8php.html#af08b7adb63adfb2eda7c466fba0cce74',1,'config.php']]],
['get_5fconversation',['get_conversation',['../classItem.html#a0c301aaed2b7d682728d18db3a22afa3',1,'Item']]],
['get_5fcurl_5fcode',['get_curl_code',['../classApp.html#ab410451f132910773d0a02e35d0dced9',1,'App']]],
['get_5fcurl_5fheaders',['get_curl_headers',['../classApp.html#abaf2173711e861ae4aebf43a7f70157e',1,'App']]],
@@ -73,13 +74,13 @@ var searchData=
['get_5ftemplate_5fengine',['get_template_engine',['../classApp.html#acb27e607fe4c82603444676e25c36b70',1,'App']]],
['get_5ftemplate_5fldelim',['get_template_ldelim',['../classApp.html#a2eb832a8577dee7d40b93abdf6d1d35a',1,'App']]],
['get_5ftemplate_5frdelim',['get_template_rdelim',['../classApp.html#aab23c59172310fd30f2d60dc039d3eea',1,'App']]],
- ['get_5fterms_5foftype',['get_terms_oftype',['../text_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1',1,'text.php']]],
- ['get_5ftheme_5fconfig_5ffile',['get_theme_config_file',['../settings_8php.html#a39abc76ff5459c57e3b957664f273f18',1,'settings.php']]],
+ ['get_5fterms_5foftype',['get_terms_oftype',['../taxonomy_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1',1,'taxonomy.php']]],
+ ['get_5ftheme_5fconfig_5ffile',['get_theme_config_file',['../mod_2settings_8php.html#a39abc76ff5459c57e3b957664f273f18',1,'settings.php']]],
['get_5ftheme_5finfo',['get_theme_info',['../plugin_8php.html#ad48de9c0fb7f19413a2aa49250d00405',1,'plugin.php']]],
['get_5ftheme_5fscreenshot',['get_theme_screenshot',['../plugin_8php.html#a48047edfbef770125a5508dcc2f9282f',1,'plugin.php']]],
['get_5fthread',['get_thread',['../classConversation.html#a4cff75d8c46b517e7133e4d0da6fc1c8',1,'Conversation']]],
['get_5fwidgets',['get_widgets',['../classApp.html#a871898becd0697d778f36d9336253ae8',1,'App']]],
- ['get_5fxconfig',['get_xconfig',['../include_2config_8php.html#ae4269ab151d08b5dcb1581b2920a934b',1,'config.php']]],
+ ['get_5fxconfig',['get_xconfig',['../include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e',1,'config.php']]],
['getext',['getExt',['../classphoto__driver.html#aa2efb5b2a6af3fd67e3f1c2b9852a5ba',1,'photo_driver']]],
['getheight',['getHeight',['../classphoto__driver.html#af769e9abb144e57002c59aa2aa8f3468',1,'photo_driver']]],
['getimage',['getImage',['../classphoto__driver.html#ab98da263bd7341fc132c4fb6fc76e8d5',1,'photo_driver\getImage()'],['../classphoto__gd.html#a86757ba021fd80d1a5cf8c2f766a8484',1,'photo_gd\getImage()'],['../classphoto__imagick.html#ad07288e0eb3922cb08cc9d33a163decc',1,'photo_imagick\getImage()']]],
diff --git a/doc/html/search/functions_69.js b/doc/html/search/functions_69.js
index 0affc3dcd..971197efd 100644
--- a/doc/html/search/functions_69.js
+++ b/doc/html/search/functions_69.js
@@ -34,12 +34,15 @@ var searchData=
['is_5fwritable',['is_writable',['../classConversation.html#a5879199008b96bee7550b576d614e1c1',1,'Conversation\is_writable()'],['../classItem.html#a99253fb1ca6f430a0b181689ef206861',1,'Item\is_writable()']]],
['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']]],
['item_5fgetfeedattach',['item_getfeedattach',['../items_8php.html#a09d425596b9f8663472cf7474ad36d96',1,'items.php']]],
['item_5fgetfeedtags',['item_getfeedtags',['../items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7',1,'items.php']]],
['item_5fmessage_5fid',['item_message_id',['../text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e',1,'text.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']]],
['item_5fpost_5ftype',['item_post_type',['../text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e',1,'text.php']]],
+ ['item_5fredir_5fand_5freplace_5fimages',['item_redir_and_replace_images',['../conversation_8php.html#adda79b75bf1ccf6ce9503aa310953533',1,'conversation.php']]],
['item_5fstore',['item_store',['../items_8php.html#a8ef003b2bc2dc4816bdcf5800aec1049',1,'items.php']]],
['item_5fstore_5fupdate',['item_store_update',['../items_8php.html#a2dc4fb9347f6fb804da4f32c107afb53',1,'items.php']]],
['items_5ffetch',['items_fetch',['../items_8php.html#a756738301f2ed96be50232500677d58a',1,'items.php']]]
diff --git a/doc/html/search/functions_6c.js b/doc/html/search/functions_6c.js
index ae95c7619..54c9fa6ab 100644
--- a/doc/html/search/functions_6c.js
+++ b/doc/html/search/functions_6c.js
@@ -3,6 +3,7 @@ var searchData=
['lang_5fselector',['lang_selector',['../text_8php.html#a71f6952243d3fe1c5a8154f78027e29c',1,'text.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']]],
@@ -12,13 +13,13 @@ var searchData=
['load_5fdatabase',['load_database',['../setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a',1,'setup.php']]],
['load_5fdatabase_5frem',['load_database_rem',['../setup_8php.html#a2b375ddc555140236fc500135de99371',1,'setup.php']]],
['load_5fhooks',['load_hooks',['../plugin_8php.html#a326365e48ef94f0b9a0a771b8d75e813',1,'plugin.php']]],
- ['load_5fpconfig',['load_pconfig',['../include_2config_8php.html#ab012f852866a0aff9b5180daffa454f5',1,'config.php']]],
+ ['load_5fpconfig',['load_pconfig',['../include_2config_8php.html#ac543813a980b3841cc5a277fcd4a24a6',1,'config.php']]],
['load_5fplugin',['load_plugin',['../plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d',1,'plugin.php']]],
['load_5ftranslation_5ftable',['load_translation_table',['../language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05',1,'language.php']]],
- ['load_5fxconfig',['load_xconfig',['../include_2config_8php.html#a913d4e1a6ee7acc1598c69b902c06fd2',1,'config.php']]],
+ ['load_5fxconfig',['load_xconfig',['../include_2config_8php.html#a55bbed9a014c9109c767486834f3ca33',1,'config.php']]],
['local_5fdelivery',['local_delivery',['../items_8php.html#ae1c27d1a6379231ac7c0435c8a791d45',1,'items.php']]],
['local_5fuser',['local_user',['../boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44',1,'boot.php']]],
- ['localize_5fitem',['localize_item',['../conversation_8php.html#afea815dd1768e8417d2b30be53e9e0b4',1,'conversation.php']]],
+ ['localize_5fitem',['localize_item',['../conversation_8php.html#a9bd7f9fb6678736c581bcba3b17f471c',1,'conversation.php']]],
['lockview_5fcontent',['lockview_content',['../lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44',1,'lockview.php']]],
['logger',['logger',['../text_8php.html#a030fa5ecc64168af0c4f44897a9bce63',1,'text.php']]],
['login',['login',['../boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4',1,'boot.php']]],
diff --git a/doc/html/search/functions_70.js b/doc/html/search/functions_70.js
index 29273fc57..a29a9886d 100644
--- a/doc/html/search/functions_70.js
+++ b/doc/html/search/functions_70.js
@@ -25,6 +25,7 @@ var searchData=
['photos_5finit',['photos_init',['../mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014',1,'photos.php']]],
['photos_5flist_5fphotos',['photos_list_photos',['../include_2photos_8php.html#aa27b9e435dcc34e1009f56dc02c7ca51',1,'photos.php']]],
['photos_5fpost',['photos_post',['../mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080',1,'photos.php']]],
+ ['php_5finit',['php_init',['../php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6',1,'php.php']]],
['ping_5finit',['ping_init',['../ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1',1,'ping.php']]],
['pkcs1_5fencode',['pkcs1_encode',['../crypto_8php.html#a890b443f80f0968fb9eabd93fc99dbb5',1,'crypto.php']]],
['pkcs5_5fpad',['pkcs5_pad',['../crypto_8php.html#a3398666e184faf8e516c8e5d91de86eb',1,'crypto.php']]],
diff --git a/doc/html/search/functions_73.js b/doc/html/search/functions_73.js
index 4d25f8100..8717244d1 100644
--- a/doc/html/search/functions_73.js
+++ b/doc/html/search/functions_73.js
@@ -48,8 +48,8 @@ var searchData=
['set_5fwidget',['set_widget',['../classApp.html#a123b903dfe5d3488cc68db3471d36fd2',1,'App']]],
['set_5fxconfig',['set_xconfig',['../include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e',1,'config.php']]],
['setdimensions',['setDimensions',['../classphoto__driver.html#ae663867d2c4eaa2fae50d60670920143',1,'photo_driver\setDimensions()'],['../classphoto__gd.html#a1c75304bd15f3b9986f0b315fb59271e',1,'photo_gd\setDimensions()'],['../classphoto__imagick.html#af92901d252c1e6ab5b54eebedbed23bb',1,'photo_imagick\setDimensions()']]],
- ['settings_5faside',['settings_aside',['../settings_8php.html#ae5aebccb006bee1300078576baaf5582',1,'settings.php']]],
- ['settings_5fpost',['settings_post',['../settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586',1,'settings.php']]],
+ ['settings_5faside',['settings_aside',['../mod_2settings_8php.html#ae5aebccb006bee1300078576baaf5582',1,'settings.php']]],
+ ['settings_5fpost',['settings_post',['../mod_2settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586',1,'settings.php']]],
['setup_5fcontent',['setup_content',['../setup_8php.html#a88247384a96e14516f474d7af6a465c1',1,'setup.php']]],
['setup_5finit',['setup_init',['../setup_8php.html#a267555abd17290e659b4bf44b885e4e0',1,'setup.php']]],
['setup_5fpost',['setup_post',['../setup_8php.html#a13cf286774149a0a7bd8adb8179cec75',1,'setup.php']]],
@@ -69,9 +69,9 @@ var searchData=
['sort_5fthr_5fcreated_5frev',['sort_thr_created_rev',['../conversation_8php.html#a9cc2a679606da9e535a06433f9f553a0',1,'conversation.php']]],
['starred_5finit',['starred_init',['../starred_8php.html#a63024fb418c678e49fd535e3752d349a',1,'starred.php']]],
['startup',['startup',['../boot_8php.html#aca47505b8732177f52bb2d647eb2741c',1,'boot.php']]],
- ['status_5feditor',['status_editor',['../conversation_8php.html#aedf008b9eac87f693d7dcc1a01404d85',1,'conversation.php']]],
+ ['status_5feditor',['status_editor',['../conversation_8php.html#a2a7d541854bba755eb8ada59af7dcb1a',1,'conversation.php']]],
['store',['store',['../classphoto__driver.html#a642a8d0c4ad5f887c99c6af77cee287b',1,'photo_driver']]],
- ['store_5fitem_5ftag',['store_item_tag',['../text_8php.html#a4ba1339b2a7054971178ce194e4440fd',1,'text.php']]],
+ ['store_5fitem_5ftag',['store_item_tag',['../taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd',1,'taxonomy.php']]],
['stream_5fperms_5fapi_5fuids',['stream_perms_api_uids',['../security_8php.html#ae92c5c1a1cbbc49ddbb8b3265d2db809',1,'security.php']]],
['string_5fplural_5fselect_5fdefault',['string_plural_select_default',['../language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0',1,'language.php']]],
['stringify_5farray_5felms',['stringify_array_elms',['../text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13',1,'text.php']]],
diff --git a/doc/html/search/functions_74.js b/doc/html/search/functions_74.js
index c8db49e83..9b46593ef 100644
--- a/doc/html/search/functions_74.js
+++ b/doc/html/search/functions_74.js
@@ -2,16 +2,16 @@ var searchData=
[
['t',['t',['../language_8php.html#aae0c3638fb476ae1e31f8d242f5dac04',1,'language.php']]],
['tag_5fdeliver',['tag_deliver',['../items_8php.html#ab1bce4261bcf75ad62753b498a144d17',1,'items.php']]],
- ['tagadelic',['tagadelic',['../text_8php.html#afe44c30f1d0f8cb3ca097d4e189d852d',1,'text.php']]],
- ['tagblock',['tagblock',['../text_8php.html#a4f3605ee8de717a401ea9df2401b59f6',1,'text.php']]],
+ ['tagadelic',['tagadelic',['../taxonomy_8php.html#afe44c30f1d0f8cb3ca097d4e189d852d',1,'taxonomy.php']]],
+ ['tagblock',['tagblock',['../taxonomy_8php.html#a4f3605ee8de717a401ea9df2401b59f6',1,'taxonomy.php']]],
['tagger_5fcontent',['tagger_content',['../tagger_8php.html#a0e4a3eb177d1684553c547503d67161c',1,'tagger.php']]],
['tagrm_5fcontent',['tagrm_content',['../tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a',1,'tagrm.php']]],
['tagrm_5fpost',['tagrm_post',['../tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78',1,'tagrm.php']]],
- ['tags_5fsort',['tags_sort',['../text_8php.html#aaeded36bcc983b35d9205fe5b6c18c43',1,'text.php']]],
+ ['tags_5fsort',['tags_sort',['../taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43',1,'taxonomy.php']]],
['template_5fengine',['template_engine',['../classApp.html#a94a1ed2dc493c58612d17035b74ae736',1,'App']]],
['template_5fescape',['template_escape',['../template__processor_8php.html#ab2bcd8738f20f293636a6ae8e1099db5',1,'template_processor.php']]],
['template_5funescape',['template_unescape',['../template__processor_8php.html#ac635bb19a5f6eadd6b0cddefdd537c1e',1,'template_processor.php']]],
- ['term_5fquery',['term_query',['../text_8php.html#a7a913d19c77610da689be48fbbf6734c',1,'text.php']]],
+ ['term_5fquery',['term_query',['../taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c',1,'taxonomy.php']]],
['terminate_5ffriendship',['terminate_friendship',['../Contact_8php.html#a38daa1c210b78385307123450ca9a1fc',1,'Contact.php']]],
['termtype',['termtype',['../items_8php.html#ad34827ed330898456783fb14c7b46154',1,'items.php']]],
['tgroup_5fcheck',['tgroup_check',['../items_8php.html#a88c6cf7649ac836fbbed82a7a0315110',1,'items.php']]],
@@ -19,6 +19,8 @@ var searchData=
['theme_5finclude',['theme_include',['../plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2',1,'plugin.php']]],
['theme_5fpost',['theme_post',['../view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6',1,'theme_post(&$a): config.php'],['../view_2theme_2redstrap_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6',1,'theme_post(&$a): config.php']]],
['theme_5fstatus',['theme_status',['../admin_8php.html#ad4f74f33944a98b56d2c8c7601f124a4',1,'admin.php']]],
+ ['thing_5fcontent',['thing_content',['../thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b',1,'thing.php']]],
+ ['thing_5finit',['thing_init',['../thing_8php.html#a8be23b1d475ec3d9291999221c674c80',1,'thing.php']]],
['timesel',['timesel',['../datetime_8php.html#a36d3d6dff8d76b5f295bb3d9c535a5b1',1,'datetime.php']]],
['timezone_5fcmp',['timezone_cmp',['../datetime_8php.html#aa51b5a7ea4f931b23acbdfcea46e9865',1,'datetime.php']]],
['title_5fis_5fbody',['title_is_body',['../items_8php.html#aa371905f0a211b307cb3f7188c6cba04',1,'items.php']]],
diff --git a/doc/html/search/functions_78.js b/doc/html/search/functions_78.js
index 4a65e7703..0f98f99b9 100644
--- a/doc/html/search/functions_78.js
+++ b/doc/html/search/functions_78.js
@@ -3,7 +3,7 @@ var searchData=
['x',['x',['../boot_8php.html#a01353c9abebc3544ea080ac161729632',1,'boot.php']]],
['xchan_5fcontent',['xchan_content',['../xchan_8php.html#a9853348bf1a35c644460221ba75edc2d',1,'xchan.php']]],
['xchan_5fmail_5fquery',['xchan_mail_query',['../text_8php.html#a543447c5ed766535221e2d9636b379ee',1,'text.php']]],
- ['xchan_5fquery',['xchan_query',['../text_8php.html#a24b2b69b9162da789ab6514e0e09a37c',1,'text.php']]],
+ ['xchan_5fquery',['xchan_query',['../text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f',1,'text.php']]],
['xml2array',['xml2array',['../include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff',1,'network.php']]],
['xml_5fstatus',['xml_status',['../include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6',1,'network.php']]],
['xmlify',['xmlify',['../text_8php.html#aaed4413ed8918838b517e3b2fafaea0d',1,'text.php']]],
diff --git a/doc/html/search/functions_7a.js b/doc/html/search/functions_7a.js
index 0d5d073c4..9c1b34db7 100644
--- a/doc/html/search/functions_7a.js
+++ b/doc/html/search/functions_7a.js
@@ -8,7 +8,7 @@ var searchData=
['z_5freaddir',['z_readdir',['../include_2attach_8php.html#aeb07968990e66a88c95483ca09a7f909',1,'attach.php']]],
['z_5froot',['z_root',['../boot_8php.html#add517a0958ac684792c62142a3877f81',1,'boot.php']]],
['zfinger_5finit',['zfinger_init',['../zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0',1,'zfinger.php']]],
- ['zid',['zid',['../boot_8php.html#a5b7ce5c0a79796800883644c389dc87f',1,'boot.php']]],
+ ['zid',['zid',['../boot_8php.html#a5b815330f3d177ab383af37a6c12e532',1,'boot.php']]],
['zid_5finit',['zid_init',['../boot_8php.html#a680fbafc2db023c5b1309e0180e81315',1,'boot.php']]],
['zidify_5fcallback',['zidify_callback',['../text_8php.html#a405afe814a23f3bd94d826101aa168ab',1,'text.php']]],
['zidify_5fimg_5fcallback',['zidify_img_callback',['../text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4',1,'text.php']]],
diff --git a/doc/html/search/variables_61.js b/doc/html/search/variables_61.js
index 58172f5d8..95336c00b 100644
--- a/doc/html/search/variables_61.js
+++ b/doc/html/search/variables_61.js
@@ -32,6 +32,7 @@ var searchData=
['activity_5fobj_5fphoto',['ACTIVITY_OBJ_PHOTO',['../boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966',1,'boot.php']]],
['activity_5fobj_5fprofile',['ACTIVITY_OBJ_PROFILE',['../boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5',1,'boot.php']]],
['activity_5fobj_5ftagterm',['ACTIVITY_OBJ_TAGTERM',['../boot_8php.html#a1da180f961f49a11573cac4ff6c62c05',1,'boot.php']]],
+ ['activity_5fobj_5fthing',['ACTIVITY_OBJ_THING',['../boot_8php.html#a0fb63e51c2a9814941842ae8f2f4dff8',1,'boot.php']]],
['activity_5fpoke',['ACTIVITY_POKE',['../boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd',1,'boot.php']]],
['activity_5fpost',['ACTIVITY_POST',['../boot_8php.html#a5c3747e0f505f0d5271dc4c54e3feaf4',1,'boot.php']]],
['activity_5freq_5ffriend',['ACTIVITY_REQ_FRIEND',['../boot_8php.html#afe084c30a1810c10442edb4fbcbc0086',1,'boot.php']]],
diff --git a/doc/html/search/variables_69.js b/doc/html/search/variables_69.js
index 484c857dc..97df485bf 100644
--- a/doc/html/search/variables_69.js
+++ b/doc/html/search/variables_69.js
@@ -7,6 +7,7 @@ var searchData=
['item_5fhidden',['ITEM_HIDDEN',['../boot_8php.html#ac99fc4d040764eac1736bec6973556fe',1,'boot.php']]],
['item_5fmentionsme',['ITEM_MENTIONSME',['../boot_8php.html#a8da836617174eed9fc2ac8054125354b',1,'boot.php']]],
['item_5fmoderated',['ITEM_MODERATED',['../boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450',1,'boot.php']]],
+ ['item_5fnocomment',['ITEM_NOCOMMENT',['../boot_8php.html#a949116d9a295b214293006c060ca4848',1,'boot.php']]],
['item_5fnotshown',['ITEM_NOTSHOWN',['../boot_8php.html#a8663f32171568489dbb2a01dd00371f8',1,'boot.php']]],
['item_5fnsfw',['ITEM_NSFW',['../boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08',1,'boot.php']]],
['item_5forigin',['ITEM_ORIGIN',['../boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7',1,'boot.php']]],
diff --git a/doc/html/search/variables_74.js b/doc/html/search/variables_74.js
index 571eac098..e36593332 100644
--- a/doc/html/search/variables_74.js
+++ b/doc/html/search/variables_74.js
@@ -4,10 +4,15 @@ var searchData=
['term_5ffile',['TERM_FILE',['../boot_8php.html#afb97615e985a013799839b68b99018d7',1,'boot.php']]],
['term_5fhashtag',['TERM_HASHTAG',['../boot_8php.html#a2750985ec445617d7e82ae3098c91e3f',1,'boot.php']]],
['term_5fmention',['TERM_MENTION',['../boot_8php.html#ae37444eaa42705185080ccf3e670cbc2',1,'boot.php']]],
+ ['term_5fobj_5fchannel',['TERM_OBJ_CHANNEL',['../boot_8php.html#a8892374789fd261eb32a7969d934a14a',1,'boot.php']]],
+ ['term_5fobj_5fobject',['TERM_OBJ_OBJECT',['../boot_8php.html#a882b666adfe21f035a0f8c02806066d6',1,'boot.php']]],
['term_5fobj_5fphoto',['TERM_OBJ_PHOTO',['../boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd',1,'boot.php']]],
['term_5fobj_5fpost',['TERM_OBJ_POST',['../boot_8php.html#a9eeb8989272d5ff804a616898bb13659',1,'boot.php']]],
+ ['term_5fobj_5fprofile',['TERM_OBJ_PROFILE',['../boot_8php.html#aead84fa27d7516b855220fe004964a45',1,'boot.php']]],
+ ['term_5fobj_5fthing',['TERM_OBJ_THING',['../boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe',1,'boot.php']]],
['term_5fpcategory',['TERM_PCATEGORY',['../boot_8php.html#a45b12aefab9675baffc7a07a09486db8',1,'boot.php']]],
['term_5fsavedsearch',['TERM_SAVEDSEARCH',['../boot_8php.html#abd7bb40da9cc073297e49736b338ca07',1,'boot.php']]],
+ ['term_5fthing',['TERM_THING',['../boot_8php.html#a0d877df1e20bae765e1708be50f6b503',1,'boot.php']]],
['term_5funknown',['TERM_UNKNOWN',['../boot_8php.html#a0c59dde058efebbc66520d136cbd1631',1,'boot.php']]],
['tplpaths',['tplpaths',['../namespaceupdatetpl.html#a52a85ffa6b6d63d840b185a133478c12',1,'updatetpl']]]
];
diff --git a/doc/html/security_8php.html b/doc/html/security_8php.html
index 8424ba7e1..1d91cb7cf 100644
--- a/doc/html/security_8php.html
+++ b/doc/html/security_8php.html
@@ -303,7 +303,7 @@ Functions
-
Referenced by admin_page_logs_post() , admin_page_plugins() , admin_page_site_post() , admin_page_themes() , admin_page_users() , admin_page_users_post() , group_content() , group_post() , invite_post() , profile_photo_post() , profiles_init() , profiles_post() , and settings_post() .
+
Referenced by admin_page_logs_post() , admin_page_plugins() , admin_page_site_post() , admin_page_themes() , admin_page_users() , admin_page_users_post() , group_content() , group_post() , invite_post() , profile_photo_post() , profiles_init() , profiles_post() , and settings_post() .
diff --git a/doc/html/taxonomy_8php.html b/doc/html/taxonomy_8php.html
new file mode 100644
index 000000000..f1d05bd2b
--- /dev/null
+++ b/doc/html/taxonomy_8php.html
@@ -0,0 +1,435 @@
+
+
+
+
+
+
+The Red Matrix: include/taxonomy.php File Reference
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The Red Matrix
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ file_tag_encode ($s)
+
+ file_tag_decode ($s)
+
+ file_tag_file_query ($table, $s, $type= 'file')
+
+ term_query ($table, $s, $type=TERM_UNKNOWN )
+
+ store_item_tag ($uid, $iid, $otype, $type, $term, $url= '')
+
+ get_terms_oftype ($arr, $type)
+
+ format_term_for_display ($term)
+
+ tagadelic ($uid, $count=0, $type=TERM_HASHTAG )
+
+ tags_sort ($a, $b)
+
+ tagblock ($link, $uid, $count=0, $type=TERM_HASHTAG )
+
+
+
+
+
+
+
+
+ file_tag_decode
+ (
+
+ $s )
+
+
+
+
+
+
+
+
+
+
+
+
+ file_tag_encode
+ (
+
+ $s )
+
+
+
+
+
+
+
+
+
+
+
+
+ file_tag_file_query
+ (
+
+ $table ,
+
+
+
+
+
+ $s ,
+
+
+
+
+
+ $type = 'file'
+
+
+
+ )
+
+
+
+
+
+
+
+
+
+
+ format_term_for_display
+ (
+
+ $term )
+
+
+
+
+
+
+
+
+
+
+ get_terms_oftype
+ (
+
+ $arr ,
+
+
+
+
+
+ $type
+
+
+
+ )
+
+
+
+
+
+
+
+
+
+
+ store_item_tag
+ (
+
+ $uid ,
+
+
+
+
+
+ $iid ,
+
+
+
+
+
+ $otype ,
+
+
+
+
+
+ $type ,
+
+
+
+
+
+ $term ,
+
+
+
+
+
+ $url = ''
+
+
+
+ )
+
+
+
+
+
+
+
+
+
+
+ tagadelic
+ (
+
+ $uid ,
+
+
+
+
+
+ $count = 0
,
+
+
+
+
+
+ $type = TERM_HASHTAG
+
+
+
+ )
+
+
+
+
+
+
+
+
+
+
+ tagblock
+ (
+
+ $link ,
+
+
+
+
+
+ $uid ,
+
+
+
+
+
+ $count = 0
,
+
+
+
+
+
+ $type = TERM_HASHTAG
+
+
+
+ )
+
+
+
+
+
+
+
+
+
+
+
+
+ tags_sort
+ (
+
+ $a ,
+
+
+
+
+
+ $b
+
+
+
+ )
+
+
+
+
+
+
+
+
+
+
+
+
+ term_query
+ (
+
+ $table ,
+
+
+
+
+
+ $s ,
+
+
+
+
+
+ $type = TERM_UNKNOWN
+
+
+
+ )
+
+
+
+
+
+
+
+
diff --git a/doc/html/taxonomy_8php.js b/doc/html/taxonomy_8php.js
new file mode 100644
index 000000000..3b22e6d3f
--- /dev/null
+++ b/doc/html/taxonomy_8php.js
@@ -0,0 +1,13 @@
+var taxonomy_8php =
+[
+ [ "file_tag_decode", "taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6", null ],
+ [ "file_tag_encode", "taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37", null ],
+ [ "file_tag_file_query", "taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1", null ],
+ [ "format_term_for_display", "taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1", null ],
+ [ "get_terms_oftype", "taxonomy_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1", null ],
+ [ "store_item_tag", "taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd", null ],
+ [ "tagadelic", "taxonomy_8php.html#afe44c30f1d0f8cb3ca097d4e189d852d", null ],
+ [ "tagblock", "taxonomy_8php.html#a4f3605ee8de717a401ea9df2401b59f6", null ],
+ [ "tags_sort", "taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43", null ],
+ [ "term_query", "taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c", null ]
+];
\ No newline at end of file
diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html
index a3bca5a58..85adf77e2 100644
--- a/doc/html/text_8php.html
+++ b/doc/html/text_8php.html
@@ -235,30 +235,6 @@ Functions
item_post_type ($item)
- file_tag_encode ($s)
-
- file_tag_decode ($s)
-
- file_tag_file_query ($table, $s, $type= 'file')
-
- term_query ($table, $s, $type=TERM_UNKNOWN )
-
- file_tag_list_to_file ($list, $type= 'file')
-
- file_tag_file_to_list ($file, $type= 'file')
-
- file_tag_update_pconfig ($uid, $file_old, $file_new, $type= 'file')
-
- store_item_tag ($uid, $iid, $otype, $type, $term, $url= '')
-
- get_terms_oftype ($arr, $type)
-
- format_term_for_display ($term)
-
- file_tag_save_file ($uid, $item, $file)
-
- file_tag_unsave_file ($uid, $item, $file, $cat=false)
-
normalise_openid ($s)
undo_post_tagging ($s)
@@ -275,8 +251,8 @@ Functions
ids_to_querystr ($arr, $idx= 'id')
- xchan_query (&$items, $abook=false)
-
+ xchan_query (&$items, $abook=true)
+
xchan_mail_query (&$item)
find_xchan_in_array ($xchan, $arr)
@@ -289,12 +265,6 @@ Functions
jindent ($json)
- tagadelic ($uid, $count=0, $type=TERM_HASHTAG )
-
- tags_sort ($a, $b)
-
- tagblock ($link, $uid, $count=0, $type=TERM_HASHTAG )
-
@@ -328,7 +298,7 @@ Variables
-
Referenced by Item\add_child() , Conversation\add_thread() , consume_feed() , get_atom_elements() , localize_item() , process_delivery() , and visible_activity() .
+
Referenced by Item\add_child() , Conversation\add_thread() , consume_feed() , conversation() , get_atom_elements() , item_post_type() , like_puller() , localize_item() , process_delivery() , and visible_activity() .
@@ -557,7 +527,7 @@ Variables
-
Referenced by Item\check_wall_to_wall() , directory_content() , fetch_post_tags() , Item\get_template_data() , localize_item() , randprof_init() , and suggest_content() .
+
Referenced by Item\check_wall_to_wall() , directory_content() , fetch_post_tags() , Item\get_template_data() , localize_item() , randprof_init() , and suggest_content() .
@@ -679,7 +649,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() , local_delivery() , mail_store() , message_content() , message_post() , network_content() , post_activity_item() , printable() , and profiles_post() .
+Referenced by admin_page_logs() , channel_content() , create_identity() , events_post() , fsuggest_post() , get_atom_elements() , item_post() , item_store() , item_store_update() , local_delivery() , mail_store() , message_content() , message_post() , network_content() , post_activity_item() , printable() , profiles_post() , and thing_init() .
@@ -731,240 +701,6 @@ Variables
-
-
-
-
-
-
-
- file_tag_decode
- (
-
- $s )
-
-
-
-
-
-
-
-
-
-
- file_tag_encode
- (
-
- $s )
-
-
-
-
-
-
-
-
-
-
- file_tag_file_query
- (
-
- $table ,
-
-
-
-
-
- $s ,
-
-
-
-
-
- $type = 'file'
-
-
-
- )
-
-
-
-
-
-
-
-
-
-
- file_tag_file_to_list
- (
-
- $file ,
-
-
-
-
-
- $type = 'file'
-
-
-
- )
-
-
-
-
-
-
-
-
-
-
- file_tag_list_to_file
- (
-
- $list ,
-
-
-
-
-
- $type = 'file'
-
-
-
- )
-
-
-
-
-
-
-
-
-
-
- file_tag_save_file
- (
-
- $uid ,
-
-
-
-
-
- $item ,
-
-
-
-
-
- $file
-
-
-
- )
-
-
-
-
-
-
-
-
-
-
-
-
- file_tag_unsave_file
- (
-
- $uid ,
-
-
-
-
-
- $item ,
-
-
-
-
-
- $file ,
-
-
-
-
-
- $cat = false
-
-
-
- )
-
-
-
-
-
-
-
-
-
-
-
-
- file_tag_update_pconfig
- (
-
- $uid ,
-
-
-
-
-
- $file_old ,
-
-
-
-
-
- $file_new ,
-
-
-
-
-
- $type = 'file'
-
-
-
- )
-
-
-
-
-
@@ -991,7 +727,7 @@ Variables
@@ -1011,22 +747,6 @@ Variables
Referenced by item_post() , message_post() , and profiles_post() .
-
-
-
-
-
-
-
- format_term_for_display
- (
-
- $term )
-
-
-
-
-
@@ -1101,7 +821,7 @@ Variables
@@ -1146,7 +866,7 @@ Variables
@@ -1166,34 +886,6 @@ Variables
Referenced by item_post() , and photos_post() .
-
-
-
-
-
-
-
- get_terms_oftype
- (
-
- $arr ,
-
-
-
-
-
- $type
-
-
-
- )
-
-
-
-
@@ -1380,7 +1072,7 @@ Variables
Compare two URLs to see if they are the same, but ignore slight but hopefully insignificant differences such as if one is https and the other isn't, or if one is www.something and the other isn't - and also ignore case differences.
Return true if the URLs match, otherwise false.
-Referenced by consume_feed() , local_delivery() , tag_deliver() , tgroup_check() , and zid() .
+Referenced by consume_feed() , like_puller() , local_delivery() , tag_deliver() , tgroup_check() , and zid() .
@@ -1428,7 +1120,7 @@ Variables
-
Referenced by account_verify_password() , Item\add_child() , Conversation\add_thread() , 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() , channel_remove() , chanview_content() , check_config() , check_form_security_token_ForbiddenOnErr() , check_form_security_token_redirectOnErr() , consume_feed() , 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() , encode_mail() , 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() , http_status_exit() , import_author_xchan() , import_channel_photo() , import_directory_profile() , import_post() , import_profile_photo() , import_xchan() , install_plugin() , item_expire() , item_post() , item_store() , item_store_update() , like_content() , limit_body_size() , load_plugin() , local_delivery() , FKOAuth1\loginUser() , FKOAuthDataStore\lookup_consumer() , FKOAuthDataStore\lookup_token() , lrdd() , magic_init() , mail_store() , message_content() , message_post() , mini_group_select() , mood_init() , FKOAuthDataStore\new_access_token() , new_contact() , new_keypair() , FKOAuthDataStore\new_request_token() , notification() , notifier_run() , onepoll_run() , parse_url_content() , parse_xml_string() , photo_upload() , photos_post() , ping_init() , poco_init() , poco_load() , poke_init() , poller_run() , post_activity_item() , post_init() , post_post() , process_delivery() , process_mail_delivery() , process_profile_delivery() , profile_load() , dba_mysql\q() , dba_mysqli\q() , q() , queue_run() , redir_init() , register_content() , reload_plugins() , Item\remove_child() , 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() , zot_build_packet() , zot_fetch() , zot_finger() , zot_gethub() , zot_import() , zot_process_response() , zot_refresh() , and zot_register_hub() .
+
Referenced by account_verify_password() , Item\add_child() , Conversation\add_thread() , 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() , 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() , encode_mail() , 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() , http_status_exit() , import_author_xchan() , import_channel_photo() , import_directory_profile() , import_post() , import_profile_photo() , import_xchan() , install_plugin() , item_expire() , item_post() , item_store() , item_store_update() , like_content() , limit_body_size() , load_plugin() , local_delivery() , FKOAuth1\loginUser() , FKOAuthDataStore\lookup_consumer() , FKOAuthDataStore\lookup_token() , lrdd() , magic_init() , mail_store() , message_content() , message_post() , mini_group_select() , mood_init() , FKOAuthDataStore\new_access_token() , new_contact() , new_keypair() , FKOAuthDataStore\new_request_token() , notification() , notifier_run() , onepoll_run() , parse_url_content() , parse_xml_string() , photo_upload() , photos_post() , ping_init() , poco_init() , poco_load() , poke_init() , poller_run() , post_activity_item() , post_init() , post_post() , process_delivery() , process_mail_delivery() , process_profile_delivery() , profile_load() , dba_mysql\q() , dba_mysqli\q() , q() , queue_run() , redir_init() , register_content() , reload_plugins() , Item\remove_child() , 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() , zot_build_packet() , zot_fetch() , zot_finger() , zot_gethub() , zot_import() , zot_process_response() , zot_refresh() , and zot_register_hub() .
@@ -1478,6 +1170,8 @@ Variables
@@ -1534,7 +1228,7 @@ Variables
-
Referenced by best_link_url() , delegate_content() , link_compare() , local_delivery() , new_follower() , tag_deliver() , and tgroup_check() .
+
Referenced by best_link_url() , conversation() , delegate_content() , item_photo_menu() , link_compare() , local_delivery() , new_follower() , tag_deliver() , and tgroup_check() .
@@ -1579,7 +1273,7 @@ Variables
Returns string Filtered string
-Referenced by admin_page_logs_post() , admin_page_site_post() , community_content() , connections_content() , consume_feed() , create_account() , directory_content() , dirfind_content() , follow_init() , get_atom_elements() , group_post() , help_content() , invite_post() , item_post() , item_store() , item_store_update() , like_content() , local_delivery() , lostpass_post() , mail_store() , message_post() , mood_init() , network_content() , new_follower() , oexchange_content() , photos_post() , poco_init() , poke_init() , profile_tabs() , profiles_post() , qsearch_init() , register_post() , sanitise_acl() , settings_post() , setup_content() , setup_post() , subthread_content() , tagger_content() , and xrd_init() .
+Referenced by admin_page_logs_post() , admin_page_site_post() , community_content() , connections_content() , consume_feed() , conversation() , create_account() , directory_content() , dirfind_content() , follow_init() , get_atom_elements() , group_post() , help_content() , invite_post() , item_post() , item_store() , item_store_update() , like_content() , local_delivery() , lostpass_post() , mail_store() , message_post() , mood_init() , network_content() , new_follower() , oexchange_content() , photos_post() , poco_init() , poke_init() , profile_tabs() , profiles_post() , qsearch_init() , register_post() , sanitise_acl() , settings_post() , setup_content() , setup_post() , subthread_content() , tagger_content() , and xrd_init() .
@@ -1615,7 +1309,7 @@ Variables
@@ -1676,7 +1370,7 @@ Variables
@@ -1738,7 +1432,7 @@ Variables
@@ -1756,7 +1450,7 @@ Variables
-
Referenced by acl_init() , api_statuses_mentions() , attach_count_files() , attach_list_files() , channel_content() , connections_content() , dirsearch_content() , file_tag_file_query() , item_permissions_sql() , items_fetch() , network_content() , permissions_sql() , photos_list_photos() , public_permissions_sql() , search_ac_init() , search_content() , and term_query() .
+
Referenced by acl_init() , api_statuses_mentions() , attach_count_files() , attach_list_files() , channel_content() , connections_content() , dirsearch_content() , file_tag_file_query() , item_permissions_sql() , items_fetch() , network_content() , permissions_sql() , photos_list_photos() , public_permissions_sql() , search_ac_init() , search_content() , and term_query() .
@@ -1818,7 +1512,7 @@ Variables
-
Referenced by aes_encapsulate() , attach_store() , create_account() , create_identity() , dfrn_deliver() , event_store() , fsuggest_post() , generate_user_guid() , group_add() , item_message_id() , item_store() , local_delivery() , lostpass_content() , lostpass_post() , magic_init() , mail_store() , new_follower() , notification() , notifier_run() , prepare_body() , profiles_init() , redir_init() , removeme_content() , send_message() , send_reg_approval_email() , settings_post() , and setup_post() .
+
Referenced by aes_encapsulate() , attach_store() , build_sync_packet() , create_account() , create_identity() , dfrn_deliver() , event_store() , fsuggest_post() , generate_user_guid() , group_add() , item_message_id() , item_store() , local_delivery() , lostpass_content() , lostpass_post() , magic_init() , mail_store() , new_follower() , notification() , notifier_run() , prepare_body() , profiles_init() , redir_init() , removeme_content() , send_message() , send_reg_approval_email() , settings_post() , setup_post() , and thing_init() .
@@ -1883,7 +1577,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() , crepair_content() , delegate_content() , directory_content() , dirfind_content() , display_content() , editpost_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() , login() , lostpass_content() , lostpass_post() , manage_content() , match_content() , message_aside() , message_content() , micropro() , mini_group_select() , mood_content() , nav() , network_content() , new_channel_content() , new_follower() , nogroup_content() , notification() , notifications_content() , notify_content() , oembed_format_object() , oexchange_init() , opensearch_init() , 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() , user_allow() , vcard_from_xchan() , viewconnections_content() , 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() , connections_content() , construct_page() , contact_block() , conversation() , crepair_content() , delegate_content() , directory_content() , dirfind_content() , display_content() , editpost_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() , login() , lostpass_content() , lostpass_post() , manage_content() , match_content() , message_aside() , message_content() , micropro() , mini_group_select() , mood_content() , nav() , network_content() , new_channel_content() , new_follower() , nogroup_content() , notification() , notifications_content() , notify_content() , oembed_format_object() , oexchange_init() , opensearch_init() , 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() , user_allow() , vcard_from_xchan() , viewconnections_content() , and xrd_init() .
@@ -2023,58 +1717,6 @@ Variables
Referenced by message_content() , and smilies_content() .
-
-
-
-
-
-
-
- store_item_tag
- (
-
- $uid ,
-
-
-
-
-
- $iid ,
-
-
-
-
-
- $otype ,
-
-
-
-
-
- $type ,
-
-
-
-
-
- $term ,
-
-
-
-
-
- $url = ''
-
-
-
- )
-
-
-
-
@@ -2103,138 +1745,6 @@ Variables
Referenced by expand_groups() , identity_basic_export() , lockview_content() , notifier_run() , and zot_import() .
-
-
-
-
-
-
-
- tagadelic
- (
-
- $uid ,
-
-
-
-
-
- $count = 0
,
-
-
-
-
-
- $type = TERM_HASHTAG
-
-
-
- )
-
-
-
-
-
-
-
-
-
-
- tagblock
- (
-
- $link ,
-
-
-
-
-
- $uid ,
-
-
-
-
-
- $count = 0
,
-
-
-
-
-
- $type = TERM_HASHTAG
-
-
-
- )
-
-
-
-
-
-
-
-
-
-
-
-
- tags_sort
- (
-
- $a ,
-
-
-
-
-
- $b
-
-
-
- )
-
-
-
-
-
-
-
-
-
-
-
-
- term_query
- (
-
- $table ,
-
-
-
-
-
- $s ,
-
-
-
-
-
- $type = TERM_UNKNOWN
-
-
-
- )
-
-
-
-
@@ -2303,7 +1813,7 @@ Variables
@@ -2325,7 +1835,7 @@ Variables
-
+
@@ -2339,7 +1849,7 @@ Variables
- $abook = false
+ $abook = true
@@ -2427,6 +1937,8 @@ Variables
diff --git a/doc/html/text_8php.js b/doc/html/text_8php.js
index 7f4842268..4e6d6f65f 100644
--- a/doc/html/text_8php.js
+++ b/doc/html/text_8php.js
@@ -20,17 +20,8 @@ var text_8php =
[ "expand_acl", "text_8php.html#ae4282a39492caa23ccbc2ce98e54f110", null ],
[ "feed_hublinks", "text_8php.html#a8d8c4a11e53461caca21181ebd72daca", null ],
[ "feed_salmonlinks", "text_8php.html#a89929fa6f70a8ba54d5273fcf622b665", null ],
- [ "file_tag_decode", "text_8php.html#a08df5164926d2b31b8e9fcfe919de2b6", null ],
- [ "file_tag_encode", "text_8php.html#a3299482ac20e9d79453048dd52881d37", null ],
- [ "file_tag_file_query", "text_8php.html#a163b5131f388080b0fc82398d3a32fe1", null ],
- [ "file_tag_file_to_list", "text_8php.html#a544fc13c1798371e5a5984b5482108f8", null ],
- [ "file_tag_list_to_file", "text_8php.html#abb55ec0142207aeec3d90b25ed4d7266", null ],
- [ "file_tag_save_file", "text_8php.html#a30311fd46e05be0e2cc466118641a4ed", null ],
- [ "file_tag_unsave_file", "text_8php.html#a48f6d04513d26270e10e9b7d153f7526", null ],
- [ "file_tag_update_pconfig", "text_8php.html#abbe4894b4e746e47e1f91c7df27f6e81", null ],
[ "find_xchan_in_array", "text_8php.html#ace3c98538c63e09b70a363210b414112", null ],
[ "fix_mce_lf", "text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28", null ],
- [ "format_term_for_display", "text_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1", null ],
[ "generate_user_guid", "text_8php.html#ae4f6881d7e13623f8eded6277595112a", null ],
[ "get_mentions", "text_8php.html#a76d1b3435c067978d7b484c45f56472b", null ],
[ "get_mood_verbs", "text_8php.html#a736db13a966b8abaf8c9198faa35911a", null ],
@@ -38,7 +29,6 @@ var text_8php =
[ "get_poke_verbs", "text_8php.html#aa46f941155c2ac1155f2f17ffb0adb66", null ],
[ "get_rel_link", "text_8php.html#a3972701c5c83624ec4e2d06242f614e7", null ],
[ "get_tags", "text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623", null ],
- [ "get_terms_oftype", "text_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1", null ],
[ "html2bb_video", "text_8php.html#a138a3a611fa7f4f3630674145fc826bf", null ],
[ "ids_to_querystr", "text_8php.html#a436a8de00c942364c2d0fcfc7e1f4b5a", null ],
[ "is_a_date_arg", "text_8php.html#a1557112a774ec00fa06ed6b6f6495506", null ],
@@ -75,18 +65,13 @@ var text_8php =
[ "smile_decode", "text_8php.html#aca0f589be74fab1a460c57e88dad9779", null ],
[ "smile_encode", "text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6", null ],
[ "smilies", "text_8php.html#a3d225b253bb9e0f2498c11647d927b0b", null ],
- [ "store_item_tag", "text_8php.html#a4ba1339b2a7054971178ce194e4440fd", null ],
[ "stringify_array_elms", "text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13", null ],
- [ "tagadelic", "text_8php.html#afe44c30f1d0f8cb3ca097d4e189d852d", null ],
- [ "tagblock", "text_8php.html#a4f3605ee8de717a401ea9df2401b59f6", null ],
- [ "tags_sort", "text_8php.html#aaeded36bcc983b35d9205fe5b6c18c43", null ],
- [ "term_query", "text_8php.html#a7a913d19c77610da689be48fbbf6734c", null ],
[ "unamp", "text_8php.html#a29d6b804e368d3ef359ee295e96ed4c7", null ],
[ "undo_post_tagging", "text_8php.html#a740ad03e00459039a2c0992246c4e727", null ],
[ "unxmlify", "text_8php.html#a1360fed7f918d859daaca1c9f384f9af", null ],
[ "valid_email", "text_8php.html#a6a3d80a6c6fb234fd0bac44203b828eb", null ],
[ "xchan_mail_query", "text_8php.html#a543447c5ed766535221e2d9636b379ee", null ],
- [ "xchan_query", "text_8php.html#a24b2b69b9162da789ab6514e0e09a37c", null ],
+ [ "xchan_query", "text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f", null ],
[ "xmlify", "text_8php.html#aaed4413ed8918838b517e3b2fafaea0d", null ],
[ "zidify_callback", "text_8php.html#a405afe814a23f3bd94d826101aa168ab", null ],
[ "zidify_img_callback", "text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4", null ],
diff --git a/doc/html/thing_8php.html b/doc/html/thing_8php.html
new file mode 100644
index 000000000..b6183f78e
--- /dev/null
+++ b/doc/html/thing_8php.html
@@ -0,0 +1,155 @@
+
+
+
+
+
+
+The Red Matrix: mod/thing.php File Reference
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The Red Matrix
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ thing_content
+ (
+ &
+ $a )
+
+
+
+
+
+
+
+
+
+
+
+
+ thing_init
+ (
+ &
+ $a )
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/html/thing_8php.js b/doc/html/thing_8php.js
new file mode 100644
index 000000000..9fe6a8ff6
--- /dev/null
+++ b/doc/html/thing_8php.js
@@ -0,0 +1,5 @@
+var thing_8php =
+[
+ [ "thing_content", "thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b", null ],
+ [ "thing_init", "thing_8php.html#a8be23b1d475ec3d9291999221c674c80", null ]
+];
\ No newline at end of file
diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html
index d1d0e487e..840499676 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() , 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() , 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() , common_aside() , common_content() , common_friends_visitor_widget() , common_init() , community_content() , connections_aside() , connections_content() , connections_init() , connections_post() , construct_page() , consume_feed() , contact_block() , contact_select() , 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() , 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() , help_content() , hostxrd_init() , import_channel_photo() , import_content() , import_post() , import_profile_photo() , info() , intro_aside() , intro_content() , invite_content() , invite_post() , is_site_admin() , item_content() , item_post() , items_fetch() , lang_selector() , like_content() , link_compare() , load_config() , load_contact_links() , load_database() , load_hooks() , load_pconfig() , load_translation_table() , load_xconfig() , local_delivery() , logger() , login() , login_content() , FKOAuth1\loginUser() , lostpass_content() , lostpass_post() , lrdd() , magic_init() , manual_config() , match_content() , message_aside() , message_content() , message_post() , mood_init() , msearch_post() , nav() , nav_set_selected() , network_content() , network_init() , new_contact() , new_follower() , 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() , paginate() , 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_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() , 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() , viewconnections_aside() , viewconnections_content() , viewconnections_init() , viewsrc_content() , wall_upload_post() , wfinger_init() , what_next() , xrd_init() , z_fetch_url() , z_path() , z_root() , 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() , common_aside() , common_content() , common_friends_visitor_widget() , common_init() , community_content() , connections_aside() , connections_clone() , connections_content() , connections_init() , connections_post() , construct_page() , consume_feed() , 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() , 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() , help_content() , hostxrd_init() , import_channel_photo() , import_content() , 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() , like_content() , like_puller() , link_compare() , load_config() , load_contact_links() , load_database() , load_hooks() , load_pconfig() , load_translation_table() , load_xconfig() , local_delivery() , logger() , login() , login_content() , FKOAuth1\loginUser() , lostpass_content() , lostpass_post() , lrdd() , magic_init() , manual_config() , match_content() , message_aside() , message_content() , message_post() , mood_init() , msearch_post() , nav() , nav_set_selected() , network_content() , network_init() , new_contact() , new_follower() , 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() , paginate() , 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_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() , viewconnections_aside() , viewconnections_content() , viewconnections_init() , viewsrc_content() , wall_upload_post() , wfinger_init() , what_next() , xrd_init() , z_fetch_url() , z_path() , z_root() , zid_init() , and zotfeed_init() .
diff --git a/doc/html/view_2theme_2redbasic_2php_2config_8php.html b/doc/html/view_2theme_2redbasic_2php_2config_8php.html
index f6085724e..c5a6eed98 100644
--- a/doc/html/view_2theme_2redbasic_2php_2config_8php.html
+++ b/doc/html/view_2theme_2redbasic_2php_2config_8php.html
@@ -239,7 +239,7 @@ Functions
diff --git a/doc/html/zot_8php.html b/doc/html/zot_8php.html
index 07d97deca..93fb59fd4 100644
--- a/doc/html/zot_8php.html
+++ b/doc/html/zot_8php.html
@@ -527,7 +527,7 @@ if($recipients)
$x = z_post_url($url,$params);
return($x);
-Referenced by directory_run() , notifier_run() , and post_init() .
+Referenced by build_sync_packet() , directory_run() , notifier_run() , and post_init() .
diff --git a/doc/install/sample-nginx.conf b/doc/install/sample-nginx.conf
index 3f33044fb..718524ee3 100644
--- a/doc/install/sample-nginx.conf
+++ b/doc/install/sample-nginx.conf
@@ -1,29 +1,114 @@
-# A sample configuration for The Red Matrix on Nginx. One should also take care to block access to dot files, etc, in their standard.conf.
+##
+# Red Nginx configuration
+# by Olaf Conradi
+#
+# On Debian based distributions you can add this file to
+# /etc/nginx/sites-available
+#
+# Then customize to your needs. To enable the configuration
+# symlink it to /etc/nginx/sites-enabled and reload Nginx
+# using /etc/init.d/nginx reload
+##
+##
+# You should look at the following URL's in order to grasp a solid understanding
+# of Nginx configuration files in order to fully unleash the power of Nginx.
+#
+# http://wiki.nginx.org/Pitfalls
+# http://wiki.nginx.org/QuickStart
+# http://wiki.nginx.org/Configuration
+##
+
+##
+# This configuration assumes your domain is example.net
+# You have a separate subdomain red.example.net
+# You want all red traffic to be https
+# You have an SSL certificate and key for your subdomain
+# You have PHP FastCGI Process Manager (php5-fpm) running on localhost
+# You have Red installed in /var/www/red
+##
server {
-listen 80;
-listen 443 ssl;
-server_name example.com;
-ssl_certificate /path/to/ssl.crt;
-ssl_certificate_key /path/to/ssl.key;
-
-root /var/www/example.com;
- index index.php;
- access_log /var/log/nginx/example.com.log;
- include standard.conf;
- location ~ \.php$ {
- fastcgi_split_path_info ^(.+\.php)(/.+)$;
- include fastcgi_params;
- fastcgi_intercept_errors on;
- fastcgi_pass php;
- fastcgi_read_timeout 300;
- }
- if (!-e $request_filename){
- rewrite ^(.*)$ /index.php?q=$1 last;
- }
- location / {
- try_files $uri $uri/ /index.php;
- }
+ server_name red.example.net;
+ index index.php;
+ root /var/www/red;
+ rewrite ^ https://red.example.net$request_uri? permanent;
}
+##
+# Configure Red with SSL
+#
+# All requests are routed to the front controller
+# except for certain known file types like images, css, etc.
+# Those are served statically whenever possible with a
+# fall back to the front controller (needed for avatars, for example)
+##
+
+server {
+ listen 80;
+ listen 443 ssl;
+ ssl on;
+ server_name red.example.net;
+ ssl_certificate /etc/nginx/ssl/red.example.net.chain.pem;
+ ssl_certificate_key /etc/nginx/ssl/example.net.key;
+ ssl_session_timeout 5m;
+ ssl_protocols SSLv3 TLSv1;
+ ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
+ ssl_prefer_server_ciphers on;
+
+
+ index index.php;
+ charset utf-8;
+ root /var/www/red;
+ access_log /var/log/nginx/red.log main;
+ #Uncomment the following line to include a standard configuration file
+ #include standard.conf
+ # allow uploads up to 20MB in size
+ client_max_body_size 20m;
+ client_body_buffer_size 128k;
+
+ # rewrite to front controller as default rule
+ location / {
+ rewrite ^/(.*) /index.php?q=$uri&$args last;
+ }
+
+ # make sure webfinger and other well known services aren't blocked
+ # by denying dot files and rewrite request to the front controller
+ location ^~ /.well-known/ {
+ allow all;
+ rewrite ^/(.*) /index.php?q=$uri&$args last;
+ }
+
+ # statically serve these file types when possible
+ # otherwise fall back to front controller
+ # allow browser to cache them
+ # added .htm for advanced source code editor library
+ location ~* \.(jpg|jpeg|gif|png|ico|css|js|htm|html|ttf|svg)$ {
+ expires 30d;
+ try_files $uri /index.php?q=$uri&$args;
+ }
+
+ # block these file types
+ location ~* \.(tpl|md|tgz|log|out)$ {
+ deny all;
+ }
+
+ # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
+ location ~* \.php$ {
+ fastcgi_split_path_info ^(.+\.php)(/.+)$;
+ # NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini
+
+ # With php5-cgi alone:
+ # fastcgi_pass 127.0.0.1:9000;
+
+ # With php5-fpm:
+ fastcgi_pass unix:/var/run/php5-fpm.sock;
+ fastcgi_index index.php;
+ include fastcgi_params;
+ }
+
+ # deny access to all dot files
+ location ~ /\. {
+ deny all;
+ }
+}
diff --git a/include/Contact.php b/include/Contact.php
index b2d459ca4..245682454 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -76,6 +76,9 @@ function abook_toggle_flag($abook,$flag) {
intval($abook['abook_id']),
intval($abook['abook_channel'])
);
+ $a = get_app();
+ if($a->data['abook'])
+ $a->data['abook']['abook_flags'] = $a->data['abook']['abook_flags'] ^ $flag;
return $r;
}
diff --git a/include/ItemObject.php b/include/ItemObject.php
index ccd192ff5..e057936ae 100644
--- a/include/ItemObject.php
+++ b/include/ItemObject.php
@@ -44,14 +44,9 @@ class Item extends BaseObject {
$this->commentable = $this->writable;
if(($this->observer) && (! $this->writable)) {
- $this->commentable = perm_is_allowed($this->data['uid'],$this->observer['xchan_hash'],'post_comments');
+ $this->commentable = can_comment_on_post($this->observer['xchan_hash'],$data);
}
-// logger('writable: ' . $this->writable);
-// logger('commentable: ' . $this->commentable . ' uid=' . $this->data['uid'] . ' observer=' . $this->observer['xchan_hash']);
-// if(get_config('system','thread_allow') && $a->theme_thread_allow && !$this->is_toplevel())
-// $this->threaded = true;
-
// Prepare the children
if(count($data['children'])) {
foreach($data['children'] as $item) {
@@ -152,6 +147,7 @@ class Item extends BaseObject {
$this->check_wall_to_wall();
if($this->is_toplevel()) {
+ // FIXME check this permission
if($conv->get_profile_owner() == local_user()) {
// FIXME we don't need all this stuff, some can be done in the template
@@ -166,15 +162,19 @@ class Item extends BaseObject {
'starred' => t('starred'),
);
- $tagger = array(
- 'tagit' => t("add tag"),
- 'classtagger' => "",
- );
}
} else {
$indent = 'comment';
}
+ // FIXME - check this permission
+ if($conv->get_profile_owner() == local_user()) {
+ $tagger = array(
+ 'tagit' => t("add tag"),
+ 'classtagger' => "",
+ );
+ }
+
if($this->is_commentable()) {
$like = array( t("I like this \x28toggle\x29"), t("like"));
$dislike = array( t("I don't like this \x28toggle\x29"), t("dislike"));
diff --git a/include/bbcode.php b/include/bbcode.php
index 4f99a8038..862570348 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -424,11 +424,14 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
$Text = preg_replace_callback("/\[video\](.*?)\[\/video\]/ism", 'tryoembed', $Text);
$Text = preg_replace_callback("/\[audio\](.*?)\[\/audio\]/ism", 'tryoembed', $Text);
- } else {
- $Text = preg_replace("/\[video\](.*?)\[\/video\]/", '$1', $Text);
- $Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '$1', $Text);
}
+ // if video couldn't be embedded, link to it instead.
+
+ $Text = preg_replace("/\[video\](.*?)\[\/video\]/", '$1 ', $Text);
+ $Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '$1 ', $Text);
+
+
// html5 video and audio
diff --git a/include/cli_startup.php b/include/cli_startup.php
index 1d5861541..6bd4e7520 100644
--- a/include/cli_startup.php
+++ b/include/cli_startup.php
@@ -21,7 +21,6 @@ function cli_startup() {
require_once('include/session.php');
- load_config('config');
load_config('system');
$a->set_baseurl(get_config('system','baseurl'));
diff --git a/include/config.php b/include/config.php
index dc4470823..1f7a4dbd7 100644
--- a/include/config.php
+++ b/include/config.php
@@ -17,20 +17,23 @@
function load_config($family) {
global $a;
- $r = q("SELECT * FROM config WHERE cat = '%s'", dbesc($family));
- if($r) {
- foreach($r as $rr) {
- $k = $rr['k'];
- if ($family === 'config') {
- $a->config[$k] = $rr['v'];
- } else {
- $a->config[$family][$k] = $rr['v'];
+
+ if(! array_key_exists($family,$a->config))
+ $a->config[$family] = array();
+
+ if(! array_key_exists('config_loaded',$a->config[$family])) {
+
+ $r = q("SELECT * FROM config WHERE cat = '%s'", dbesc($family));
+ if($r !== false) {
+ if($r) {
+ foreach($r as $rr) {
+ $k = $rr['k'];
+ $a->config[$family][$k] = $rr['v'];
+ }
}
+ $a->config[$family]['config_loaded'] = true;
}
- } else if ($family != 'config') {
- // Negative caching
- $a->config[$family] = "!!";
- }
+ }
}
// get a particular config variable given the family name
@@ -42,54 +45,49 @@ function load_config($family) {
// to hit the DB again for this item.
-function get_config($family, $key, $instore = false) {
+function get_config($family, $key) {
global $a;
- if(! $instore) {
- // Looking if the whole family isn't set
- if(isset($a->config[$family])) {
- if($a->config[$family] === '!!') {
- return false;
- }
- }
+ if((! array_key_exists($family,$a->config)) || (! array_key_exists('config_loaded',$a->config[$family])))
+ load_config($family);
- if(isset($a->config[$family][$key])) {
- if($a->config[$family][$key] === '!!') {
- return false;
- }
- return $a->config[$family][$key];
+ if(array_key_exists('config_loaded',$a->config[$family])) {
+ if(! array_key_exists($key,$a->config[$family])) {
+ return false;
}
- }
- $ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
- dbesc($family),
- dbesc($key)
- );
- if(count($ret)) {
- // manage array value
- $val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
- $a->config[$family][$key] = $val;
- return $val;
- }
- else {
- $a->config[$family][$key] = '!!';
+ return ((preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$family][$key]))
+ ? unserialize($a->config[$family][$key])
+ : $a->config[$family][$key]
+ );
}
return false;
}
+function get_config_from_storage($family,$key) {
+ $ret = q("select * from config where cat = '%s' and k = '%s' limit 1",
+ dbesc($family),
+ dbesc($key)
+ );
+ return $ret;
+}
+
+
+
// Store a config value ($value) in the category ($family)
// under the key ($key)
// Return the value, or false if the database update failed
-
function set_config($family,$key,$value) {
global $a;
// manage array value
- $dbvalue = (is_array($value)?serialize($value):$value);
- $dbvalue = (is_bool($dbvalue) ? intval($dbvalue) : $dbvalue);
- if(get_config($family,$key,true) === false) {
+ $dbvalue = ((is_array($value)) ? serialize($value) : $value);
+ $dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue) : $dbvalue);
+
+ if(get_config($family,$key) === false || (! get_config_from_storage($family,$key))) {
$a->config[$family][$key] = $value;
- $ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ",
+
+ $ret = q("INSERT INTO config ( cat, k, v ) VALUES ( '%s', '%s', '%s' ) ",
dbesc($family),
dbesc($key),
dbesc($dbvalue)
@@ -99,7 +97,7 @@ function set_config($family,$key,$value) {
return $ret;
}
- $ret = q("UPDATE `config` SET `v` = '%s' WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
+ $ret = q("UPDATE config SET v = '%s' WHERE cat = '%s' AND k = '%s' LIMIT 1",
dbesc($dbvalue),
dbesc($family),
dbesc($key)
@@ -112,14 +110,11 @@ function set_config($family,$key,$value) {
return $ret;
}
-
-
function del_config($family,$key) {
-
global $a;
- if(x($a->config[$family],$key))
+ if(array_key_exists($family,$a->config) && array_key_exists($key,$a->config[$family]))
unset($a->config[$family][$key]);
- $ret = q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
+ $ret = q("DELETE FROM config WHERE cat = '%s' AND k = '%s' LIMIT 1",
dbesc($family),
dbesc($key)
);
@@ -127,11 +122,16 @@ function del_config($family,$key) {
}
-function load_pconfig($uid,$family) {
+function load_pconfig($uid,$family = '') {
global $a;
- if(($uid) && (! array_key_exists($uid,$a->config)))
+ if($uid === false)
+ return false;
+
+ if(! array_key_exists($uid,$a->config))
$a->config[$uid] = array();
+ if(($family) && (! array_key_exists($family,$a->config[$uid])))
+ $a->config[$uid][$family] = array();
if($family) {
$r = q("SELECT * FROM `pconfig` WHERE `cat` = '%s' AND `uid` = %d",
@@ -149,15 +149,13 @@ function load_pconfig($uid,$family) {
foreach($r as $rr) {
$k = $rr['k'];
$c = $rr['cat'];
- if(! array_key_exists($c,$a->config[$uid]))
+ if(! array_key_exists($c,$a->config[$uid])) {
$a->config[$uid][$c] = array();
+ $a->config[$uid][$c]['config_loaded'] = true;
+ }
$a->config[$uid][$c][$k] = $rr['v'];
}
}
-// else if ($family != 'config') {
- // Negative caching
-// $a->config[$uid][$family] = "!!";
-// }
}
@@ -167,74 +165,77 @@ function get_pconfig($uid,$family, $key, $instore = false) {
global $a;
- if(! $instore) {
- // Looking if the whole family isn't set
- if(isset($a->config[$uid][$family])) {
- if($a->config[$uid][$family] === '!!') {
- return false;
- }
- }
+ if($uid === false)
+ return false;
- if(isset($a->config[$uid][$family][$key])) {
- if($a->config[$uid][$family][$key] === '!!') {
- return false;
- }
- return $a->config[$uid][$family][$key];
- }
- }
+ if(! array_key_exists($uid,$a->config))
+ load_pconfig($uid);
- $ret = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
- intval($uid),
- dbesc($family),
- dbesc($key)
+ if((! array_key_exists($family,$a->config[$uid])) || (! array_key_exists($key,$a->config[$uid][$family])))
+ return false;
+
+ return ((preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$uid][$family][$key]))
+ ? unserialize($a->config[$uid][$family][$key])
+ : $a->config[$uid][$family][$key]
);
-
- if(count($ret)) {
- $val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
- $a->config[$uid][$family][$key] = $val;
- return $val;
- }
- else {
- $a->config[$uid][$family][$key] = '!!';
- }
- return false;
}
-
-
-
-
-// Same as above functions except these are for personal config storage and take an
-// additional $uid argument.
-
-
function set_pconfig($uid,$family,$key,$value) {
global $a;
- // manage array value
- $dbvalue = (is_array($value)?serialize($value):$value);
- if(get_pconfig($uid,$family,$key,true) === false) {
+ // manage array value
+ $dbvalue = ((is_array($value)) ? serialize($value) : $value);
+ $dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue) : $dbvalue);
+
+ if(get_pconfig($uid,$family,$key) === false) {
+ if(! array_key_exists($uid,$a->config))
+ $a->config[$uid] = array();
+ if(! array_key_exists($family,$a->config[$uid]))
+ $a->config[$uid][$family] = array();
+
+ // keep a separate copy for all variables which were
+ // set in the life of this page. We need this to
+ // synchronise channel clones.
+
+ if(! array_key_exists('transient',$a->config[$uid]))
+ $a->config[$uid]['transient'] = array();
+ if(! array_key_exists($family,$a->config[$uid]['transient']))
+ $a->config[$uid]['transient'][$family] = array();
+
$a->config[$uid][$family][$key] = $value;
- $ret = q("INSERT INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ",
+ $a->config[$uid]['transient'][$family][$key] = $value;
+
+ $ret = q("INSERT INTO pconfig ( uid, cat, k, v ) VALUES ( %d, '%s', '%s', '%s' ) ",
intval($uid),
dbesc($family),
dbesc($key),
dbesc($dbvalue)
);
- if($ret)
+ if($ret)
return $value;
return $ret;
}
- $ret = q("UPDATE `pconfig` SET `v` = '%s' WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
+
+ $ret = q("UPDATE pconfig SET v = '%s' WHERE uid = %d and cat = '%s' AND k = '%s' LIMIT 1",
dbesc($dbvalue),
intval($uid),
dbesc($family),
dbesc($key)
);
+ // keep a separate copy for all variables which were
+ // set in the life of this page. We need this to
+ // synchronise channel clones.
+
+ if(! array_key_exists('transient',$a->config[$uid]))
+ $a->config[$uid]['transient'] = array();
+ if(! array_key_exists($family,$a->config[$uid]['transient']))
+ $a->config[$uid]['transient'][$family] = array();
+
$a->config[$uid][$family][$key] = $value;
+ $a->config[$uid]['transient'][$family][$key] = $value;
if($ret)
return $value;
@@ -247,7 +248,7 @@ function del_pconfig($uid,$family,$key) {
global $a;
if(x($a->config[$uid][$family],$key))
unset($a->config[$uid][$family][$key]);
- $ret = q("DELETE FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
+ $ret = q("DELETE FROM pconfig WHERE uid = %d AND cat = '%s' AND k = '%s' LIMIT 1",
intval($uid),
dbesc($family),
dbesc($key)
@@ -257,61 +258,64 @@ function del_pconfig($uid,$family,$key) {
-function load_xconfig($xchan,$family) {
+function load_xconfig($xchan,$family = '') {
global $a;
- $r = q("SELECT * FROM `xconfig` WHERE `cat` = '%s' AND `xchan` = '%s'",
- dbesc($family),
- dbesc($xchan)
- );
- if(count($r)) {
+
+ if(! $xchan)
+ return false;
+
+ if(! array_key_exists($xchan,$a->config))
+ $a->config[$xchan] = array();
+ if(($family) && (! array_key_exists($family,$a->config[$xchan])))
+ $a->config[$xchan][$family] = array();
+
+ if($family) {
+ $r = q("SELECT * FROM `xconfig` WHERE `cat` = '%s' AND `xchan` = '%s'",
+ dbesc($family),
+ dbesc($xchan)
+ );
+ }
+ else {
+ $r = q("SELECT * FROM `xconfig` WHERE `xchan` = '%s'",
+ dbesc($xchan)
+ );
+ }
+
+ if($r) {
foreach($r as $rr) {
$k = $rr['k'];
- $a->config[$xchan][$family][$k] = $rr['v'];
+ $c = $rr['cat'];
+ if(! array_key_exists($c,$a->config[$xchan])) {
+ $a->config[$xchan][$c] = array();
+ $a->config[$xchan][$c]['config_loaded'] = true;
+ }
+ $a->config[$xchan][$c][$k] = $rr['v'];
}
- } else if ($family != 'config') {
- // Negative caching
- $a->config[$xchan][$family] = "!!";
- }
+ }
+
}
-function get_xconfig($xchan,$family, $key, $instore = false) {
+function get_xconfig($xchan,$family, $key) {
global $a;
- if(! $instore) {
- // Looking if the whole family isn't set
- if(isset($a->config[$xchan][$family])) {
- if($a->config[$xchan][$family] === '!!') {
- return false;
- }
- }
+ if(! $xchan)
+ return false;
- if(isset($a->config[$xchan][$family][$key])) {
- if($a->config[$xchan][$family][$key] === '!!') {
- return false;
- }
- return $a->config[$xchan][$family][$key];
- }
- }
+ if(! array_key_exists($xchan,$a->config))
+ load_xconfig($xchan);
- $ret = q("SELECT `v` FROM `xconfig` WHERE `xchan` = '%s' AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
- dbesc($xchan),
- dbesc($family),
- dbesc($key)
+ if((! array_key_exists($family,$a->config[$xchan])) || (! array_key_exists($key,$a->config[$xchan][$family])))
+ return false;
+
+ return ((preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$xchan][$family][$key]))
+ ? unserialize($a->config[$xchan][$family][$key])
+ : $a->config[$xchan][$family][$key]
);
- if(count($ret)) {
- $val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
- $a->config[$xchan][$family][$key] = $val;
- return $val;
- }
- else {
- $a->config[$xchan][$family][$key] = '!!';
- }
- return false;
}
@@ -320,21 +324,28 @@ function set_xconfig($xchan,$family,$key,$value) {
global $a;
// manage array value
- $dbvalue = (is_array($value)?serialize($value):$value);
+ $dbvalue = ((is_array($value)) ? serialize($value) : $value);
+ $dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue) : $dbvalue);
+
+ if(get_xconfig($xchan,$family,$key) === false) {
+ if(! array_key_exists($xchan,$a->config))
+ $a->config[$xchan] = array();
+ if(! array_key_exists($family,$a->config[$xchan]))
+ $a->config[$xchan][$family] = array();
- if(get_xconfig($xchan,$family,$key,true) === false) {
$a->config[$xchan][$family][$key] = $value;
- $ret = q("INSERT INTO `xconfig` ( `xchan`, `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s', '%s' ) ",
+ $ret = q("INSERT INTO xconfig ( xchan, cat, k, v ) VALUES ( '%s', '%s', '%s', '%s' ) ",
dbesc($xchan),
dbesc($family),
dbesc($key),
dbesc($dbvalue)
);
- if($ret)
+ if($ret)
return $value;
return $ret;
}
- $ret = q("UPDATE `xconfig` SET `v` = '%s' WHERE `xchan` = '%s' AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
+
+ $ret = q("UPDATE xconfig SET v = '%s' WHERE xchan = '%s' and cat = '%s' AND k = '%s' LIMIT 1",
dbesc($dbvalue),
dbesc($xchan),
dbesc($family),
@@ -346,6 +357,7 @@ function set_xconfig($xchan,$family,$key,$value) {
if($ret)
return $value;
return $ret;
+
}
diff --git a/include/conversation.php b/include/conversation.php
index 8e69e9ea3..410143a7a 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -6,7 +6,7 @@ require_once('include/items.php');
// is identical to the code in mod/message.php for 'item_extract_images' and
// 'item_redir_and_replace_images'
-if(! function_exists('item_extract_images')) {
+
function item_extract_images($body) {
$saved_image = array();
@@ -46,9 +46,9 @@ function item_extract_images($body) {
$new_body = $new_body . $orig_body;
return array('body' => $new_body, 'images' => $saved_image);
-}}
+}
+
-if(! function_exists('item_redir_and_replace_images')) {
function item_redir_and_replace_images($body, $images, $cid) {
$origbody = $body;
@@ -81,7 +81,7 @@ function item_redir_and_replace_images($body, $images, $cid) {
}
return $newbody;
-}}
+}
@@ -108,6 +108,44 @@ function localize_item(&$item){
$item_url = get_rel_link($obj['link'],'alternate');
+ $Bphoto = '';
+
+ switch($obj->type) {
+ case ACTIVITY_OBJ_PHOTO:
+ $post_type = t('photo');
+ break;
+ case ACTIVITY_OBJ_EVENT:
+ $post_type = t('event');
+ break;
+ case ACTIVITY_OBJ_PERSON:
+ $post_type = t('channel');
+ $author_name = $obj['title'];
+ if($obj['link']) {
+ $author_link = get_rel_link($obj['link'],'alternate');
+ $Bphoto = get_rel_link($obj['link'],'photo');
+ }
+ break;
+ case ACTIVITY_OBJ_THING:
+ $post_type = $obj['title'];
+ if($obj['owner']) {
+ if(array_key_exists('name',$obj['owner']))
+ $obj['owner']['name'];
+ if(array_key_exists('link',$obj['owner']))
+ $author_link = get_rel_link($obj['owner']['link'],'alternate');
+ }
+ if($obj['link']) {
+ $Bphoto = get_rel_link($obj['link'],'photo');
+ }
+ break;
+
+ case ACTIVITY_OBJ_NOTE:
+ default:
+ $post_type = t('status');
+ if($obj->id != $item['mid'])
+ $post_type = t('comment');
+ break;
+ }
+
// If we couldn't parse something useful, don't bother translating.
// We need something better than zid here, probably magic_link(), but it needs writing
@@ -117,21 +155,6 @@ function localize_item(&$item){
$author = '[zrl=' . chanlink_url($item['author']['xchan_url']) . ']' . $item['author']['xchan_name'] . '[/zrl]';
$objauthor = '[zrl=' . chanlink_url($author_link) . ']' . $author_name . '[/zrl]';
- switch($obj->type) {
- case ACTIVITY_OBJ_PHOTO:
- $post_type = t('photo');
- break;
- case ACTIVITY_OBJ_EVENT:
- $post_type = t('event');
- break;
- case ACTIVITY_OBJ_NOTE:
- default:
- $post_type = t('status');
- if($obj->id != $item['mid'])
- $post_type = t('comment');
- break;
- }
-
$plink = '[zrl=' . zid($item_url) . ']' . $post_type . '[/zrl]';
if(activity_match($item['verb'],ACTIVITY_LIKE)) {
@@ -141,6 +164,8 @@ function localize_item(&$item){
$bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
}
$item['body'] = $item['localize'] = sprintf($bodyverb, $author, $objauthor, $plink);
+ if($Bphoto != "")
+ $item['body'] .= "\n\n\n" . '[zrl=' . chanlink_url($author_link) . '][zmg=80x80]' . $Bphoto . '[/zmg][/zrl]';
}
@@ -148,7 +173,8 @@ function localize_item(&$item){
if (activity_match($item['verb'],ACTIVITY_FRIEND)) {
- if ($item['obj_type']=="" || $item['obj_type']!== ACTIVITY_OBJ_PERSON) return;
+
+// if ($item['obj_type']=="" || $item['obj_type']!== ACTIVITY_OBJ_PERSON) return;
$Aname = $item['author']['xchan_name'];
$Alink = $item['author']['xchan_url'];
@@ -349,7 +375,9 @@ function count_descendants($item) {
function visible_activity($item) {
- if(activity_match($item['verb'],ACTIVITY_LIKE) || activity_match($item['verb'],ACTIVITY_DISLIKE))
+ // likes can apply to other things besides posts. Check if they are post children, in which case we handle them specially
+
+ if((activity_match($item['verb'],ACTIVITY_LIKE) || activity_match($item['verb'],ACTIVITY_DISLIKE)) && ($item['mid'] != $item['parent_mid']))
return false;
return true;
}
@@ -826,7 +854,7 @@ function best_link_url($item) {
}
-if(! function_exists('item_photo_menu')){
+
function item_photo_menu($item){
$a = get_app();
$contact = null;
@@ -893,9 +921,9 @@ function item_photo_menu($item){
elseif ($v!="") $o .= "$k \n";
}
return $o;
-}}
+}
+
-if(! function_exists('like_puller')) {
function like_puller($a,$item,&$arr,$mode) {
$url = '';
@@ -923,7 +951,7 @@ function like_puller($a,$item,&$arr,$mode) {
$arr[$item['thr_parent'] . '-l'][] = '' . $item['author']['xchan_name'] . ' ';
}
return;
-}}
+}
// Format the like/dislike text for a profile item
// $cnt = number of people who like/dislike the item
@@ -932,7 +960,7 @@ function like_puller($a,$item,&$arr,$mode) {
// $id = item id
// returns formatted text
-if(! function_exists('format_like')) {
+
function format_like($cnt,$arr,$type,$id) {
$o = '';
if($cnt == 1)
@@ -956,7 +984,7 @@ function format_like($cnt,$arr,$type,$id) {
$o .= "\t" . '' . $str . '
';
}
return $o;
-}}
+}
function status_editor($a,$x,$popup=false) {
diff --git a/include/directory.php b/include/directory.php
index 5f3696a58..c286f5683 100644
--- a/include/directory.php
+++ b/include/directory.php
@@ -19,11 +19,6 @@ function directory_run($argv, $argc){
if($dirmode === false)
$dirmode = DIRECTORY_MODE_NORMAL;
- if(($dirmode == DIRECTORY_MODE_PRIMARY) || ($dirmode == DIRECTORY_MODE_STANDALONE)) {
- syncdirs($argv[1]);
- return;
- }
-
$x = q("select * from channel where channel_id = %d limit 1",
intval($argv[1])
);
@@ -32,6 +27,15 @@ function directory_run($argv, $argc){
$channel = $x[0];
+
+ if(($dirmode == DIRECTORY_MODE_PRIMARY) || ($dirmode == DIRECTORY_MODE_STANDALONE)) {
+ syncdirs($argv[1]);
+
+ // Now update all the connections
+ proc_run('php','include/notifier.php','refresh_all',$channel['channel_id']);
+ return;
+ }
+
$directory = find_upstream_directory($dirmode);
if($directory) {
@@ -49,7 +53,7 @@ function directory_run($argv, $argc){
// Now update all the connections
- proc_run('php','notifier','refresh_all',$channel['channel_id']);
+ proc_run('php','include/notifier.php','refresh_all',$channel['channel_id']);
}
diff --git a/include/enotify.php b/include/enotify.php
index 5728d054c..3b7a643ed 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -50,6 +50,8 @@ function notification($params) {
$additional_mail_header = "";
+ // We really should pass this through localize_item - but only if we have a complete item. We may only have a couple of elements.
+
if(array_key_exists('item',$params)) {
$title = $params['item']['title'];
$body = $params['item']['body'];
@@ -352,10 +354,27 @@ 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'));
+
$htmlversion = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"),
- " \n",$body))));
+ " \n",$body))), ENT_QUOTES,'UTF-8');
+
+
+ // use $_SESSION['zid_override'] to force zid() to use
+ // the recipient address instead of the current observer
+
+ $_SESSION['zid_override'] = $recip['channel_address'] . '@' . get_app()->get_hostname();
+ $_SESSION['zrl_override'] = z_root() . '/channel/' . $recip['channel_address'];
+
+ $textversion = zidify_links($textversion);
+ $htmlversion = zidify_links($htmlversion);
+
+ // unset when done to revert to normal behaviour
+
+ unset($_SESSION['zid_override']);
+ unset($_SESSION['zrl_override']);
$datarray = array();
diff --git a/include/items.php b/include/items.php
index 64eeae4b4..c4ffcbca6 100755
--- a/include/items.php
+++ b/include/items.php
@@ -53,6 +53,37 @@ function collect_recipients($item,&$private) {
}
+
+function can_comment_on_post($observer_xchan,$item) {
+ if(! $observer_xchan)
+ return false;
+ if($item['comment_policy'] === 'none')
+ return false;
+ switch($item['comment_policy']) {
+ case 'self':
+ if($observer_xchan === $item['author_xchan'] || $observer_xchan === $item['owner_xchan'])
+ return true;
+ break;
+ case 'public':
+ return false;
+ break;
+ case 'contacts':
+ case '':
+ if(($item['owner']['abook_xchan']) && ($item['owner']['abook_their_perms'] & PERMS_W_COMMENT))
+ return true;
+ break;
+ default:
+ break;
+ }
+ if(strstr($item['comment_policy'],'network:') && strstr($item['comment_policy'],'red'))
+ return true;
+ if(strstr($item['comment_policy'],'site:') && strstr($item['comment_policy'],get_app()->get_hostname()))
+ return true;
+
+ return false;
+}
+
+
/**
* @function red_zrl_callback
* preg_match function when fixing 'naked' links in mod item.php
@@ -142,6 +173,7 @@ function post_activity_item($arr) {
$arr['deny_cid'] = ((x($arr,'deny_cid')) ? $arr['deny_cid'] : $channel['channel_deny_cid']);
$arr['deny_gid'] = ((x($arr,'deny_gid')) ? $arr['deny_gid'] : $channel['channel_deny_gid']);
+ $arr['comment_policy'] = map_scope($channel['channel_w_comment']);
// for the benefit of plugins, we will behave as if this is an API call rather than a normal online post
@@ -481,7 +513,8 @@ function get_item_elements($x) {
$arr['mimetype'] = (($x['mimetype']) ? htmlentities($x['mimetype'], ENT_COMPAT,'UTF-8',false) : '');
$arr['obj_type'] = (($x['object_type']) ? htmlentities($x['object_type'], ENT_COMPAT,'UTF-8',false) : '');
$arr['tgt_type'] = (($x['target_type']) ? htmlentities($x['target_type'], ENT_COMPAT,'UTF-8',false) : '');
-
+ $arr['comment_policy'] = (($x['comment_scope']) ? htmlentities($x['comment_scope'], ENT_COMPAT,'UTF-8',false) : 'contacts');
+
$arr['object'] = activity_sanitise($x['object']);
$arr['target'] = activity_sanitise($x['target']);
@@ -545,17 +578,21 @@ function encode_item($item) {
logger('encode_item: ' . print_r($item,true));
- $r = q("select channel_r_stream from channel where channel_id = %d limit 1",
+ $r = q("select channel_r_stream, channel_w_comment from channel where channel_id = %d limit 1",
intval($item['uid'])
);
- if($r)
+ if($r) {
$public_scope = $r[0]['channel_r_stream'];
- else
+ $comment_scope = $r[0]['channel_w_comment'];
+ }
+ else {
$public_scope = 0;
+ $comment_scope = 0;
+ }
$scope = map_scope($public_scope);
-
+ $c_scope = map_scope($comment_scope);
if($item['item_restrict'] & ITEM_DELETED) {
$x['message_id'] = $item['mid'];
@@ -597,6 +634,11 @@ function encode_item($item) {
if(! in_array('private',$y))
$x['public_scope'] = $scope;
+ if($item['item_flags'] & ITEM_NOCOMMENT)
+ $x['comment_scope'] = 'none';
+ else
+ $x['comment_scope'] = $c_scope;
+
if($item['term'])
$x['tags'] = encode_item_terms($item['term']);
@@ -818,6 +860,7 @@ function get_profile_elements($x) {
$arr['desc'] = (($x['title']) ? htmlentities($x['title'],ENT_COMPAT,'UTF-8',false) : '');
$arr['dob'] = datetime_convert('UTC','UTC',$x['birthday'],'Y-m-d');
+ $arr['age'] = (($x['age']) ? intval($x['age']) : 0);
$arr['gender'] = (($x['gender']) ? htmlentities($x['gender'], ENT_COMPAT,'UTF-8',false) : '');
$arr['marital'] = (($x['marital']) ? htmlentities($x['marital'], ENT_COMPAT,'UTF-8',false) : '');
@@ -1323,10 +1366,17 @@ function item_store($arr,$force_parent = false) {
$arr['attach'] = ((x($arr,'attach')) ? notags(trim($arr['attach'])) : '');
$arr['app'] = ((x($arr,'app')) ? notags(trim($arr['app'])) : '');
$arr['item_restrict'] = ((x($arr,'item_restrict')) ? intval($arr['item_restrict']) : 0 );
+
+ $arr['comment_policy'] = ((x($arr,'comment_policy')) ? notags(trim($arr['comment_policy'])) : 'contacts' );
+
$arr['item_flags'] = ((x($arr,'item_flags')) ? intval($arr['item_flags']) : 0 );
$arr['item_flags'] = $arr['item_flags'] | ITEM_UNSEEN;
+ if($arr['comment_policy'] == 'none')
+ $arr['item_flags'] = $arr['item_flags'] | ITEM_NOCOMMENT;
+
+
// handle time travelers
// Allow a bit of fudge in case somebody just has a slightly slow/fast clock
@@ -1811,27 +1861,73 @@ function tag_deliver($uid,$item_id) {
// FIXME --- If the item is deleted, remove the tag from the parent.
// (First ensure that deleted items use this function, or else do that part separately.)
+ logger('tag_deliver: community tag activity received');
+
if(($item['owner_xchan'] === $u[0]['channel_hash']) && (! get_pconfig($u[0]['channel_id'],'system','blocktags'))) {
$j_tgt = json_decode($item['target'],true);
- if($j_tgt && $j_tgt['mid']) {
+ if($j_tgt && $j_tgt['id']) {
$p = q("select * from item where mid = '%s' and uid = %d limit 1",
- dbesc($j_tgt['mid']),
+ dbesc($j_tgt['id']),
intval($u[0]['channel_id'])
);
if($p) {
$j_obj = json_decode($item['object'],true);
+ logger('tag_deliver: tag object: ' . print_r($j_obj,true), LOGGER_DATA);
if($j_obj && $j_obj['id'] && $j_obj['title']) {
- store_item_tag($u[0]['channel_id'],$p[0]['id'],TERM_OBJ_POST,TERM_HASHTAG,$j_obj['title'],$j['obj']['id']);
+ if(is_array($j_obj['link']))
+ $taglink = get_rel_link($j_obj['link'],'alternate');
+ store_item_tag($u[0]['channel_id'],$p[0]['id'],TERM_OBJ_POST,TERM_HASHTAG,$j_obj['title'],$j_obj['id']);
proc_run('php','include/notifier.php','edit_post',$p[0]['id']);
}
}
}
}
+ else
+ logger('tag_deliver: tag permission denied for ' . $u[0]['channel_address']);
+ }
+
+ // This might be a followup by the original post author to a tagged forum
+ // If so setup a second delivery chain
+
+ $r = null;
+
+ if( ! ($item['item_flags'] & ITEM_THREAD_TOP)) {
+ $x = q("select * from item where id = parent and parent = %d and uid = %d limit 1",
+ 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.');
+
+ // now change this copy of the post to a forum head message and deliver to all the tgroup members
+ // also reset all the privacy bits to the forum default permissions
+
+ $private = (($u[0]['allow_cid'] || $u[0]['allow_gid'] || $u[0]['deny_cid'] || $u[0]['deny_gid']) ? 1 : 0);
+
+ $flag_bits = ITEM_WALL|ITEM_ORIGIN;
+
+ $r = q("update item set item_flags = ( item_flags | %d ), owner_xchan = '%s', allow_cid = '%s', allow_gid = '%s',
+ deny_cid = '%s', deny_gid = '%s', item_private = %d where id = %d limit 1",
+ intval($flag_bits),
+ dbesc($u[0]['channel_hash']),
+ dbesc($u[0]['allow_cid']),
+ dbesc($u[0]['allow_gid']),
+ dbesc($u[0]['deny_cid']),
+ dbesc($u[0]['deny_gid']),
+ intval($private),
+ intval($item_id)
+ );
+ if($r)
+ proc_run('php','include/notifier.php','tgroup',$item_id);
+ else
+ logger('tag_deliver: failed to update item');
+ }
}
$terms = get_terms_oftype($item['term'],TERM_MENTION);
- logger('tag_deliver: post mentions: ' . print_r($terms,true), LOGGER_DATA);
+ if($terms)
+ logger('tag_deliver: post mentions: ' . print_r($terms,true), LOGGER_DATA);
$link = normalise_link($a->get_baseurl() . '/channel/' . $u[0]['channel_address']);
@@ -4690,7 +4786,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
intval($uid)
);
if($r) {
- $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval($arr['uid']) . " AND ( author_xchan = " . dbesc($r[0]['abook_xchan']) . " or owner_xchan = " . dbesc($r[0]['abook_xchan']) . " ) and item_restrict = 0 ) ";
+ $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval($arr['uid']) . " AND ( author_xchan = '" . dbesc($r[0]['abook_xchan']) . "' or owner_xchan = '" . dbesc($r[0]['abook_xchan']) . "' ) and item_restrict = 0 ) ";
}
else {
$result['message'] = t('Connection not found.');
diff --git a/include/network.php b/include/network.php
index f750fcfd8..8b9a8a6a6 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1049,15 +1049,21 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
$s = htmlspecialchars_decode($s);
$matches = null;
- $c = preg_match_all('/\[img.*?\](.*?)\[\/img\]/ism',$s,$matches,PREG_SET_ORDER);
+ $c = preg_match_all('/\[img(.*?)\](.*?)\[\/img\]/ism',$s,$matches,PREG_SET_ORDER);
if($c) {
require_once('include/photo/photo_driver.php');
foreach($matches as $mtch) {
- logger('scale_external_image: ' . $mtch[1]);
+ logger('scale_external_image: ' . $mtch[1] . ' ' . $mtch[2]);
+
+ if(substr($mtch[1],0,1) == '=') {
+ $owidth = intval(substr($mtch[1],1));
+ if(intval($owidth) > 0 && intval($owidth) < 640)
+ continue;
+ }
$hostname = str_replace('www.','',substr($a->get_baseurl(),strpos($a->get_baseurl(),'://')+3));
- if(stristr($mtch[1],$hostname))
+ if(stristr($mtch[2],$hostname))
continue;
// $scale_replace, if passed, is an array of two elements. The
@@ -1066,9 +1072,9 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
// This allows Friendica to display the smaller remote image if
// one exists, while still linking to the full-size image
if($scale_replace)
- $scaled = str_replace($scale_replace[0], $scale_replace[1], $mtch[1]);
+ $scaled = str_replace($scale_replace[0], $scale_replace[1], $mtch[2]);
else
- $scaled = $mtch[1];
+ $scaled = $mtch[2];
$i = fetch_url($scaled);
$cache = get_config('system','itemcache');
@@ -1078,7 +1084,7 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
}
// guess mimetype from headers or filename
- $type = guess_image_type($mtch[1],true);
+ $type = guess_image_type($mtch[2],true);
if($i) {
$ph = photo_factory($i, $type);
@@ -1094,7 +1100,7 @@ function scale_external_images($s, $include_link = true, $scale_replace = false)
logger('scale_external_images: ' . $orig_width . '->' . $new_width . 'w ' . $orig_height . '->' . $new_height . 'h' . ' match: ' . $mtch[0], LOGGER_DEBUG);
$s = str_replace($mtch[0],'[img=' . $new_width . 'x' . $new_height. ']' . $scaled . '[/img]'
. "\n" . (($include_link)
- ? '[zrl=' . $mtch[1] . ']' . t('view full size') . '[/zrl]' . "\n"
+ ? '[zrl=' . $mtch[2] . ']' . t('view full size') . '[/zrl]' . "\n"
: ''),$s);
logger('scale_external_images: new string: ' . $s, LOGGER_DEBUG);
}
diff --git a/include/notifier.php b/include/notifier.php
index 7d107e4d4..96c0bf31f 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -189,6 +189,7 @@ function notifier_run($argv, $argc){
$item = $suggest[0];
}
elseif($cmd === 'refresh_all') {
+ logger('notifier: refresh_all: ' . $item_id);
$s = q("select * from channel where channel_id = %d limit 1",
intval($item_id)
);
@@ -196,10 +197,9 @@ 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) and not (abook_flags & %d)",
+ $r = q("select * from abook where abook_channel = %d and not (abook_flags & %d)",
intval($item_id),
- intval(ABOOK_FLAG_SELF),
- intval(ABOOK_FLAG_PENDING)
+ intval(ABOOK_FLAG_SELF)
);
if($r) {
foreach($r as $rr) {
diff --git a/include/poller.php b/include/poller.php
index dff16d3d7..f50bd4e3e 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -63,6 +63,9 @@ function poller_run($argv, $argc){
// once daily run birthday_updates and then expire in background
+ // FIXME: add birthday updates, both locally and for xprof for use
+ // by directory servers
+
$d1 = get_config('system','last_expire_day');
$d2 = intval(datetime_convert('UTC','UTC','now','d'));
diff --git a/include/settings.php b/include/settings.php
new file mode 100644
index 000000000..26f375a42
--- /dev/null
+++ b/include/settings.php
@@ -0,0 +1,99 @@
+get_channel();
+
+ $h = q("select * from hubloc where hubloc_hash = '%s'",
+ dbesc($channel['channel_hash'])
+ );
+
+ if(! $h)
+ return;
+
+ $synchubs = array();
+
+ foreach($h as $x) {
+ if($x['host'] == $a->get_hostname())
+ continue;
+ $synchubs[] = $x;
+ }
+
+ if(! $synchubs)
+ return;
+
+ $r = q("select xchan_guid, xchan_guid_sig from xchan where xchan_hash = '%s' limit 1",
+ dbesc($channel['channel_hash'])
+ );
+ if(! $r)
+ return;
+
+ $env_recips = array();
+ $env_recips[] = array('guid' => $r[0]['xchan_guid'],'guid_sig' => $r[0]['xchan_guid_sig']);
+
+ $info = (($packet) ? $packet : array());
+
+ if(array_key_exists($uid,$a->config) && array_key_exists('transient',$a->config[$uid])) {
+ $settings = $a->config[$uid]['transient'];
+ if($settings) {
+ $info['config'] = $settings;
+ }
+ }
+
+ if($channel) {
+ $info['channel'] = array();
+ foreach($channel as $k => $v) {
+ if(strpos('channel_',$k) !== 0)
+ continue;
+
+ // don't pass these elements, they should not be synchronised
+
+ $disallowed = array('channel_id','channel_account_id','channel_primary','channel_prvkey');
+
+ if(in_array($k,$disallowed))
+ continue;
+
+ $info['channel'][$k] = $v;
+ }
+ }
+
+ $interval = ((get_config('system','delivery_interval') !== false)
+ ? intval(get_config('system','delivery_interval')) : 2 );
+
+
+ foreach($synchubs as $hub) {
+ $hash = random_string();
+ $n = zot_build_packet($channel,'channel_sync',$env_recips,$hub['hubloc_sitekey'],null,$hash);
+ 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']),
+ intval($channel['channel_id']),
+ dbesc($hub['hubloc_callback']),
+ intval(1),
+ dbesc(datetime_convert()),
+ dbesc(datetime_convert()),
+ dbesc($n),
+ dbesc(json_encode($info))
+ );
+
+ proc_run('php','include/deliver.php',$hash);
+ if($interval)
+ @time_sleep_until(microtime(true) + (float) $interval);
+ }
+
+
+}
diff --git a/include/taxonomy.php b/include/taxonomy.php
new file mode 100644
index 000000000..7e9a4c856
--- /dev/null
+++ b/include/taxonomy.php
@@ -0,0 +1,159 @@
+','[',']'),array('%3c','%3e','%5b','%5d'),$s);
+}
+
+function file_tag_decode($s) {
+ return str_replace(array('%3c','%3e','%5b','%5d'),array('<','>','[',']'),$s);
+}
+
+function file_tag_file_query($table,$s,$type = 'file') {
+
+ if($type == 'file')
+ $termtype = TERM_FILE;
+ else
+ $termtype = TERM_CATEGORY;
+
+ return sprintf(" AND " . (($table) ? dbesc($table) . '.' : '') . "id in (select term.oid from term where term.type = %d and term.term = '%s' and term.uid = " . (($table) ? dbesc($table) . '.' : '') . "uid ) ",
+ intval($termtype),
+ protect_sprintf(dbesc($s))
+ );
+}
+
+function term_query($table,$s,$type = TERM_UNKNOWN) {
+
+ return sprintf(" AND " . (($table) ? dbesc($table) . '.' : '') . "id in (select term.oid from term where term.type = %d and term.term = '%s' and term.uid = " . (($table) ? dbesc($table) . '.' : '') . "uid ) ",
+ intval($type),
+ protect_sprintf(dbesc($s))
+ );
+}
+
+
+function store_item_tag($uid,$iid,$otype,$type,$term,$url = '') {
+ if(! $term)
+ return false;
+ $r = q("select * from term
+ where uid = %d and oid = %d and otype = %d and type = %d
+ and term = '%s' and url = '%s' ",
+ intval($uid),
+ intval($iid),
+ intval($otype),
+ intval($type),
+ dbesc($term),
+ dbesc($url)
+ );
+ if($r)
+ return false;
+ $r = q("insert into term (uid, oid, otype, type, term, url)
+ values( %d, %d, %d, %d, '%s', '%s') ",
+ intval($uid),
+ intval($iid),
+ intval($otype),
+ intval($type),
+ dbesc($term),
+ dbesc($url)
+ );
+ return $r;
+}
+
+function get_terms_oftype($arr,$type) {
+ $ret = array();
+ if(! (is_array($arr) && count($arr)))
+ return $ret;
+
+ if(! is_array($type))
+ $type = array($type);
+
+ foreach($type as $t)
+ foreach($arr as $x)
+ if($x['type'] == $t)
+ $ret[] = $x;
+ return $ret;
+}
+
+function format_term_for_display($term) {
+ $s = '';
+ if($term['type'] == TERM_HASHTAG)
+ $s .= '#';
+ elseif($term['type'] == TERM_MENTION)
+ $s .= '@';
+ else
+ return $s;
+
+ if($term['url'])
+ $s .= '' . htmlspecialchars($term['term']) . ' ';
+ else
+ $s .= htmlspecialchars($term['term']);
+ return $s;
+}
+
+// Tag cloud functions - need to be adpated to this database format
+
+
+function tagadelic($uid, $count = 0, $type = TERM_HASHTAG) {
+
+ // Fetch tags
+ $r = q("select term, count(term) as total from term
+ where uid = %d and type = %d
+ and otype = %d
+ group by term order by total desc %s",
+ intval($uid),
+ intval($type),
+ intval(TERM_OBJ_POST),
+ ((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['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 tags_sort($a,$b) {
+ if($a[0] == $b[0])
+ return 0;
+ return((strtolower($a[0]) < strtolower($b[0])) ? -1 : 1);
+}
+
+
+function tagblock($link,$uid,$count = 0,$type = TERM_HASHTAG) {
+ $tab = 0;
+ $r = tagadelic($uid,$count,$type);
+
+ if($r) {
+ echo '';
+ }
+}
diff --git a/include/text.php b/include/text.php
index 71f2257ac..db29697f9 100755
--- a/include/text.php
+++ b/include/text.php
@@ -850,7 +850,6 @@ function smilies($s, $sample = false) {
':like',
':dislike',
'red#',
- '~friendika',
'~friendica'
);
@@ -889,7 +888,6 @@ function smilies($s, $sample = false) {
' ',
' ',
' ',
- '~friendika ',
'~friendica '
);
@@ -1025,6 +1023,20 @@ function prepare_body($item,$attach = false) {
$s .= '
';
}
+ if(is_array($item['term']) && count($item['term'])) {
+ $tstr = '';
+ foreach($item['term'] as $t) {
+ $t1 = format_term_for_display($t);
+ if($t1) {
+ if($tstr)
+ $tstr .= ' ';
+ $tstr .= $t1;
+ }
+ }
+ if($tstr)
+ $s .= '' . $tstr . '
';
+ }
+
$writeable = ((get_observer_hash() == $item['owner_xchan']) ? true : false);
$x = '';
@@ -1424,278 +1436,28 @@ function reltoabs($text, $base)
}
function item_post_type($item) {
- if(intval($item['event-id']))
- return t('event');
- if(strlen($item['resource_id']))
- return t('photo');
- if(strlen($item['verb']) && $item['verb'] !== ACTIVITY_POST)
- return t('activity');
- if($item['id'] != $item['parent'])
- return t('comment');
- return t('post');
+
+
+ switch($item['resource_type']) {
+ case 'photo':
+ $post_type = t('photo');
+ break;
+ case 'event':
+ $post_type = t('event');
+ break;
+ default:
+ $post_type = t('status');
+ if($item['mid'] != $item['parent_mid'])
+ $post_type = t('comment');
+ break;
+ }
+
+ if(strlen($item['verb']) && (! activity_match($item['verb'],ACTIVITY_POST)))
+ $post_type = t('activity');
+
+ return $post_type;
}
-// post categories and "save to file" use the same item.file table for storage.
-// We will differentiate the different uses by wrapping categories in angle brackets
-// and save to file categories in square brackets.
-// To do this we need to escape these characters if they appear in our tag.
-
-function file_tag_encode($s) {
- return str_replace(array('<','>','[',']'),array('%3c','%3e','%5b','%5d'),$s);
-}
-
-function file_tag_decode($s) {
- return str_replace(array('%3c','%3e','%5b','%5d'),array('<','>','[',']'),$s);
-}
-
-function file_tag_file_query($table,$s,$type = 'file') {
-
- if($type == 'file')
- $termtype = TERM_FILE;
- else
- $termtype = TERM_CATEGORY;
-
- return sprintf(" AND " . (($table) ? dbesc($table) . '.' : '') . "id in (select term.oid from term where term.type = %d and term.term = '%s' and term.uid = " . (($table) ? dbesc($table) . '.' : '') . "uid ) ",
- intval($termtype),
- protect_sprintf(dbesc($s))
- );
-}
-
-function term_query($table,$s,$type = TERM_UNKNOWN) {
-
- return sprintf(" AND " . (($table) ? dbesc($table) . '.' : '') . "id in (select term.oid from term where term.type = %d and term.term = '%s' and term.uid = " . (($table) ? dbesc($table) . '.' : '') . "uid ) ",
- intval($type),
- protect_sprintf(dbesc($s))
- );
-}
-
-// ex. given music,video return or [music][video]
-function file_tag_list_to_file($list,$type = 'file') {
- $tag_list = '';
- if(strlen($list)) {
- $list_array = explode(",",$list);
- if($type == 'file') {
- $lbracket = '[';
- $rbracket = ']';
- }
- else {
- $lbracket = '<';
- $rbracket = '>';
- }
-
- foreach($list_array as $item) {
- if(strlen($item)) {
- $tag_list .= $lbracket . file_tag_encode(trim($item)) . $rbracket;
- }
- }
- }
- return $tag_list;
-}
-
-// ex. given [friends], return music,video or friends
-function file_tag_file_to_list($file,$type = 'file') {
- $matches = false;
- $list = '';
- if($type == 'file') {
- $cnt = preg_match_all('/\[(.*?)\]/',$file,$matches,PREG_SET_ORDER);
- }
- else {
- $cnt = preg_match_all('/<(.*?)>/',$file,$matches,PREG_SET_ORDER);
- }
- if($cnt) {
- foreach($matches as $mtch) {
- if(strlen($list))
- $list .= ',';
- $list .= file_tag_decode($mtch[1]);
- }
- }
-
- return $list;
-}
-
-function file_tag_update_pconfig($uid,$file_old,$file_new,$type = 'file') {
- // $file_old - categories previously associated with an item
- // $file_new - new list of categories for an item
-
- if(! intval($uid))
- return false;
-
- if($file_old == $file_new)
- return true;
-
- $saved = get_pconfig($uid,'system','filetags');
- if(strlen($saved)) {
- if($type == 'file') {
- $lbracket = '[';
- $rbracket = ']';
- }
- else {
- $lbracket = '<';
- $rbracket = '>';
- }
-
- $filetags_updated = $saved;
-
- // check for new tags to be added as filetags in pconfig
- $new_tags = array();
- $check_new_tags = explode(",",file_tag_file_to_list($file_new,$type));
-
- foreach($check_new_tags as $tag) {
- if(! stristr($saved,$lbracket . file_tag_encode($tag) . $rbracket))
- $new_tags[] = $tag;
- }
-
- $filetags_updated .= file_tag_list_to_file(implode(",",$new_tags),$type);
-
- // check for deleted tags to be removed from filetags in pconfig
- $deleted_tags = array();
- $check_deleted_tags = explode(",",file_tag_file_to_list($file_old,$type));
-
- foreach($check_deleted_tags as $tag) {
- if(! stristr($file_new,$lbracket . file_tag_encode($tag) . $rbracket))
- $deleted_tags[] = $tag;
- }
-
- foreach($deleted_tags as $key => $tag) {
- $r = q("select file from item where uid = %d " . file_tag_file_query('item',$tag,$type),
- intval($uid)
- );
-
- if(count($r)) {
- unset($deleted_tags[$key]);
- }
- else {
- $filetags_updated = str_replace($lbracket . file_tag_encode($tag) . $rbracket,'',$filetags_updated);
- }
- }
-
- if($saved != $filetags_updated) {
- set_pconfig($uid,'system','filetags', $filetags_updated);
- }
- return true;
- }
- else
- if(strlen($file_new)) {
- set_pconfig($uid,'system','filetags', $file_new);
- }
- return true;
-}
-
-function store_item_tag($uid,$iid,$otype,$type,$term,$url = '') {
- if(! $term)
- return false;
- $r = q("select * from term
- where uid = %d and oid = %d and otype = %d and type = %d
- and term = '%s' and url = '%s' ",
- intval($uid),
- intval($iid),
- intval($otype),
- intval($type),
- dbesc($term),
- dbesc($url)
- );
- if($r)
- return false;
- $r = q("insert into term (uid, oid, otype, type, term, url)
- values( %d, %d, %d, %d, '%s', '%s') ",
- intval($uid),
- intval($iid),
- intval($otype),
- intval($type),
- dbesc($term),
- dbesc($url)
- );
- return $r;
-}
-
-function get_terms_oftype($arr,$type) {
- $ret = array();
- if(! (is_array($arr) && count($arr)))
- return $ret;
-
- if(! is_array($type))
- $type = array($type);
-
- foreach($type as $t)
- foreach($arr as $x)
- if($x['type'] == $t)
- $ret[] = $x;
- return $ret;
-}
-
-function format_term_for_display($term) {
- $s = '';
- if($term['type'] == TERM_HASHTAG)
- $s .= '#';
- elseif($term['type'] == TERM_MENTION)
- $s .= '@';
-
- if($term['url']) $s .= '' . htmlspecialchars($term['term']) . ' ';
- else $s .= htmlspecialchars($term['term']);
- return $s;
-}
-
-
-
-function file_tag_save_file($uid,$item,$file) {
- $result = false;
- if(! intval($uid))
- return false;
-
- $r = q("select file from item where id = %d and uid = %d limit 1",
- intval($item),
- intval($uid)
- );
- if($r) {
- if(! stristr($r[0]['file'],'[' . file_tag_encode($file) . ']'))
- q("update item set file = '%s' where id = %d and uid = %d limit 1",
- dbesc($r[0]['file'] . '[' . file_tag_encode($file) . ']'),
- intval($item),
- intval($uid)
- );
- $saved = get_pconfig($uid,'system','filetags');
- if((! strlen($saved)) || (! stristr($saved,'[' . file_tag_encode($file) . ']')))
- set_pconfig($uid,'system','filetags',$saved . '[' . file_tag_encode($file) . ']');
- info( t('Item filed') );
- }
- return true;
-}
-
-function file_tag_unsave_file($uid,$item,$file,$cat = false) {
- $result = false;
- if(! intval($uid))
- return false;
-
- if($cat == true)
- $pattern = '<' . file_tag_encode($file) . '>' ;
- else
- $pattern = '[' . file_tag_encode($file) . ']' ;
-
-
- $r = q("select file from item where id = %d and uid = %d limit 1",
- intval($item),
- intval($uid)
- );
- if(! $r)
- return false;
-
- q("update item set file = '%s' where id = %d and uid = %d limit 1",
- dbesc(str_replace($pattern,'',$r[0]['file'])),
- intval($item),
- intval($uid)
- );
-
- $r = q("select file from item where uid = %d and deleted = 0 " . file_tag_file_query('item',$file,(($cat) ? 'category' : 'file')),
- intval($uid)
- );
-
- if(! $r) {
- $saved = get_pconfig($uid,'system','filetags');
- set_pconfig($uid,'system','filetags',str_replace($pattern,'',$saved));
-
- }
- return true;
-}
function normalise_openid($s) {
return trim(str_replace(array('http://','https://'),array('',''),$s),'/');
@@ -1794,7 +1556,7 @@ function ids_to_querystr($arr,$idx = 'id') {
// author_xchan and owner_xchan. If $abook is true also include the abook info.
// This is needed in the API to save extra per item lookups there.
-function xchan_query(&$items,$abook = false) {
+function xchan_query(&$items,$abook = true) {
$arr = array();
if($items && count($items)) {
foreach($items as $item) {
@@ -1806,8 +1568,10 @@ function xchan_query(&$items,$abook = false) {
}
if(count($arr)) {
if($abook) {
- $chans = q("select * from xchan left join hubloc on hubloc_hash = xchan_hash left join abook on abook_xchan = xchan_hash
- where xchan_hash in (" . implode(',', $arr) . ") and ( hubloc_flags & " . intval(HUBLOC_FLAGS_PRIMARY) . " )");
+ $chans = q("select * from xchan left join hubloc on hubloc_hash = xchan_hash left join abook on abook_xchan = xchan_hash and abook_channel = %d
+ where xchan_hash in (" . implode(',', $arr) . ") and ( hubloc_flags & " . intval(HUBLOC_FLAGS_PRIMARY) . " )",
+ intval($item['uid'])
+ );
}
else {
$chans = q("select xchan.*,hubloc.* from xchan left join hubloc on hubloc_hash = xchan_hash
@@ -1936,67 +1700,3 @@ function jindent($json) {
}
-// Tag cloud functions - need to be adpated to this database format
-
-
-function tagadelic($uid, $count = 0, $type = TERM_HASHTAG) {
-
- // Fetch tags
- $r = q("select term, count(term) as total from term
- where uid = %d and type = %d
- and otype = %d
- group by term order by total desc %s",
- intval($uid),
- intval($type),
- intval(TERM_OBJ_POST),
- ((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['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 tags_sort($a,$b) {
- if($a[0] == $b[0])
- return 0;
- return((strtolower($a[0]) < strtolower($b[0])) ? -1 : 1);
-}
-
-
-function tagblock($link,$uid,$count = 0,$type = TERM_HASHTAG) {
- $tab = 0;
- $r = tagadelic($uid,$count,$type);
-
- if($r) {
- echo '';
- }
-}
diff --git a/include/zot.php b/include/zot.php
index 79031ab26..f10a02d47 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -874,8 +874,16 @@ function zot_import($arr) {
$result = process_profile_delivery($i['notify']['sender'],$arr,$deliveries);
}
+ elseif($i['message']['type'] === 'channel_sync') {
+// $arr = get_channelsync_elements($i['message']);
+ $arr = $i['message'];
+ logger('Channel sync received: ' . print_r($arr,true), LOGGER_DATA);
+ logger('Channel sync recipients: ' . print_r($deliveries,true), LOGGER_DATA);
+
+// $result = process_channelsync_delivery($i['notify']['sender'],$arr,$deliveries);
+ }
}
if($result)
$return = array_merge($return,$result);
@@ -1028,6 +1036,10 @@ function process_delivery($sender,$arr,$deliveries,$relay) {
}
if($arr['item_restrict'] & ITEM_DELETED) {
+
+ // remove_community_tag is a no-op if this isn't a community tag activity
+ remove_community_tag($sender,$arr,$channel['channel_id']);
+
$item_id = delete_imported_item($sender,$arr,$channel['channel_id']);
$result[] = array($d['hash'],'deleted');
@@ -1040,7 +1052,7 @@ function process_delivery($sender,$arr,$deliveries,$relay) {
continue;
}
- // for events, extract the event info and create and event linked to an item
+ // for events, extract the event info and create an event linked to an item
if((x($arr,'obj_type')) && (activity_match($arr['obj_type'],ACTIVITY_OBJ_EVENT))) {
require_once('include/event.php');
@@ -1108,6 +1120,68 @@ function process_delivery($sender,$arr,$deliveries,$relay) {
}
+function remove_community_tag($sender,$arr,$uid) {
+
+ if(! (activity_match($arr['verb'],ACTIVITY_TAG) && ($arr['obj_type'] == ACTIVITY_OBJ_TAGTERM)))
+ return;
+
+ logger('remove_community_tag: invoked');
+
+
+ if(! get_pconfig($uid,'system','blocktags')) {
+ logger('remove_community tag: permission denied.');
+ return;
+ }
+
+ $r = q("select * from item where mid = '%s' and uid = %d limit 1",
+ dbesc($arr['mid']),
+ intval($uid)
+ );
+ if(! $r) {
+ logger('remove_community_tag: no item');
+ return;
+ }
+
+ if(($sender['hash'] != $r[0]['owner_xchan']) && ($sender['hash'] != $r[0]['author_xchan'])) {
+ logger('remove_community_tag: sender not authorised.');
+ return;
+ }
+
+ $i = $r[0];
+
+ if($i['target'])
+ $i['target'] = json_decode($i['target'],true);
+ if($i['object'])
+ $i['object'] = json_decode($i['object'],true);
+
+ if(! ($i['target'] && $i['object'])) {
+ logger('remove_community_tag: no target/object');
+ return;
+ }
+
+ $message_id = $i['target']['id'];
+
+ $r = q("select id from item where mid = '%s' and uid = %d limit 1",
+ dbesc($message_id),
+ intval($uid)
+ );
+ if(! $r) {
+ logger('remove_community_tag: no parent message');
+ return;
+ }
+
+ $x = q("delete from term where uid = %d and oid = %d and otype = %d and type = %d and term = '%s' and url = '%s' limit 1",
+ intval($uid),
+ intval($r[0]['id']),
+ intval(TERM_OBJ_POST),
+ intval(TERM_HASHTAG),
+ dbesc($i['object']['title']),
+ dbesc(get_rel_link($i['object']['link'],'alternate'))
+ );
+
+ return;
+}
+
function update_imported_item($sender,$item,$uid) {
item_store_update($item);
@@ -1217,6 +1291,7 @@ function import_directory_profile($hash,$profile) {
$arr['xprof_hash'] = $hash;
$arr['xprof_desc'] = (($profile['description']) ? htmlentities($profile['description'], ENT_COMPAT,'UTF-8',false) : '');
$arr['xprof_dob'] = datetime_convert('','',$profile['birthday'],'Y-m-d'); // !!!! check this for 0000 year
+ $arr['xprof_age'] = (($profile['age']) ? intval($profile['age']) : 0);
$arr['xprof_gender'] = (($profile['gender']) ? htmlentities($profile['gender'], ENT_COMPAT,'UTF-8',false) : '');
$arr['xprof_marital'] = (($profile['marital']) ? htmlentities($profile['marital'], ENT_COMPAT,'UTF-8',false) : '');
$arr['xprof_sexual'] = (($profile['sexual']) ? htmlentities($profile['sexual'], ENT_COMPAT,'UTF-8',false) : '');
diff --git a/install/database.sql b/install/database.sql
index 33dd9f31b..5cb0146f7 100644
--- a/install/database.sql
+++ b/install/database.sql
@@ -462,6 +462,7 @@ CREATE TABLE IF NOT EXISTS `item` (
`inform` mediumtext NOT NULL,
`location` char(255) NOT NULL DEFAULT '',
`coord` char(255) NOT NULL DEFAULT '',
+ `comment_policy` char(255) NOT NULL DEFAULT '',
`allow_cid` mediumtext NOT NULL,
`allow_gid` mediumtext NOT NULL,
`deny_cid` mediumtext NOT NULL,
@@ -494,6 +495,7 @@ CREATE TABLE IF NOT EXISTS `item` (
KEY `mid` (`mid`),
KEY `parent_mid` (`parent_mid`),
KEY `uid_mid` (`mid`,`uid`),
+ KEY `comment_policy` (`comment_policy`),
FULLTEXT KEY `title` (`title`),
FULLTEXT KEY `body` (`body`),
FULLTEXT KEY `allow_cid` (`allow_cid`),
@@ -795,10 +797,12 @@ CREATE TABLE IF NOT EXISTS `site` (
`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_flags` (`site_flags`),
KEY `site_update` (`site_update`),
- KEY `site_directory` (`site_directory`)
+ KEY `site_directory` (`site_directory`),
+ KEY `site_register` (`site_register`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `spam` (
@@ -824,13 +828,17 @@ CREATE TABLE IF NOT EXISTS `term` (
`type` tinyint(3) unsigned NOT NULL,
`term` char(255) NOT NULL,
`url` char(255) NOT NULL,
+ `imgurl` char(255) NOT NULL,
+ `term_hash` char(255) NOT NULL DEFAULT '',
PRIMARY KEY (`tid`),
KEY `oid` (`oid`),
KEY `otype` (`otype`),
KEY `type` (`type`),
KEY `term` (`term`),
KEY `uid` (`uid`),
- KEY `aid` (`aid`)
+ KEY `aid` (`aid`),
+ KEY `imgurl` (`imgurl`),
+ KEY `term_hash` (`term_hash`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `tokens` (
@@ -927,12 +935,13 @@ CREATE TABLE IF NOT EXISTS `xlink` (
KEY `xlink_link` (`xlink_link`),
KEY `xlink_updated` (`xlink_updated`),
KEY `xlink_rating` (`xlink_rating`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `xprof` (
`xprof_hash` char(255) NOT NULL,
`xprof_desc` char(255) NOT NULL DEFAULT '',
`xprof_dob` char(12) NOT NULL DEFAULT '',
+ `xprof_age` tinyint(3) NOT NULL DEFAULT '0',
`xprof_gender` char(255) NOT NULL DEFAULT '',
`xprof_marital` char(255) NOT NULL DEFAULT '',
`xprof_sexual` char(255) NOT NULL DEFAULT '',
@@ -944,6 +953,7 @@ CREATE TABLE IF NOT EXISTS `xprof` (
PRIMARY KEY (`xprof_hash`),
KEY `xprof_desc` (`xprof_desc`),
KEY `xprof_dob` (`xprof_dob`),
+ KEY `xprof_age` (`xprof_age`),
KEY `xprof_gender` (`xprof_gender`),
KEY `xprof_marital` (`xprof_marital`),
KEY `xprof_sexual` (`xprof_sexual`),
diff --git a/install/update.php b/install/update.php
index 382e8723c..ef436c688 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
{1} ({2})".format(this.photo, this.name, this.nick)
- that.add(html, this.nick.replace(' ','') + '+' + this.id + ' - ' + this.link);
+ that.add(this.taggable, html, this.nick.replace(' ','') + '+' + this.id + ' - ' + this.link);
});
} else {
that.cont.hide();
@@ -89,9 +89,9 @@ ACPopup.prototype._search = function(){
});
}
- ACPopup.prototype.add = function(label, value){
+ACPopup.prototype.add = function(taggable, label, value){
var that=this;
- var elm = $("");
+ var elm = $("");
elm.click(function(e){
t = $(this).attr('title').replace(new RegExp(' \- .*'),'');
if(typeof(that.element.container) === "undefined") {
diff --git a/js/main.js b/js/main.js
index f1a50e28a..8b1114d19 100644
--- a/js/main.js
+++ b/js/main.js
@@ -343,6 +343,8 @@
function updateConvItems(mode,data) {
+ var expanded_comments = false;
+
if(mode === 'update') {
prev = 'threads-begin';
@@ -353,7 +355,14 @@ function updateConvItems(mode,data) {
$('img',this).each(function() {
$(this).attr('src',$(this).attr('dst'));
});
+// expanded_comments = false;
+// $('.collapsed-comments',this).each(function() {
+// if($(this).is(':visible'))
+// expanded_comments = this;
+// });
$('#' + prev).after($(this));
+// if(expanded_comments)
+// $(expanded_comments).show();
$(".autotime").timeago();
// divgrow doesn't prevent itself from attaching a second (or 500th)
// "show more" div to a content region - it also has a few other
@@ -365,7 +374,14 @@ function updateConvItems(mode,data) {
$('img',this).each(function() {
$(this).attr('src',$(this).attr('dst'));
});
+// expanded_comments = false;
+// $('.collapsed-comments',this).each(function() {
+// if($(this).is(':visible'))
+// expanded_comments = this;
+// });
$('#' + ident).replaceWith($(this));
+// if(expanded_comments)
+// $(expanded_comments).show();
$(".autotime").timeago();
// $("div.wall-item-body").divgrow({ initialHeight: 400 });
diff --git a/mod/admin.php b/mod/admin.php
index 20518dfc8..224a41867 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -281,7 +281,7 @@ function admin_page_site_post(&$a){
set_config('system','delivery_interval',$delivery_interval);
set_config('system','poll_interval',$poll_interval);
set_config('system','maxloadavg',$maxloadavg);
- set_config('config','sitename',$sitename);
+ set_config('system','sitename',$sitename);
if ($banner=="") {
del_config('system','banner');
@@ -405,7 +405,7 @@ function admin_page_site(&$a) {
'$baseurl' => $a->get_baseurl(true),
// name, label, value, help string, extra data...
- '$sitename' => array('sitename', t("Site name"), htmlentities($a->config['sitename'], ENT_QUOTES), ""),
+ '$sitename' => array('sitename', t("Site name"), htmlentities(get_config('system','sitename'), ENT_QUOTES), ""),
'$banner' => array('banner', t("Banner/Logo"), $banner, ""),
'$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices),
'$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - change theme settings "), $theme_choices),
@@ -414,8 +414,8 @@ function admin_page_site(&$a) {
'$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),
'$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"), $a->config['system']['register_policy'], "", $register_choices),
- '$register_text' => array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.")),
+ '$register_policy' => array('register_policy', t("Register policy"), get_config('system','register_policy'), "", $register_choices),
+ '$register_text' => array('register_text', t("Register text"), htmlentities(get_config('system','register_text'), ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.")),
'$abandon_days' => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')),
'$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")),
'$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")),
diff --git a/mod/chanview.php b/mod/chanview.php
index 8de59b92e..4f7638846 100644
--- a/mod/chanview.php
+++ b/mod/chanview.php
@@ -29,7 +29,11 @@ function chanview_content(&$a) {
);
}
elseif($_REQUEST['url']) {
- $r = q("select * from xchan where xchan_url = '%s' limit 1",
+
+ // if somebody re-installed they will have more than one xchan, use the most recent name date as this is
+ // the most useful consistently ascending table item we have.
+
+ $r = q("select * from xchan where xchan_url = '%s' order by xchan_name_date desc limit 1",
dbesc($_REQUEST['url'])
);
}
diff --git a/mod/connections.php b/mod/connections.php
index ff3edfeaa..a53107dcf 100644
--- a/mod/connections.php
+++ b/mod/connections.php
@@ -126,13 +126,27 @@ function connections_post(&$a) {
intval(local_user()),
intval($contact_id)
);
- if($r)
+ if($r) {
$a->data['abook'] = $r[0];
+ }
+
return;
}
+function connections_clone(&$a) {
+
+ if(! array_key_exists('abook',$a->data))
+ return;
+ $clone = $a->data['abook'];
+
+ unset($clone['abook_id']);
+ unset($clone['abook_account']);
+ unset($clone['abook_channel']);
+ require_once('include/settings.php');
+ build_sync_packet(0 /* use the current local_user */, array('abook' => array($clone)));
+}
function connections_content(&$a) {
@@ -183,40 +197,48 @@ function connections_content(&$a) {
}
if($cmd === 'block') {
- if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_BLOCKED))
+ if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_BLOCKED)) {
info((($orig_record[0]['abook_flags'] & ABOOK_FLAG_BLOCKED)
? t('Channel has been unblocked')
: t('Channel has been blocked')) . EOL );
+ connections_clone($a);
+ }
else
notice(t('Unable to set address book parameters.') . EOL);
goaway($a->get_baseurl(true) . '/connections/' . $contact_id);
}
if($cmd === 'ignore') {
- if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_IGNORED))
+ if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_IGNORED)) {
info((($orig_record[0]['abook_flags'] & ABOOK_FLAG_IGNORED)
? t('Channel has been unignored')
: t('Channel has been ignored')) . EOL );
+ connections_clone($a);
+ }
else
notice(t('Unable to set address book parameters.') . EOL);
goaway($a->get_baseurl(true) . '/connections/' . $contact_id);
}
if($cmd === 'archive') {
- if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_ARCHIVED))
+ if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_ARCHIVED)) {
info((($orig_record[0]['abook_flags'] & ABOOK_FLAG_ARCHIVED)
? t('Channel has been unarchived')
: t('Channel has been archived')) . EOL );
+ connections_clone($a);
+ }
else
notice(t('Unable to set address book parameters.') . EOL);
goaway($a->get_baseurl(true) . '/connections/' . $contact_id);
}
if($cmd === 'hide') {
- if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_HIDDEN))
+ if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_HIDDEN)) {
info((($orig_record[0]['abook_flags'] & ABOOK_FLAG_HIDDEN)
? t('Channel has been unhidden')
: t('Channel has been hidden')) . EOL );
+ connections_clone($a);
+ }
else
notice(t('Unable to set address book parameters.') . EOL);
goaway($a->get_baseurl(true) . '/connections/' . $contact_id);
@@ -226,10 +248,12 @@ function connections_content(&$a) {
if($cmd === 'approve') {
if($orig_record[0]['abook_flags'] & ABOOK_FLAG_PENDING) {
- if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_PENDING))
+ if(abook_toggle_flag($orig_record[0],ABOOK_FLAG_PENDING)) {
info((($orig_record[0]['abook_flags'] & ABOOK_FLAG_PENDING)
? t('Channel has been approved')
: t('Channel has been unapproved')) . EOL );
+ connections_clone($a);
+ }
else
notice(t('Unable to set address book parameters.') . EOL);
}
@@ -244,6 +268,7 @@ function connections_content(&$a) {
// terminate_friendship($a->get_channel(),$orig_record[0]);
contact_remove(local_user(), $orig_record[0]['abook_id']);
+// FIXME - send to clones
info( t('Contact has been removed.') . EOL );
if(x($_SESSION,'return_url'))
goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
diff --git a/mod/dirsearch.php b/mod/dirsearch.php
index 5465e11ff..b2b28ce8c 100644
--- a/mod/dirsearch.php
+++ b/mod/dirsearch.php
@@ -32,6 +32,8 @@ function dirsearch_content(&$a) {
$gender = ((x($_REQUEST,'gender')) ? $_REQUEST['gender'] : '');
$marital = ((x($_REQUEST,'marital')) ? $_REQUEST['marital'] : '');
$keywords = ((x($_REQUEST,'keywords')) ? $_REQUEST['keywords'] : '');
+ $agege = ((x($_REQUEST,'agege')) ? intval($_REQUEST['agege']) : 0 );
+ $agele = ((x($_REQUEST,'agele')) ? intval($_REQUEST['agele']) : 0 );
// TODO - a meta search which joins all of these things to one search string
@@ -58,6 +60,14 @@ function dirsearch_content(&$a) {
if($keywords)
$sql_extra .= " OR xprof_keywords like '" . protect_sprintf( '%' . dbesc($keywords) . '%' ) . "' ";
+ // we only support an age range currently. You must set both agege
+ // (greater than or equal) and agele (less than or equal)
+
+ if($agele && $agege) {
+ $sql_extra .= " OR ( xprof_age <= " . intval($agele) . " ";
+ $sql_extra .= " AND xprof_age >= " . intval($agege) . ") ";
+ }
+
$perpage = (($_REQUEST['n']) ? $_REQUEST['n'] : 80);
$page = (($_REQUEST['p']) ? intval($_REQUEST['p'] - 1) : 0);
$startrec = (($page+1) * $perpage) - $perpage;
@@ -124,6 +134,7 @@ function dirsearch_content(&$a) {
$entry['postcode'] = $rr['xprof_postcode'];
$entry['country'] = $rr['xprof_country'];
$entry['birthday'] = $rr['xprof_dob'];
+ $entry['age'] = $rr['xprof_age'];
$entry['gender'] = $rr['xprof_gender'];
$entry['marital'] = $rr['xprof_marital'];
$entry['keywords'] = $rr['xprof_keywords'];
diff --git a/mod/display.php b/mod/display.php
index b1ae54df3..110dd1807 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -59,7 +59,7 @@ function display_content(&$a, $update = 0, $load = false) {
$o .= '
' . "\r\n";
- $o .= "\r\n";
$a->page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array(
@@ -152,7 +152,7 @@ function display_content(&$a, $update = 0, $load = false) {
- $o .= conversation($a,$items,'display', $update, 'client');
+ $o .= conversation($a, $items, 'display', $update, 'client');
if($updateable) {
$x = q("UPDATE item SET item_flags = ( item_flags ^ %d )
diff --git a/mod/editpost.php b/mod/editpost.php
index b28e58348..af6f741c6 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -85,7 +85,7 @@ function editpost_content(&$a) {
'$jotnets' => $jotnets,
'$title' => htmlspecialchars($itm[0]['title']),
'$placeholdertitle' => t('Set title'),
- '$category' => file_tag_file_to_list($itm[0]['file'], 'category'),
+ '$category' => '', // FIXME
'$placeholdercategory' => t('Categories (comma-separated list)'),
'$emtitle' => t('Example: bob@example.com, mary@example.com'),
'$lockstate' => $lockstate,
diff --git a/mod/item.php b/mod/item.php
index ed5941d2a..c504c77e1 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -140,7 +140,9 @@ function item_post(&$a) {
}
}
- if($parent) logger('mod_item: item_post parent=' . $parent);
+ if($parent) {
+ logger('mod_item: item_post parent=' . $parent);
+ }
$observer = $a->get_observer();
@@ -320,6 +322,18 @@ function item_post(&$a) {
$body = fix_mce_lf($body);
}
+ // If we're sending a private top-level message with a single @-taggable channel as a recipient, @-tag it.
+
+ 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
@@ -532,6 +546,7 @@ function item_post(&$a) {
$datarray['item_restrict'] = $item_restrict;
$datarray['item_flags'] = $item_flags;
+ $datarray['comment_policy'] = map_scope($channel['channel_w_comment']);
// preview mode - prepare the body for display and send it via json
diff --git a/mod/like.php b/mod/like.php
index bf707477c..f617391a1 100755
--- a/mod/like.php
+++ b/mod/like.php
@@ -102,8 +102,7 @@ function like_content(&$a) {
$post_type = (($item['resource_type'] === 'photo') ? $t('photo') : t('status'));
- $links = array(array('rel' => 'alternate','type' => 'text/html',
- 'href' => z_root() . '/display/' . $item['mid']));
+ $links = array(array('rel' => 'alternate','type' => 'text/html', 'href' => $item['plink']));
$objtype = (($item['resource_type'] === 'photo') ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE );
$body = $item['body'];
diff --git a/mod/network.php b/mod/network.php
index bbd9f9de7..aa134eece 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -465,7 +465,7 @@ function network_content(&$a, $update = 0, $load = false) {
intval(local_user())
);
if($r) {
- $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval(local_user()) . " AND ( author_xchan = " . dbesc($r[0]['abook_xchan']) . " or owner_xchan = " . dbesc($r[0]['abook_xchan']) . " ) and item_restrict = 0 ) ";
+ $sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval(local_user()) . " AND ( author_xchan = '" . dbesc($r[0]['abook_xchan']) . "' or owner_xchan = '" . dbesc($r[0]['abook_xchan']) . "' ) and item_restrict = 0 ) ";
$o = '' . t('Contact: ') . $r[0]['name'] . ' ' . $o;
}
else {
diff --git a/mod/search.php b/mod/search.php
index 4e093d865..1335ea508 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -153,7 +153,7 @@ function search_content(&$a,$update = 0, $load = false) {
// because browser prefetching might change it on us. We have to deliver it with the page.
$o .= '
' . "\r\n";
- $o .= "\r\n";
$a->page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array(
@@ -171,7 +171,7 @@ function search_content(&$a,$update = 0, $load = false) {
'$nouveau' => '0',
'$wall' => '0',
'$page' => (($a->pager['page'] != 1) ? $a->pager['page'] : 1),
- '$search' => (($tag) ? '#' : '') . $search,
+ '$search' => (($tag) ? urlencode('#') : '') . $search,
'$order' => '',
'$file' => '',
'$cats' => '',
@@ -189,7 +189,7 @@ function search_content(&$a,$update = 0, $load = false) {
$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
dbg(1);
if($load) {
- $r = q("SELECT distinct(mid), item.* from item
+ $r = q("SELECT distinct mid, id as item_id from item
WHERE item_restrict = 0
AND (( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND item_private = 0 )
OR ( `item`.`uid` = %d ))
@@ -209,15 +209,15 @@ dbg(0);
if($r) {
$parents_str = ids_to_querystr($r,'item_id');
-
+dbg(1);
$items = q("SELECT `item`.*, `item`.`id` AS `item_id`
FROM `item`
WHERE item_restrict = 0
- $sql_extra ",
- intval($a->profile['profile_uid']),
- dbesc($parents_str)
+ $sql_extra and parent in ( $parents_str ) "
+// intval($a->profile['profile_uid']),
+// dbesc($parents_str)
);
-
+dbg(0);
xchan_query($items);
$items = fetch_post_tags($items,true);
$items = conv_sort($items,'created');
diff --git a/mod/settings.php b/mod/settings.php
index f417586af..e830d7070 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -1,5 +1,7 @@
user) && x($a->user,'uid') && $a->user['uid'] != local_user()) {
-// notice( t('Permission denied.') . EOL);
-// return;
-// }
-
- $old_page_flags = $a->user['page-flags'];
-
if((argc() > 1) && (argv(1) === 'oauth') && x($_POST,'remove')){
check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
@@ -182,6 +177,7 @@ function settings_post(&$a) {
check_form_security_token_redirectOnErr('/settings/featured', 'settings_featured');
call_hooks('feature_settings_post', $_POST);
+ build_sync_packet();
return;
}
@@ -194,6 +190,7 @@ function settings_post(&$a) {
set_pconfig(local_user(),'feature',substr($k,8),((intval($v)) ? 1 : 0));
}
}
+ build_sync_packet();
return;
}
@@ -237,6 +234,7 @@ function settings_post(&$a) {
);
call_hooks('display_settings_post', $_POST);
+ build_sync_packet();
goaway($a->get_baseurl(true) . '/settings/display' );
return; // NOTREACHED
}
@@ -292,7 +290,7 @@ function settings_post(&$a) {
$errs[] = t('Not valid email.');
$adm = trim(get_config('system','admin_email'));
if(($adm) && (strcasecmp($email,$adm) == 0)) {
- $errs[] = t('Protected email. Cannot change to that email.');
+ $errs[] = t('Protected email address. Cannot change to that email.');
$email = $a->user['email'];
}
if(! $errs) {
@@ -550,11 +548,12 @@ function settings_post(&$a) {
dbesc($username),
intval($channel['channel_id'])
);
- // we really need to send out notifications to all our friends
}
proc_run('php','include/directory.php',local_user());
+ build_sync_packet();
+
//$_SESSION['theme'] = $theme;
if($email_changed && $a->config['system']['register_policy'] == REGISTER_VERIFY) {
@@ -719,7 +718,6 @@ function settings_content(&$a) {
if((argc() > 1) && (argv(1) === 'features')) {
-
$arr = array();
$features = get_features();
@@ -739,6 +737,7 @@ function settings_content(&$a) {
'$submit' => t('Submit'),
'$field_yesno' => 'field_yesno.tpl',
));
+
return $o;
}
diff --git a/mod/tagger.php b/mod/tagger.php
index 28e10d131..ec5c92184 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -11,6 +11,8 @@ function tagger_content(&$a) {
return;
}
+ $observer_hash = get_observer_hash();
+
$term = notags(trim($_GET['term']));
// no commas allowed
$term = str_replace(array(',',' '),array('','_'),$term);
@@ -121,7 +123,8 @@ function tagger_content(&$a) {
$arr['obj_type'] = $objtype;
$arr['object'] = $obj;
$arr['parent_mid'] = $item['mid'];
-
+
+ store_item_tag($item['uid'],$item['id'],TERM_OBJ_POST,TERM_HASHTAG,$term,$tagid);
$ret = post_activity_item($arr);
if($ret['success'])
diff --git a/mod/thing.php b/mod/thing.php
new file mode 100644
index 000000000..723b069bc
--- /dev/null
+++ b/mod/thing.php
@@ -0,0 +1,43 @@
+get_account();
+
+ $name = escape_tags($_REQUEST['term']);
+ $url = $_REQUEST['link'];
+ $photo = $_REQUEST['photo'];
+
+ $hash = random_string();
+
+
+ if(! $name)
+ return;
+
+ $r = q("insert into term ( aid, uid, oid, otype, type, term, url, imgurl, term_hash )
+ values( %d, %d, %d, %d, %d, '%s', '%s', '%s', '%s' ) ",
+ intval($account_id),
+ intval(local_user()),
+ 0,
+ TERM_OBJ_THING,
+ TERM_THING,
+ dbesc($name),
+ dbesc(($url) ? $url : z_root() . '/thing/' . $hash),
+ dbesc(($photo) ? $photo : ''),
+ dbesc($hash)
+ );
+
+}
+
+
+function thing_content(&$a) {
+
+
+
+
+}
diff --git a/mod/zfinger.php b/mod/zfinger.php
index 48582b3d6..d438940a1 100644
--- a/mod/zfinger.php
+++ b/mod/zfinger.php
@@ -91,6 +91,9 @@ function zfinger_init(&$a) {
$profile['birthday'] = $p[0]['dob'];
if($profile['birthday'] != '0000-00-00')
$profile['next_birthday'] = z_birthday($p[0]['dob'],$e['channel_timezone']);
+
+ if($age = age($p[0]['dob'],$e['channel_timezone'],''))
+ $profile['age'] = $age;
$profile['gender'] = $p[0]['gender'];
$profile['marital'] = $p[0]['marital'];
$profile['sexual'] = $p[0]['sexual'];
@@ -181,7 +184,14 @@ function zfinger_init(&$a) {
$ret['site']['directory_mode'] = 'standalone';
if($dirmode != DIRECTORY_MODE_NORMAL)
$ret['site']['directory_url'] = z_root() . '/dirsearch';
-
+ $register_policy = intval(get_config('system','register_policy'));
+ if($register_policy == REGISTER_CLOSED)
+ $ret['site']['register_policy'] = 'closed';
+ if($register_policy == REGISTER_APPROVE)
+ $ret['site']['register_policy'] = 'approve';
+ if($register_policy == REGISTER_OPEN)
+ $ret['site']['register_policy'] = 'open';
+
json_return_and_die($ret);
}
\ No newline at end of file
diff --git a/util/messages.po b/util/messages.po
index e184ded34..982efc247 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-06-14 00:01-0700\n"
+"POT-Creation-Date: 2013-06-28 00:01-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -70,180 +70,180 @@ msgstr ""
msgid "%s Administrator"
msgstr ""
-#: ../../include/enotify.php:62
+#: ../../include/enotify.php:64
#, php-format
msgid "%s "
msgstr ""
-#: ../../include/enotify.php:66
+#: ../../include/enotify.php:68
#, php-format
msgid "[Red:Notify] New mail received at %s"
msgstr ""
-#: ../../include/enotify.php:68
+#: ../../include/enotify.php:70
#, php-format
msgid "%1$s sent you a new private message at %2$s."
msgstr ""
-#: ../../include/enotify.php:69
+#: ../../include/enotify.php:71
#, php-format
msgid "%1$s sent you %2$s."
msgstr ""
-#: ../../include/enotify.php:69
+#: ../../include/enotify.php:71
msgid "a private message"
msgstr ""
-#: ../../include/enotify.php:70
+#: ../../include/enotify.php:72
#, php-format
msgid "Please visit %s to view and/or reply to your private messages."
msgstr ""
-#: ../../include/enotify.php:116
+#: ../../include/enotify.php:118
#, php-format
msgid "%1$s commented on [zrl=%2$s]a %3$s[/zrl]"
msgstr ""
-#: ../../include/enotify.php:123
+#: ../../include/enotify.php:125
#, php-format
msgid "%1$s commented on [zrl=%2$s]%3$s's %4$s[/zrl]"
msgstr ""
-#: ../../include/enotify.php:131
+#: ../../include/enotify.php:133
#, php-format
msgid "%1$s commented on [zrl=%2$s]your %3$s[/zrl]"
msgstr ""
-#: ../../include/enotify.php:141
+#: ../../include/enotify.php:143
#, php-format
msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
msgstr ""
-#: ../../include/enotify.php:142
+#: ../../include/enotify.php:144
#, php-format
msgid "%s commented on an item/conversation you have been following."
msgstr ""
-#: ../../include/enotify.php:145 ../../include/enotify.php:162
-#: ../../include/enotify.php:175 ../../include/enotify.php:193
-#: ../../include/enotify.php:206
+#: ../../include/enotify.php:147 ../../include/enotify.php:164
+#: ../../include/enotify.php:177 ../../include/enotify.php:195
+#: ../../include/enotify.php:208
#, php-format
msgid "Please visit %s to view and/or reply to the conversation."
msgstr ""
-#: ../../include/enotify.php:152
+#: ../../include/enotify.php:154
#, php-format
msgid "[Red:Notify] %s posted to your profile wall"
msgstr ""
-#: ../../include/enotify.php:154
+#: ../../include/enotify.php:156
#, php-format
msgid "%1$s posted to your profile wall at %2$s"
msgstr ""
-#: ../../include/enotify.php:156
+#: ../../include/enotify.php:158
#, php-format
msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]"
msgstr ""
-#: ../../include/enotify.php:169
+#: ../../include/enotify.php:171
#, php-format
msgid "[Red:Notify] %s tagged you"
msgstr ""
-#: ../../include/enotify.php:170
+#: ../../include/enotify.php:172
#, php-format
msgid "%1$s tagged you at %2$s"
msgstr ""
-#: ../../include/enotify.php:171
+#: ../../include/enotify.php:173
#, php-format
msgid "%1$s [zrl=%2$s]tagged you[/zrl]."
msgstr ""
-#: ../../include/enotify.php:183
+#: ../../include/enotify.php:185
#, php-format
msgid "[Red:Notify] %1$s poked you"
msgstr ""
-#: ../../include/enotify.php:184
+#: ../../include/enotify.php:186
#, php-format
msgid "%1$s poked you at %2$s"
msgstr ""
-#: ../../include/enotify.php:185
+#: ../../include/enotify.php:187
#, php-format
msgid "%1$s [zrl=%2$s]poked you[/zrl]."
msgstr ""
-#: ../../include/enotify.php:200
+#: ../../include/enotify.php:202
#, php-format
msgid "[Red:Notify] %s tagged your post"
msgstr ""
-#: ../../include/enotify.php:201
+#: ../../include/enotify.php:203
#, php-format
msgid "%1$s tagged your post at %2$s"
msgstr ""
-#: ../../include/enotify.php:202
+#: ../../include/enotify.php:204
#, php-format
msgid "%1$s tagged [zrl=%2$s]your post[/zrl]"
msgstr ""
-#: ../../include/enotify.php:213
+#: ../../include/enotify.php:215
msgid "[Red:Notify] Introduction received"
msgstr ""
-#: ../../include/enotify.php:214
+#: ../../include/enotify.php:216
#, php-format
msgid "You've received an introduction from '%1$s' at %2$s"
msgstr ""
-#: ../../include/enotify.php:215
+#: ../../include/enotify.php:217
#, php-format
msgid "You've received [zrl=%1$s]an introduction[/zrl] from %2$s."
msgstr ""
-#: ../../include/enotify.php:218 ../../include/enotify.php:236
+#: ../../include/enotify.php:220 ../../include/enotify.php:238
#, php-format
msgid "You may visit their profile at %s"
msgstr ""
-#: ../../include/enotify.php:220
+#: ../../include/enotify.php:222
#, php-format
msgid "Please visit %s to approve or reject the introduction."
msgstr ""
-#: ../../include/enotify.php:227
+#: ../../include/enotify.php:229
msgid "[Red:Notify] Friend suggestion received"
msgstr ""
-#: ../../include/enotify.php:228
+#: ../../include/enotify.php:230
#, php-format
msgid "You've received a friend suggestion from '%1$s' at %2$s"
msgstr ""
-#: ../../include/enotify.php:229
+#: ../../include/enotify.php:231
#, php-format
msgid "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s."
msgstr ""
-#: ../../include/enotify.php:234
+#: ../../include/enotify.php:236
msgid "Name:"
msgstr ""
-#: ../../include/enotify.php:235
+#: ../../include/enotify.php:237
msgid "Photo:"
msgstr ""
-#: ../../include/enotify.php:238
+#: ../../include/enotify.php:240
#, php-format
msgid "Please visit %s to approve or reject the suggestion."
msgstr ""
#: ../../include/Contact.php:53 ../../include/contact_widgets.php:9
-#: ../../mod/match.php:58 ../../mod/suggest.php:56 ../../boot.php:1571
+#: ../../mod/match.php:58 ../../mod/suggest.php:56 ../../boot.php:1578
msgid "Connect"
msgstr ""
@@ -255,33 +255,33 @@ msgstr ""
msgid "Open the selected location in a different window or browser tab"
msgstr ""
-#: ../../include/Contact.php:375 ../../include/conversation.php:874
+#: ../../include/Contact.php:378 ../../include/conversation.php:905
msgid "Poke"
msgstr ""
-#: ../../include/Contact.php:376 ../../include/conversation.php:868
+#: ../../include/Contact.php:379 ../../include/conversation.php:899
msgid "View Status"
msgstr ""
-#: ../../include/Contact.php:377 ../../include/nav.php:75
-#: ../../include/conversation.php:869 ../../mod/connections.php:264
-#: ../../mod/connections.php:371
+#: ../../include/Contact.php:380 ../../include/nav.php:75
+#: ../../include/conversation.php:900 ../../mod/connections.php:289
+#: ../../mod/connections.php:396
msgid "View Profile"
msgstr ""
-#: ../../include/Contact.php:378 ../../include/conversation.php:870
+#: ../../include/Contact.php:381 ../../include/conversation.php:901
msgid "View Photos"
msgstr ""
-#: ../../include/Contact.php:379 ../../include/conversation.php:871
+#: ../../include/Contact.php:382 ../../include/conversation.php:902
msgid "Network Posts"
msgstr ""
-#: ../../include/Contact.php:380 ../../include/conversation.php:872
+#: ../../include/Contact.php:383 ../../include/conversation.php:903
msgid "Edit Contact"
msgstr ""
-#: ../../include/Contact.php:381 ../../include/conversation.php:873
+#: ../../include/Contact.php:384 ../../include/conversation.php:904
msgid "Send PM"
msgstr ""
@@ -346,7 +346,7 @@ msgid "RSS/Atom"
msgstr ""
#: ../../include/contact_selectors.php:79 ../../mod/admin.php:624
-#: ../../mod/admin.php:633 ../../boot.php:1316
+#: ../../mod/admin.php:633 ../../boot.php:1323
msgid "Email"
msgstr ""
@@ -410,7 +410,7 @@ msgid "Examples: Robert Morgenstein, Fishing"
msgstr ""
#: ../../include/contact_widgets.php:33 ../../mod/directory.php:160
-#: ../../mod/directory.php:165 ../../mod/connections.php:626
+#: ../../mod/directory.php:165 ../../mod/connections.php:651
msgid "Find"
msgstr ""
@@ -450,7 +450,7 @@ msgstr[0] ""
msgstr[1] ""
#: ../../include/contact_widgets.php:126 ../../include/js_strings.php:7
-#: ../../include/ItemObject.php:269
+#: ../../include/ItemObject.php:273
msgid "show more"
msgstr ""
@@ -545,7 +545,7 @@ msgid "Finishes:"
msgstr ""
#: ../../include/event.php:40 ../../include/bb2diaspora.php:455
-#: ../../mod/events.php:448 ../../mod/directory.php:116 ../../boot.php:1625
+#: ../../mod/events.php:448 ../../mod/directory.php:116 ../../boot.php:1632
msgid "Location:"
msgstr ""
@@ -642,7 +642,7 @@ msgid "Enable widget to display Network posts only from selected collections"
msgstr ""
#: ../../include/features.php:45 ../../mod/network.php:163
-#: ../../mod/search.php:17 ../../custom/network.php:168
+#: ../../mod/search.php:17
msgid "Saved Searches"
msgstr ""
@@ -766,7 +766,6 @@ msgid "Channels not in any collection"
msgstr ""
#: ../../include/group.php:289 ../../mod/network.php:164
-#: ../../custom/network.php:169
msgid "add"
msgstr ""
@@ -774,7 +773,7 @@ msgstr ""
msgid "Delete this item?"
msgstr ""
-#: ../../include/js_strings.php:6 ../../include/ItemObject.php:540
+#: ../../include/js_strings.php:6 ../../include/ItemObject.php:544
#: ../../mod/photos.php:1061 ../../mod/photos.php:1099
#: ../../mod/photos.php:1126
msgid "Comment"
@@ -881,7 +880,7 @@ msgstr ""
msgid "Stored post could not be verified."
msgstr ""
-#: ../../include/network.php:1097
+#: ../../include/network.php:1103
msgid "view full size"
msgstr ""
@@ -900,12 +899,12 @@ msgstr ""
msgid "Profile"
msgstr ""
-#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1008
+#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1007
msgid "Full Name:"
msgstr ""
#: ../../include/profile_advanced.php:17 ../../mod/directory.php:118
-#: ../../boot.php:1627
+#: ../../boot.php:1634
msgid "Gender:"
msgstr ""
@@ -926,7 +925,7 @@ msgid "Age:"
msgstr ""
#: ../../include/profile_advanced.php:37 ../../mod/directory.php:120
-#: ../../boot.php:1628
+#: ../../boot.php:1635
msgid "Status:"
msgstr ""
@@ -940,7 +939,7 @@ msgid "Sexual Preference:"
msgstr ""
#: ../../include/profile_advanced.php:48 ../../mod/directory.php:122
-#: ../../boot.php:1629
+#: ../../boot.php:1636
msgid "Homepage:"
msgstr ""
@@ -1026,7 +1025,29 @@ msgid ""
"form has been opened for too long (>3 hours) before submitting it."
msgstr ""
-#: ../../include/nav.php:71 ../../include/nav.php:86 ../../boot.php:1313
+#: ../../include/bbcode.php:94 ../../include/bbcode.php:412
+#: ../../include/bbcode.php:413
+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:376 ../../include/bbcode.php:396
+msgid "$1 wrote:"
+msgstr ""
+
+#: ../../include/bbcode.php:417 ../../include/bbcode.php:418
+msgid "Encrypted content"
+msgstr ""
+
+#: ../../include/nav.php:71 ../../include/nav.php:86 ../../boot.php:1320
msgid "Logout"
msgstr ""
@@ -1055,7 +1076,7 @@ msgstr ""
msgid "Manage/Edit Profiles"
msgstr ""
-#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2020
+#: ../../include/nav.php:78 ../../mod/fbrowser.php:25 ../../boot.php:2027
msgid "Photos"
msgstr ""
@@ -1063,7 +1084,7 @@ msgstr ""
msgid "Your photos"
msgstr ""
-#: ../../include/nav.php:84 ../../boot.php:1314
+#: ../../include/nav.php:84 ../../boot.php:1321
msgid "Login"
msgstr ""
@@ -1084,7 +1105,7 @@ msgstr ""
msgid "Home Page"
msgstr ""
-#: ../../include/nav.php:118 ../../mod/register.php:181 ../../boot.php:1289
+#: ../../include/nav.php:118 ../../mod/register.php:181 ../../boot.php:1296
msgid "Register"
msgstr ""
@@ -1153,7 +1174,7 @@ msgstr ""
msgid "Intros"
msgstr ""
-#: ../../include/nav.php:151 ../../mod/connections.php:512
+#: ../../include/nav.php:151 ../../mod/connections.php:537
msgid "New Connections"
msgstr ""
@@ -1205,7 +1226,7 @@ msgstr ""
msgid "New Message"
msgstr ""
-#: ../../include/nav.php:167 ../../mod/events.php:346 ../../boot.php:2031
+#: ../../include/nav.php:167 ../../mod/events.php:346 ../../boot.php:2038
msgid "Events"
msgstr ""
@@ -1229,7 +1250,7 @@ msgstr ""
msgid "Manage Your Channels"
msgstr ""
-#: ../../include/nav.php:173 ../../mod/settings.php:101
+#: ../../include/nav.php:173 ../../mod/settings.php:103
#: ../../mod/admin.php:716 ../../mod/admin.php:921
msgid "Settings"
msgstr ""
@@ -1238,7 +1259,7 @@ msgstr ""
msgid "Account/Channel Settings"
msgstr ""
-#: ../../include/nav.php:175 ../../mod/connections.php:620
+#: ../../include/nav.php:175 ../../mod/connections.php:645
msgid "Connections"
msgstr ""
@@ -1283,15 +1304,15 @@ 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:4395
+#: ../../include/attach.php:464 ../../include/items.php:4455
#: ../../mod/common.php:43 ../../mod/events.php:134 ../../mod/invite.php:13
#: ../../mod/invite.php:99 ../../mod/allfriends.php:10 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/setup.php:181 ../../mod/settings.php:580
+#: ../../mod/api.php:31 ../../mod/setup.php:181 ../../mod/settings.php:579
#: ../../mod/viewconnections.php:33 ../../mod/viewconnections.php:38
#: ../../mod/delegate.php:6 ../../mod/group.php:15 ../../mod/photos.php:74
#: ../../mod/photos.php:639 ../../mod/viewsrc.php:12 ../../mod/message.php:204
-#: ../../mod/item.php:148 ../../mod/network.php:7 ../../mod/intro.php:50
-#: ../../mod/connections.php:146 ../../mod/profiles.php:163
+#: ../../mod/item.php:150 ../../mod/network.php:7 ../../mod/intro.php:50
+#: ../../mod/connections.php:160 ../../mod/profiles.php:163
#: ../../mod/profiles.php:471 ../../mod/new_channel.php:66
#: ../../mod/new_channel.php:97 ../../mod/manage.php:6
#: ../../mod/crepair.php:115 ../../mod/nogroup.php:25
@@ -1299,8 +1320,7 @@ msgstr ""
#: ../../mod/notifications.php:66 ../../mod/editpost.php:10
#: ../../mod/poke.php:128 ../../mod/channel.php:105 ../../mod/fsuggest.php:78
#: ../../mod/suggest.php:32 ../../mod/register.php:60 ../../mod/regmod.php:18
-#: ../../mod/mood.php:111 ../../custom/network.php:7 ../../index.php:174
-#: ../../index.php:336
+#: ../../mod/mood.php:111 ../../index.php:175 ../../index.php:337
msgid "Permission denied."
msgstr ""
@@ -1321,7 +1341,7 @@ msgstr ""
msgid "Photo storage failed."
msgstr ""
-#: ../../include/photos.php:276 ../../boot.php:2023
+#: ../../include/photos.php:276 ../../boot.php:2030
msgid "Photo Albums"
msgstr ""
@@ -1475,8 +1495,7 @@ msgid "Sex Addict"
msgstr ""
#: ../../include/profile_selectors.php:42 ../../include/identity.php:225
-#: ../../mod/network.php:377 ../../mod/connections.php:337
-#: ../../custom/network.php:382
+#: ../../mod/network.php:377 ../../mod/connections.php:362
msgid "Friends"
msgstr ""
@@ -1598,8 +1617,8 @@ msgid "Registration request at %s"
msgstr ""
#: ../../include/account.php:266 ../../include/account.php:293
-#: ../../include/account.php:350 ../../include/items.php:3920
-#: ../../boot.php:1154
+#: ../../include/account.php:350 ../../include/items.php:3980
+#: ../../boot.php:1161
msgid "Administrator"
msgstr ""
@@ -1671,122 +1690,6 @@ msgstr ""
msgid "Unable to verify site signature for %s"
msgstr ""
-#: ../../include/auth.php:65
-msgid "Logged out."
-msgstr ""
-
-#: ../../include/auth.php:162
-msgid "Failed authentication"
-msgstr ""
-
-#: ../../include/auth.php:171
-msgid "Login failed."
-msgstr ""
-
-#: ../../include/follow.php:21
-msgid "Channel is blocked on this site."
-msgstr ""
-
-#: ../../include/follow.php:26
-msgid "Channel location missing."
-msgstr ""
-
-#: ../../include/follow.php:43
-msgid "Channel discovery failed. Website may be down or misconfigured."
-msgstr ""
-
-#: ../../include/follow.php:51
-msgid "Response from remote channel was not understood."
-msgstr ""
-
-#: ../../include/follow.php:58
-msgid "Response from remote channel was incomplete."
-msgstr ""
-
-#: ../../include/follow.php:124
-msgid "local account not found."
-msgstr ""
-
-#: ../../include/follow.php:133
-msgid "Cannot connect to yourself."
-msgstr ""
-
-#: ../../include/permissions.php:13
-msgid "Can view my \"public\" stream and posts"
-msgstr ""
-
-#: ../../include/permissions.php:14
-msgid "Can view my \"public\" channel profile"
-msgstr ""
-
-#: ../../include/permissions.php:15
-msgid "Can view my \"public\" photo albums"
-msgstr ""
-
-#: ../../include/permissions.php:16
-msgid "Can view my \"public\" address book"
-msgstr ""
-
-#: ../../include/permissions.php:17
-msgid "Can view my \"public\" file storage"
-msgstr ""
-
-#: ../../include/permissions.php:18
-msgid "Can view my \"public\" pages"
-msgstr ""
-
-#: ../../include/permissions.php:21
-msgid "Can send me their channel stream and posts"
-msgstr ""
-
-#: ../../include/permissions.php:22
-msgid "Can post on my channel page (\"wall\")"
-msgstr ""
-
-#: ../../include/permissions.php:23
-msgid "Can comment on my posts"
-msgstr ""
-
-#: ../../include/permissions.php:24
-msgid "Can send me private mail messages"
-msgstr ""
-
-#: ../../include/permissions.php:25
-msgid "Can post photos to my photo albums"
-msgstr ""
-
-#: ../../include/permissions.php:26
-msgid "Can forward to all my channel contacts via post hashtags"
-msgstr ""
-
-#: ../../include/permissions.php:26
-msgid "Advanced - useful for creating group forum channels"
-msgstr ""
-
-#: ../../include/permissions.php:27
-msgid "Can chat with me (when available)"
-msgstr ""
-
-#: ../../include/permissions.php:27
-msgid "Requires compatible chat plugin"
-msgstr ""
-
-#: ../../include/permissions.php:28
-msgid "Can write to my \"public\" file storage"
-msgstr ""
-
-#: ../../include/permissions.php:29
-msgid "Can edit my \"public\" pages"
-msgstr ""
-
-#: ../../include/permissions.php:31
-msgid "Can administer my channel resources"
-msgstr ""
-
-#: ../../include/permissions.php:31
-msgid "Extremely advanced. Leave this alone unless you know what you are doing"
-msgstr ""
-
#: ../../include/text.php:281
msgid "prev"
msgstr ""
@@ -1834,7 +1737,7 @@ msgstr ""
msgid "poke"
msgstr ""
-#: ../../include/text.php:742 ../../include/conversation.php:207
+#: ../../include/text.php:742 ../../include/conversation.php:233
msgid "poked"
msgstr ""
@@ -2042,64 +1945,177 @@ msgstr ""
msgid "bytes"
msgstr ""
-#: ../../include/text.php:1037 ../../include/text.php:1052
-#: ../../include/conversation.php:774
+#: ../../include/text.php:1051 ../../include/text.php:1066
+#: ../../include/conversation.php:805
msgid "remove"
msgstr ""
-#: ../../include/text.php:1037 ../../include/text.php:1052
+#: ../../include/text.php:1051 ../../include/text.php:1066
msgid "[remove]"
msgstr ""
-#: ../../include/text.php:1040 ../../include/conversation.php:637
+#: ../../include/text.php:1054 ../../include/conversation.php:667
msgid "Categories:"
msgstr ""
-#: ../../include/text.php:1055 ../../include/conversation.php:638
+#: ../../include/text.php:1069 ../../include/conversation.php:668
msgid "Filed under:"
msgstr ""
-#: ../../include/text.php:1071 ../../include/text.php:1083
+#: ../../include/text.php:1085 ../../include/text.php:1097
msgid "Click to open/close"
msgstr ""
-#: ../../include/text.php:1235 ../../mod/events.php:324
+#: ../../include/text.php:1249 ../../mod/events.php:324
msgid "link to source"
msgstr ""
-#: ../../include/text.php:1267
+#: ../../include/text.php:1281
msgid "default"
msgstr ""
-#: ../../include/text.php:1279
+#: ../../include/text.php:1293
msgid "Select an alternate language"
msgstr ""
-#: ../../include/text.php:1428 ../../include/conversation.php:125
-#: ../../mod/tagger.php:47
-msgid "event"
-msgstr ""
-
-#: ../../include/text.php:1430 ../../include/conversation.php:122
+#: ../../include/text.php:1445 ../../include/conversation.php:115
#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:43
msgid "photo"
msgstr ""
-#: ../../include/text.php:1432
-msgid "activity"
+#: ../../include/text.php:1448 ../../include/conversation.php:118
+#: ../../mod/tagger.php:47
+msgid "event"
msgstr ""
-#: ../../include/text.php:1434 ../../include/conversation.php:131
+#: ../../include/text.php:1451 ../../include/conversation.php:143
+#: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:51
+msgid "status"
+msgstr ""
+
+#: ../../include/text.php:1453 ../../include/conversation.php:145
#: ../../mod/tagger.php:53
msgid "comment"
msgstr ""
-#: ../../include/text.php:1435 ../../include/bbcode.php:163
-msgid "post"
+#: ../../include/text.php:1458
+msgid "activity"
msgstr ""
-#: ../../include/text.php:1659
-msgid "Item filed"
+#: ../../include/auth.php:65
+msgid "Logged out."
+msgstr ""
+
+#: ../../include/auth.php:162
+msgid "Failed authentication"
+msgstr ""
+
+#: ../../include/auth.php:171
+msgid "Login failed."
+msgstr ""
+
+#: ../../include/follow.php:21
+msgid "Channel is blocked on this site."
+msgstr ""
+
+#: ../../include/follow.php:26
+msgid "Channel location missing."
+msgstr ""
+
+#: ../../include/follow.php:43
+msgid "Channel discovery failed. Website may be down or misconfigured."
+msgstr ""
+
+#: ../../include/follow.php:51
+msgid "Response from remote channel was not understood."
+msgstr ""
+
+#: ../../include/follow.php:58
+msgid "Response from remote channel was incomplete."
+msgstr ""
+
+#: ../../include/follow.php:124
+msgid "local account not found."
+msgstr ""
+
+#: ../../include/follow.php:133
+msgid "Cannot connect to yourself."
+msgstr ""
+
+#: ../../include/permissions.php:13
+msgid "Can view my \"public\" stream and posts"
+msgstr ""
+
+#: ../../include/permissions.php:14
+msgid "Can view my \"public\" channel profile"
+msgstr ""
+
+#: ../../include/permissions.php:15
+msgid "Can view my \"public\" photo albums"
+msgstr ""
+
+#: ../../include/permissions.php:16
+msgid "Can view my \"public\" address book"
+msgstr ""
+
+#: ../../include/permissions.php:17
+msgid "Can view my \"public\" file storage"
+msgstr ""
+
+#: ../../include/permissions.php:18
+msgid "Can view my \"public\" pages"
+msgstr ""
+
+#: ../../include/permissions.php:21
+msgid "Can send me their channel stream and posts"
+msgstr ""
+
+#: ../../include/permissions.php:22
+msgid "Can post on my channel page (\"wall\")"
+msgstr ""
+
+#: ../../include/permissions.php:23
+msgid "Can comment on my posts"
+msgstr ""
+
+#: ../../include/permissions.php:24
+msgid "Can send me private mail messages"
+msgstr ""
+
+#: ../../include/permissions.php:25
+msgid "Can post photos to my photo albums"
+msgstr ""
+
+#: ../../include/permissions.php:26
+msgid "Can forward to all my channel contacts via post hashtags"
+msgstr ""
+
+#: ../../include/permissions.php:26
+msgid "Advanced - useful for creating group forum channels"
+msgstr ""
+
+#: ../../include/permissions.php:27
+msgid "Can chat with me (when available)"
+msgstr ""
+
+#: ../../include/permissions.php:27
+msgid "Requires compatible chat plugin"
+msgstr ""
+
+#: ../../include/permissions.php:28
+msgid "Can write to my \"public\" file storage"
+msgstr ""
+
+#: ../../include/permissions.php:29
+msgid "Can edit my \"public\" pages"
+msgstr ""
+
+#: ../../include/permissions.php:31
+msgid "Can administer my channel resources"
+msgstr ""
+
+#: ../../include/permissions.php:31
+msgid "Extremely advanced. Leave this alone unless you know what you are doing"
msgstr ""
#: ../../include/attach.php:184 ../../include/attach.php:232
@@ -2135,144 +2151,126 @@ msgstr ""
msgid "Path not available."
msgstr ""
-#: ../../include/bbcode.php:94 ../../include/bbcode.php:412
-#: ../../include/bbcode.php:413
-msgid "Image/photo"
-msgstr ""
-
-#: ../../include/bbcode.php:161
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr ""
-
-#: ../../include/bbcode.php:376 ../../include/bbcode.php:396
-msgid "$1 wrote:"
-msgstr ""
-
-#: ../../include/bbcode.php:417 ../../include/bbcode.php:418
-msgid "Encrypted content"
-msgstr ""
-
-#: ../../include/ItemObject.php:105 ../../mod/photos.php:928
+#: ../../include/ItemObject.php:109 ../../mod/photos.php:928
msgid "Private Message"
msgstr ""
-#: ../../include/ItemObject.php:110 ../../mod/settings.php:660
+#: ../../include/ItemObject.php:114 ../../mod/settings.php:659
#: ../../mod/editpost.php:66
msgid "Edit"
msgstr ""
-#: ../../include/ItemObject.php:123 ../../include/conversation.php:600
-#: ../../mod/settings.php:661 ../../mod/group.php:177
+#: ../../include/ItemObject.php:127 ../../include/conversation.php:630
+#: ../../mod/settings.php:660 ../../mod/group.php:177
#: ../../mod/photos.php:1154 ../../mod/admin.php:628
-#: ../../mod/connections.php:304
+#: ../../mod/connections.php:329
msgid "Delete"
msgstr ""
-#: ../../include/ItemObject.php:129 ../../include/conversation.php:599
+#: ../../include/ItemObject.php:133 ../../include/conversation.php:629
msgid "Select"
msgstr ""
-#: ../../include/ItemObject.php:133
+#: ../../include/ItemObject.php:137
msgid "save to folder"
msgstr ""
-#: ../../include/ItemObject.php:160
+#: ../../include/ItemObject.php:164
msgid "add star"
msgstr ""
-#: ../../include/ItemObject.php:161
+#: ../../include/ItemObject.php:165
msgid "remove star"
msgstr ""
-#: ../../include/ItemObject.php:162
+#: ../../include/ItemObject.php:166
msgid "toggle star status"
msgstr ""
-#: ../../include/ItemObject.php:166
+#: ../../include/ItemObject.php:170
msgid "starred"
msgstr ""
-#: ../../include/ItemObject.php:170
+#: ../../include/ItemObject.php:174
msgid "add tag"
msgstr ""
-#: ../../include/ItemObject.php:179 ../../mod/photos.php:1041
+#: ../../include/ItemObject.php:183 ../../mod/photos.php:1041
msgid "I like this (toggle)"
msgstr ""
-#: ../../include/ItemObject.php:179
+#: ../../include/ItemObject.php:183
msgid "like"
msgstr ""
-#: ../../include/ItemObject.php:180 ../../mod/photos.php:1042
+#: ../../include/ItemObject.php:184 ../../mod/photos.php:1042
msgid "I don't like this (toggle)"
msgstr ""
-#: ../../include/ItemObject.php:180
+#: ../../include/ItemObject.php:184
msgid "dislike"
msgstr ""
-#: ../../include/ItemObject.php:182
+#: ../../include/ItemObject.php:186
msgid "Share this"
msgstr ""
-#: ../../include/ItemObject.php:182
+#: ../../include/ItemObject.php:186
msgid "share"
msgstr ""
-#: ../../include/ItemObject.php:206 ../../include/ItemObject.php:207
+#: ../../include/ItemObject.php:210 ../../include/ItemObject.php:211
#, php-format
msgid "View %s's profile - %s"
msgstr ""
-#: ../../include/ItemObject.php:208
+#: ../../include/ItemObject.php:212
msgid "to"
msgstr ""
-#: ../../include/ItemObject.php:209
+#: ../../include/ItemObject.php:213
msgid "Wall-to-Wall"
msgstr ""
-#: ../../include/ItemObject.php:210
+#: ../../include/ItemObject.php:214
msgid "via Wall-To-Wall:"
msgstr ""
-#: ../../include/ItemObject.php:220 ../../include/conversation.php:647
+#: ../../include/ItemObject.php:224 ../../include/conversation.php:677
#, php-format
msgid " from %s"
msgstr ""
-#: ../../include/ItemObject.php:247 ../../include/conversation.php:666
-#: ../../include/conversation.php:1021 ../../mod/photos.php:1044
+#: ../../include/ItemObject.php:251 ../../include/conversation.php:696
+#: ../../include/conversation.php:1052 ../../mod/photos.php:1044
#: ../../mod/message.php:296 ../../mod/message.php:429
#: ../../mod/editpost.php:75
msgid "Please wait"
msgstr ""
-#: ../../include/ItemObject.php:268
+#: ../../include/ItemObject.php:272
#, php-format
msgid "%d comment"
msgid_plural "%d comments"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/ItemObject.php:538 ../../mod/photos.php:1059
+#: ../../include/ItemObject.php:542 ../../mod/photos.php:1059
#: ../../mod/photos.php:1097 ../../mod/photos.php:1124
msgid "This is you"
msgstr ""
-#: ../../include/ItemObject.php:541 ../../mod/events.php:456
+#: ../../include/ItemObject.php:545 ../../mod/events.php:456
#: ../../mod/invite.php:138 ../../mod/setup.php:283 ../../mod/setup.php:326
-#: ../../mod/settings.php:598 ../../mod/settings.php:710
-#: ../../mod/settings.php:739 ../../mod/settings.php:762
-#: ../../mod/settings.php:833 ../../mod/settings.php:1000
+#: ../../mod/settings.php:597 ../../mod/settings.php:709
+#: ../../mod/settings.php:737 ../../mod/settings.php:761
+#: ../../mod/settings.php:832 ../../mod/settings.php:999
#: ../../mod/group.php:83 ../../mod/photos.php:674 ../../mod/photos.php:766
#: ../../mod/photos.php:1023 ../../mod/photos.php:1062
#: ../../mod/photos.php:1100 ../../mod/photos.php:1127
#: ../../mod/message.php:297 ../../mod/message.php:428 ../../mod/admin.php:397
#: ../../mod/admin.php:621 ../../mod/admin.php:757 ../../mod/admin.php:956
-#: ../../mod/admin.php:1043 ../../mod/connections.php:381
+#: ../../mod/admin.php:1043 ../../mod/connections.php:406
#: ../../mod/profiles.php:523 ../../mod/import.php:351
#: ../../mod/crepair.php:166 ../../mod/poke.php:166 ../../mod/fsuggest.php:108
#: ../../mod/mood.php:134 ../../view/theme/redbasic/php/config.php:132
@@ -2281,298 +2279,297 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: ../../include/ItemObject.php:542
+#: ../../include/ItemObject.php:546
msgid "Bold"
msgstr ""
-#: ../../include/ItemObject.php:543
+#: ../../include/ItemObject.php:547
msgid "Italic"
msgstr ""
-#: ../../include/ItemObject.php:544
+#: ../../include/ItemObject.php:548
msgid "Underline"
msgstr ""
-#: ../../include/ItemObject.php:545
+#: ../../include/ItemObject.php:549
msgid "Quote"
msgstr ""
-#: ../../include/ItemObject.php:546
+#: ../../include/ItemObject.php:550
msgid "Code"
msgstr ""
-#: ../../include/ItemObject.php:547
+#: ../../include/ItemObject.php:551
msgid "Image"
msgstr ""
-#: ../../include/ItemObject.php:548
+#: ../../include/ItemObject.php:552
msgid "Link"
msgstr ""
-#: ../../include/ItemObject.php:549
+#: ../../include/ItemObject.php:553
msgid "Video"
msgstr ""
-#: ../../include/ItemObject.php:550 ../../include/conversation.php:1039
+#: ../../include/ItemObject.php:554 ../../include/conversation.php:1070
#: ../../mod/photos.php:1063 ../../mod/editpost.php:95
msgid "Preview"
msgstr ""
-#: ../../include/conversation.php:129 ../../mod/like.php:103
-#: ../../mod/subthread.php:89 ../../mod/tagger.php:51
-msgid "status"
+#: ../../include/conversation.php:121
+msgid "channel"
msgstr ""
-#: ../../include/conversation.php:138 ../../mod/like.php:134
+#: ../../include/conversation.php:161 ../../mod/like.php:133
#, php-format
msgid "%1$s likes %2$s's %3$s"
msgstr ""
-#: ../../include/conversation.php:141 ../../mod/like.php:136
+#: ../../include/conversation.php:164 ../../mod/like.php:135
#, php-format
msgid "%1$s doesn't like %2$s's %3$s"
msgstr ""
-#: ../../include/conversation.php:172
+#: ../../include/conversation.php:198
#, php-format
msgid "%1$s is now connected with %2$s"
msgstr ""
-#: ../../include/conversation.php:203
+#: ../../include/conversation.php:229
#, php-format
msgid "%1$s poked %2$s"
msgstr ""
-#: ../../include/conversation.php:225 ../../mod/mood.php:63
+#: ../../include/conversation.php:251 ../../mod/mood.php:63
#, php-format
msgid "%1$s is currently %2$s"
msgstr ""
-#: ../../include/conversation.php:625
+#: ../../include/conversation.php:655
#, php-format
msgid "View %s's profile @ %s"
msgstr ""
-#: ../../include/conversation.php:664
+#: ../../include/conversation.php:694
msgid "View in context"
msgstr ""
-#: ../../include/conversation.php:778
+#: ../../include/conversation.php:809
msgid "Loading..."
msgstr ""
-#: ../../include/conversation.php:779
+#: ../../include/conversation.php:810
msgid "Delete Selected Items"
msgstr ""
-#: ../../include/conversation.php:867
+#: ../../include/conversation.php:898
msgid "Follow Thread"
msgstr ""
-#: ../../include/conversation.php:936
+#: ../../include/conversation.php:967
#, php-format
msgid "%s likes this."
msgstr ""
-#: ../../include/conversation.php:936
+#: ../../include/conversation.php:967
#, php-format
msgid "%s doesn't like this."
msgstr ""
-#: ../../include/conversation.php:940
+#: ../../include/conversation.php:971
#, php-format
msgid "%2$d people like this."
msgstr ""
-#: ../../include/conversation.php:942
+#: ../../include/conversation.php:973
#, php-format
msgid "%2$d people don't like this."
msgstr ""
-#: ../../include/conversation.php:948
+#: ../../include/conversation.php:979
msgid "and"
msgstr ""
-#: ../../include/conversation.php:951
+#: ../../include/conversation.php:982
#, php-format
msgid ", and %d other people"
msgstr ""
-#: ../../include/conversation.php:952
+#: ../../include/conversation.php:983
#, php-format
msgid "%s like this."
msgstr ""
-#: ../../include/conversation.php:952
+#: ../../include/conversation.php:983
#, php-format
msgid "%s don't like this."
msgstr ""
-#: ../../include/conversation.php:977
+#: ../../include/conversation.php:1008
msgid "Visible to everybody "
msgstr ""
-#: ../../include/conversation.php:978 ../../mod/message.php:252
+#: ../../include/conversation.php:1009 ../../mod/message.php:252
#: ../../mod/message.php:363
msgid "Please enter a link URL:"
msgstr ""
-#: ../../include/conversation.php:979
+#: ../../include/conversation.php:1010
msgid "Please enter a video link/URL:"
msgstr ""
-#: ../../include/conversation.php:980
+#: ../../include/conversation.php:1011
msgid "Please enter an audio link/URL:"
msgstr ""
-#: ../../include/conversation.php:981
+#: ../../include/conversation.php:1012
msgid "Tag term:"
msgstr ""
-#: ../../include/conversation.php:982 ../../mod/filer.php:35
+#: ../../include/conversation.php:1013 ../../mod/filer.php:35
msgid "Save to Folder:"
msgstr ""
-#: ../../include/conversation.php:983
+#: ../../include/conversation.php:1014
msgid "Where are you right now?"
msgstr ""
-#: ../../include/conversation.php:998 ../../mod/photos.php:1043
+#: ../../include/conversation.php:1029 ../../mod/photos.php:1043
msgid "Share"
msgstr ""
-#: ../../include/conversation.php:1000
+#: ../../include/conversation.php:1031
msgid "Page link title"
msgstr ""
-#: ../../include/conversation.php:1002 ../../mod/message.php:294
+#: ../../include/conversation.php:1033 ../../mod/message.php:294
#: ../../mod/message.php:426 ../../mod/editpost.php:67
msgid "Upload photo"
msgstr ""
-#: ../../include/conversation.php:1003
+#: ../../include/conversation.php:1034
msgid "upload photo"
msgstr ""
-#: ../../include/conversation.php:1004 ../../mod/editpost.php:68
+#: ../../include/conversation.php:1035 ../../mod/editpost.php:68
msgid "Attach file"
msgstr ""
-#: ../../include/conversation.php:1005
+#: ../../include/conversation.php:1036
msgid "attach file"
msgstr ""
-#: ../../include/conversation.php:1006 ../../mod/message.php:295
+#: ../../include/conversation.php:1037 ../../mod/message.php:295
#: ../../mod/message.php:427 ../../mod/editpost.php:69
msgid "Insert web link"
msgstr ""
-#: ../../include/conversation.php:1007
+#: ../../include/conversation.php:1038
msgid "web link"
msgstr ""
-#: ../../include/conversation.php:1008
+#: ../../include/conversation.php:1039
msgid "Insert video link"
msgstr ""
-#: ../../include/conversation.php:1009
+#: ../../include/conversation.php:1040
msgid "video link"
msgstr ""
-#: ../../include/conversation.php:1010
+#: ../../include/conversation.php:1041
msgid "Insert audio link"
msgstr ""
-#: ../../include/conversation.php:1011
+#: ../../include/conversation.php:1042
msgid "audio link"
msgstr ""
-#: ../../include/conversation.php:1012 ../../mod/editpost.php:73
+#: ../../include/conversation.php:1043 ../../mod/editpost.php:73
msgid "Set your location"
msgstr ""
-#: ../../include/conversation.php:1013
+#: ../../include/conversation.php:1044
msgid "set location"
msgstr ""
-#: ../../include/conversation.php:1014 ../../mod/editpost.php:74
+#: ../../include/conversation.php:1045 ../../mod/editpost.php:74
msgid "Clear browser location"
msgstr ""
-#: ../../include/conversation.php:1015
+#: ../../include/conversation.php:1046
msgid "clear location"
msgstr ""
-#: ../../include/conversation.php:1017 ../../mod/editpost.php:87
+#: ../../include/conversation.php:1048 ../../mod/editpost.php:87
msgid "Set title"
msgstr ""
-#: ../../include/conversation.php:1020 ../../mod/editpost.php:89
+#: ../../include/conversation.php:1051 ../../mod/editpost.php:89
msgid "Categories (comma-separated list)"
msgstr ""
-#: ../../include/conversation.php:1022 ../../mod/editpost.php:76
+#: ../../include/conversation.php:1053 ../../mod/editpost.php:76
msgid "Permission settings"
msgstr ""
-#: ../../include/conversation.php:1023
+#: ../../include/conversation.php:1054
msgid "permissions"
msgstr ""
-#: ../../include/conversation.php:1031 ../../mod/editpost.php:84
+#: ../../include/conversation.php:1062 ../../mod/editpost.php:84
msgid "Public post"
msgstr ""
-#: ../../include/conversation.php:1033 ../../mod/editpost.php:90
+#: ../../include/conversation.php:1064 ../../mod/editpost.php:90
msgid "Example: bob@example.com, mary@example.com"
msgstr ""
-#: ../../include/items.php:120 ../../mod/like.php:55 ../../mod/group.php:70
-#: ../../mod/profperm.php:28 ../../index.php:335
+#: ../../include/items.php:151 ../../mod/like.php:55 ../../mod/group.php:70
+#: ../../mod/profperm.php:28 ../../index.php:336
msgid "Permission denied"
msgstr ""
-#: ../../include/items.php:2448
+#: ../../include/items.php:2508
#, php-format
msgid "%s's birthday"
msgstr ""
-#: ../../include/items.php:2449
+#: ../../include/items.php:2509
#, php-format
msgid "Happy Birthday %s"
msgstr ""
-#: ../../include/items.php:3910
+#: ../../include/items.php:3970
msgid "[Name Withheld]"
msgstr ""
-#: ../../include/items.php:3918
+#: ../../include/items.php:3978
msgid "A new person is sharing with you at "
msgstr ""
-#: ../../include/items.php:3918
+#: ../../include/items.php:3978
msgid "You have a new follower at "
msgstr ""
-#: ../../include/items.php:4344 ../../mod/viewsrc.php:18
+#: ../../include/items.php:4404 ../../mod/viewsrc.php:18
#: ../../mod/admin.php:142 ../../mod/admin.php:665 ../../mod/admin.php:864
#: ../../mod/display.php:33 ../../mod/page.php:34
msgid "Item not found."
msgstr ""
-#: ../../include/items.php:4516
+#: ../../include/items.php:4576
msgid "Archives"
msgstr ""
-#: ../../include/items.php:4664 ../../mod/group.php:43 ../../mod/group.php:141
+#: ../../include/items.php:4724 ../../mod/group.php:43 ../../mod/group.php:141
msgid "Collection not found."
msgstr ""
-#: ../../include/items.php:4674
+#: ../../include/items.php:4734
msgid "Collection has no members."
msgstr ""
-#: ../../include/items.php:4690
+#: ../../include/items.php:4750
msgid "Connection not found."
msgstr ""
@@ -2781,16 +2778,16 @@ msgid ""
"and/or create new posts for you?"
msgstr ""
-#: ../../mod/api.php:105 ../../mod/settings.php:955 ../../mod/settings.php:960
-#: ../../mod/settings.php:983 ../../mod/settings.php:985
-#: ../../mod/settings.php:986 ../../mod/settings.php:987
+#: ../../mod/api.php:105 ../../mod/settings.php:954 ../../mod/settings.php:959
+#: ../../mod/settings.php:982 ../../mod/settings.php:984
+#: ../../mod/settings.php:985 ../../mod/settings.php:986
#: ../../mod/profiles.php:501
msgid "Yes"
msgstr ""
-#: ../../mod/api.php:106 ../../mod/settings.php:955 ../../mod/settings.php:960
-#: ../../mod/settings.php:983 ../../mod/settings.php:985
-#: ../../mod/settings.php:986 ../../mod/settings.php:987
+#: ../../mod/api.php:106 ../../mod/settings.php:954 ../../mod/settings.php:959
+#: ../../mod/settings.php:982 ../../mod/settings.php:984
+#: ../../mod/settings.php:985 ../../mod/settings.php:986
#: ../../mod/profiles.php:502
msgid "No"
msgstr ""
@@ -3152,12 +3149,12 @@ msgstr ""
msgid "[Embedded content - reload page to view]"
msgstr ""
-#: ../../mod/chanview.php:74 ../../mod/magic.php:63 ../../mod/page.php:21
+#: ../../mod/chanview.php:78 ../../mod/magic.php:63 ../../mod/page.php:21
#: ../../mod/wall_upload.php:35
msgid "Channel not found."
msgstr ""
-#: ../../mod/chanview.php:90
+#: ../../mod/chanview.php:94
msgid "toggle full screen mode"
msgstr ""
@@ -3166,423 +3163,423 @@ msgstr ""
msgid "%1$s tagged %2$s's %3$s with %4$s"
msgstr ""
-#: ../../mod/settings.php:43
+#: ../../mod/settings.php:45
msgid "Account settings"
msgstr ""
-#: ../../mod/settings.php:49
+#: ../../mod/settings.php:51
msgid "Channel settings"
msgstr ""
-#: ../../mod/settings.php:55
+#: ../../mod/settings.php:57
msgid "Additional features"
msgstr ""
-#: ../../mod/settings.php:61
+#: ../../mod/settings.php:63
msgid "Feature settings"
msgstr ""
-#: ../../mod/settings.php:67
+#: ../../mod/settings.php:69
msgid "Display settings"
msgstr ""
-#: ../../mod/settings.php:73
+#: ../../mod/settings.php:75
msgid "Connected apps"
msgstr ""
-#: ../../mod/settings.php:79
+#: ../../mod/settings.php:81
msgid "Export channel"
msgstr ""
-#: ../../mod/settings.php:91
+#: ../../mod/settings.php:93
msgid "Automatic Permissions (Advanced)"
msgstr ""
-#: ../../mod/settings.php:146
+#: ../../mod/settings.php:141
msgid "Missing some important data!"
msgstr ""
-#: ../../mod/settings.php:149 ../../mod/settings.php:624
+#: ../../mod/settings.php:144 ../../mod/settings.php:623
msgid "Update"
msgstr ""
-#: ../../mod/settings.php:259
+#: ../../mod/settings.php:257
msgid "Passwords do not match. Password unchanged."
msgstr ""
-#: ../../mod/settings.php:263
+#: ../../mod/settings.php:261
msgid "Empty passwords are not allowed. Password unchanged."
msgstr ""
-#: ../../mod/settings.php:276
+#: ../../mod/settings.php:274
msgid "Password changed."
msgstr ""
-#: ../../mod/settings.php:278
+#: ../../mod/settings.php:276
msgid "Password update failed. Please try again."
msgstr ""
-#: ../../mod/settings.php:292
+#: ../../mod/settings.php:290
msgid "Not valid email."
msgstr ""
-#: ../../mod/settings.php:295
-msgid "Protected email. Cannot change to that email."
+#: ../../mod/settings.php:293
+msgid "Protected email address. Cannot change to that email."
msgstr ""
-#: ../../mod/settings.php:304
+#: ../../mod/settings.php:302
msgid "System failure storing new email. Please try again."
msgstr ""
-#: ../../mod/settings.php:532
+#: ../../mod/settings.php:530
msgid "Settings updated."
msgstr ""
-#: ../../mod/settings.php:597 ../../mod/settings.php:623
-#: ../../mod/settings.php:659
+#: ../../mod/settings.php:596 ../../mod/settings.php:622
+#: ../../mod/settings.php:658
msgid "Add application"
msgstr ""
-#: ../../mod/settings.php:599 ../../mod/settings.php:625
+#: ../../mod/settings.php:598 ../../mod/settings.php:624
#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/fbrowser.php:81
#: ../../mod/fbrowser.php:116
msgid "Cancel"
msgstr ""
-#: ../../mod/settings.php:600 ../../mod/settings.php:626
+#: ../../mod/settings.php:599 ../../mod/settings.php:625
#: ../../mod/admin.php:624 ../../mod/crepair.php:148
msgid "Name"
msgstr ""
-#: ../../mod/settings.php:601 ../../mod/settings.php:627
+#: ../../mod/settings.php:600 ../../mod/settings.php:626
msgid "Consumer Key"
msgstr ""
-#: ../../mod/settings.php:602 ../../mod/settings.php:628
+#: ../../mod/settings.php:601 ../../mod/settings.php:627
msgid "Consumer Secret"
msgstr ""
-#: ../../mod/settings.php:603 ../../mod/settings.php:629
+#: ../../mod/settings.php:602 ../../mod/settings.php:628
msgid "Redirect"
msgstr ""
-#: ../../mod/settings.php:604 ../../mod/settings.php:630
+#: ../../mod/settings.php:603 ../../mod/settings.php:629
msgid "Icon url"
msgstr ""
-#: ../../mod/settings.php:615
+#: ../../mod/settings.php:614
msgid "You can't edit this application."
msgstr ""
-#: ../../mod/settings.php:658
+#: ../../mod/settings.php:657
msgid "Connected Apps"
msgstr ""
-#: ../../mod/settings.php:662
+#: ../../mod/settings.php:661
msgid "Client key starts with"
msgstr ""
-#: ../../mod/settings.php:663
+#: ../../mod/settings.php:662
msgid "No name"
msgstr ""
-#: ../../mod/settings.php:664
+#: ../../mod/settings.php:663
msgid "Remove authorization"
msgstr ""
-#: ../../mod/settings.php:675
+#: ../../mod/settings.php:674
msgid "No feature settings configured"
msgstr ""
-#: ../../mod/settings.php:683
+#: ../../mod/settings.php:682
msgid "Feature Settings"
msgstr ""
-#: ../../mod/settings.php:706
+#: ../../mod/settings.php:705
msgid "Account Settings"
msgstr ""
-#: ../../mod/settings.php:707
+#: ../../mod/settings.php:706
msgid "Password Settings"
msgstr ""
-#: ../../mod/settings.php:708
+#: ../../mod/settings.php:707
msgid "New Password:"
msgstr ""
-#: ../../mod/settings.php:709
+#: ../../mod/settings.php:708
msgid "Confirm:"
msgstr ""
-#: ../../mod/settings.php:709
+#: ../../mod/settings.php:708
msgid "Leave password fields blank unless changing"
msgstr ""
-#: ../../mod/settings.php:711 ../../mod/settings.php:1009
+#: ../../mod/settings.php:710 ../../mod/settings.php:1008
msgid "Email Address:"
msgstr ""
-#: ../../mod/settings.php:712
+#: ../../mod/settings.php:711
msgid "Remove Account"
msgstr ""
-#: ../../mod/settings.php:713
+#: ../../mod/settings.php:712
msgid "Warning: This action is permanent and cannot be reversed."
msgstr ""
-#: ../../mod/settings.php:730
+#: ../../mod/settings.php:728
msgid "Off"
msgstr ""
-#: ../../mod/settings.php:730
+#: ../../mod/settings.php:728
msgid "On"
msgstr ""
-#: ../../mod/settings.php:737
+#: ../../mod/settings.php:735
msgid "Additional Features"
msgstr ""
-#: ../../mod/settings.php:761
+#: ../../mod/settings.php:760
msgid "Connector Settings"
msgstr ""
-#: ../../mod/settings.php:791 ../../mod/admin.php:356
+#: ../../mod/settings.php:790 ../../mod/admin.php:356
msgid "No special theme for mobile devices"
msgstr ""
-#: ../../mod/settings.php:831
+#: ../../mod/settings.php:830
msgid "Display Settings"
msgstr ""
-#: ../../mod/settings.php:837
+#: ../../mod/settings.php:836
msgid "Display Theme:"
msgstr ""
-#: ../../mod/settings.php:838
+#: ../../mod/settings.php:837
msgid "Mobile Theme:"
msgstr ""
-#: ../../mod/settings.php:839
+#: ../../mod/settings.php:838
msgid "Update browser every xx seconds"
msgstr ""
-#: ../../mod/settings.php:839
+#: ../../mod/settings.php:838
msgid "Minimum of 10 seconds, no maximum"
msgstr ""
-#: ../../mod/settings.php:840
+#: ../../mod/settings.php:839
msgid "Maximum number of conversations to load at any time:"
msgstr ""
-#: ../../mod/settings.php:840
+#: ../../mod/settings.php:839
msgid "Maximum of 100 items"
msgstr ""
-#: ../../mod/settings.php:841
+#: ../../mod/settings.php:840
msgid "Don't show emoticons"
msgstr ""
-#: ../../mod/settings.php:877
+#: ../../mod/settings.php:876
msgid "Nobody except yourself"
msgstr ""
-#: ../../mod/settings.php:878
+#: ../../mod/settings.php:877
msgid "Only those you specifically allow"
msgstr ""
-#: ../../mod/settings.php:879
+#: ../../mod/settings.php:878
msgid "Anybody in your address book"
msgstr ""
-#: ../../mod/settings.php:880
+#: ../../mod/settings.php:879
msgid "Anybody on this website"
msgstr ""
-#: ../../mod/settings.php:881
+#: ../../mod/settings.php:880
msgid "Anybody in this network"
msgstr ""
-#: ../../mod/settings.php:882
+#: ../../mod/settings.php:881
msgid "Anybody on the internet"
msgstr ""
-#: ../../mod/settings.php:955
+#: ../../mod/settings.php:954
msgid "Publish your default profile in the network directory"
msgstr ""
-#: ../../mod/settings.php:960
+#: ../../mod/settings.php:959
msgid "Allow us to suggest you as a potential friend to new members?"
msgstr ""
-#: ../../mod/settings.php:964 ../../mod/profile_photo.php:276
+#: ../../mod/settings.php:963 ../../mod/profile_photo.php:276
msgid "or"
msgstr ""
-#: ../../mod/settings.php:969
+#: ../../mod/settings.php:968
msgid "Your channel address is"
msgstr ""
-#: ../../mod/settings.php:980
+#: ../../mod/settings.php:979
msgid "Automatically expire posts after this many days:"
msgstr ""
-#: ../../mod/settings.php:980
+#: ../../mod/settings.php:979
msgid "If empty, posts will not expire. Expired posts will be deleted"
msgstr ""
-#: ../../mod/settings.php:981
+#: ../../mod/settings.php:980
msgid "Advanced expiration settings"
msgstr ""
-#: ../../mod/settings.php:982
+#: ../../mod/settings.php:981
msgid "Advanced Expiration"
msgstr ""
-#: ../../mod/settings.php:983
+#: ../../mod/settings.php:982
msgid "Expire posts:"
msgstr ""
-#: ../../mod/settings.php:985
+#: ../../mod/settings.php:984
msgid "Expire starred posts:"
msgstr ""
-#: ../../mod/settings.php:986
+#: ../../mod/settings.php:985
msgid "Expire photos:"
msgstr ""
-#: ../../mod/settings.php:987
+#: ../../mod/settings.php:986
msgid "Only expire posts by others:"
msgstr ""
-#: ../../mod/settings.php:998
+#: ../../mod/settings.php:997
msgid "Channel Settings"
msgstr ""
-#: ../../mod/settings.php:1007
+#: ../../mod/settings.php:1006
msgid "Basic Settings"
msgstr ""
-#: ../../mod/settings.php:1010
+#: ../../mod/settings.php:1009
msgid "Your Timezone:"
msgstr ""
-#: ../../mod/settings.php:1011
+#: ../../mod/settings.php:1010
msgid "Default Post Location:"
msgstr ""
-#: ../../mod/settings.php:1012
+#: ../../mod/settings.php:1011
msgid "Use Browser Location:"
msgstr ""
-#: ../../mod/settings.php:1015
+#: ../../mod/settings.php:1014
msgid "Security and Privacy Settings"
msgstr ""
-#: ../../mod/settings.php:1017
+#: ../../mod/settings.php:1016
msgid "Quick Privacy Settings:"
msgstr ""
-#: ../../mod/settings.php:1018
+#: ../../mod/settings.php:1017
msgid "Very Public - extremely permissive"
msgstr ""
-#: ../../mod/settings.php:1019
+#: ../../mod/settings.php:1018
msgid "Typical - default public, privacy when desired"
msgstr ""
-#: ../../mod/settings.php:1020
+#: ../../mod/settings.php:1019
msgid "Private - default private, rarely open or public"
msgstr ""
-#: ../../mod/settings.php:1021
+#: ../../mod/settings.php:1020
msgid "Blocked - default blocked to/from everybody"
msgstr ""
-#: ../../mod/settings.php:1024
+#: ../../mod/settings.php:1023
msgid "Maximum Friend Requests/Day:"
msgstr ""
-#: ../../mod/settings.php:1024
+#: ../../mod/settings.php:1023
msgid "May reduce spam activity"
msgstr ""
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1024
msgid "Default Post Permissions"
msgstr ""
-#: ../../mod/settings.php:1026
+#: ../../mod/settings.php:1025
msgid "(click to open/close)"
msgstr ""
-#: ../../mod/settings.php:1039
+#: ../../mod/settings.php:1038
msgid "Maximum private messages per day from unknown people:"
msgstr ""
-#: ../../mod/settings.php:1039
+#: ../../mod/settings.php:1038
msgid "Useful to reduce spamming"
msgstr ""
-#: ../../mod/settings.php:1042
+#: ../../mod/settings.php:1041
msgid "Notification Settings"
msgstr ""
-#: ../../mod/settings.php:1043
+#: ../../mod/settings.php:1042
msgid "By default post a status message when:"
msgstr ""
-#: ../../mod/settings.php:1044
+#: ../../mod/settings.php:1043
msgid "accepting a friend request"
msgstr ""
-#: ../../mod/settings.php:1045
+#: ../../mod/settings.php:1044
msgid "joining a forum/community"
msgstr ""
-#: ../../mod/settings.php:1046
+#: ../../mod/settings.php:1045
msgid "making an interesting profile change"
msgstr ""
-#: ../../mod/settings.php:1047
+#: ../../mod/settings.php:1046
msgid "Send a notification email when:"
msgstr ""
-#: ../../mod/settings.php:1048
+#: ../../mod/settings.php:1047
msgid "You receive an introduction"
msgstr ""
-#: ../../mod/settings.php:1049
+#: ../../mod/settings.php:1048
msgid "Your introductions are confirmed"
msgstr ""
-#: ../../mod/settings.php:1050
+#: ../../mod/settings.php:1049
msgid "Someone writes on your profile wall"
msgstr ""
-#: ../../mod/settings.php:1051
+#: ../../mod/settings.php:1050
msgid "Someone writes a followup comment"
msgstr ""
-#: ../../mod/settings.php:1052
+#: ../../mod/settings.php:1051
msgid "You receive a private message"
msgstr ""
-#: ../../mod/settings.php:1053
+#: ../../mod/settings.php:1052
msgid "You receive a friend suggestion"
msgstr ""
-#: ../../mod/settings.php:1054
+#: ../../mod/settings.php:1053
msgid "You are tagged in a post"
msgstr ""
-#: ../../mod/settings.php:1055
+#: ../../mod/settings.php:1054
msgid "You are poked/prodded/etc. in a post"
msgstr ""
-#: ../../mod/settings.php:1058
+#: ../../mod/settings.php:1057
msgid "Advanced Account/Page Type Settings"
msgstr ""
-#: ../../mod/settings.php:1059
+#: ../../mod/settings.php:1058
msgid "Change the behaviour of this account for special situations"
msgstr ""
@@ -3880,11 +3877,11 @@ msgstr ""
msgid "added your channel"
msgstr ""
-#: ../../mod/ping.php:230 ../../boot.php:1676 ../../boot.php:1756
+#: ../../mod/ping.php:230 ../../boot.php:1683 ../../boot.php:1763
msgid "g A l F d"
msgstr ""
-#: ../../mod/ping.php:252 ../../boot.php:1722 ../../boot.php:1797
+#: ../../mod/ping.php:252 ../../boot.php:1729 ../../boot.php:1804
msgid "[today]"
msgstr ""
@@ -3987,11 +3984,11 @@ msgstr ""
msgid "Help:"
msgstr ""
-#: ../../mod/help.php:38 ../../index.php:222
+#: ../../mod/help.php:38 ../../index.php:223
msgid "Not Found"
msgstr ""
-#: ../../mod/help.php:41 ../../index.php:225
+#: ../../mod/help.php:41 ../../index.php:226
msgid "Page not found."
msgstr ""
@@ -4011,122 +4008,115 @@ msgstr ""
msgid "Unable to locate original post."
msgstr ""
-#: ../../mod/item.php:282
+#: ../../mod/item.php:284
msgid "Empty post discarded."
msgstr ""
-#: ../../mod/item.php:700
+#: ../../mod/item.php:715
msgid "System error. Post not saved."
msgstr ""
-#: ../../mod/item.php:969 ../../mod/wall_upload.php:41
+#: ../../mod/item.php:992 ../../mod/wall_upload.php:41
msgid "Wall Photos"
msgstr ""
#: ../../mod/network.php:154 ../../mod/search.php:20
-#: ../../custom/network.php:159
msgid "Remove term"
msgstr ""
-#: ../../mod/network.php:292 ../../custom/network.php:297
+#: ../../mod/network.php:292
msgid "Commented Order"
msgstr ""
-#: ../../mod/network.php:295 ../../custom/network.php:300
+#: ../../mod/network.php:295
msgid "Sort by Comment Date"
msgstr ""
-#: ../../mod/network.php:298 ../../custom/network.php:303
+#: ../../mod/network.php:298
msgid "Posted Order"
msgstr ""
-#: ../../mod/network.php:301 ../../custom/network.php:306
+#: ../../mod/network.php:301
msgid "Sort by Post Date"
msgstr ""
#: ../../mod/network.php:305 ../../mod/notifications.php:85
-#: ../../custom/network.php:310
msgid "Personal"
msgstr ""
-#: ../../mod/network.php:308 ../../custom/network.php:313
+#: ../../mod/network.php:308
msgid "Posts that mention or involve you"
msgstr ""
-#: ../../mod/network.php:311 ../../mod/connections.php:480
-#: ../../custom/network.php:316
+#: ../../mod/network.php:311 ../../mod/connections.php:505
msgid "New"
msgstr ""
-#: ../../mod/network.php:314 ../../custom/network.php:319
+#: ../../mod/network.php:314
msgid "Activity Stream - by date"
msgstr ""
-#: ../../mod/network.php:321 ../../custom/network.php:326
+#: ../../mod/network.php:321
msgid "Starred"
msgstr ""
-#: ../../mod/network.php:324 ../../custom/network.php:329
+#: ../../mod/network.php:324
msgid "Favourite Posts"
msgstr ""
-#: ../../mod/network.php:331 ../../custom/network.php:336
+#: ../../mod/network.php:331
msgid "Spam"
msgstr ""
-#: ../../mod/network.php:334 ../../custom/network.php:339
+#: ../../mod/network.php:334
msgid "Posts flagged as SPAM"
msgstr ""
-#: ../../mod/network.php:374 ../../custom/network.php:379
+#: ../../mod/network.php:374
msgid "Refresh"
msgstr ""
-#: ../../mod/network.php:375 ../../mod/connections.php:334
-#: ../../custom/network.php:380
+#: ../../mod/network.php:375 ../../mod/connections.php:359
msgid "Me"
msgstr ""
-#: ../../mod/network.php:376 ../../mod/connections.php:336
-#: ../../custom/network.php:381
+#: ../../mod/network.php:376 ../../mod/connections.php:361
msgid "Best Friends"
msgstr ""
-#: ../../mod/network.php:378 ../../custom/network.php:383
+#: ../../mod/network.php:378
msgid "Co-workers"
msgstr ""
-#: ../../mod/network.php:379 ../../mod/connections.php:338
-#: ../../custom/network.php:384
+#: ../../mod/network.php:379 ../../mod/connections.php:363
msgid "Former Friends"
msgstr ""
-#: ../../mod/network.php:380 ../../mod/connections.php:339
-#: ../../custom/network.php:385
+#: ../../mod/network.php:380 ../../mod/connections.php:364
msgid "Acquaintances"
msgstr ""
-#: ../../mod/network.php:381 ../../custom/network.php:386
+#: ../../mod/network.php:381
msgid "Everybody"
msgstr ""
-#: ../../mod/network.php:398 ../../custom/network.php:403
+#: ../../mod/network.php:398
msgid "Search Results For:"
msgstr ""
-#: ../../mod/network.php:443 ../../custom/network.php:448
+#: ../../mod/network.php:443
msgid "No such group"
msgstr ""
-#: ../../mod/network.php:454 ../../custom/network.php:459
+#: ../../mod/network.php:454
msgid "Group is empty"
msgstr ""
-#: ../../mod/network.php:469 ../../custom/network.php:474
+#: ../../mod/network.php:469
msgid "Contact: "
msgstr ""
-#: ../../mod/network.php:472 ../../custom/network.php:477
+#: ../../mod/network.php:472
msgid "Invalid contact."
msgstr ""
@@ -4539,12 +4529,12 @@ msgid "Deny"
msgstr ""
#: ../../mod/admin.php:629 ../../mod/intro.php:14 ../../mod/intro.php:99
-#: ../../mod/connections.php:278 ../../mod/connections.php:418
+#: ../../mod/connections.php:303 ../../mod/connections.php:443
msgid "Block"
msgstr ""
-#: ../../mod/admin.php:630 ../../mod/connections.php:278
-#: ../../mod/connections.php:418
+#: ../../mod/admin.php:630 ../../mod/connections.php:303
+#: ../../mod/connections.php:443
msgid "Unblock"
msgstr ""
@@ -4644,7 +4634,7 @@ msgid "Log level"
msgstr ""
#: ../../mod/intro.php:17 ../../mod/intro.php:100
-#: ../../mod/connections.php:285 ../../mod/connections.php:419
+#: ../../mod/connections.php:310 ../../mod/connections.php:444
#: ../../mod/notifications.php:51 ../../mod/notifications.php:160
#: ../../mod/notifications.php:206
msgid "Ignore"
@@ -4670,7 +4660,7 @@ msgstr ""
msgid "System error. Please try again later."
msgstr ""
-#: ../../mod/intro.php:95 ../../mod/connections.php:424
+#: ../../mod/intro.php:95 ../../mod/connections.php:449
#: ../../mod/notifications.php:153 ../../mod/notifications.php:200
msgid "Hide this contact from others"
msgstr ""
@@ -4702,361 +4692,361 @@ msgstr ""
msgid "Failed to update connection record."
msgstr ""
-#: ../../mod/connections.php:167
+#: ../../mod/connections.php:181
msgid "Could not access address book record."
msgstr ""
-#: ../../mod/connections.php:181
+#: ../../mod/connections.php:195
msgid "Refresh failed - channel is currently unavailable."
msgstr ""
-#: ../../mod/connections.php:188
+#: ../../mod/connections.php:202
msgid "Channel has been unblocked"
msgstr ""
-#: ../../mod/connections.php:189
+#: ../../mod/connections.php:203
msgid "Channel has been blocked"
msgstr ""
-#: ../../mod/connections.php:191 ../../mod/connections.php:201
-#: ../../mod/connections.php:211 ../../mod/connections.php:221
-#: ../../mod/connections.php:234
+#: ../../mod/connections.php:207 ../../mod/connections.php:219
+#: ../../mod/connections.php:231 ../../mod/connections.php:243
+#: ../../mod/connections.php:258
msgid "Unable to set address book parameters."
msgstr ""
-#: ../../mod/connections.php:198
+#: ../../mod/connections.php:214
msgid "Channel has been unignored"
msgstr ""
-#: ../../mod/connections.php:199
+#: ../../mod/connections.php:215
msgid "Channel has been ignored"
msgstr ""
-#: ../../mod/connections.php:208
+#: ../../mod/connections.php:226
msgid "Channel has been unarchived"
msgstr ""
-#: ../../mod/connections.php:209
+#: ../../mod/connections.php:227
msgid "Channel has been archived"
msgstr ""
-#: ../../mod/connections.php:218
+#: ../../mod/connections.php:238
msgid "Channel has been unhidden"
msgstr ""
-#: ../../mod/connections.php:219
+#: ../../mod/connections.php:239
msgid "Channel has been hidden"
msgstr ""
-#: ../../mod/connections.php:231
+#: ../../mod/connections.php:253
msgid "Channel has been approved"
msgstr ""
-#: ../../mod/connections.php:232
+#: ../../mod/connections.php:254
msgid "Channel has been unapproved"
msgstr ""
-#: ../../mod/connections.php:247
+#: ../../mod/connections.php:272
msgid "Contact has been removed."
msgstr ""
-#: ../../mod/connections.php:267
+#: ../../mod/connections.php:292
#, php-format
msgid "View %s's profile"
msgstr ""
-#: ../../mod/connections.php:271
+#: ../../mod/connections.php:296
msgid "Refresh Permissions"
msgstr ""
-#: ../../mod/connections.php:274
+#: ../../mod/connections.php:299
msgid "Fetch updated permissions"
msgstr ""
-#: ../../mod/connections.php:281
+#: ../../mod/connections.php:306
msgid "Block or Unblock this connection"
msgstr ""
-#: ../../mod/connections.php:285 ../../mod/connections.php:419
+#: ../../mod/connections.php:310 ../../mod/connections.php:444
msgid "Unignore"
msgstr ""
-#: ../../mod/connections.php:288
+#: ../../mod/connections.php:313
msgid "Ignore or Unignore this connection"
msgstr ""
-#: ../../mod/connections.php:291
+#: ../../mod/connections.php:316
msgid "Unarchive"
msgstr ""
-#: ../../mod/connections.php:291
+#: ../../mod/connections.php:316
msgid "Archive"
msgstr ""
-#: ../../mod/connections.php:294
+#: ../../mod/connections.php:319
msgid "Archive or Unarchive this connection"
msgstr ""
-#: ../../mod/connections.php:297
+#: ../../mod/connections.php:322
msgid "Unhide"
msgstr ""
-#: ../../mod/connections.php:297
+#: ../../mod/connections.php:322
msgid "Hide"
msgstr ""
-#: ../../mod/connections.php:300
+#: ../../mod/connections.php:325
msgid "Hide or Unhide this connection"
msgstr ""
-#: ../../mod/connections.php:307
+#: ../../mod/connections.php:332
msgid "Delete this connection"
msgstr ""
-#: ../../mod/connections.php:340
+#: ../../mod/connections.php:365
msgid "Unknown"
msgstr ""
-#: ../../mod/connections.php:350 ../../mod/connections.php:378
+#: ../../mod/connections.php:375 ../../mod/connections.php:403
msgid "Approve this connection"
msgstr ""
-#: ../../mod/connections.php:350
+#: ../../mod/connections.php:375
msgid "Accept connection to allow communication"
msgstr ""
-#: ../../mod/connections.php:366
+#: ../../mod/connections.php:391
msgid "Automatic Permissions Settings"
msgstr ""
-#: ../../mod/connections.php:366
+#: ../../mod/connections.php:391
#, php-format
msgid "Connections: settings for %s"
msgstr ""
-#: ../../mod/connections.php:370
+#: ../../mod/connections.php:395
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:372
+#: ../../mod/connections.php:397
msgid "Slide to adjust your degree of friendship"
msgstr ""
-#: ../../mod/connections.php:379
+#: ../../mod/connections.php:404
msgid "Connection has no individual permissions!"
msgstr ""
-#: ../../mod/connections.php:380
+#: ../../mod/connections.php:405
msgid ""
"This may be appropriate based on your privacy settings"
"a>, though you may wish to review the \"Advanced Permissions\""
msgstr ""
-#: ../../mod/connections.php:382
+#: ../../mod/connections.php:407
msgid "Profile Visibility"
msgstr ""
-#: ../../mod/connections.php:383
+#: ../../mod/connections.php:408
#, php-format
msgid ""
"Please choose the profile you would like to display to %s when viewing your "
"profile securely."
msgstr ""
-#: ../../mod/connections.php:384
+#: ../../mod/connections.php:409
msgid "Contact Information / Notes"
msgstr ""
-#: ../../mod/connections.php:385
+#: ../../mod/connections.php:410
msgid "Edit contact notes"
msgstr ""
-#: ../../mod/connections.php:387
+#: ../../mod/connections.php:412
msgid "Their Settings"
msgstr ""
-#: ../../mod/connections.php:388
+#: ../../mod/connections.php:413
msgid "My Settings"
msgstr ""
-#: ../../mod/connections.php:390
+#: ../../mod/connections.php:415
msgid "Forum Members"
msgstr ""
-#: ../../mod/connections.php:391
+#: ../../mod/connections.php:416
msgid "Soapbox"
msgstr ""
-#: ../../mod/connections.php:392
+#: ../../mod/connections.php:417
msgid "Full Sharing"
msgstr ""
-#: ../../mod/connections.php:393
+#: ../../mod/connections.php:418
msgid "Cautious Sharing"
msgstr ""
-#: ../../mod/connections.php:394
+#: ../../mod/connections.php:419
msgid "Follow Only"
msgstr ""
-#: ../../mod/connections.php:395
+#: ../../mod/connections.php:420
msgid "Individual Permissions"
msgstr ""
-#: ../../mod/connections.php:396
+#: ../../mod/connections.php:421
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:397
+#: ../../mod/connections.php:422
msgid "Advanced Permissions"
msgstr ""
-#: ../../mod/connections.php:398
+#: ../../mod/connections.php:423
msgid "Quick Links"
msgstr ""
-#: ../../mod/connections.php:402
+#: ../../mod/connections.php:427
#, php-format
msgid "Visit %s's profile - %s"
msgstr ""
-#: ../../mod/connections.php:403
+#: ../../mod/connections.php:428
msgid "Block/Unblock contact"
msgstr ""
-#: ../../mod/connections.php:404
+#: ../../mod/connections.php:429
msgid "Ignore contact"
msgstr ""
-#: ../../mod/connections.php:405
+#: ../../mod/connections.php:430
msgid "Repair URL settings"
msgstr ""
-#: ../../mod/connections.php:406
+#: ../../mod/connections.php:431
msgid "View conversations"
msgstr ""
-#: ../../mod/connections.php:408
+#: ../../mod/connections.php:433
msgid "Delete contact"
msgstr ""
-#: ../../mod/connections.php:411
+#: ../../mod/connections.php:436
msgid "Last update:"
msgstr ""
-#: ../../mod/connections.php:413
+#: ../../mod/connections.php:438
msgid "Update public posts"
msgstr ""
-#: ../../mod/connections.php:415
+#: ../../mod/connections.php:440
msgid "Update now"
msgstr ""
-#: ../../mod/connections.php:420
+#: ../../mod/connections.php:445
msgid "Currently blocked"
msgstr ""
-#: ../../mod/connections.php:421
+#: ../../mod/connections.php:446
msgid "Currently ignored"
msgstr ""
-#: ../../mod/connections.php:422
+#: ../../mod/connections.php:447
msgid "Currently archived"
msgstr ""
-#: ../../mod/connections.php:423
+#: ../../mod/connections.php:448
msgid "Currently pending"
msgstr ""
-#: ../../mod/connections.php:424
+#: ../../mod/connections.php:449
msgid ""
"Replies/likes to your public posts may still be visible"
msgstr ""
-#: ../../mod/connections.php:460 ../../mod/connections.php:531
+#: ../../mod/connections.php:485 ../../mod/connections.php:556
msgid "Blocked"
msgstr ""
-#: ../../mod/connections.php:465 ../../mod/connections.php:538
+#: ../../mod/connections.php:490 ../../mod/connections.php:563
msgid "Ignored"
msgstr ""
-#: ../../mod/connections.php:470 ../../mod/connections.php:552
+#: ../../mod/connections.php:495 ../../mod/connections.php:577
msgid "Hidden"
msgstr ""
-#: ../../mod/connections.php:475 ../../mod/connections.php:545
+#: ../../mod/connections.php:500 ../../mod/connections.php:570
msgid "Archived"
msgstr ""
-#: ../../mod/connections.php:485
+#: ../../mod/connections.php:510
msgid "All"
msgstr ""
-#: ../../mod/connections.php:506
+#: ../../mod/connections.php:531
msgid "Suggestions"
msgstr ""
-#: ../../mod/connections.php:509
+#: ../../mod/connections.php:534
msgid "Suggest new connections"
msgstr ""
-#: ../../mod/connections.php:515
+#: ../../mod/connections.php:540
msgid "Show pending (new) connections"
msgstr ""
-#: ../../mod/connections.php:518
+#: ../../mod/connections.php:543
msgid "All Connections"
msgstr ""
-#: ../../mod/connections.php:521
+#: ../../mod/connections.php:546
msgid "Show all connections"
msgstr ""
-#: ../../mod/connections.php:524
+#: ../../mod/connections.php:549
msgid "Unblocked"
msgstr ""
-#: ../../mod/connections.php:527
+#: ../../mod/connections.php:552
msgid "Only show unblocked connections"
msgstr ""
-#: ../../mod/connections.php:534
+#: ../../mod/connections.php:559
msgid "Only show blocked connections"
msgstr ""
-#: ../../mod/connections.php:541
+#: ../../mod/connections.php:566
msgid "Only show ignored connections"
msgstr ""
-#: ../../mod/connections.php:548
+#: ../../mod/connections.php:573
msgid "Only show archived connections"
msgstr ""
-#: ../../mod/connections.php:555
+#: ../../mod/connections.php:580
msgid "Only show hidden connections"
msgstr ""
-#: ../../mod/connections.php:597
+#: ../../mod/connections.php:622
#, php-format
msgid "%1$s [%2$s]"
msgstr ""
-#: ../../mod/connections.php:598 ../../mod/nogroup.php:41
+#: ../../mod/connections.php:623 ../../mod/nogroup.php:41
msgid "Edit contact"
msgstr ""
-#: ../../mod/connections.php:624
+#: ../../mod/connections.php:649
msgid "Search your connections"
msgstr ""
-#: ../../mod/connections.php:625
+#: ../../mod/connections.php:650
msgid "Finding: "
msgstr ""
@@ -5323,23 +5313,23 @@ msgstr ""
msgid "Edit/Manage Profiles"
msgstr ""
-#: ../../mod/profiles.php:618 ../../boot.php:1589
+#: ../../mod/profiles.php:618 ../../boot.php:1596
msgid "Change profile photo"
msgstr ""
-#: ../../mod/profiles.php:619 ../../boot.php:1596
+#: ../../mod/profiles.php:619 ../../boot.php:1603
msgid "Create New Profile"
msgstr ""
-#: ../../mod/profiles.php:630 ../../boot.php:1610
+#: ../../mod/profiles.php:630 ../../boot.php:1617
msgid "Profile Image"
msgstr ""
-#: ../../mod/profiles.php:633 ../../boot.php:1613
+#: ../../mod/profiles.php:633 ../../boot.php:1620
msgid "visible to everybody"
msgstr ""
-#: ../../mod/profiles.php:634 ../../boot.php:1614
+#: ../../mod/profiles.php:634 ../../boot.php:1621
msgid "Edit visibility"
msgstr ""
@@ -5408,7 +5398,7 @@ msgid ""
"Password reset failed."
msgstr ""
-#: ../../mod/lostpass.php:85 ../../boot.php:1324
+#: ../../mod/lostpass.php:85 ../../boot.php:1331
msgid "Password Reset"
msgstr ""
@@ -5893,7 +5883,7 @@ msgstr ""
msgid "Insert Vorbis [.ogg] audio"
msgstr ""
-#: ../../mod/profile.php:8 ../../mod/channel.php:8 ../../boot.php:1486
+#: ../../mod/profile.php:8 ../../mod/channel.php:8 ../../boot.php:1493
msgid "Requested profile is not available."
msgstr ""
@@ -6165,96 +6155,96 @@ msgstr ""
msgid "Shiny style"
msgstr ""
-#: ../../boot.php:1148
+#: ../../boot.php:1155
#, php-format
msgid "Update %s failed. See error logs."
msgstr ""
-#: ../../boot.php:1151
+#: ../../boot.php:1158
#, php-format
msgid "Update Error at %s"
msgstr ""
-#: ../../boot.php:1288
+#: ../../boot.php:1295
msgid "Create a New Account"
msgstr ""
-#: ../../boot.php:1317
+#: ../../boot.php:1324
msgid "Password"
msgstr ""
-#: ../../boot.php:1318
+#: ../../boot.php:1325
msgid "Remember me"
msgstr ""
-#: ../../boot.php:1323
+#: ../../boot.php:1330
msgid "Forgot your password?"
msgstr ""
-#: ../../boot.php:1440
+#: ../../boot.php:1447
msgid "Requested channel is not available."
msgstr ""
-#: ../../boot.php:1452
+#: ../../boot.php:1459
msgid " Sorry, you don't have the permission to view this profile. "
msgstr ""
-#: ../../boot.php:1595
+#: ../../boot.php:1602
msgid "Profiles"
msgstr ""
-#: ../../boot.php:1595
+#: ../../boot.php:1602
msgid "Manage/edit profiles"
msgstr ""
-#: ../../boot.php:1599
+#: ../../boot.php:1606
msgid "Edit Profile"
msgstr ""
-#: ../../boot.php:1677 ../../boot.php:1757
+#: ../../boot.php:1684 ../../boot.php:1764
msgid "F d"
msgstr ""
-#: ../../boot.php:1734
+#: ../../boot.php:1741
msgid "Birthday Reminders"
msgstr ""
-#: ../../boot.php:1735
+#: ../../boot.php:1742
msgid "Birthdays this week:"
msgstr ""
-#: ../../boot.php:1790
+#: ../../boot.php:1797
msgid "[No description]"
msgstr ""
-#: ../../boot.php:1808
+#: ../../boot.php:1815
msgid "Event Reminders"
msgstr ""
-#: ../../boot.php:1809
+#: ../../boot.php:1816
msgid "Events this week:"
msgstr ""
-#: ../../boot.php:2006
+#: ../../boot.php:2013
msgid "Channel"
msgstr ""
-#: ../../boot.php:2009
+#: ../../boot.php:2016
msgid "Status Messages and Posts"
msgstr ""
-#: ../../boot.php:2013
+#: ../../boot.php:2020
msgid "About"
msgstr ""
-#: ../../boot.php:2016
+#: ../../boot.php:2023
msgid "Profile Details"
msgstr ""
-#: ../../boot.php:2034
+#: ../../boot.php:2041
msgid "Events and Calendar"
msgstr ""
-#: ../../boot.php:2256
+#: ../../boot.php:2267
msgid "toggle mobile"
msgstr ""
diff --git a/version.inc b/version.inc
index b47f8837e..ab6fd81ae 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-06-16.346
+2013-07-01.361
diff --git a/view/cs/follow_notify_eml.tpl b/view/cs/follow_notify_eml.tpl
index 440ba9ca4..ba07b19da 100644
--- a/view/cs/follow_notify_eml.tpl
+++ b/view/cs/follow_notify_eml.tpl
@@ -1,14 +1,14 @@
-Milý/Milá $username,
+Dear {{$myname}},
-Máte nového následovatele na $sitename - '$requestor'.
+You have a new follower at {{$sitename}} - '{{$requestor}}'.
-Můžete si prohlédnout jeho/její profil na $url.
+You may visit their profile at {{$url}}.
-Přihlaste se na váš server k odsouhlasení nebo ignorování/zrušení žádosti.
+Please login to your site to approve or ignore/cancel the request.
-$siteurl
+{{$siteurl}}
-S pozdravem,
+Regards,
- $sitename administrátor
+ {{$sitename}} administrator
diff --git a/view/cs/friend_complete_eml.tpl b/view/cs/friend_complete_eml.tpl
index 50bb7e105..1c647b994 100644
--- a/view/cs/friend_complete_eml.tpl
+++ b/view/cs/friend_complete_eml.tpl
@@ -1,17 +1,22 @@
-Milý/Milá $username,
+Dear {{$username}},
- Skvělé zprávy... '$fn' na '$dfrn_url' odsouhlasil Váš požadavek na spojení na '$sitename'.
+ Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted
+your connection request at '{{$sitename}}'.
-Jste nyní přátelé a můžete si vyměňovat aktualizace statusu, fotek a e-mailů bez omezení.
+You are now mutual friends and may exchange status updates, photos, and email
+without restriction.
-Pokud budete chtít tento vztah jakkoliv upravit, navštivte Vaši stránku "Kontakty" na $sitename.
+Please visit your 'Connnections' page at {{$sitename}} if you wish to make
+any changes to this relationship.
-$siteurl
+{{$siteurl}}
-(Nyní můžete například vytvořit separátní profil s informacemi, které nebudou viditelné veřejně, a nastavit právo pro zobrazení tohoto profilu pro '$fn').
+[For instance, you may create a separate profile with information that is not
+available to the general public - and assign viewing rights to '{{$fn}}'].
-S pozdravem,
+Sincerely,
- $sitename administrátor
+ {{$sitename}} Administrator
+
diff --git a/view/cs/htconfig.tpl b/view/cs/htconfig.tpl
new file mode 100644
index 000000000..493cb5d00
--- /dev/null
+++ b/view/cs/htconfig.tpl
@@ -0,0 +1,70 @@
+config['system']['baseurl'] = '{{$siteurl}}';
+$a->config['system']['sitename'] = "Red Matrix";
+$a->config['system']['location_hash'] = '{{$site_id}}';
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['system']['register_policy'] = REGISTER_OPEN;
+$a->config['system']['register_text'] = '';
+$a->config['system']['admin_email'] = '{{$adminmail}}';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['system']['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['system']['php_path'] = '{{$phpath}}';
+
+// Configure how we communicate with directory servers.
+// DIRECTORY_MODE_NORMAL = directory client, we will find a directory
+// DIRECTORY_MODE_SECONDARY = caching directory or mirror
+// DIRECTORY_MODE_PRIMARY = main directory server
+// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services
+
+$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL;
+
+// default system theme
+
+$a->config['system']['theme'] = 'redbasic';
+
diff --git a/view/cs/intro_complete_eml.tpl b/view/cs/intro_complete_eml.tpl
index 91753f35d..2c2428d68 100644
--- a/view/cs/intro_complete_eml.tpl
+++ b/view/cs/intro_complete_eml.tpl
@@ -1,17 +1,22 @@
-Milý/Milá $username,
+Dear {{$username}},
+ '{{$fn}}' at '{{$dfrn_url}}' has accepted
+your connection request at '{{$sitename}}'.
- '$fn' na '$dfrn_url' odsouhlasil Váš požadavek na spojení na '$sitename'.
+ '{{$fn}}' has chosen to accept you a "fan", which restricts
+some forms of communication - such as private messaging and some profile
+interactions. If this is a celebrity or community page, these settings were
+applied automatically.
- '$fn' Vás označil za svého "fanouška", což jistým způsobem omezuje komunikaci (například v oblasti soukromých zpráv a některých profilových interakcí. Pokud je toto celebritní nebo komunitní stránka, bylo toto nastavení byla přijato automaticky.
+ '{{$fn}}' may choose to extend this into a two-way or more permissive
+relationship in the future.
- '$fn' může v budoucnu rozšířit toto spojení na oboustranné nebo jinak méně restriktivní.
+ You will start receiving public status updates from '{{$fn}}',
+which will appear on your 'Matrix' page at
- Nyní začnete dostávat veřejné aktualizace statusu od '$fn', které se objeví ve Vaší stránce "Síť" na webu
+{{$siteurl}}
-$siteurl
+Sincerely,
-S pozdravem,
-
- $sitename administrátor
+ {{$sitename}} Administrator
diff --git a/view/cs/lostpass_eml.tpl b/view/cs/lostpass_eml.tpl
index 05042ddce..3b79d2791 100644
--- a/view/cs/lostpass_eml.tpl
+++ b/view/cs/lostpass_eml.tpl
@@ -1,23 +1,32 @@
-Milý/Milá $username,
- Na webu $sitename byl zaregistrován požadavek na znovunastavení hesla k Vašemu účtu. Pro potvrzení této žádosti prosím klikněte na potvrzovací odkaz níže, nebo si tento odkaz zkopírujte do adresního řádku prohlížeče.
-Pokud jste o znovunastavení hesla NEŽÁDALI, prosím NEKLIKEJTE na tento odkaz a ignorujte tento e-mail nebo ho rovnou smažte.
+Dear {{$username}},
+ A request was recently received at {{$sitename}} to reset your account
+password. In order to confirm this request, please select the verification link
+below or paste it into your web browser address bar.
-Vaše heslo nebude změněno, dokud nebudeme mít potvrzení, že jste o tento požadavek zažádali právě Vy.
+If you did NOT request this change, please DO NOT follow the link
+provided and ignore and/or delete this email.
-Klikněte na tento odkaz pro prověření Vaší identity:
+Your password will not be changed unless we can verify that you
+issued this request.
-$reset_link
+Follow this link to verify your identity:
-Poté obdržíte další zprávu obsahující nové heslo.
+{{$reset_link}}
-Následně si toto heslo můžete změnit z vašeho účtu na stránce Nastavení.
+You will then receive a follow-up message containing the new password.
-Přihlašovací údaje jsou tato:
+You may change that password from your account settings page after logging in.
-Adresa webu: $siteurl
-Přihlašovací jméno: $email
+The login details are as follows:
-S pozdravem,
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
- $sitename administrátor
+
+
+
+Sincerely,
+ {{$sitename}} Administrator
+
+
diff --git a/view/cs/passchanged_eml.tpl b/view/cs/passchanged_eml.tpl
index 5447d2e80..0d94be3c2 100644
--- a/view/cs/passchanged_eml.tpl
+++ b/view/cs/passchanged_eml.tpl
@@ -1,14 +1,20 @@
-Milý/Milá $username,
- Vaše heslo bylo na Vaši žádost změněno. Prosím zaznamenejte si tuto informaci (nebo si Vaše heslo změňte na nějaké, které si budete pamatovat).
+Dear {{$username}},
+ Your password has been changed as requested. Please retain this
+information for your records (or change your password immediately to
+something that you will remember).
+
+
+Your login details are as follows:
+
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
+Password: {{$new_password}}
+
+You may change that password from your account settings page after logging in.
+
+
+Sincerely,
+ {{$sitename}} Administrator
+
-Vaše přihlašovací údaje jsou tato:
-
-Adresa webu: $siteurl
-Přihlašovací jméno: $email
-Heslo: $new_password
-
-Toto heslo si můžete změnit z vašeho účtu na stránce Nastavení poté, co se přihlásíte.
-
-S pozdravem,
- $sitename administrátor
diff --git a/view/cs/register_open_eml.tpl b/view/cs/register_open_eml.tpl
index f8e42678b..4b397201c 100644
--- a/view/cs/register_open_eml.tpl
+++ b/view/cs/register_open_eml.tpl
@@ -1,23 +1,19 @@
-Milý/milá $username,
- Díky za registraci na $sitename. Váš účet byl vytvořen.
-Vaše přihlašovací údaje jsou tato:
-Adresa webu: $siteurl
-Přihlašovací jméno: $email
-Heslo: $password
+An account has been created at {{$sitename}} for this email address.
+The login details are as follows:
-Toto heslo si můžete změnit z vašeho účtu na stránce "Nastavení" poté, co se přihlásíte.
+Site Location: {{$siteurl}}
+Login: {{$email}}
+Password: (the password which was provided during registration)
-Věnujte prosím chvíli revizi dalších nastavení Vašeho účtu na této stránce.
+If this account was created without your knowledge and is not desired, you may
+visit this site and reset the password. This will allow you to remove the
+account from the links on the Settings page, and we
+apologise for any inconvenience.
-Můžete také přidat některé základní informace do Vašeho defaultního profilu (na stránce "Profily"), čímž umožníte jiným lidem Vás snadněji nalézt.
+Thank you and welcome to {{$sitename}}.
-Doporučujeme nastavit celé jméno, přidat profilové foto, přidat nějaká profilová "klíčová slova" (což je velmi užitečné pro hledání nových přátel) a zemi, ve které žijete. Nemusíte zadávat víc informací.
+Sincerely,
+ {{$sitename}} Administrator
-Plně respektujeme Vaše právo na soukromí a žádná z výše uvedených položek není povinná.
-Pokud jste nový a neznáte na tomto webu nikoho jiného, zadáním těchto položek můžete získat nové a zajímavé přátele.
-
-Díky a vítejte na $sitename.
-
-S pozdravem,
- $sitename administrátor
+
diff --git a/view/cs/register_verify_eml.tpl b/view/cs/register_verify_eml.tpl
index 4b34c6b6d..85d9a12d3 100644
--- a/view/cs/register_verify_eml.tpl
+++ b/view/cs/register_verify_eml.tpl
@@ -1,22 +1,25 @@
-Na webu $sitename byla vytvořena nová uživatelská registrace, která vyžaduje Vaše schválení.
-
-Přihlašovací údaje jsou tato:
-
-Celé jméno: $username
-Adresa webu: $siteurl
-Přihlašovací jméno: $email
-
-Pro odsouhlasení tohoto požadavku prosím klikněte na následující odkaz:
+A new user registration request was received at {{$sitename}} which requires
+your approval.
-$siteurl/regmod/allow/$hash
+The login details are as follows:
+
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
+IP Address: {{$details}}
+
+To approve this request please visit the following link:
-Pro zamítnutí žádosti a odstranění účtu prosím klikněte na tento odkaz:
+{{$siteurl}}/regmod/allow/{{$hash}}
-$siteurl/regmod/deny/$hash
+To deny the request and remove the account, please visit:
-Díky.
+{{$siteurl}}/regmod/deny/{{$hash}}
+
+
+Thank you.
+
diff --git a/view/cs/request_notify_eml.tpl b/view/cs/request_notify_eml.tpl
index 74010c79c..d01b8ff27 100644
--- a/view/cs/request_notify_eml.tpl
+++ b/view/cs/request_notify_eml.tpl
@@ -1,15 +1,17 @@
-Milý/Milá $username,
+Dear {{$myname}},
-Právě jste obdržel/obdržela požadavek na spojení na webu $sitename
+You have just received a connection request at {{$sitename}}
-od '$requestor'.
+from '{{$requestor}}'.
-Můžete navštívit jeho/její profil na následujícím odkazu $url.
+You may visit their profile at {{$url}}.
-Přihlaste se na Váš web k zobrazení kompletní žádosti a odsouhlaste nebo ignorujte/zrušte tuto žádost.
+Please login to your site to view the complete introduction
+and approve or ignore/cancel the request.
-$siteurl
+{{$siteurl}}
-S pozdravem,
- $sitename administrátor
+Regards,
+
+ {{$sitename}} administrator
diff --git a/view/cs/update_fail_eml.tpl b/view/cs/update_fail_eml.tpl
new file mode 100644
index 000000000..a7df8fc2f
--- /dev/null
+++ b/view/cs/update_fail_eml.tpl
@@ -0,0 +1,13 @@
+Hey,
+I'm the web server at {{$sitename}};
+
+The Red Matrix developers released update {{$update}} recently,
+but when I tried to install it, something went terribly wrong.
+This needs to be fixed soon and it requires human intervention.
+Please contact a Red developer if you can not figure out how to
+fix it on your own. My database might be invalid.
+
+The error message is '{{$error}}'.
+
+Apologies for the inconvenience,
+ your web server at {{$siteurl}}
\ No newline at end of file
diff --git a/view/de/follow_notify_eml.tpl b/view/de/follow_notify_eml.tpl
index a866a08a2..ba07b19da 100644
--- a/view/de/follow_notify_eml.tpl
+++ b/view/de/follow_notify_eml.tpl
@@ -1,14 +1,14 @@
-Hallo $[myname],
+Dear {{$myname}},
-Du hast einen neuen Anhänger auf $[sitename] - '$[requestor]'.
+You have a new follower at {{$sitename}} - '{{$requestor}}'.
-Du kannst das Profil unter $[url] besuchen.
+You may visit their profile at {{$url}}.
-Bitte melde dich an um die Anfrage zu bestätigen oder sie zu ignorieren bzw. abzulehnen.
+Please login to your site to approve or ignore/cancel the request.
-$[siteurl]
+{{$siteurl}}
-beste Grüße,
+Regards,
- $[sitename] Administrator
\ No newline at end of file
+ {{$sitename}} administrator
diff --git a/view/de/friend_complete_eml.tpl b/view/de/friend_complete_eml.tpl
index 39f2725ea..1c647b994 100644
--- a/view/de/friend_complete_eml.tpl
+++ b/view/de/friend_complete_eml.tpl
@@ -1,22 +1,22 @@
-Hallo $[username],
+Dear {{$username}},
- Großartige Neuigkeiten... '$[fn]' auf '$[dfrn_url]' hat
-deine Kontaktanfrage auf '$[sitename]' bestätigt.
+ Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted
+your connection request at '{{$sitename}}'.
-Ihr seid nun beidseitige Freunde und könnt Statusmitteilungen, Bilder und Emails
-ohne Einschränkungen austauschen.
+You are now mutual friends and may exchange status updates, photos, and email
+without restriction.
-Rufe deine 'Kontakte' Seite auf $[sitename] auf, wenn du
-Änderungen an diesem Kontakt vornehmen willst.
+Please visit your 'Connnections' page at {{$sitename}} if you wish to make
+any changes to this relationship.
-$[siteurl]
+{{$siteurl}}
-[Du könntest z.B. ein spezielles Profil anlegen, das Informationen enthält,
-die nicht für die breite Öffentlichkeit sichtbar sein sollen und es für '$[fn]' zum Betrachten freigeben].
+[For instance, you may create a separate profile with information that is not
+available to the general public - and assign viewing rights to '{{$fn}}'].
-Beste Grüße,
+Sincerely,
- $[sitename] Administrator
+ {{$sitename}} Administrator
-
\ No newline at end of file
+
diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl
new file mode 100644
index 000000000..493cb5d00
--- /dev/null
+++ b/view/de/htconfig.tpl
@@ -0,0 +1,70 @@
+config['system']['baseurl'] = '{{$siteurl}}';
+$a->config['system']['sitename'] = "Red Matrix";
+$a->config['system']['location_hash'] = '{{$site_id}}';
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['system']['register_policy'] = REGISTER_OPEN;
+$a->config['system']['register_text'] = '';
+$a->config['system']['admin_email'] = '{{$adminmail}}';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['system']['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['system']['php_path'] = '{{$phpath}}';
+
+// Configure how we communicate with directory servers.
+// DIRECTORY_MODE_NORMAL = directory client, we will find a directory
+// DIRECTORY_MODE_SECONDARY = caching directory or mirror
+// DIRECTORY_MODE_PRIMARY = main directory server
+// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services
+
+$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL;
+
+// default system theme
+
+$a->config['system']['theme'] = 'redbasic';
+
diff --git a/view/de/intro_complete_eml.tpl b/view/de/intro_complete_eml.tpl
index 9d47a6fb1..2c2428d68 100644
--- a/view/de/intro_complete_eml.tpl
+++ b/view/de/intro_complete_eml.tpl
@@ -1,22 +1,22 @@
-Hallo $[username],
+Dear {{$username}},
- '$[fn]' auf '$[dfrn_url]' hat deine Verbindungsanfrage
-auf '$[sitename]' akzeptiert.
+ '{{$fn}}' at '{{$dfrn_url}}' has accepted
+your connection request at '{{$sitename}}'.
- '$[fn]' hat entschieden Dich als "Fan" zu akzeptieren, was zu einigen
-Einschränkungen bei der Kommunikation führt - wie zB das Schreiben von privaten Nachrichten und einige Profil
-Interaktionen. Sollte dies ein Promi-Konto oder eine Forum-Seite sein, werden die Einstellungen
-automatisch angewandt.
+ '{{$fn}}' has chosen to accept you a "fan", which restricts
+some forms of communication - such as private messaging and some profile
+interactions. If this is a celebrity or community page, these settings were
+applied automatically.
- '$[fn]' kann wählen, ob die Freundschaft in eine beidseitige oder alles erlaubende
-Beziehung in der Zukunft erweitert wird.
+ '{{$fn}}' may choose to extend this into a two-way or more permissive
+relationship in the future.
- Du empfängst ab sofort die öffentlichen Beiträge von '$[fn]',
-auf deiner "Netzwerk" Seite.
+ You will start receiving public status updates from '{{$fn}}',
+which will appear on your 'Matrix' page at
-$[siteurl]
+{{$siteurl}}
-Beste Grüße,
+Sincerely,
- $[sitename] Administrator
\ No newline at end of file
+ {{$sitename}} Administrator
diff --git a/view/de/lostpass_eml.tpl b/view/de/lostpass_eml.tpl
index 9f71bbfb1..3b79d2791 100644
--- a/view/de/lostpass_eml.tpl
+++ b/view/de/lostpass_eml.tpl
@@ -1,32 +1,32 @@
-Hallo $[username],
- Auf $[sitename] wurde eine Anfrage zum Zurücksetzen deines
-Passworts empfangen. Um diese zu bestätigen folge bitte dem Link
-weiter unten oder kopiere ihn in die Adressleiste deines Browsers.
+Dear {{$username}},
+ A request was recently received at {{$sitename}} to reset your account
+password. In order to confirm this request, please select the verification link
+below or paste it into your web browser address bar.
-Wenn du die Anfrage NICHT gesendet haben solltest, dann IGNORIERE
-bitte diese Mail und den Link.
+If you did NOT request this change, please DO NOT follow the link
+provided and ignore and/or delete this email.
-Dein Passwort wird nicht geändert werden solange wir nicht überprüfen
-konnten, dass du die Anfrage gestellt hast.
+Your password will not be changed unless we can verify that you
+issued this request.
-Folge diesem Link um deine Identität zu verifizieren:
+Follow this link to verify your identity:
-$[reset_link]
+{{$reset_link}}
-Du wirst eine weitere Email erhalten mit dem neuen Passwort.
+You will then receive a follow-up message containing the new password.
-Das Passwort kannst du anschließend wie gewohnt in deinen Account Einstellungen ändern.
+You may change that password from your account settings page after logging in.
-Die Login-Details sind die folgenden:
+The login details are as follows:
-Adresse der Seite: $[siteurl]
-Login Name: $[email]
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
-Grüße,
- $[sitename] Administrator
+Sincerely,
+ {{$sitename}} Administrator
-
\ No newline at end of file
+
diff --git a/view/de/passchanged_eml.tpl b/view/de/passchanged_eml.tpl
index dcabbbe49..0d94be3c2 100644
--- a/view/de/passchanged_eml.tpl
+++ b/view/de/passchanged_eml.tpl
@@ -1,20 +1,20 @@
-Hallo $[username],
- Dein Passwort wurde wie gewünscht geändert. Bitte bewahre diese
-Informationen in deinen Unterlagen auf (oder ändere dein Passwort sofort
-in etwas, was du dir merken kannst).
+Dear {{$username}},
+ Your password has been changed as requested. Please retain this
+information for your records (or change your password immediately to
+something that you will remember).
-Deine Login Daten wurden wie folgt geändert:
+Your login details are as follows:
-Adresse der Seite: $[siteurl]
-Login Name: $[email]
-Passwort: $[new_password]
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
+Password: {{$new_password}}
-Du kannst dein Passwort unter deinen Account-Einstellungen ändern, wenn du angemeldet bist.
+You may change that password from your account settings page after logging in.
-Beste Grüße,
- $[sitename] Administrator
+Sincerely,
+ {{$sitename}} Administrator
-
\ No newline at end of file
+
diff --git a/view/de/register_open_eml.tpl b/view/de/register_open_eml.tpl
index 4392e8da2..4b397201c 100644
--- a/view/de/register_open_eml.tpl
+++ b/view/de/register_open_eml.tpl
@@ -1,34 +1,19 @@
-Hallo $[username],
- Danke für deine Anmeldung auf $[sitename]. Dein Account wurde angelegt.
-Hier die Login Details:
+An account has been created at {{$sitename}} for this email address.
+The login details are as follows:
+Site Location: {{$siteurl}}
+Login: {{$email}}
+Password: (the password which was provided during registration)
-Adresse der Seite: $[siteurl]
-Login Name: $[email]
-Passwort: $[password]
+If this account was created without your knowledge and is not desired, you may
+visit this site and reset the password. This will allow you to remove the
+account from the links on the Settings page, and we
+apologise for any inconvenience.
-Du kannst und solltest das Passwort in den "Einstellungen" zu deinem Account ändern,
-nachdem du dich erstmalig eingeloggt hast.
+Thank you and welcome to {{$sitename}}.
-Bitte nimm dir einige Augenblicke Zeit, um die anderen Einstellungen auf der Seite kennenzulernen und zu überprüfen.
+Sincerely,
+ {{$sitename}} Administrator
-Eventuell möchtest du außerdem einige grundlegende Informationen in deinem Standardprofil (auf der "Profile" Seite) eintragen,
-damit andere Leute dich einfacher finden können.
-
-Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profilbild hochzuladen,
-sowie ein paar "Profil-Schlüsselwörter" einzutragen (um leichter Menschen mit gleichen Interessen zu finden) - und
-vielleicht auch in welchen Land du lebst; falls du nicht konkreter
-werden möchtest.
-
-Wir respektieren dein Recht auf Privatsphäre und keine dieser Angaben ist notwendig.
-Wenn du ganz neu bei Friendica bist und niemanden kennst, werden sie dir aber helfen
-ein paar neue und interessante Freunde zu finden.
-
-
-Danke und willkommen auf $[sitename].
-
-Beste Grüße,
- $[sitename] Administrator
-
-
\ No newline at end of file
+
diff --git a/view/de/register_verify_eml.tpl b/view/de/register_verify_eml.tpl
index 8f25f5c36..85d9a12d3 100644
--- a/view/de/register_verify_eml.tpl
+++ b/view/de/register_verify_eml.tpl
@@ -1,25 +1,25 @@
-Eine Neuanmeldung auf $[sitename] benötigt
-deine Aufmerksamkeit.
+A new user registration request was received at {{$sitename}} which requires
+your approval.
-Die Login-Einzelheiten sind die folgenden:
+The login details are as follows:
-Kompletter Name: $[username]
-Adresse der Seite: $[siteurl]
-Login Name: $[email]
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
+IP Address: {{$details}}
+
+To approve this request please visit the following link:
-Um die Anfrage zu bestätigen besuche bitte:
+{{$siteurl}}/regmod/allow/{{$hash}}
-$[siteurl]/regmod/allow/$[hash]
+To deny the request and remove the account, please visit:
-Um die Anfrage abzulehnen und den Account zu löschen besuche bitte:
+{{$siteurl}}/regmod/deny/{{$hash}}
-$[siteurl]/regmod/deny/$[hash]
+Thank you.
-
-Danke!
diff --git a/view/de/request_notify_eml.tpl b/view/de/request_notify_eml.tpl
index 057044e8c..d01b8ff27 100644
--- a/view/de/request_notify_eml.tpl
+++ b/view/de/request_notify_eml.tpl
@@ -1,17 +1,17 @@
-Hallo $[myname],
+Dear {{$myname}},
-du hast eine Kontaktanfrage von '$[requestor]' auf $[sitename]
+You have just received a connection request at {{$sitename}}
-erhalten.
+from '{{$requestor}}'.
-Du kannst sein/ihr Profil unter $[url] finden.
+You may visit their profile at {{$url}}.
-Bitte melde dich an um die komplette Vorstellung einzusehen
-und die Anfrage zu bestätigen oder zu ignorieren oder abzulehnen.
+Please login to your site to view the complete introduction
+and approve or ignore/cancel the request.
-$[siteurl]
+{{$siteurl}}
-Beste Grüße,
+Regards,
- $[sitename] Administrator
\ No newline at end of file
+ {{$sitename}} administrator
diff --git a/view/de/update_fail_eml.tpl b/view/de/update_fail_eml.tpl
index cfb55e240..a7df8fc2f 100644
--- a/view/de/update_fail_eml.tpl
+++ b/view/de/update_fail_eml.tpl
@@ -1,11 +1,13 @@
-Hi,
-ich bin $sitename.
-Die friendica Entwickler haben jüngst Update $update veröffentlicht,
-aber als ich versucht habe es zu installieren ist etwas schrecklich schief gegangen.
-Das sollte schnellst möglichst behoben werden und ich kann das nicht alleine machen.
-Bitte wende dich an einen friendica Entwickler, falls du mir nicht alleine helfen kannst. Meine Datenbank könnte unbrauchbar sein.
+Hey,
+I'm the web server at {{$sitename}};
+
+The Red Matrix developers released update {{$update}} recently,
+but when I tried to install it, something went terribly wrong.
+This needs to be fixed soon and it requires human intervention.
+Please contact a Red developer if you can not figure out how to
+fix it on your own. My database might be invalid.
-Die Fehlermeldung lautet '$error'.
+The error message is '{{$error}}'.
-Tut mir Leid!
-Deine friendica Instanz auf $siteurl
\ No newline at end of file
+Apologies for the inconvenience,
+ your web server at {{$siteurl}}
\ No newline at end of file
diff --git a/view/eo/follow_notify_eml.tpl b/view/eo/follow_notify_eml.tpl
index e76453ac1..ba07b19da 100644
--- a/view/eo/follow_notify_eml.tpl
+++ b/view/eo/follow_notify_eml.tpl
@@ -1,14 +1,14 @@
-Kara $[myname],
+Dear {{$myname}},
-Vi havas novan abonanton ĉe $[sitename] - '$[requestor]'.
+You have a new follower at {{$sitename}} - '{{$requestor}}'.
-Vi povas viziti ilian profilon ĉe $[url].
+You may visit their profile at {{$url}}.
-Bonvolu ensaluti en vian retejon por aprobi au malaprobi/nuligi la peton.
+Please login to your site to approve or ignore/cancel the request.
-$[siteurl]
+{{$siteurl}}
-Salutoj,
+Regards,
- [$sitename] administranto
\ No newline at end of file
+ {{$sitename}} administrator
diff --git a/view/eo/friend_complete_eml.tpl b/view/eo/friend_complete_eml.tpl
index f429ca450..1c647b994 100644
--- a/view/eo/friend_complete_eml.tpl
+++ b/view/eo/friend_complete_eml.tpl
@@ -1,22 +1,22 @@
-Kara $[username],
+Dear {{$username}},
- Boegaj novaĵoj.... '$[fn]' ĉe '$[dfrn_url]' aprobis
-vian kontaktpeton ĉe '$[sitename]'.
+ Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted
+your connection request at '{{$sitename}}'.
-Vi nun estas reciprokaj amikoj kaj povas interŝanĝi afiŝojn, bildojn kaj mesaĝojn
-senkatene.
+You are now mutual friends and may exchange status updates, photos, and email
+without restriction.
-Bonvolu viziti vian 'Kontaktoj' paĝon ĉe $[sitename] se vi volas
-ŝangi la rilaton.
+Please visit your 'Connnections' page at {{$sitename}} if you wish to make
+any changes to this relationship.
-$[siteurl]
+{{$siteurl}}
-[Ekzempe, vi eble volas krei disiĝintan profilon kun informoj kiu ne
-haveblas al la komuna publiko - kaj rajtigi '$[fn]' al ĝi]'
+[For instance, you may create a separate profile with information that is not
+available to the general public - and assign viewing rights to '{{$fn}}'].
-Salutoj,
+Sincerely,
- $[sitename] administranto
+ {{$sitename}} Administrator
-
\ No newline at end of file
+
diff --git a/view/eo/htconfig.tpl b/view/eo/htconfig.tpl
new file mode 100644
index 000000000..493cb5d00
--- /dev/null
+++ b/view/eo/htconfig.tpl
@@ -0,0 +1,70 @@
+config['system']['baseurl'] = '{{$siteurl}}';
+$a->config['system']['sitename'] = "Red Matrix";
+$a->config['system']['location_hash'] = '{{$site_id}}';
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['system']['register_policy'] = REGISTER_OPEN;
+$a->config['system']['register_text'] = '';
+$a->config['system']['admin_email'] = '{{$adminmail}}';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['system']['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['system']['php_path'] = '{{$phpath}}';
+
+// Configure how we communicate with directory servers.
+// DIRECTORY_MODE_NORMAL = directory client, we will find a directory
+// DIRECTORY_MODE_SECONDARY = caching directory or mirror
+// DIRECTORY_MODE_PRIMARY = main directory server
+// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services
+
+$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL;
+
+// default system theme
+
+$a->config['system']['theme'] = 'redbasic';
+
diff --git a/view/eo/intro_complete_eml.tpl b/view/eo/intro_complete_eml.tpl
index 56a4fd880..2c2428d68 100644
--- a/view/eo/intro_complete_eml.tpl
+++ b/view/eo/intro_complete_eml.tpl
@@ -1,22 +1,22 @@
-Kara $[username],
+Dear {{$username}},
- '$[fn]' ĉe '$[dfrn_url]' akceptis
-vian kontaktpeton ĉe '$[sitename]'.
+ '{{$fn}}' at '{{$dfrn_url}}' has accepted
+your connection request at '{{$sitename}}'.
- '$[fn]' elektis vin kiel "admiranto", kio malpermesas
-kelkajn komunikilojn - ekzemple privataj mesaĝoj kaj kelkaj profilrilataj
-agoj. Se tio estas konto de komunumo aŭ de eminentulo, tiaj agordoj
-aŭtomate aktiviĝis.
+ '{{$fn}}' has chosen to accept you a "fan", which restricts
+some forms of communication - such as private messaging and some profile
+interactions. If this is a celebrity or community page, these settings were
+applied automatically.
- '$[fn]' eblas konverti la rilaton al ambaŭdirekta rilato
-aŭ apliki pli da permesoj.
+ '{{$fn}}' may choose to extend this into a two-way or more permissive
+relationship in the future.
- Vi ekricevos publikajn afiŝojn de '$[fn]',
-kiuj aperos sur via 'Reto' paĝo ĉe
+ You will start receiving public status updates from '{{$fn}}',
+which will appear on your 'Matrix' page at
-$[siteurl]
+{{$siteurl}}
-Salutoj,
+Sincerely,
- $[sitename] administranto
\ No newline at end of file
+ {{$sitename}} Administrator
diff --git a/view/eo/lostpass_eml.tpl b/view/eo/lostpass_eml.tpl
index 26d1a3c23..3b79d2791 100644
--- a/view/eo/lostpass_eml.tpl
+++ b/view/eo/lostpass_eml.tpl
@@ -1,32 +1,32 @@
-Kara $[username],
- $[sitename] ricevis peton por rekomencigi vian pasvorton.
-Por konfirmi la peton, bonvolu klaki la sekvantan konfirmligilon
-aŭ alglui ĝin en la adreskampo de via retumilo.
+Dear {{$username}},
+ A request was recently received at {{$sitename}} to reset your account
+password. In order to confirm this request, please select the verification link
+below or paste it into your web browser address bar.
-Se vi NE petis tiun ŝanĝon, bonvolu NE KLAKU la
-sekvantan ligilon kaj ignoru aŭ forvisu ĉi-mesaĝon.
+If you did NOT request this change, please DO NOT follow the link
+provided and ignore and/or delete this email.
-Ni ne ŝanĝu vian pasvorton se ni ne povas kontroli ĉu estas vi
-kiu petis la ŝanĝon.
+Your password will not be changed unless we can verify that you
+issued this request.
-Sekvu ĉi tion ligilon por konfirmi vian identecon:
+Follow this link to verify your identity:
-$[reset_link]
+{{$reset_link}}
-Poste, vi ricevos mesaĝon enhavonte la novan pasvorton.
+You will then receive a follow-up message containing the new password.
-Vi eblas ŝangi la pasvorton ĉe viaj kontdoagordoj paĝo post ensaluti.
+You may change that password from your account settings page after logging in.
-La akreditaĵoj estas:
+The login details are as follows:
-Retejo:»$[siteurl]
-Salutnomo:»$[email]
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
-Salutoj,
- $[sitename] administranto
+Sincerely,
+ {{$sitename}} Administrator
-
\ No newline at end of file
+
diff --git a/view/eo/passchanged_eml.tpl b/view/eo/passchanged_eml.tpl
index ee775d5dd..0d94be3c2 100644
--- a/view/eo/passchanged_eml.tpl
+++ b/view/eo/passchanged_eml.tpl
@@ -1,20 +1,20 @@
-Kara $[username],
- Via pasvorto estas ŝanĝita laŭ via peto. Bonvolu konservi ĉi tiun
-informon (aŭ tuj ŝanĝu vian pasvorton al
-iu kiun vi povas memori).
+Dear {{$username}},
+ Your password has been changed as requested. Please retain this
+information for your records (or change your password immediately to
+something that you will remember).
-Jen viaj legitimaĵoj:
+Your login details are as follows:
-Retejo:»$[siteurl]
-Salutnomo:»$[email]
-Pasvorto:»$[new_password]
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
+Password: {{$new_password}}
-Vi eblas ŝanĝi la pasvorton ĉe la paĝo Agordoj -> Konto kiam vi estas ensalutita.
+You may change that password from your account settings page after logging in.
-Salutoj,
- $[sitename] administranto
+Sincerely,
+ {{$sitename}} Administrator
-
\ No newline at end of file
+
diff --git a/view/eo/register_open_eml.tpl b/view/eo/register_open_eml.tpl
index 735ea9a4b..4b397201c 100644
--- a/view/eo/register_open_eml.tpl
+++ b/view/eo/register_open_eml.tpl
@@ -1,34 +1,19 @@
-Kara $[username],
- Dankon pro via registrado ĉe $[sitename]. Vian konton estas kreita.
-Jen viaj legitimaĵoj:
+An account has been created at {{$sitename}} for this email address.
+The login details are as follows:
+Site Location: {{$siteurl}}
+Login: {{$email}}
+Password: (the password which was provided during registration)
-Retejo:»$[siteurl]
-Salutnomo:»$[email]
-Pasvorto:»$[password]
+If this account was created without your knowledge and is not desired, you may
+visit this site and reset the password. This will allow you to remove the
+account from the links on the Settings page, and we
+apologise for any inconvenience.
-Vi eblas ŝanĝi la pasvorton ĉe la paĝo Agordoj -> Konto kiam vi estas
-ensalutita.
+Thank you and welcome to {{$sitename}}.
-Bonvolu preni kelkajn momentoj por kontroli la aliajn kontaktagordojn.
+Sincerely,
+ {{$sitename}} Administrator
-Eble vi volas aldoni kelkajn bazajn informojn al via profilo
-(ĉe la paĝo "Profiloj"), tial vi troveblas al aliaj uzantoj.
-
-Ni rekomendas agordi vian plenan noman, aldoni profilbildon,
-kaj aldojo kelkajn ŝlosilvortojn (tre utila por trovi novajn amikojn) - kaj
-eble en kiu lando vi loĝas, se vi ne volas pli specifa
-ol tio.
-
-Ni tute respektas vian privatecon, kaj neniu de tiuj agordoj necesas.
-Se vi novas kaj ne konas iun ĉi tie, ili eble helpas
-vin trovi novajn kaj interesajn amikojn.
-
-
-Dankon kaj bonvenon ĉe $[sitename].
-
-Salutoj,
- $[sitename] administranto
-
-
\ No newline at end of file
+
diff --git a/view/eo/register_verify_eml.tpl b/view/eo/register_verify_eml.tpl
index cc99ab4b6..85d9a12d3 100644
--- a/view/eo/register_verify_eml.tpl
+++ b/view/eo/register_verify_eml.tpl
@@ -1,25 +1,25 @@
-Nova peto por registrado atendas ĉe $[sitename]
-kaj bezonas vian aprobon.
+A new user registration request was received at {{$sitename}} which requires
+your approval.
-Jen la detaloj de la peto:
+The login details are as follows:
-Plena Nomo:»$[username]
-Retejo:»$[siteurl]
-Salutnomo:»$[email]
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
+IP Address: {{$details}}
+
+To approve this request please visit the following link:
-Aprobonte la peton, bonvolu klaki tiun ligilon:
+{{$siteurl}}/regmod/allow/{{$hash}}
-$[siteurl]/regmod/allow/$[hash]
+To deny the request and remove the account, please visit:
-Malaprobonte kaj forviŝonte la konton, bonvolu klaki:
+{{$siteurl}}/regmod/deny/{{$hash}}
-$[siteurl]/regmod/deny/$[hash]
+Thank you.
-
-Dankon!
diff --git a/view/eo/request_notify_eml.tpl b/view/eo/request_notify_eml.tpl
index eb91414b9..d01b8ff27 100644
--- a/view/eo/request_notify_eml.tpl
+++ b/view/eo/request_notify_eml.tpl
@@ -1,17 +1,17 @@
-Kara $[myname],
+Dear {{$myname}},
-Vi ĵus ricevis kontaktpeton ĉe $[sitename]
+You have just received a connection request at {{$sitename}}
-de '$[requestor]'.
+from '{{$requestor}}'.
-Vi eblas viziti la profilon de la petanto ĉe $[url].
+You may visit their profile at {{$url}}.
-Bonvolu ensaluti en la retejo por vidi la plenan prezenton
-kaj aprobi aŭ ignori/nuligi la peton.
+Please login to your site to view the complete introduction
+and approve or ignore/cancel the request.
-$[siteurl]
+{{$siteurl}}
-Salutoj,
+Regards,
- $[sitename] administranto
\ No newline at end of file
+ {{$sitename}} administrator
diff --git a/view/eo/update_fail_eml.tpl b/view/eo/update_fail_eml.tpl
index f7e0d8bce..a7df8fc2f 100644
--- a/view/eo/update_fail_eml.tpl
+++ b/view/eo/update_fail_eml.tpl
@@ -1,11 +1,13 @@
-Saluton!
-Mi estas $sitename.
-La programistoj de Frienda eldonis ĝisdatigon $update antaŭ ne longe,
-sed kiam mi provis instali ĝin, io terure malsukcesis.
-Tio tuj bezonas riparon kaj mi ne povas fari ĝin sole. Bonvolu kontakti
-Friendica programistion se vi ne povas helpi vin mem. Mia datumbazo eble ne plu validas.
+Hey,
+I'm the web server at {{$sitename}};
+
+The Red Matrix developers released update {{$update}} recently,
+but when I tried to install it, something went terribly wrong.
+This needs to be fixed soon and it requires human intervention.
+Please contact a Red developer if you can not figure out how to
+fix it on your own. My database might be invalid.
-La erarmesaĝo estas '$error'.
+The error message is '{{$error}}'.
-Mi bedaŭras,
-via Friendica servilo ĉe $siteurl
\ No newline at end of file
+Apologies for the inconvenience,
+ your web server at {{$siteurl}}
\ No newline at end of file
diff --git a/view/es/follow_notify_eml.tpl b/view/es/follow_notify_eml.tpl
index 17bd2c01c..ba07b19da 100644
--- a/view/es/follow_notify_eml.tpl
+++ b/view/es/follow_notify_eml.tpl
@@ -1,13 +1,14 @@
-Estimado/a $myname,
+Dear {{$myname}},
-Tienes un nuevo seguidor en $sitename - '$requestor'.
+You have a new follower at {{$sitename}} - '{{$requestor}}'.
-Puedes visitar su perfil en $url.
+You may visit their profile at {{$url}}.
-Inicie sesión en su sitio para aprobar o rechazar/cancelar la solicitud.
+Please login to your site to approve or ignore/cancel the request.
-$siteurl
+{{$siteurl}}
+Regards,
- $sitename
+ {{$sitename}} administrator
diff --git a/view/es/friend_complete_eml.tpl b/view/es/friend_complete_eml.tpl
index 0dc867efd..1c647b994 100644
--- a/view/es/friend_complete_eml.tpl
+++ b/view/es/friend_complete_eml.tpl
@@ -1,19 +1,22 @@
-Estimado/a $username,
+Dear {{$username}},
- Grandes noticias... '$fn' a '$dfrn_url' ha aceptado tu solicitud de conexión en '$sitename'.
+ Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted
+your connection request at '{{$sitename}}'.
-Ahora sois amigos mutuos y podreis intercambiar actualizaciones de estado, fotos, y correo electrónico
-sin restricción alguna.
+You are now mutual friends and may exchange status updates, photos, and email
+without restriction.
-Visita tu página de 'Contactos' en $sitename si desear realizar cualquier cambio en esta relación.
+Please visit your 'Connnections' page at {{$sitename}} if you wish to make
+any changes to this relationship.
-$siteurl
+{{$siteurl}}
-[Por ejemplo, puedes crear un perfil independiente con información que no está disponible al público en general
-- y asignar derechos de visualización a '$fn'].
+[For instance, you may create a separate profile with information that is not
+available to the general public - and assign viewing rights to '{{$fn}}'].
+Sincerely,
- $sitename
+ {{$sitename}} Administrator
diff --git a/view/es/htconfig.tpl b/view/es/htconfig.tpl
new file mode 100644
index 000000000..493cb5d00
--- /dev/null
+++ b/view/es/htconfig.tpl
@@ -0,0 +1,70 @@
+config['system']['baseurl'] = '{{$siteurl}}';
+$a->config['system']['sitename'] = "Red Matrix";
+$a->config['system']['location_hash'] = '{{$site_id}}';
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['system']['register_policy'] = REGISTER_OPEN;
+$a->config['system']['register_text'] = '';
+$a->config['system']['admin_email'] = '{{$adminmail}}';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['system']['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['system']['php_path'] = '{{$phpath}}';
+
+// Configure how we communicate with directory servers.
+// DIRECTORY_MODE_NORMAL = directory client, we will find a directory
+// DIRECTORY_MODE_SECONDARY = caching directory or mirror
+// DIRECTORY_MODE_PRIMARY = main directory server
+// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services
+
+$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL;
+
+// default system theme
+
+$a->config['system']['theme'] = 'redbasic';
+
diff --git a/view/es/intro_complete_eml.tpl b/view/es/intro_complete_eml.tpl
index a2964808c..2c2428d68 100644
--- a/view/es/intro_complete_eml.tpl
+++ b/view/es/intro_complete_eml.tpl
@@ -1,21 +1,22 @@
-Estimado/a $username,
+Dear {{$username}},
- '$fn' en '$dfrn_url' ha aceptado tu petición
-conexión a '$sitename'.
+ '{{$fn}}' at '{{$dfrn_url}}' has accepted
+your connection request at '{{$sitename}}'.
- '$fn' ha optado por aceptarte come "fan", que restringe ciertas
-formas de comunicación, como mensajes privados y algunas interacciones
-con el perfil. Si eres una "celebridad" o una página de comunidad,
-estos ajustes se aplican automáticamente
+ '{{$fn}}' has chosen to accept you a "fan", which restricts
+some forms of communication - such as private messaging and some profile
+interactions. If this is a celebrity or community page, these settings were
+applied automatically.
- '$fn' puede optar por extender esto en una relación más permisiva
-en el futuro.
+ '{{$fn}}' may choose to extend this into a two-way or more permissive
+relationship in the future.
- Empezarás a recibir las actualizaciones públicas de estado de '$fn',
-que aparecerán en tu página "Red" en
+ You will start receiving public status updates from '{{$fn}}',
+which will appear on your 'Matrix' page at
-$siteurl
+{{$siteurl}}
+Sincerely,
- $sitename
+ {{$sitename}} Administrator
diff --git a/view/es/lostpass_eml.tpl b/view/es/lostpass_eml.tpl
index 607744bfe..3b79d2791 100644
--- a/view/es/lostpass_eml.tpl
+++ b/view/es/lostpass_eml.tpl
@@ -1,34 +1,32 @@
-Estimado/a $username,
-
- Se ha recibido una solicitud en $sitename recientemente para restablecer
-tu contraseña. Para confirmar esta solicitud, por favor seleccione el enlace de
-verificación debajo o cópialo y pégalo en la barra de direcciones de tu navegador.
+Dear {{$username}},
+ A request was recently received at {{$sitename}} to reset your account
+password. In order to confirm this request, please select the verification link
+below or paste it into your web browser address bar.
-Se NO has solicitado este cambio, por favor NO sigas el enlace indicado e ignora
-y/o elimina este mensaje.
+If you did NOT request this change, please DO NOT follow the link
+provided and ignore and/or delete this email.
-Tu contraseña no se cambiará a menos que podamos verificar que eres tu quien
-emitió esta solicitud.
+Your password will not be changed unless we can verify that you
+issued this request.
-Sigue este enlace para verificar tu identidad:
+Follow this link to verify your identity:
-$reset_link
+{{$reset_link}}
-A continuación recibirás un mensaje con la nueva contraseña.
+You will then receive a follow-up message containing the new password.
-Despues de accceder, podrás cambiar la contraseña de tu cuenta en la página de
-configuración.
+You may change that password from your account settings page after logging in.
-Los datos de acceso son los siguientes:
+The login details are as follows:
-Sitio: $siteurl
-Nombre: $email
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
-Saludos,
- La administración de $sitename
+Sincerely,
+ {{$sitename}} Administrator
diff --git a/view/es/passchanged_eml.tpl b/view/es/passchanged_eml.tpl
index 7959846b7..0d94be3c2 100644
--- a/view/es/passchanged_eml.tpl
+++ b/view/es/passchanged_eml.tpl
@@ -1,19 +1,20 @@
-Estimado/a $username,
-
- Tu contraseña ha sido modificada como has solicitado. Anota esta información
-(o cambia inmediatamente la contraseña con algo que recuerdes).
+Dear {{$username}},
+ Your password has been changed as requested. Please retain this
+information for your records (or change your password immediately to
+something that you will remember).
-Tus datos de acceso son los siguientes:
+Your login details are as follows:
-Sitio: $siteurl
-Nombre: $email
-Contraseña: $new_password
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
+Password: {{$new_password}}
-Después de acceder puedes cambiar la contraseña desde la página de configuración de tu perfil.
+You may change that password from your account settings page after logging in.
- $sitename
+Sincerely,
+ {{$sitename}} Administrator
diff --git a/view/es/register_open_eml.tpl b/view/es/register_open_eml.tpl
index 7c7a90b40..4b397201c 100644
--- a/view/es/register_open_eml.tpl
+++ b/view/es/register_open_eml.tpl
@@ -1,21 +1,19 @@
-Estimado/a $username,
+An account has been created at {{$sitename}} for this email address.
+The login details are as follows:
- Gracias por registrarte en $sitename. Tu cuenta ha sido creada.
+Site Location: {{$siteurl}}
+Login: {{$email}}
+Password: (the password which was provided during registration)
+If this account was created without your knowledge and is not desired, you may
+visit this site and reset the password. This will allow you to remove the
+account from the links on the Settings page, and we
+apologise for any inconvenience.
-Los datos de acceso son los siguientes:
+Thank you and welcome to {{$sitename}}.
-Sitio: $siteurl
-Nombre: $email
-Contraseña: $password
-
-
-Después de acceder puedes cambiar tu contraseña en la página de "Configuración".
-
-Toma un momento para revisar las otras configuraciones de la cuenta en esa página.
-
-
-Gracias y bienvenido/a $sitename.
+Sincerely,
+ {{$sitename}} Administrator
diff --git a/view/es/register_verify_eml.tpl b/view/es/register_verify_eml.tpl
index 9f2cc4d9b..85d9a12d3 100644
--- a/view/es/register_verify_eml.tpl
+++ b/view/es/register_verify_eml.tpl
@@ -1,22 +1,25 @@
-Se ha recibido la solicitud de registro de un nuevo usuario en
-$sitename que requiere tu aprobación.
-
-Los datos de acceso son los siguientes:
-
-Nombre Completo: $username
-Sitio: $siteurl
-Nombre: $email
+A new user registration request was received at {{$sitename}} which requires
+your approval.
-Para aprobar esta solicitud, visita el siguiente enlace:
+The login details are as follows:
-$siteurl/regmod/allow/$hash
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
+IP Address: {{$details}}
-Para denegar la solicitud y eliminar la cuenta, por favor visita:
-
-$siteurl/regmod/deny/$hash
+To approve this request please visit the following link:
-Gracias.
+{{$siteurl}}/regmod/allow/{{$hash}}
+
+
+To deny the request and remove the account, please visit:
+
+
+{{$siteurl}}/regmod/deny/{{$hash}}
+
+
+Thank you.
diff --git a/view/es/request_notify_eml.tpl b/view/es/request_notify_eml.tpl
index 6161c45c1..d01b8ff27 100644
--- a/view/es/request_notify_eml.tpl
+++ b/view/es/request_notify_eml.tpl
@@ -1,13 +1,17 @@
-Estimado/a $myname,
+Dear {{$myname}},
-Acabas de recibir una solicitud de conexión de '$requestor' en $sitename.
+You have just received a connection request at {{$sitename}}
-Puedes visitar su perfil en $url.
+from '{{$requestor}}'.
-Accede a tu sitio para ver la presentación completa y aceptar o ignorar/cancelar la solicitud.
+You may visit their profile at {{$url}}.
-$siteurl
+Please login to your site to view the complete introduction
+and approve or ignore/cancel the request.
+{{$siteurl}}
- $sitename
+Regards,
+
+ {{$sitename}} administrator
diff --git a/view/es/update_fail_eml.tpl b/view/es/update_fail_eml.tpl
new file mode 100644
index 000000000..a7df8fc2f
--- /dev/null
+++ b/view/es/update_fail_eml.tpl
@@ -0,0 +1,13 @@
+Hey,
+I'm the web server at {{$sitename}};
+
+The Red Matrix developers released update {{$update}} recently,
+but when I tried to install it, something went terribly wrong.
+This needs to be fixed soon and it requires human intervention.
+Please contact a Red developer if you can not figure out how to
+fix it on your own. My database might be invalid.
+
+The error message is '{{$error}}'.
+
+Apologies for the inconvenience,
+ your web server at {{$siteurl}}
\ No newline at end of file
diff --git a/view/fr/follow_notify_eml.tpl b/view/fr/follow_notify_eml.tpl
index 10d0b343b..ba07b19da 100644
--- a/view/fr/follow_notify_eml.tpl
+++ b/view/fr/follow_notify_eml.tpl
@@ -1,14 +1,14 @@
-Cher(e) $myname,
+Dear {{$myname}},
-Une nouvelle personne - $requestor - vous suit désormais sur $sitename.
+You have a new follower at {{$sitename}} - '{{$requestor}}'.
-Vous pouvez consulter son profil sur $url.
+You may visit their profile at {{$url}}.
-Merci de vous connecter à votre site pour approuver ou ignorer/annuler cette demande.
+Please login to your site to approve or ignore/cancel the request.
-$siteurl
+{{$siteurl}}
-Cordialement,
+Regards,
- l'administrateur de $sitename
+ {{$sitename}} administrator
diff --git a/view/fr/friend_complete_eml.tpl b/view/fr/friend_complete_eml.tpl
index 1f2553b5e..1c647b994 100644
--- a/view/fr/friend_complete_eml.tpl
+++ b/view/fr/friend_complete_eml.tpl
@@ -1,23 +1,22 @@
-Cher(e) $username,
+Dear {{$username}},
- Grande nouvelle… « $fn » (de « $dfrn_url ») a accepté votre
-demande de connexion à « $sitename ».
+ Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted
+your connection request at '{{$sitename}}'.
-Vous êtes désormais dans une relation réciproque et pouvez échanger des
-photos, des humeurs et des messages sans restriction.
+You are now mutual friends and may exchange status updates, photos, and email
+without restriction.
-Merci de visiter votre page « Contacts » sur $sitename pour toute
-modification que vous souhaiteriez apporter à cette relation.
+Please visit your 'Connnections' page at {{$sitename}} if you wish to make
+any changes to this relationship.
-$siteurl
+{{$siteurl}}
-[Par exemple, vous pouvez créer un profil spécifique avec des informations
-cachées au grand public - et ainsi assigner des droits privilégiés à
-« $fn »]/
+[For instance, you may create a separate profile with information that is not
+available to the general public - and assign viewing rights to '{{$fn}}'].
-Sincèremment,
+Sincerely,
- l'administrateur de $sitename
+ {{$sitename}} Administrator
diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl
new file mode 100644
index 000000000..493cb5d00
--- /dev/null
+++ b/view/fr/htconfig.tpl
@@ -0,0 +1,70 @@
+config['system']['baseurl'] = '{{$siteurl}}';
+$a->config['system']['sitename'] = "Red Matrix";
+$a->config['system']['location_hash'] = '{{$site_id}}';
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['system']['register_policy'] = REGISTER_OPEN;
+$a->config['system']['register_text'] = '';
+$a->config['system']['admin_email'] = '{{$adminmail}}';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['system']['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['system']['php_path'] = '{{$phpath}}';
+
+// Configure how we communicate with directory servers.
+// DIRECTORY_MODE_NORMAL = directory client, we will find a directory
+// DIRECTORY_MODE_SECONDARY = caching directory or mirror
+// DIRECTORY_MODE_PRIMARY = main directory server
+// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services
+
+$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL;
+
+// default system theme
+
+$a->config['system']['theme'] = 'redbasic';
+
diff --git a/view/fr/intro_complete_eml.tpl b/view/fr/intro_complete_eml.tpl
index f698cfeb7..2c2428d68 100644
--- a/view/fr/intro_complete_eml.tpl
+++ b/view/fr/intro_complete_eml.tpl
@@ -1,22 +1,22 @@
-Cher(e) $username,
+Dear {{$username}},
- « $fn » du site « $dfrn_url » a accepté votre
-demande de mise en relation sur « $sitename ».
+ '{{$fn}}' at '{{$dfrn_url}}' has accepted
+your connection request at '{{$sitename}}'.
- « $fn » a décidé de vous accepter comme « fan », ce qui restreint
-certains de vos moyens de communication - tels que les messages privés et
-certaines interactions avec son profil. S'il s'agit de la page d'une
-célébrité et/ou communauté, ces réglages ont été définis automatiquement.
+ '{{$fn}}' has chosen to accept you a "fan", which restricts
+some forms of communication - such as private messaging and some profile
+interactions. If this is a celebrity or community page, these settings were
+applied automatically.
- « $fn » pourra choisir d'étendre votre relation à quelque chose de
-plus permissif dans l'avenir.
+ '{{$fn}}' may choose to extend this into a two-way or more permissive
+relationship in the future.
- Vous allez commencer à recevoir les mises à jour publiques du
-statut de « $fn », lesquelles apparaîtront sur votre page « Réseau » sur
+ You will start receiving public status updates from '{{$fn}}',
+which will appear on your 'Matrix' page at
-$siteurl
+{{$siteurl}}
-Sincèrement votre,
+Sincerely,
- l'administrateur de $sitename
+ {{$sitename}} Administrator
diff --git a/view/fr/lostpass_eml.tpl b/view/fr/lostpass_eml.tpl
index 96c11d723..3b79d2791 100644
--- a/view/fr/lostpass_eml.tpl
+++ b/view/fr/lostpass_eml.tpl
@@ -1,34 +1,32 @@
-Cher(e) $username,
+Dear {{$username}},
+ A request was recently received at {{$sitename}} to reset your account
+password. In order to confirm this request, please select the verification link
+below or paste it into your web browser address bar.
- Nous avons récemment reçu, chez $sitename, une demande de remise
-à zéro du mot de passe protégeant votre compte. Pour confirmer cette
-demande, merci de cliquer sur le lien de vérification suivant, ou de le
-coller dans la barre d'adresse de votre navigateur web.
+If you did NOT request this change, please DO NOT follow the link
+provided and ignore and/or delete this email.
-Si vous n'êtes PAS à l'origine de cette demande, merci de NE PAS suivre
-le lien en question, et d'ignorer/supprimer ce courriel.
+Your password will not be changed unless we can verify that you
+issued this request.
-Votre mot de passe ne sera réinitialisé qu'une fois que nous aurons pu
-nous assurer que vous êtes bien à l'origine de cette demande.
+Follow this link to verify your identity:
-Merci de suivre le lien suivant pour confirmer votre identité :
+{{$reset_link}}
-$reset_link
+You will then receive a follow-up message containing the new password.
-Vous recevrez en retour un message avec votre nouveau mot de passe.
+You may change that password from your account settings page after logging in.
-Vous pourrez ensuite changer ce mot de passe, après connexion, dans la
-page des réglages du compte.
+The login details are as follows:
-Les informations du compte concerné sont :
-
-Site : $siteurl
-Pseudo/Courriel : $email
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
-Sincèrement votre,
- l'administrateur de $sitename
+
+Sincerely,
+ {{$sitename}} Administrator
diff --git a/view/fr/passchanged_eml.tpl b/view/fr/passchanged_eml.tpl
index 4ea8899fc..0d94be3c2 100644
--- a/view/fr/passchanged_eml.tpl
+++ b/view/fr/passchanged_eml.tpl
@@ -1,20 +1,20 @@
-Cher(e) $username,
+Dear {{$username}},
+ Your password has been changed as requested. Please retain this
+information for your records (or change your password immediately to
+something that you will remember).
- Votre mot de passe a été modifié comme demandé. Merci de conserver
-cette information pour un usage ultérieur (ou bien de changer votre mot de
-passe immédiatement en quelque chose dont vous vous souviendrez).
-Vos informations de connexion sont désormais :
+Your login details are as follows:
-Site : $siteurl
-Pseudo/Courriel : $email
-Mot de passe : $new_password
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
+Password: {{$new_password}}
-Vous pouvez changer ce mot de passe depuis la page des « réglages » de votre compte,
-après connexion
+You may change that password from your account settings page after logging in.
-Sincèrement votre,
- l'administrateur de $sitename
+
+Sincerely,
+ {{$sitename}} Administrator
diff --git a/view/fr/register_open_eml.tpl b/view/fr/register_open_eml.tpl
index 5d9e737c3..4b397201c 100644
--- a/view/fr/register_open_eml.tpl
+++ b/view/fr/register_open_eml.tpl
@@ -1,22 +1,19 @@
-Cher(e) $username,
+An account has been created at {{$sitename}} for this email address.
+The login details are as follows:
- Merci de votre inscription à $sitename. Votre compte a été créé.
-Les informations de connexion sont les suivantes :
+Site Location: {{$siteurl}}
+Login: {{$email}}
+Password: (the password which was provided during registration)
-Site : $siteurl
-Pseudo/Courriel : $email
-Mot de passe : $password
+If this account was created without your knowledge and is not desired, you may
+visit this site and reset the password. This will allow you to remove the
+account from the links on the Settings page, and we
+apologise for any inconvenience.
-Vous pouvez changer de mot de passe dans la page des « Réglages » de votre compte,
-après connexion.
+Thank you and welcome to {{$sitename}}.
-Merci de prendre quelques minutes pour découvrir les autres réglages disponibles
-sur cette page.
-
-Merci, et bienvenue sur $sitename.
-
-Sincèrement votre,
- l'administrateur de $sitename
+Sincerely,
+ {{$sitename}} Administrator
diff --git a/view/fr/register_verify_eml.tpl b/view/fr/register_verify_eml.tpl
index 9cb31a6a8..85d9a12d3 100644
--- a/view/fr/register_verify_eml.tpl
+++ b/view/fr/register_verify_eml.tpl
@@ -1,27 +1,25 @@
-Une nouvelle demande d'inscription a été reçue sur $sitename, et elle
-nécessite votre approbation.
+A new user registration request was received at {{$sitename}} which requires
+your approval.
-Les informations de connexion sont les suivantes :
+The login details are as follows:
-Nom complet : $username
-Site : $siteurl
-Pseudo/Courriel : $email
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
+IP Address: {{$details}}
+
+To approve this request please visit the following link:
-Pour approuver cette demande, merci de suivre le lien :
+{{$siteurl}}/regmod/allow/{{$hash}}
-$siteurl/regmod/allow/$hash
+To deny the request and remove the account, please visit:
-Pour rejeter cette demande et supprimer le compte associé,
-merci de suivre le lien :
+{{$siteurl}}/regmod/deny/{{$hash}}
-$siteurl/regmod/deny/$hash
-
-
-En vous remerçiant.
+Thank you.
diff --git a/view/fr/request_notify_eml.tpl b/view/fr/request_notify_eml.tpl
index 9234ceaaa..d01b8ff27 100644
--- a/view/fr/request_notify_eml.tpl
+++ b/view/fr/request_notify_eml.tpl
@@ -1,17 +1,17 @@
-Cher(e) $myname,
+Dear {{$myname}},
-Vous venez de recevoir une demande de mise en relation sur $sitename
+You have just received a connection request at {{$sitename}}
-venant de « $requestor ».
+from '{{$requestor}}'.
-Vous pouvez visiter son profil sur $url.
+You may visit their profile at {{$url}}.
-Vous pouvez vous connecter à votre site pour voir la demande
-complète et l'approuver ou l'ignorer/annuler.
+Please login to your site to view the complete introduction
+and approve or ignore/cancel the request.
-$siteurl
+{{$siteurl}}
-Cordialement,
+Regards,
- l'administrateur de $sitename
+ {{$sitename}} administrator
diff --git a/view/fr/update_fail_eml.tpl b/view/fr/update_fail_eml.tpl
new file mode 100644
index 000000000..a7df8fc2f
--- /dev/null
+++ b/view/fr/update_fail_eml.tpl
@@ -0,0 +1,13 @@
+Hey,
+I'm the web server at {{$sitename}};
+
+The Red Matrix developers released update {{$update}} recently,
+but when I tried to install it, something went terribly wrong.
+This needs to be fixed soon and it requires human intervention.
+Please contact a Red developer if you can not figure out how to
+fix it on your own. My database might be invalid.
+
+The error message is '{{$error}}'.
+
+Apologies for the inconvenience,
+ your web server at {{$siteurl}}
\ No newline at end of file
diff --git a/view/it/follow_notify_eml.tpl b/view/it/follow_notify_eml.tpl
index c85a0cdc9..ba07b19da 100644
--- a/view/it/follow_notify_eml.tpl
+++ b/view/it/follow_notify_eml.tpl
@@ -1,14 +1,14 @@
-Ciao $[myname],
+Dear {{$myname}},
-Un nuovo utente ha iniziato a seguirti su $[sitename] - '$[requestor]'.
+You have a new follower at {{$sitename}} - '{{$requestor}}'.
-Puoi vedere il suo profilo su $[url].
+You may visit their profile at {{$url}}.
-Accedi sul tuo sito per approvare o ignorare la richiesta.
+Please login to your site to approve or ignore/cancel the request.
-$[siteurl]
+{{$siteurl}}
-Saluti,
+Regards,
- L'amministratore di $[sitename]
\ No newline at end of file
+ {{$sitename}} administrator
diff --git a/view/it/friend_complete_eml.tpl b/view/it/friend_complete_eml.tpl
index 890b0148c..1c647b994 100644
--- a/view/it/friend_complete_eml.tpl
+++ b/view/it/friend_complete_eml.tpl
@@ -1,22 +1,22 @@
-Ciao $[username],
+Dear {{$username}},
- Ottime notizie... '$[fn]' di '$[dfrn_url]' ha accettato
-la tua richiesta di connessione su '$[sitename]'.
+ Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted
+your connection request at '{{$sitename}}'.
-Adesso siete amici reciproci e potete scambiarvi aggiornamenti di stato, foto ed email
-senza restrizioni.
+You are now mutual friends and may exchange status updates, photos, and email
+without restriction.
-Vai nella pagina 'Contatti' di $[sitename] se vuoi effettuare
-qualche modifica riguardo questa relazione
+Please visit your 'Connnections' page at {{$sitename}} if you wish to make
+any changes to this relationship.
-$[siteurl]
+{{$siteurl}}
-[Ad esempio, potresti creare un profilo separato con le informazioni che non
-sono disponibili pubblicamente - ed permettere di vederlo a '$[fn]'].
+[For instance, you may create a separate profile with information that is not
+available to the general public - and assign viewing rights to '{{$fn}}'].
-Saluti,
+Sincerely,
- l'amministratore di $[sitename]
+ {{$sitename}} Administrator
-
\ No newline at end of file
+
diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl
new file mode 100644
index 000000000..493cb5d00
--- /dev/null
+++ b/view/it/htconfig.tpl
@@ -0,0 +1,70 @@
+config['system']['baseurl'] = '{{$siteurl}}';
+$a->config['system']['sitename'] = "Red Matrix";
+$a->config['system']['location_hash'] = '{{$site_id}}';
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['system']['register_policy'] = REGISTER_OPEN;
+$a->config['system']['register_text'] = '';
+$a->config['system']['admin_email'] = '{{$adminmail}}';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['system']['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['system']['php_path'] = '{{$phpath}}';
+
+// Configure how we communicate with directory servers.
+// DIRECTORY_MODE_NORMAL = directory client, we will find a directory
+// DIRECTORY_MODE_SECONDARY = caching directory or mirror
+// DIRECTORY_MODE_PRIMARY = main directory server
+// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services
+
+$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL;
+
+// default system theme
+
+$a->config['system']['theme'] = 'redbasic';
+
diff --git a/view/it/intro_complete_eml.tpl b/view/it/intro_complete_eml.tpl
index 46fe7018b..2c2428d68 100644
--- a/view/it/intro_complete_eml.tpl
+++ b/view/it/intro_complete_eml.tpl
@@ -1,22 +1,22 @@
-Ciao $[username],
+Dear {{$username}},
- '$[fn]' di '$[dfrn_url]' ha accettato
-la tua richiesta di connessione a '$[sitename]'.
+ '{{$fn}}' at '{{$dfrn_url}}' has accepted
+your connection request at '{{$sitename}}'.
- '$[fn]' ha deciso di accettarti come "fan", il che restringe
-alcune forme di comunicazione - come i messaggi privati e alcune
-interazioni. Se è la pagina di una persona famosa o di una comunità, queste impostazioni saranno
-applicate automaticamente.
+ '{{$fn}}' has chosen to accept you a "fan", which restricts
+some forms of communication - such as private messaging and some profile
+interactions. If this is a celebrity or community page, these settings were
+applied automatically.
- '$[fn]' potrebbe decidere di estendere questa relazione in una comunicazione bidirezionale o ancora più permissiva
-.
+ '{{$fn}}' may choose to extend this into a two-way or more permissive
+relationship in the future.
- Inizierai a ricevere gli aggiornamenti di stato pubblici da '$[fn]',
-che apparirà nella tua pagina 'Rete'
+ You will start receiving public status updates from '{{$fn}}',
+which will appear on your 'Matrix' page at
-$[siteurl]
+{{$siteurl}}
-Saluti,
+Sincerely,
- l'amministratore di $[sitename]
\ No newline at end of file
+ {{$sitename}} Administrator
diff --git a/view/it/lostpass_eml.tpl b/view/it/lostpass_eml.tpl
index 26d3d6817..3b79d2791 100644
--- a/view/it/lostpass_eml.tpl
+++ b/view/it/lostpass_eml.tpl
@@ -1,32 +1,32 @@
-Ciao $[username],
- Su $[sitename] è stata ricevuta una richiesta di azzeramento di password per un account.
-Per confermare la richiesta, clicca sul link di verifica
-qui in fondo oppure copialo nella barra degli indirizzi del tuo browser.
+Dear {{$username}},
+ A request was recently received at {{$sitename}} to reset your account
+password. In order to confirm this request, please select the verification link
+below or paste it into your web browser address bar.
-Se NON hai richiesto l'azzeramento, NON seguire il link
-e ignora e/o cancella questa email.
+If you did NOT request this change, please DO NOT follow the link
+provided and ignore and/or delete this email.
-La tua password non sarà modificata finché non avremo verificato che
-hai fatto questa richiesta.
+Your password will not be changed unless we can verify that you
+issued this request.
-Per verificare la tua identità clicca su:
+Follow this link to verify your identity:
-$[reset_link]
+{{$reset_link}}
-Dopo la verifica riceverai un messaggio di risposta con la nuova password.
+You will then receive a follow-up message containing the new password.
-Potrai cambiare la password dalla pagina delle impostazioni dopo aver effettuato l'accesso.
+You may change that password from your account settings page after logging in.
-I dati di accesso sono i seguenti:
+The login details are as follows:
-Sito:»$[siteurl]
-Nome utente:»$[email]
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
-Saluti,
- l'amministratore di $[sitename]
+Sincerely,
+ {{$sitename}} Administrator
-
\ No newline at end of file
+
diff --git a/view/it/passchanged_eml.tpl b/view/it/passchanged_eml.tpl
index ab3f1aede..0d94be3c2 100644
--- a/view/it/passchanged_eml.tpl
+++ b/view/it/passchanged_eml.tpl
@@ -1,20 +1,20 @@
-Ciao $[username],
- La tua password è cambiata come hai richiesto. Conserva queste
-informazioni (oppure cambia immediatamente la password con
-qualcosa che ti è più facile ricordare).
+Dear {{$username}},
+ Your password has been changed as requested. Please retain this
+information for your records (or change your password immediately to
+something that you will remember).
-I tuoi dati di access sono i seguenti:
+Your login details are as follows:
-Sito:»$[siteurl]
-Nome utente:»$[email]
-Password:»$[new_password]
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
+Password: {{$new_password}}
-Puoi cambiare la tua password dalla pagina delle impostazioni dopo aver effettuato l'accesso.
+You may change that password from your account settings page after logging in.
-Saluti,
- l'amministratore di $[sitename]
+Sincerely,
+ {{$sitename}} Administrator
-
\ No newline at end of file
+
diff --git a/view/it/register_open_eml.tpl b/view/it/register_open_eml.tpl
index 11a7752bc..4b397201c 100644
--- a/view/it/register_open_eml.tpl
+++ b/view/it/register_open_eml.tpl
@@ -1,34 +1,19 @@
-Ciao $[username],
- Grazie per aver effettuato la registrazione a $[sitename]. Il tuo account è stato creato.
-I dettagli di accesso sono i seguenti
+An account has been created at {{$sitename}} for this email address.
+The login details are as follows:
+Site Location: {{$siteurl}}
+Login: {{$email}}
+Password: (the password which was provided during registration)
-Sito:»$[siteurl]
-Nome utente:»$[email]
-Password:»$[password]
+If this account was created without your knowledge and is not desired, you may
+visit this site and reset the password. This will allow you to remove the
+account from the links on the Settings page, and we
+apologise for any inconvenience.
-Puoi cambiare la tua password dalla pagina "Impostazioni" del tuo profilo dopo aver effettuato l'accesso
-.
+Thank you and welcome to {{$sitename}}.
-Prenditi un momento per dare un'occhiata alle altre impostazioni del tuo profilo nella stessa pagina.
+Sincerely,
+ {{$sitename}} Administrator
-Potrest voler aggiungere alcune informazioni di base a quelle predefinite del profilo
-(nella pagina "Profilo") per rendere agli altri più facile trovarti.
-
-Noi raccomandiamo di impostare il tuo nome completo, di aggiungere una foto,
-di aggiungere alcune "parole chiavi" (molto utili per farsi nuovi amici) - e
-magari il paese dove vivi; se non vuoi essere più dettagliato
-di così.
-
-Noi rispettiamo il tuo diritto alla privacy e nessuna di queste informazioni è indispensabile.
-Se ancora non conosci nessuno qui, potrebbe esserti di aiuto
-per farti nuovi e interessanti amici.
-
-
-Grazie. Siamo contenti di darti il benvenuto su $[sitename]
-
-Saluti,
- l'amministratore di $[sitename]
-
-
\ No newline at end of file
+
diff --git a/view/it/register_verify_eml.tpl b/view/it/register_verify_eml.tpl
index baac57976..85d9a12d3 100644
--- a/view/it/register_verify_eml.tpl
+++ b/view/it/register_verify_eml.tpl
@@ -1,25 +1,25 @@
-Su $[sitename] è stata ricevuta una nuova richiesta di registrazione da parte di un utente che richiede
-la tua approvazione.
+A new user registration request was received at {{$sitename}} which requires
+your approval.
-I tuoi dati di accesso sono i seguenti:
+The login details are as follows:
-Nome completo:»$[username]
-Sito:»$[siteurl]
-Nome utente:»$[email]
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
+IP Address: {{$details}}
+
+To approve this request please visit the following link:
-Per approvare questa richiesta clicca su:
+{{$siteurl}}/regmod/allow/{{$hash}}
-$[siteurl]/regmod/allow/$[hash]
+To deny the request and remove the account, please visit:
-Per negare la richiesta e rimuove il profilo, clicca su:
+{{$siteurl}}/regmod/deny/{{$hash}}
-$[siteurl]/regmod/deny/$[hash]
+Thank you.
-
-Grazie.
diff --git a/view/it/request_notify_eml.tpl b/view/it/request_notify_eml.tpl
index 1360be90c..d01b8ff27 100644
--- a/view/it/request_notify_eml.tpl
+++ b/view/it/request_notify_eml.tpl
@@ -1,17 +1,17 @@
-Ciao $[myname],
+Dear {{$myname}},
-Hai appena ricevuto una richiesta di connessione da $[sitename]
+You have just received a connection request at {{$sitename}}
-da '$[requestor]'.
+from '{{$requestor}}'.
-Puoi visitare il suo profilo su $[url].
+You may visit their profile at {{$url}}.
-Accedi al tuo sito per vedere la richiesta completa
-e approva o ignora/annulla la richiesta.
+Please login to your site to view the complete introduction
+and approve or ignore/cancel the request.
-$[siteurl]
+{{$siteurl}}
-Saluti,
+Regards,
- l'amministratore di $[sitename]
\ No newline at end of file
+ {{$sitename}} administrator
diff --git a/view/it/update_fail_eml.tpl b/view/it/update_fail_eml.tpl
new file mode 100644
index 000000000..a7df8fc2f
--- /dev/null
+++ b/view/it/update_fail_eml.tpl
@@ -0,0 +1,13 @@
+Hey,
+I'm the web server at {{$sitename}};
+
+The Red Matrix developers released update {{$update}} recently,
+but when I tried to install it, something went terribly wrong.
+This needs to be fixed soon and it requires human intervention.
+Please contact a Red developer if you can not figure out how to
+fix it on your own. My database might be invalid.
+
+The error message is '{{$error}}'.
+
+Apologies for the inconvenience,
+ your web server at {{$siteurl}}
\ No newline at end of file
diff --git a/view/nb-no/follow_notify_eml.tpl b/view/nb-no/follow_notify_eml.tpl
index 73a347027..ba07b19da 100644
--- a/view/nb-no/follow_notify_eml.tpl
+++ b/view/nb-no/follow_notify_eml.tpl
@@ -1,14 +1,14 @@
-Kjære $[myname],
+Dear {{$myname}},
-Du har en ny følgesvenn på $[sitename] - '$[requestor]'.
+You have a new follower at {{$sitename}} - '{{$requestor}}'.
-Du kan besøke profilen deres på $[url].
+You may visit their profile at {{$url}}.
-Vennligst logg inn på ditt sted for å godkjenne eller ignorere/avbryte forespørselen.
+Please login to your site to approve or ignore/cancel the request.
-$[siteurl]
+{{$siteurl}}
-Med vennlig hilsen,
+Regards,
- $[sitename] administrator
\ No newline at end of file
+ {{$sitename}} administrator
diff --git a/view/nb-no/friend_complete_eml.tpl b/view/nb-no/friend_complete_eml.tpl
index 4526c94d0..1c647b994 100644
--- a/view/nb-no/friend_complete_eml.tpl
+++ b/view/nb-no/friend_complete_eml.tpl
@@ -1,22 +1,22 @@
-Kjære $[username],
+Dear {{$username}},
- Gode nyheter... '$[fn]' ved '$[dfrn_url]' har godtatt
-din forespørsel om kobling hos '$[sitename]'.
+ Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted
+your connection request at '{{$sitename}}'.
-Dere er nå gjensidige venner og kan utveksle statusoppdateringer, bilder og e-post
-uten hindringer.
+You are now mutual friends and may exchange status updates, photos, and email
+without restriction.
-Vennligst besøk din side "Kontakter" ved $[sitename] hvis du ønsker å gjøre
-noen endringer på denne forbindelsen.
+Please visit your 'Connnections' page at {{$sitename}} if you wish to make
+any changes to this relationship.
-$[siteurl]
+{{$siteurl}}
-[For eksempel, så kan du lage en egen profil med informasjon som ikke er
-tilgjengelig for alle - og angi visningsrettigheter til '$[fn]'].
+[For instance, you may create a separate profile with information that is not
+available to the general public - and assign viewing rights to '{{$fn}}'].
-Med vennlig hilsen,
+Sincerely,
- $[sitename] administrator
+ {{$sitename}} Administrator
-
\ No newline at end of file
+
diff --git a/view/nb-no/htconfig.tpl b/view/nb-no/htconfig.tpl
new file mode 100644
index 000000000..493cb5d00
--- /dev/null
+++ b/view/nb-no/htconfig.tpl
@@ -0,0 +1,70 @@
+config['system']['baseurl'] = '{{$siteurl}}';
+$a->config['system']['sitename'] = "Red Matrix";
+$a->config['system']['location_hash'] = '{{$site_id}}';
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['system']['register_policy'] = REGISTER_OPEN;
+$a->config['system']['register_text'] = '';
+$a->config['system']['admin_email'] = '{{$adminmail}}';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['system']['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['system']['php_path'] = '{{$phpath}}';
+
+// Configure how we communicate with directory servers.
+// DIRECTORY_MODE_NORMAL = directory client, we will find a directory
+// DIRECTORY_MODE_SECONDARY = caching directory or mirror
+// DIRECTORY_MODE_PRIMARY = main directory server
+// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services
+
+$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL;
+
+// default system theme
+
+$a->config['system']['theme'] = 'redbasic';
+
diff --git a/view/nb-no/intro_complete_eml.tpl b/view/nb-no/intro_complete_eml.tpl
index 17b0be5a8..2c2428d68 100644
--- a/view/nb-no/intro_complete_eml.tpl
+++ b/view/nb-no/intro_complete_eml.tpl
@@ -1,22 +1,22 @@
-Kjære $[username],
+Dear {{$username}},
- '$[fn]' ved '$[dfrn_url]' har godtatt
-din forespørsel om kobling ved $[sitename]'.
+ '{{$fn}}' at '{{$dfrn_url}}' has accepted
+your connection request at '{{$sitename}}'.
- '$[fn]' har valgt å godta deg som "fan", som begrenser
-noen typer kommunikasjon - slik som private meldinger og noen profilhandlinger.
-Hvis dette er en kjendis- eller forumside, så ble disse innstillingene
-angitt automatisk.
+ '{{$fn}}' has chosen to accept you a "fan", which restricts
+some forms of communication - such as private messaging and some profile
+interactions. If this is a celebrity or community page, these settings were
+applied automatically.
- '$[fn]' kan velge å utvide dette til en to-veis eller mer åpen
-forbindelse i fremtiden.
+ '{{$fn}}' may choose to extend this into a two-way or more permissive
+relationship in the future.
- Du vil nå motta offentlige statusoppdateringer fra '$[fn]',
-som vil vises på din "Nettverk"-side ved
+ You will start receiving public status updates from '{{$fn}}',
+which will appear on your 'Matrix' page at
-$[siteurl]
+{{$siteurl}}
-Med vennlig hilsen,
+Sincerely,
- $[sitename] administrator
\ No newline at end of file
+ {{$sitename}} Administrator
diff --git a/view/nb-no/lostpass_eml.tpl b/view/nb-no/lostpass_eml.tpl
index 762c8c2e9..3b79d2791 100644
--- a/view/nb-no/lostpass_eml.tpl
+++ b/view/nb-no/lostpass_eml.tpl
@@ -1,32 +1,32 @@
-Kjære $[username],
- En forespørsel ble nylig mottatt hos $[sitename] om å tilbakestille din kontos
-passord. For å godkjenne denne forespørselen, vennligst velg bekreftelseslenken
-nedenfor eller lim den inn på adresselinjen i nettleseren din.
+Dear {{$username}},
+ A request was recently received at {{$sitename}} to reset your account
+password. In order to confirm this request, please select the verification link
+below or paste it into your web browser address bar.
-Hvis du IKKE har spurt om denne endringen, vennligst IKKE følg lenken
-som er oppgitt og ignorer og/eller slett denne e-posten.
+If you did NOT request this change, please DO NOT follow the link
+provided and ignore and/or delete this email.
-Passordet ditt vil ikke bli endret med mindre vi kan forsikre oss om at du
-sendte denne forespørselen.
+Your password will not be changed unless we can verify that you
+issued this request.
-Følg denne lenken for å bekrefte din identitet:
+Follow this link to verify your identity:
-$[reset_link]
+{{$reset_link}}
-Du vil da motta en oppfølgings melding med det nye passordet.
+You will then receive a follow-up message containing the new password.
-Du kan endre passordet på siden for dine kontoinnstillinger etter innlogging.
+You may change that password from your account settings page after logging in.
-Innloggingsdetaljene er som følger:
+The login details are as follows:
-Nettstedsadresse:»$[siteurl]
-Brukernavn:»$[email]
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
-Beste hilsen,
- $[sitename] administrator
+Sincerely,
+ {{$sitename}} Administrator
-
\ No newline at end of file
+
diff --git a/view/nb-no/passchanged_eml.tpl b/view/nb-no/passchanged_eml.tpl
index 6f153d38c..0d94be3c2 100644
--- a/view/nb-no/passchanged_eml.tpl
+++ b/view/nb-no/passchanged_eml.tpl
@@ -1,20 +1,20 @@
-Kjære $[username],
- Ditt passord har blitt endret som forespurt. Vennligst ta vare på denne
-meldingen for sikkerhets skyld (eller bytt passordet ditt umiddelbart til
-noe du husker).
+Dear {{$username}},
+ Your password has been changed as requested. Please retain this
+information for your records (or change your password immediately to
+something that you will remember).
-Dine logg inn-detaljer er som følger:
+Your login details are as follows:
-Nettsted:»$[siteurl]
-Brukernavn:»$[email]
-Passord:»$[new_password]
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
+Password: {{$new_password}}
-Du kan endre dette passordet på din side for kontoinnstillinger etter innlogging.
+You may change that password from your account settings page after logging in.
-Med vennlig hilsen,
- $[sitename] administrator
+Sincerely,
+ {{$sitename}} Administrator
-
\ No newline at end of file
+
diff --git a/view/nb-no/register_open_eml.tpl b/view/nb-no/register_open_eml.tpl
index 345ca0b65..4b397201c 100644
--- a/view/nb-no/register_open_eml.tpl
+++ b/view/nb-no/register_open_eml.tpl
@@ -1,34 +1,19 @@
-Kjære $[username],
- Takk for at du registrerte deg hos $[sitename]. Kontoen din er opprettet.
-Innloggingsdetaljene er som følger:
+An account has been created at {{$sitename}} for this email address.
+The login details are as follows:
+Site Location: {{$siteurl}}
+Login: {{$email}}
+Password: (the password which was provided during registration)
-Nettstedsadresse:»$[siteurl]
-Brukernavn:»$[email]
-Passord:»$[password]
+If this account was created without your knowledge and is not desired, you may
+visit this site and reset the password. This will allow you to remove the
+account from the links on the Settings page, and we
+apologise for any inconvenience.
-Du kan endre passordet ditt på siden "Innstillinger" etter at du har logget
-inn.
+Thank you and welcome to {{$sitename}}.
-Vennligst bruk litt tid til å se over de andre kontoinnstillingene på den siden.
+Sincerely,
+ {{$sitename}} Administrator
-Du vil antakelig ønske å legge til litt grunnleggende informasjon til standardprofilen din
-(på siden "Profiler") slik at folk lettere kan finne deg.
-
-Vi anbefaler å oppgi fullt navn, legge til et profilbilde,
-legge til noen "nøkkelord" for profilen (svært nyttig for å få nye venner) - og
-kanskje hvilket land du bor i, hvis du ikke ønsker å være mer spesifikk
-enn det.
-
-Vi respekterer ditt privatliv fullt ut, og ingen av disse elementene er nødvendige.
-Hvis du er ny og ikke kjenner noen her, så kan de hjelpe
-deg å få noen nye og interessante venner.
-
-
-Takk og velkommen til $[sitename].
-
-Beste hilsen,
- $[sitename] administrator
-
-
\ No newline at end of file
+
diff --git a/view/nb-no/register_verify_eml.tpl b/view/nb-no/register_verify_eml.tpl
index 4c2176d7d..85d9a12d3 100644
--- a/view/nb-no/register_verify_eml.tpl
+++ b/view/nb-no/register_verify_eml.tpl
@@ -1,25 +1,25 @@
-En ny forespørsel om brukerregistering ble mottatt hos $[sitename] og krever
-din godkjenning.
+A new user registration request was received at {{$sitename}} which requires
+your approval.
-Innloggingsdetaljene er som følger:
+The login details are as follows:
-Fullt navn:»$[username]
-Nettstedsadresse:»$[siteurl]
-Brukernavn:»$[email]
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
+IP Address: {{$details}}
+
+To approve this request please visit the following link:
-For å godkjenne denne forespørselen, vennligst besøk følgende lenke:
+{{$siteurl}}/regmod/allow/{{$hash}}
-$[siteurl]/regmod/allow/$[hash]
+To deny the request and remove the account, please visit:
-For å avslå denne forespørselen og fjerne kontoen, vennligst besøk:
+{{$siteurl}}/regmod/deny/{{$hash}}
-$[siteurl]/regmod/deny/$[hash]
+Thank you.
-
-Mange takk.
diff --git a/view/nb-no/request_notify_eml.tpl b/view/nb-no/request_notify_eml.tpl
index e6a62c51f..d01b8ff27 100644
--- a/view/nb-no/request_notify_eml.tpl
+++ b/view/nb-no/request_notify_eml.tpl
@@ -1,17 +1,17 @@
-Kjære $[myname],
+Dear {{$myname}},
-Du har akkurat mottatt en kontaktforespørsel hos $[sitename]
+You have just received a connection request at {{$sitename}}
-fra '$[requestor]'.
+from '{{$requestor}}'.
-Du kan besøke profilen på $[url].
+You may visit their profile at {{$url}}.
-Vennligst logg inn på ditt nettsted for å se hele introduksjonen
-og godkjenne eller ignorere/avbryte forespørselen.
+Please login to your site to view the complete introduction
+and approve or ignore/cancel the request.
-$[siteurl]
+{{$siteurl}}
-Beste hilsen,
+Regards,
- $[siteurl] administrator
\ No newline at end of file
+ {{$sitename}} administrator
diff --git a/view/nb-no/update_fail_eml.tpl b/view/nb-no/update_fail_eml.tpl
index a4a3cf950..a7df8fc2f 100644
--- a/view/nb-no/update_fail_eml.tpl
+++ b/view/nb-no/update_fail_eml.tpl
@@ -1,11 +1,13 @@
-Hei,
-jeg er $sitename.
-Friendica-utviklerne slapp nylig oppdateringen $update,
-men da jeg prøvde å installere den, gikk noe forferdelig galt.
-Dette trenger å bli fikset raskt og jeg kan ikke gjøre det alene. Vennligst kontakt en
-Friendica-utvikler hvis du ikke kan hjelpe meg på egenhånd. Databasen min er kanskje ugyldig.
+Hey,
+I'm the web server at {{$sitename}};
+
+The Red Matrix developers released update {{$update}} recently,
+but when I tried to install it, something went terribly wrong.
+This needs to be fixed soon and it requires human intervention.
+Please contact a Red developer if you can not figure out how to
+fix it on your own. My database might be invalid.
-Feilmeldingen er '$error'.
+The error message is '{{$error}}'.
-Jeg beklager,
-din Friendica-tjener hos $siteurl
\ No newline at end of file
+Apologies for the inconvenience,
+ your web server at {{$siteurl}}
\ No newline at end of file
diff --git a/view/pt-br/follow_notify_eml.tpl b/view/pt-br/follow_notify_eml.tpl
new file mode 100644
index 000000000..ba07b19da
--- /dev/null
+++ b/view/pt-br/follow_notify_eml.tpl
@@ -0,0 +1,14 @@
+
+Dear {{$myname}},
+
+You have a new follower at {{$sitename}} - '{{$requestor}}'.
+
+You may visit their profile at {{$url}}.
+
+Please login to your site to approve or ignore/cancel the request.
+
+{{$siteurl}}
+
+Regards,
+
+ {{$sitename}} administrator
diff --git a/view/pt-br/friend_complete_eml.tpl b/view/pt-br/friend_complete_eml.tpl
new file mode 100644
index 000000000..1c647b994
--- /dev/null
+++ b/view/pt-br/friend_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Dear {{$username}},
+
+ Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted
+your connection request at '{{$sitename}}'.
+
+You are now mutual friends and may exchange status updates, photos, and email
+without restriction.
+
+Please visit your 'Connnections' page at {{$sitename}} if you wish to make
+any changes to this relationship.
+
+{{$siteurl}}
+
+[For instance, you may create a separate profile with information that is not
+available to the general public - and assign viewing rights to '{{$fn}}'].
+
+Sincerely,
+
+ {{$sitename}} Administrator
+
+
diff --git a/view/pt-br/htconfig.tpl b/view/pt-br/htconfig.tpl
new file mode 100644
index 000000000..493cb5d00
--- /dev/null
+++ b/view/pt-br/htconfig.tpl
@@ -0,0 +1,70 @@
+config['system']['baseurl'] = '{{$siteurl}}';
+$a->config['system']['sitename'] = "Red Matrix";
+$a->config['system']['location_hash'] = '{{$site_id}}';
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['system']['register_policy'] = REGISTER_OPEN;
+$a->config['system']['register_text'] = '';
+$a->config['system']['admin_email'] = '{{$adminmail}}';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['system']['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['system']['php_path'] = '{{$phpath}}';
+
+// Configure how we communicate with directory servers.
+// DIRECTORY_MODE_NORMAL = directory client, we will find a directory
+// DIRECTORY_MODE_SECONDARY = caching directory or mirror
+// DIRECTORY_MODE_PRIMARY = main directory server
+// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services
+
+$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL;
+
+// default system theme
+
+$a->config['system']['theme'] = 'redbasic';
+
diff --git a/view/pt-br/intro_complete_eml.tpl b/view/pt-br/intro_complete_eml.tpl
new file mode 100644
index 000000000..2c2428d68
--- /dev/null
+++ b/view/pt-br/intro_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Dear {{$username}},
+
+ '{{$fn}}' at '{{$dfrn_url}}' has accepted
+your connection request at '{{$sitename}}'.
+
+ '{{$fn}}' has chosen to accept you a "fan", which restricts
+some forms of communication - such as private messaging and some profile
+interactions. If this is a celebrity or community page, these settings were
+applied automatically.
+
+ '{{$fn}}' may choose to extend this into a two-way or more permissive
+relationship in the future.
+
+ You will start receiving public status updates from '{{$fn}}',
+which will appear on your 'Matrix' page at
+
+{{$siteurl}}
+
+Sincerely,
+
+ {{$sitename}} Administrator
diff --git a/view/pt-br/lostpass_eml.tpl b/view/pt-br/lostpass_eml.tpl
new file mode 100644
index 000000000..3b79d2791
--- /dev/null
+++ b/view/pt-br/lostpass_eml.tpl
@@ -0,0 +1,32 @@
+
+Dear {{$username}},
+ A request was recently received at {{$sitename}} to reset your account
+password. In order to confirm this request, please select the verification link
+below or paste it into your web browser address bar.
+
+If you did NOT request this change, please DO NOT follow the link
+provided and ignore and/or delete this email.
+
+Your password will not be changed unless we can verify that you
+issued this request.
+
+Follow this link to verify your identity:
+
+{{$reset_link}}
+
+You will then receive a follow-up message containing the new password.
+
+You may change that password from your account settings page after logging in.
+
+The login details are as follows:
+
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
+
+
+
+
+Sincerely,
+ {{$sitename}} Administrator
+
+
diff --git a/view/pt-br/passchanged_eml.tpl b/view/pt-br/passchanged_eml.tpl
new file mode 100644
index 000000000..0d94be3c2
--- /dev/null
+++ b/view/pt-br/passchanged_eml.tpl
@@ -0,0 +1,20 @@
+
+Dear {{$username}},
+ Your password has been changed as requested. Please retain this
+information for your records (or change your password immediately to
+something that you will remember).
+
+
+Your login details are as follows:
+
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
+Password: {{$new_password}}
+
+You may change that password from your account settings page after logging in.
+
+
+Sincerely,
+ {{$sitename}} Administrator
+
+
diff --git a/view/pt-br/register_open_eml.tpl b/view/pt-br/register_open_eml.tpl
new file mode 100644
index 000000000..4b397201c
--- /dev/null
+++ b/view/pt-br/register_open_eml.tpl
@@ -0,0 +1,19 @@
+
+An account has been created at {{$sitename}} for this email address.
+The login details are as follows:
+
+Site Location: {{$siteurl}}
+Login: {{$email}}
+Password: (the password which was provided during registration)
+
+If this account was created without your knowledge and is not desired, you may
+visit this site and reset the password. This will allow you to remove the
+account from the links on the Settings page, and we
+apologise for any inconvenience.
+
+Thank you and welcome to {{$sitename}}.
+
+Sincerely,
+ {{$sitename}} Administrator
+
+
diff --git a/view/pt-br/register_verify_eml.tpl b/view/pt-br/register_verify_eml.tpl
new file mode 100644
index 000000000..85d9a12d3
--- /dev/null
+++ b/view/pt-br/register_verify_eml.tpl
@@ -0,0 +1,25 @@
+
+A new user registration request was received at {{$sitename}} which requires
+your approval.
+
+
+The login details are as follows:
+
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
+IP Address: {{$details}}
+
+To approve this request please visit the following link:
+
+
+{{$siteurl}}/regmod/allow/{{$hash}}
+
+
+To deny the request and remove the account, please visit:
+
+
+{{$siteurl}}/regmod/deny/{{$hash}}
+
+
+Thank you.
+
diff --git a/view/pt-br/request_notify_eml.tpl b/view/pt-br/request_notify_eml.tpl
new file mode 100644
index 000000000..d01b8ff27
--- /dev/null
+++ b/view/pt-br/request_notify_eml.tpl
@@ -0,0 +1,17 @@
+
+Dear {{$myname}},
+
+You have just received a connection request at {{$sitename}}
+
+from '{{$requestor}}'.
+
+You may visit their profile at {{$url}}.
+
+Please login to your site to view the complete introduction
+and approve or ignore/cancel the request.
+
+{{$siteurl}}
+
+Regards,
+
+ {{$sitename}} administrator
diff --git a/view/pt-br/update_fail_eml.tpl b/view/pt-br/update_fail_eml.tpl
new file mode 100644
index 000000000..a7df8fc2f
--- /dev/null
+++ b/view/pt-br/update_fail_eml.tpl
@@ -0,0 +1,13 @@
+Hey,
+I'm the web server at {{$sitename}};
+
+The Red Matrix developers released update {{$update}} recently,
+but when I tried to install it, something went terribly wrong.
+This needs to be fixed soon and it requires human intervention.
+Please contact a Red developer if you can not figure out how to
+fix it on your own. My database might be invalid.
+
+The error message is '{{$error}}'.
+
+Apologies for the inconvenience,
+ your web server at {{$siteurl}}
\ No newline at end of file
diff --git a/view/ru/follow_notify_eml.tpl b/view/ru/follow_notify_eml.tpl
new file mode 100644
index 000000000..ba07b19da
--- /dev/null
+++ b/view/ru/follow_notify_eml.tpl
@@ -0,0 +1,14 @@
+
+Dear {{$myname}},
+
+You have a new follower at {{$sitename}} - '{{$requestor}}'.
+
+You may visit their profile at {{$url}}.
+
+Please login to your site to approve or ignore/cancel the request.
+
+{{$siteurl}}
+
+Regards,
+
+ {{$sitename}} administrator
diff --git a/view/ru/friend_complete_eml.tpl b/view/ru/friend_complete_eml.tpl
new file mode 100644
index 000000000..1c647b994
--- /dev/null
+++ b/view/ru/friend_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Dear {{$username}},
+
+ Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted
+your connection request at '{{$sitename}}'.
+
+You are now mutual friends and may exchange status updates, photos, and email
+without restriction.
+
+Please visit your 'Connnections' page at {{$sitename}} if you wish to make
+any changes to this relationship.
+
+{{$siteurl}}
+
+[For instance, you may create a separate profile with information that is not
+available to the general public - and assign viewing rights to '{{$fn}}'].
+
+Sincerely,
+
+ {{$sitename}} Administrator
+
+
diff --git a/view/ru/htconfig.tpl b/view/ru/htconfig.tpl
new file mode 100644
index 000000000..493cb5d00
--- /dev/null
+++ b/view/ru/htconfig.tpl
@@ -0,0 +1,70 @@
+config['system']['baseurl'] = '{{$siteurl}}';
+$a->config['system']['sitename'] = "Red Matrix";
+$a->config['system']['location_hash'] = '{{$site_id}}';
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['system']['register_policy'] = REGISTER_OPEN;
+$a->config['system']['register_text'] = '';
+$a->config['system']['admin_email'] = '{{$adminmail}}';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['system']['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['system']['php_path'] = '{{$phpath}}';
+
+// Configure how we communicate with directory servers.
+// DIRECTORY_MODE_NORMAL = directory client, we will find a directory
+// DIRECTORY_MODE_SECONDARY = caching directory or mirror
+// DIRECTORY_MODE_PRIMARY = main directory server
+// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services
+
+$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL;
+
+// default system theme
+
+$a->config['system']['theme'] = 'redbasic';
+
diff --git a/view/ru/intro_complete_eml.tpl b/view/ru/intro_complete_eml.tpl
new file mode 100644
index 000000000..2c2428d68
--- /dev/null
+++ b/view/ru/intro_complete_eml.tpl
@@ -0,0 +1,22 @@
+
+Dear {{$username}},
+
+ '{{$fn}}' at '{{$dfrn_url}}' has accepted
+your connection request at '{{$sitename}}'.
+
+ '{{$fn}}' has chosen to accept you a "fan", which restricts
+some forms of communication - such as private messaging and some profile
+interactions. If this is a celebrity or community page, these settings were
+applied automatically.
+
+ '{{$fn}}' may choose to extend this into a two-way or more permissive
+relationship in the future.
+
+ You will start receiving public status updates from '{{$fn}}',
+which will appear on your 'Matrix' page at
+
+{{$siteurl}}
+
+Sincerely,
+
+ {{$sitename}} Administrator
diff --git a/view/ru/lostpass_eml.tpl b/view/ru/lostpass_eml.tpl
new file mode 100644
index 000000000..3b79d2791
--- /dev/null
+++ b/view/ru/lostpass_eml.tpl
@@ -0,0 +1,32 @@
+
+Dear {{$username}},
+ A request was recently received at {{$sitename}} to reset your account
+password. In order to confirm this request, please select the verification link
+below or paste it into your web browser address bar.
+
+If you did NOT request this change, please DO NOT follow the link
+provided and ignore and/or delete this email.
+
+Your password will not be changed unless we can verify that you
+issued this request.
+
+Follow this link to verify your identity:
+
+{{$reset_link}}
+
+You will then receive a follow-up message containing the new password.
+
+You may change that password from your account settings page after logging in.
+
+The login details are as follows:
+
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
+
+
+
+
+Sincerely,
+ {{$sitename}} Administrator
+
+
diff --git a/view/ru/passchanged_eml.tpl b/view/ru/passchanged_eml.tpl
new file mode 100644
index 000000000..0d94be3c2
--- /dev/null
+++ b/view/ru/passchanged_eml.tpl
@@ -0,0 +1,20 @@
+
+Dear {{$username}},
+ Your password has been changed as requested. Please retain this
+information for your records (or change your password immediately to
+something that you will remember).
+
+
+Your login details are as follows:
+
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
+Password: {{$new_password}}
+
+You may change that password from your account settings page after logging in.
+
+
+Sincerely,
+ {{$sitename}} Administrator
+
+
diff --git a/view/ru/register_open_eml.tpl b/view/ru/register_open_eml.tpl
new file mode 100644
index 000000000..4b397201c
--- /dev/null
+++ b/view/ru/register_open_eml.tpl
@@ -0,0 +1,19 @@
+
+An account has been created at {{$sitename}} for this email address.
+The login details are as follows:
+
+Site Location: {{$siteurl}}
+Login: {{$email}}
+Password: (the password which was provided during registration)
+
+If this account was created without your knowledge and is not desired, you may
+visit this site and reset the password. This will allow you to remove the
+account from the links on the Settings page, and we
+apologise for any inconvenience.
+
+Thank you and welcome to {{$sitename}}.
+
+Sincerely,
+ {{$sitename}} Administrator
+
+
diff --git a/view/ru/register_verify_eml.tpl b/view/ru/register_verify_eml.tpl
new file mode 100644
index 000000000..85d9a12d3
--- /dev/null
+++ b/view/ru/register_verify_eml.tpl
@@ -0,0 +1,25 @@
+
+A new user registration request was received at {{$sitename}} which requires
+your approval.
+
+
+The login details are as follows:
+
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
+IP Address: {{$details}}
+
+To approve this request please visit the following link:
+
+
+{{$siteurl}}/regmod/allow/{{$hash}}
+
+
+To deny the request and remove the account, please visit:
+
+
+{{$siteurl}}/regmod/deny/{{$hash}}
+
+
+Thank you.
+
diff --git a/view/ru/request_notify_eml.tpl b/view/ru/request_notify_eml.tpl
new file mode 100644
index 000000000..d01b8ff27
--- /dev/null
+++ b/view/ru/request_notify_eml.tpl
@@ -0,0 +1,17 @@
+
+Dear {{$myname}},
+
+You have just received a connection request at {{$sitename}}
+
+from '{{$requestor}}'.
+
+You may visit their profile at {{$url}}.
+
+Please login to your site to view the complete introduction
+and approve or ignore/cancel the request.
+
+{{$siteurl}}
+
+Regards,
+
+ {{$sitename}} administrator
diff --git a/view/ru/update_fail_eml.tpl b/view/ru/update_fail_eml.tpl
new file mode 100644
index 000000000..a7df8fc2f
--- /dev/null
+++ b/view/ru/update_fail_eml.tpl
@@ -0,0 +1,13 @@
+Hey,
+I'm the web server at {{$sitename}};
+
+The Red Matrix developers released update {{$update}} recently,
+but when I tried to install it, something went terribly wrong.
+This needs to be fixed soon and it requires human intervention.
+Please contact a Red developer if you can not figure out how to
+fix it on your own. My database might be invalid.
+
+The error message is '{{$error}}'.
+
+Apologies for the inconvenience,
+ your web server at {{$siteurl}}
\ No newline at end of file
diff --git a/view/sv/follow_notify_eml.tpl b/view/sv/follow_notify_eml.tpl
index fee08bdca..ba07b19da 100644
--- a/view/sv/follow_notify_eml.tpl
+++ b/view/sv/follow_notify_eml.tpl
@@ -1,12 +1,14 @@
-$myname,
-'$requestor' på $sitename vill följa dina uppdateringar här på Friendika.
+Dear {{$myname}},
-Besök dennes profil på $url.
+You have a new follower at {{$sitename}} - '{{$requestor}}'.
-Logga in för att godkänna eller avslå förfrågan.
+You may visit their profile at {{$url}}.
-$siteurl
+Please login to your site to approve or ignore/cancel the request.
-Hälsningar,
-$sitename admin
+{{$siteurl}}
+
+Regards,
+
+ {{$sitename}} administrator
diff --git a/view/sv/friend_complete_eml.tpl b/view/sv/friend_complete_eml.tpl
index 2b8b0238e..1c647b994 100644
--- a/view/sv/friend_complete_eml.tpl
+++ b/view/sv/friend_complete_eml.tpl
@@ -1,17 +1,22 @@
-$username,
-Goda nyheter... '$fn' på '$dfrn_url' har accepterat din kontaktförfrågan på '$sitename'.
+Dear {{$username}},
-Ni är nu ömsesidiga vänner och kan se varandras statusuppdateringar samt skicka foton och meddelanden
-utan begränsningar.
+ Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted
+your connection request at '{{$sitename}}'.
-Gå in på din sida 'Kontakter' på $sitename om du vill göra några
-ändringar när det gäller denna kontakt.
+You are now mutual friends and may exchange status updates, photos, and email
+without restriction.
-$siteurl
+Please visit your 'Connnections' page at {{$sitename}} if you wish to make
+any changes to this relationship.
-[Du kan exempelvis skapa en separat profil med information som inte
-är tillgänglig för vem som helst, och ge visningsrättigheter till '$fn'].
+{{$siteurl}}
-Hälsningar,
-$sitename admin
+[For instance, you may create a separate profile with information that is not
+available to the general public - and assign viewing rights to '{{$fn}}'].
+
+Sincerely,
+
+ {{$sitename}} Administrator
+
+
diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl
new file mode 100644
index 000000000..493cb5d00
--- /dev/null
+++ b/view/sv/htconfig.tpl
@@ -0,0 +1,70 @@
+config['system']['baseurl'] = '{{$siteurl}}';
+$a->config['system']['sitename'] = "Red Matrix";
+$a->config['system']['location_hash'] = '{{$site_id}}';
+
+// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
+// Be certain to create your own personal account before setting
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
+// the registration page. REGISTER_APPROVE requires you set 'admin_email'
+// to the email address of an already registered person who can authorise
+// and/or approve/deny the request.
+
+$a->config['system']['register_policy'] = REGISTER_OPEN;
+$a->config['system']['register_text'] = '';
+$a->config['system']['admin_email'] = '{{$adminmail}}';
+
+// Maximum size of an imported message, 0 is unlimited
+
+$a->config['system']['max_import_size'] = 200000;
+
+// maximum size of uploaded photos
+
+$a->config['system']['maximagesize'] = 800000;
+
+// Location of PHP command line processor
+
+$a->config['system']['php_path'] = '{{$phpath}}';
+
+// Configure how we communicate with directory servers.
+// DIRECTORY_MODE_NORMAL = directory client, we will find a directory
+// DIRECTORY_MODE_SECONDARY = caching directory or mirror
+// DIRECTORY_MODE_PRIMARY = main directory server
+// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services
+
+$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL;
+
+// default system theme
+
+$a->config['system']['theme'] = 'redbasic';
+
diff --git a/view/sv/intro_complete_eml.tpl b/view/sv/intro_complete_eml.tpl
index 1f24af25f..2c2428d68 100644
--- a/view/sv/intro_complete_eml.tpl
+++ b/view/sv/intro_complete_eml.tpl
@@ -1,19 +1,22 @@
-$username,
-'$fn' på '$dfrn_url' har accepterat din kontaktförfrågan på '$sitename'.
+Dear {{$username}},
-'$fn' har valt att acceptera dig som ett "fan" vilket innebär vissa begränsningar
-i kommunikationen mellan er - som till exempel personliga meddelanden och viss interaktion
-mellan profiler. Om detta är en kändis eller en gemenskap så har dessa inställningar gjorts
-per automatik.
+ '{{$fn}}' at '{{$dfrn_url}}' has accepted
+your connection request at '{{$sitename}}'.
-'$fn' kan välja att utöka detta till vanlig tvåvägskommunikation eller någon annan mer
-tillåtande kommunikationsform i framtiden.
+ '{{$fn}}' has chosen to accept you a "fan", which restricts
+some forms of communication - such as private messaging and some profile
+interactions. If this is a celebrity or community page, these settings were
+applied automatically.
-Du kommer hädanefter att få statusuppdateringar från '$fn',
-vilka kommer att synas på din Nätverk-sida på
+ '{{$fn}}' may choose to extend this into a two-way or more permissive
+relationship in the future.
-$siteurl
+ You will start receiving public status updates from '{{$fn}}',
+which will appear on your 'Matrix' page at
-Hälsningar,
-$sitename admin
+{{$siteurl}}
+
+Sincerely,
+
+ {{$sitename}} Administrator
diff --git a/view/sv/lostpass_eml.tpl b/view/sv/lostpass_eml.tpl
index df338fa69..3b79d2791 100644
--- a/view/sv/lostpass_eml.tpl
+++ b/view/sv/lostpass_eml.tpl
@@ -1,29 +1,32 @@
-$username,
-En begäran om återställning av lösenord på $sitename har mottagits.
-Gå till adressen nedan för att bekräfta denna begäran. Du kan också
-klistra in länken i adressfältet i din webbläsare.
+Dear {{$username}},
+ A request was recently received at {{$sitename}} to reset your account
+password. In order to confirm this request, please select the verification link
+below or paste it into your web browser address bar.
-Gå INTE till länken nedan om du INTE har begärt lösenordsåterställning.
-Då kan du ignorera det här meddelandet.
+If you did NOT request this change, please DO NOT follow the link
+provided and ignore and/or delete this email.
-Ditt lösenord kommer inte att återställas om vi inte kan säkerställa att du
-initierat detta.
+Your password will not be changed unless we can verify that you
+issued this request.
-Med den här länken kan du bekräfta din identitet:
+Follow this link to verify your identity:
-$reset_link
+{{$reset_link}}
-Sedan kommer du att få ett meddelande med ett nytt lösenord.
+You will then receive a follow-up message containing the new password.
-Lösenordet kan sedan ändras i dina inställningar efter att du loggat in.
+You may change that password from your account settings page after logging in.
-Detaljerna ser ut så här:
+The login details are as follows:
-Webbplats: $siteurl
-Inloggningsnamn: $email
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
-Hälsningar,
-$sitename admin
-
\ No newline at end of file
+
+
+Sincerely,
+ {{$sitename}} Administrator
+
+
diff --git a/view/sv/passchanged_eml.tpl b/view/sv/passchanged_eml.tpl
index 590462468..0d94be3c2 100644
--- a/view/sv/passchanged_eml.tpl
+++ b/view/sv/passchanged_eml.tpl
@@ -1,18 +1,20 @@
-$username,
-
-Lösenordet har ändrats enligt din begäran. Behåll den här
-informationen om den skulle behövas i framtiden. (eller ändra lösenord
-på en gång till något som du kommer ihåg).
+Dear {{$username}},
+ Your password has been changed as requested. Please retain this
+information for your records (or change your password immediately to
+something that you will remember).
-Här är dina inloggningsuppgifter:
+Your login details are as follows:
-Webbplats: $siteurl
-Användarnamn: $email
-Lösenord: $new_password
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
+Password: {{$new_password}}
-När du loggat in kan du byta lösenord bland inställningarna.
+You may change that password from your account settings page after logging in.
-Hälsningar,
-$sitename admin
+
+Sincerely,
+ {{$sitename}} Administrator
+
+
diff --git a/view/sv/register_open_eml.tpl b/view/sv/register_open_eml.tpl
index 1471c9b98..4b397201c 100644
--- a/view/sv/register_open_eml.tpl
+++ b/view/sv/register_open_eml.tpl
@@ -1,17 +1,19 @@
-$username,
-Tack för att du registrerat dig på $sitename. Kontot har skapats.
-Här är dina inloggningsuppgifter:
-Webbplats: $siteurl
-Användarnamn: $email
-Lösenord: $password
+An account has been created at {{$sitename}} for this email address.
+The login details are as follows:
-Lösenordet kan ändras på sidan Inställningar efter att du loggat in.
+Site Location: {{$siteurl}}
+Login: {{$email}}
+Password: (the password which was provided during registration)
-Ägna en liten stund åt att gå igenom alla kontoinställningar där.
+If this account was created without your knowledge and is not desired, you may
+visit this site and reset the password. This will allow you to remove the
+account from the links on the Settings page, and we
+apologise for any inconvenience.
-Välkommen till $sitename.
+Thank you and welcome to {{$sitename}}.
-Hälsningar,
-$sitename admin
+Sincerely,
+ {{$sitename}} Administrator
+
diff --git a/view/sv/register_verify_eml.tpl b/view/sv/register_verify_eml.tpl
index aa72bc9aa..85d9a12d3 100644
--- a/view/sv/register_verify_eml.tpl
+++ b/view/sv/register_verify_eml.tpl
@@ -1,17 +1,25 @@
-En registreringsförfrågan som kräver svar har mottagits
-på $sitename
+
+A new user registration request was received at {{$sitename}} which requires
+your approval.
-Här är inloggningsuppgifterna:
+The login details are as follows:
-Fullständigt namn: $username
-Webbplats: $siteurl
-Användarnamn: $email
+Site Location: {{$siteurl}}
+Login Name: {{$email}}
+IP Address: {{$details}}
+
+To approve this request please visit the following link:
-Gå till denna adress om du vill godkänna:
-$siteurl/regmod/allow/$hash
+{{$siteurl}}/regmod/allow/{{$hash}}
-Gå till denna adress om du vill avslå förfrågan och ta bort kontot:
-$siteurl/regmod/deny/$hash
+
+To deny the request and remove the account, please visit:
+
+
+{{$siteurl}}/regmod/deny/{{$hash}}
+
+
+Thank you.
diff --git a/view/sv/request_notify_eml.tpl b/view/sv/request_notify_eml.tpl
index 893bce17c..d01b8ff27 100644
--- a/view/sv/request_notify_eml.tpl
+++ b/view/sv/request_notify_eml.tpl
@@ -1,13 +1,17 @@
-$myname,
-Du har just fått en kontaktförfrågan på $sitename från '$requestor'
+Dear {{$myname}},
-Profilen finns på $url.
+You have just received a connection request at {{$sitename}}
-Logga in för att se hela förfrågan och godkänna eller
-avslå den.
+from '{{$requestor}}'.
-$siteurl
+You may visit their profile at {{$url}}.
-Hälsningar,
-$sitename admin
+Please login to your site to view the complete introduction
+and approve or ignore/cancel the request.
+
+{{$siteurl}}
+
+Regards,
+
+ {{$sitename}} administrator
diff --git a/view/sv/update_fail_eml.tpl b/view/sv/update_fail_eml.tpl
new file mode 100644
index 000000000..a7df8fc2f
--- /dev/null
+++ b/view/sv/update_fail_eml.tpl
@@ -0,0 +1,13 @@
+Hey,
+I'm the web server at {{$sitename}};
+
+The Red Matrix developers released update {{$update}} recently,
+but when I tried to install it, something went terribly wrong.
+This needs to be fixed soon and it requires human intervention.
+Please contact a Red developer if you can not figure out how to
+fix it on your own. My database might be invalid.
+
+The error message is '{{$error}}'.
+
+Apologies for the inconvenience,
+ your web server at {{$siteurl}}
\ No newline at end of file
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 416e79dd5..38eea5b94 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2814,16 +2814,20 @@ aside input[type='text'] {
margin-top: 10px;
}
-.body-tag, .filesavetags, .categorytags {
+.posttags a, .body-tag, .filesavetags, .categorytags {
opacity: 0.5;
filter:alpha(opacity=50);
}
-.body-tag:hover, .filesavetags:hover, .categorytags:hover {
+.posttags a:hover, .body-tag:hover, .filesavetags:hover, .categorytags:hover {
opacity: 1.0 !important;
filter:alpha(opacity=100) !important;
}
+.posttags {
+ margin-top: 15px;
+}
+
.item-select {
opacity: 0.1;
filter:alpha(opacity=10);
@@ -3256,6 +3260,9 @@ brain is weird like that */
background-color:#ffffff; padding: 4px;
clear:left;
}
+.acpopupitem.taggable {
+ background-color: #ddddff;
+}
.acpopupitem img {
float: left;
margin-right: 4px;
@@ -3740,7 +3747,7 @@ ul.menu-popup {
margin: 4px;
}
.acl-list-item.taggable {
- background-color: #ccccff;
+ background-color: #ddddff;
}
.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;}