clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
Michael 2018-04-26 20:42:30 +00:00
parent 3abd0b54cc 33a551235e
commit d071a5cdad
11 changed files with 563 additions and 310 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/Account-Basics.md
View File

@ -16,19 +16,19 @@ If you'd like to have your own server, you can do that too.
Visit [the Friendica website](http://friendi.ca/) to download the code with setup instructions. Visit [the Friendica website](http://friendi.ca/) to download the code with setup instructions.
It's a very simple installation process that anybody experienced in hosting websites, or with basic Linux experience can handle easily. It's a very simple installation process that anybody experienced in hosting websites, or with basic Linux experience can handle easily.
###OpenID ### OpenID
The first field on the Registration page is for an OpenID address. The first field on the Registration page is for an OpenID address.
If you do not have an OpenID address or do not wish to use OpenID, leave this field blank. If you do not have an OpenID address or do not wish to use OpenID, leave this field blank.
If you have an OpenID account elsewhere and wish to use it, enter the address into this field and click 'Register'. If you have an OpenID account elsewhere and wish to use it, enter the address into this field and click 'Register'.
Friendica will attempt to extract as much information as possible from your OpenID provider and return to this page with those items already filled in. Friendica will attempt to extract as much information as possible from your OpenID provider and return to this page with those items already filled in.
###Your Full Name ### Your Full Name
Please provide your full name **as you would like it to be displayed on this system**. Please provide your full name **as you would like it to be displayed on this system**.
Most people use their real name for this, but you're under no obligation to do so yourself. Most people use their real name for this, but you're under no obligation to do so yourself.
###Email Address ### Email Address
Please provide a valid email address. Please provide a valid email address.
Your email address is **never** published. Your email address is **never** published.
@ -38,7 +38,7 @@ This doesn't have to be your primary email address, but it does need to be a rea
You can't get your initial password, or reset a lost password later without it. You can't get your initial password, or reset a lost password later without it.
This is the only bit of personal information that has to be accurate. This is the only bit of personal information that has to be accurate.
###Nickname ### Nickname
A nickname is used to generate web addresses for many of your personal pages, and is also treated like an email address when establishing communications with others. A nickname is used to generate web addresses for many of your personal pages, and is also treated like an email address when establishing communications with others.
Due to the way that the nickname is used, it has some limitations. Due to the way that the nickname is used, it has some limitations.
@ -47,7 +47,7 @@ It also must be unique on this system.
This is used in many places to identify your account, and once set it cannot be changed. This is used in many places to identify your account, and once set it cannot be changed.
###Directory Publishing ### Directory Publishing
The registration form also allows you to choose whether or not to list your account in the online directory of your node. The registration form also allows you to choose whether or not to list your account in the online directory of your node.
This is like a "phone book" and you may choose to be unlisted. This is like a "phone book" and you may choose to be unlisted.
@ -55,7 +55,7 @@ We recommend that you select 'Yes' so that other people (friends, family, etc.)
If you choose 'No', you will essentially be invisible and have few opportunities for interaction. If you choose 'No', you will essentially be invisible and have few opportunities for interaction.
Whichever you choose, this can be changed any time from your Settings page after you login. Whichever you choose, this can be changed any time from your Settings page after you login.
###Register ### Register
Once you have provided the necessary details, click the 'Register' button. Once you have provided the necessary details, click the 'Register' button.
An email will be sent to you providing your account login details. An email will be sent to you providing your account login details.

376
doc/Addons.md
View File

@ -321,184 +321,300 @@ Complete list of hook callbacks
Here is a complete list of all hook callbacks with file locations (as of 01-Apr-2018). Please see the source for details of any hooks not documented above. Here is a complete list of all hook callbacks with file locations (as of 01-Apr-2018). Please see the source for details of any hooks not documented above.
index.php: Addon::callHooks('init_1'); ### index.php
index.php: Addon::callHooks('app_menu', $arr);
index.php: Addon::callHooks('page_content_top', $a->page['content']);
index.php: Addon::callHooks($a->module.'_mod_init', $placeholder);
index.php: Addon::callHooks($a->module.'_mod_init', $placeholder);
index.php: Addon::callHooks($a->module.'_mod_post', $_POST);
index.php: Addon::callHooks($a->module.'_mod_afterpost', $placeholder);
index.php: Addon::callHooks($a->module.'_mod_content', $arr);
index.php: Addon::callHooks($a->module.'_mod_aftercontent', $arr);
index.php: Addon::callHooks('page_end', $a->page['content']);
include/api.php: Addon::callHooks('logged_in', $a->user); Addon::callHooks('init_1');
include/api.php: Addon::callHooks('authenticate', $addon_auth); Addon::callHooks('app_menu', $arr);
include/api.php: Addon::callHooks('logged_in', $a->user); Addon::callHooks('page_content_top', $a->page['content']);
Addon::callHooks($a->module.'_mod_init', $placeholder);
Addon::callHooks($a->module.'_mod_init', $placeholder);
Addon::callHooks($a->module.'_mod_post', $_POST);
Addon::callHooks($a->module.'_mod_afterpost', $placeholder);
Addon::callHooks($a->module.'_mod_content', $arr);
Addon::callHooks($a->module.'_mod_aftercontent', $arr);
Addon::callHooks('page_end', $a->page['content']);
include/enotify.php: Addon::callHooks('enotify', $h); ### include/api.php
include/enotify.php: Addon::callHooks('enotify_store', $datarray);
include/enotify.php: Addon::callHooks('enotify_mail', $datarray);
include/enotify.php: Addon::callHooks('check_item_notification', $notification_data);
include/conversation.php: Addon::callHooks('conversation_start', $cb); Addon::callHooks('logged_in', $a->user);
include/conversation.php: Addon::callHooks('render_location', $locate); Addon::callHooks('authenticate', $addon_auth);
include/conversation.php: Addon::callHooks('display_item', $arr); Addon::callHooks('logged_in', $a->user);
include/conversation.php: Addon::callHooks('display_item', $arr);
include/conversation.php: Addon::callHooks('item_photo_menu', $args);
include/conversation.php: Addon::callHooks('jot_tool', $jotplugins);
include/security.php: Addon::callHooks('logged_in', $a->user); ### include/enotify.php
include/text.php: Addon::callHooks('contact_block_end', $arr); Addon::callHooks('enotify', $h);
include/text.php: Addon::callHooks('poke_verbs', $arr); Addon::callHooks('enotify_store', $datarray);
include/text.php: Addon::callHooks('prepare_body_init', $item); Addon::callHooks('enotify_mail', $datarray);
include/text.php: Addon::callHooks('prepare_body_content_filter', $hook_data); Addon::callHooks('check_item_notification', $notification_data);
include/text.php: Addon::callHooks('prepare_body', $hook_data);
include/text.php: Addon::callHooks('prepare_body_final', $hook_data);
include/items.php: Addon::callHooks('page_info_data', $data); ### include/conversation.php
mod/directory.php: Addon::callHooks('directory_item', $arr); Addon::callHooks('conversation_start', $cb);
Addon::callHooks('render_location', $locate);
Addon::callHooks('display_item', $arr);
Addon::callHooks('display_item', $arr);
Addon::callHooks('item_photo_menu', $args);
Addon::callHooks('jot_tool', $jotplugins);
mod/xrd.php: Addon::callHooks('personal_xrd', $arr); ### include/security.php
mod/ping.php: Addon::callHooks('network_ping', $arr); Addon::callHooks('logged_in', $a->user);
mod/parse_url.php: Addon::callHooks("parse_link", $arr); ### include/text.php
mod/manage.php: Addon::callHooks('home_init', $ret); Addon::callHooks('contact_block_end', $arr);
Addon::callHooks('poke_verbs', $arr);
Addon::callHooks('prepare_body_init', $item);
Addon::callHooks('prepare_body_content_filter', $hook_data);
Addon::callHooks('prepare_body', $hook_data);
Addon::callHooks('prepare_body_final', $hook_data);
mod/acl.php: Addon::callHooks('acl_lookup_end', $results); ### include/items.php
mod/network.php: Addon::callHooks('network_content_init', $arr); Addon::callHooks('page_info_data', $data);
mod/network.php: Addon::callHooks('network_tabs', $arr);
mod/friendica.php: Addon::callHooks('about_hook', $o); ### mod/directory.php
mod/subthread.php: Addon::callHooks('post_local_end', $arr);
mod/profiles.php: Addon::callHooks('profile_post', $_POST); Addon::callHooks('directory_item', $arr);
mod/profiles.php: Addon::callHooks('profile_edit', $arr);
mod/settings.php: Addon::callHooks('addon_settings_post', $_POST); ### mod/xrd.php
mod/settings.php: Addon::callHooks('connector_settings_post', $_POST);
mod/settings.php: Addon::callHooks('display_settings_post', $_POST);
mod/settings.php: Addon::callHooks('settings_post', $_POST);
mod/settings.php: Addon::callHooks('addon_settings', $settings_addons);
mod/settings.php: Addon::callHooks('connector_settings', $settings_connectors);
mod/settings.php: Addon::callHooks('display_settings', $o);
mod/settings.php: Addon::callHooks('settings_form', $o);
mod/photos.php: Addon::callHooks('photo_post_init', $_POST); Addon::callHooks('personal_xrd', $arr);
mod/photos.php: Addon::callHooks('photo_post_file', $ret);
mod/photos.php: Addon::callHooks('photo_post_end', $foo);
mod/photos.php: Addon::callHooks('photo_post_end', $foo);
mod/photos.php: Addon::callHooks('photo_post_end', $foo);
mod/photos.php: Addon::callHooks('photo_post_end', $foo);
mod/photos.php: Addon::callHooks('photo_post_end', intval($item_id));
mod/photos.php: Addon::callHooks('photo_upload_form', $ret);
mod/profile.php: Addon::callHooks('profile_advanced', $o); ### mod/ping.php
mod/home.php: Addon::callHooks('home_init', $ret); Addon::callHooks('network_ping', $arr);
mod/home.php: Addon::callHooks("home_content", $content);
mod/poke.php: Addon::callHooks('post_local_end', $arr); ### mod/parse_url.php
mod/contacts.php: Addon::callHooks('contact_edit_post', $_POST); Addon::callHooks("parse_link", $arr);
mod/contacts.php: Addon::callHooks('contact_edit', $arr);
mod/tagger.php: Addon::callHooks('post_local_end', $arr); ### mod/manage.php
mod/lockview.php: Addon::callHooks('lockview_content', $item); Addon::callHooks('home_init', $ret);
mod/uexport.php: Addon::callHooks('uexport_options', $options); ### mod/acl.php
mod/register.php: Addon::callHooks('register_post', $arr); Addon::callHooks('acl_lookup_end', $results);
mod/register.php: Addon::callHooks('register_form', $arr);
mod/item.php: Addon::callHooks('post_local_start', $_REQUEST); ### mod/network.php
mod/item.php: Addon::callHooks('post_local', $datarray);
mod/item.php: Addon::callHooks('post_local_end', $datarray);
mod/editpost.php: Addon::callHooks('jot_tool', $jotplugins); Addon::callHooks('network_content_init', $arr);
Addon::callHooks('network_tabs', $arr);
src/Network/FKOAuth1.php: Addon::callHooks('logged_in', $a->user); ### mod/friendica.php
src/Render/FriendicaSmartyEngine.php: Addon::callHooks("template_vars", $arr); Addon::callHooks('about_hook', $o);
src/Model/Item.php: Addon::callHooks('post_local', $item); ### mod/subthread.php
src/Model/Item.php: Addon::callHooks('post_remote', $item);
src/Model/Item.php: Addon::callHooks('post_local_end', $posted_item);
src/Model/Item.php: Addon::callHooks('post_remote_end', $posted_item);
src/Model/Item.php: Addon::callHooks('tagged', $arr);
src/Model/Item.php: Addon::callHooks('post_local_end', $new_item);
src/Model/Contact.php: Addon::callHooks('contact_photo_menu', $args); Addon::callHooks('post_local_end', $arr);
src/Model/Contact.php: Addon::callHooks('follow', $arr);
src/Model/Profile.php: Addon::callHooks('profile_sidebar_enter', $profile); ### mod/profiles.php
src/Model/Profile.php: Addon::callHooks('profile_sidebar', $arr);
src/Model/Profile.php: Addon::callHooks('profile_tabs', $arr);
src/Model/Profile.php: Addon::callHooks('zrl_init', $arr);
src/Model/Event.php: Addon::callHooks('event_updated', $event['id']); Addon::callHooks('profile_post', $_POST);
src/Model/Event.php: Addon::callHooks("event_created", $event['id']); Addon::callHooks('profile_edit', $arr);
src/Model/User.php: Addon::callHooks('register_account', $uid); ### mod/settings.php
src/Model/User.php: Addon::callHooks('remove_user', $user);
src/Content/Text/BBCode.php: Addon::callHooks('bbcode', $text); Addon::callHooks('addon_settings_post', $_POST);
src/Content/Text/BBCode.php: Addon::callHooks('bb2diaspora', $text); Addon::callHooks('connector_settings_post', $_POST);
Addon::callHooks('display_settings_post', $_POST);
Addon::callHooks('settings_post', $_POST);
Addon::callHooks('addon_settings', $settings_addons);
Addon::callHooks('connector_settings', $settings_connectors);
Addon::callHooks('display_settings', $o);
Addon::callHooks('settings_form', $o);
src/Content/Text/HTML.php: Addon::callHooks('html2bbcode', $message); ### mod/photos.php
src/Content/Smilies.php: Addon::callHooks('smilie', $params); Addon::callHooks('photo_post_init', $_POST);
Addon::callHooks('photo_post_file', $ret);
Addon::callHooks('photo_post_end', $foo);
Addon::callHooks('photo_post_end', $foo);
Addon::callHooks('photo_post_end', $foo);
Addon::callHooks('photo_post_end', $foo);
Addon::callHooks('photo_post_end', intval($item_id));
Addon::callHooks('photo_upload_form', $ret);
src/Content/Feature.php: Addon::callHooks('isEnabled', $arr); ### mod/profile.php
src/Content/Feature.php: Addon::callHooks('get', $arr);
src/Content/ContactSelector.php: Addon::callHooks('network_to_name', $nets); Addon::callHooks('profile_advanced', $o);
src/Content/ContactSelector.php: Addon::callHooks('gender_selector', $select);
src/Content/ContactSelector.php: Addon::callHooks('sexpref_selector', $select);
src/Content/ContactSelector.php: Addon::callHooks('marital_selector', $select);
src/Content/OEmbed.php: Addon::callHooks('oembed_fetch_url', $embedurl, $j); ### mod/home.php
src/Content/Nav.php: Addon::callHooks('page_header', $a->page['nav']); Addon::callHooks('home_init', $ret);
src/Content/Nav.php: Addon::callHooks('nav_info', $nav); Addon::callHooks("home_content", $content);
src/Worker/Directory.php: Addon::callHooks('globaldir_update', $arr); ### mod/poke.php
src/Worker/Notifier.php: Addon::callHooks('notifier_end', $target_item);
src/Worker/Queue.php: Addon::callHooks('queue_predeliver', $r);
src/Worker/Queue.php: Addon::callHooks('queue_deliver', $params);
src/Module/Login.php: Addon::callHooks('authenticate', $addon_auth); Addon::callHooks('post_local_end', $arr);
src/Module/Login.php: Addon::callHooks('login_hook', $o);
src/Module/Logout.php: Addon::callHooks("logging_out");
src/Object/Post.php: Addon::callHooks('render_location', $locate); ### mod/contacts.php
src/Object/Post.php: Addon::callHooks('display_item', $arr);
src/Core/ACL.php: Addon::callHooks('contact_select_options', $x); Addon::callHooks('contact_edit_post', $_POST);
src/Core/ACL.php: Addon::callHooks($a->module.'_pre_'.$selname, $arr); Addon::callHooks('contact_edit', $arr);
src/Core/ACL.php: Addon::callHooks($a->module.'_post_'.$selname, $o);
src/Core/ACL.php: Addon::callHooks($a->module.'_pre_'.$selname, $arr);
src/Core/ACL.php: Addon::callHooks($a->module.'_post_'.$selname, $o);
src/Core/ACL.php: Addon::callHooks('jot_networks', $jotnets);
src/Core/Worker.php: Addon::callHooks("proc_run", $arr); ### mod/tagger.php
src/Util/Emailer.php: Addon::callHooks('emailer_send_prepare', $params); Addon::callHooks('post_local_end', $arr);
src/Util/Emailer.php: Addon::callHooks("emailer_send", $hookdata);
src/Util/Map.php: Addon::callHooks('generate_map', $arr); ### mod/lockview.php
src/Util/Map.php: Addon::callHooks('generate_named_map', $arr);
src/Util/Map.php: Addon::callHooks('Map::getCoordinates', $arr);
src/Util/Network.php: Addon::callHooks('avatar_lookup', $avatar); Addon::callHooks('lockview_content', $item);
src/Util/ParseUrl.php: Addon::callHooks("getsiteinfo", $siteinfo); ### mod/uexport.php
src/Protocol/DFRN.php: Addon::callHooks('atom_feed_end', $atom); Addon::callHooks('uexport_options', $options);
src/Protocol/DFRN.php: Addon::callHooks('atom_feed_end', $atom);
### mod/register.php
Addon::callHooks('register_post', $arr);
Addon::callHooks('register_form', $arr);
### mod/item.php
Addon::callHooks('post_local_start', $_REQUEST);
Addon::callHooks('post_local', $datarray);
Addon::callHooks('post_local_end', $datarray);
### mod/editpost.php
Addon::callHooks('jot_tool', $jotplugins);
### src/Network/FKOAuth1.php
Addon::callHooks('logged_in', $a->user);
### src/Render/FriendicaSmartyEngine.php
Addon::callHooks("template_vars", $arr);
### src/Model/Item.php
Addon::callHooks('post_local', $item);
Addon::callHooks('post_remote', $item);
Addon::callHooks('post_local_end', $posted_item);
Addon::callHooks('post_remote_end', $posted_item);
Addon::callHooks('tagged', $arr);
Addon::callHooks('post_local_end', $new_item);
### src/Model/Contact.php
Addon::callHooks('contact_photo_menu', $args);
Addon::callHooks('follow', $arr);
### src/Model/Profile.php
Addon::callHooks('profile_sidebar_enter', $profile);
Addon::callHooks('profile_sidebar', $arr);
Addon::callHooks('profile_tabs', $arr);
Addon::callHooks('zrl_init', $arr);
### src/Model/Event.php
Addon::callHooks('event_updated', $event['id']);
Addon::callHooks("event_created", $event['id']);
### src/Model/User.php
Addon::callHooks('register_account', $uid);
Addon::callHooks('remove_user', $user);
### src/Content/Text/BBCode.php
Addon::callHooks('bbcode', $text);
Addon::callHooks('bb2diaspora', $text);
### src/Content/Text/HTML.php
Addon::callHooks('html2bbcode', $message);
### src/Content/Smilies.php
Addon::callHooks('smilie', $params);
### src/Content/Feature.php
Addon::callHooks('isEnabled', $arr);
Addon::callHooks('get', $arr);
### src/Content/ContactSelector.php
Addon::callHooks('network_to_name', $nets);
Addon::callHooks('gender_selector', $select);
Addon::callHooks('sexpref_selector', $select);
Addon::callHooks('marital_selector', $select);
### src/Content/OEmbed.php
Addon::callHooks('oembed_fetch_url', $embedurl, $j);
### src/Content/Nav.php
Addon::callHooks('page_header', $a->page['nav']);
Addon::callHooks('nav_info', $nav);
### src/Worker/Directory.php
Addon::callHooks('globaldir_update', $arr);
### src/Worker/Notifier.php
Addon::callHooks('notifier_end', $target_item);
### src/Worker/Queue.php
Addon::callHooks('queue_predeliver', $r);
Addon::callHooks('queue_deliver', $params);
### src/Module/Login.php
Addon::callHooks('authenticate', $addon_auth);
Addon::callHooks('login_hook', $o);
### src/Module/Logout.php
Addon::callHooks("logging_out");
### src/Object/Post.php
Addon::callHooks('render_location', $locate);
Addon::callHooks('display_item', $arr);
### src/Core/ACL.php
Addon::callHooks('contact_select_options', $x);
Addon::callHooks($a->module.'_pre_'.$selname, $arr);
Addon::callHooks($a->module.'_post_'.$selname, $o);
Addon::callHooks($a->module.'_pre_'.$selname, $arr);
Addon::callHooks($a->module.'_post_'.$selname, $o);
Addon::callHooks('jot_networks', $jotnets);
### src/Core/Worker.php
Addon::callHooks("proc_run", $arr);
### src/Util/Emailer.php
Addon::callHooks('emailer_send_prepare', $params);
Addon::callHooks("emailer_send", $hookdata);
### src/Util/Map.php
Addon::callHooks('generate_map', $arr);
Addon::callHooks('generate_named_map', $arr);
Addon::callHooks('Map::getCoordinates', $arr);
### src/Util/Network.php
Addon::callHooks('avatar_lookup', $avatar);
### src/Util/ParseUrl.php
Addon::callHooks("getsiteinfo", $siteinfo);
### src/Protocol/DFRN.php
Addon::callHooks('atom_feed_end', $atom);
Addon::callHooks('atom_feed_end', $atom);

4
doc/Chats.md
View File

@ -37,7 +37,7 @@ You can use several servers to create an account:
* [https://jappix.com](https://jappix.com) * [https://jappix.com](https://jappix.com)
* [http://xmpp.net](http://xmpp.net) * [http://xmpp.net](http://xmpp.net)
###1. Basics ### 1. Basics
At first you have to get the current version. You can either pull it from [Github](https://github.com) like so: At first you have to get the current version. You can either pull it from [Github](https://github.com) like so:
@ -54,7 +54,7 @@ The following page shows the settings of this addon.
Activate the BOSH proxy. Activate the BOSH proxy.
###2. Settings ### 2. Settings
Go to your user account settings next and choose the addon page. Go to your user account settings next and choose the addon page.
Scroll down until you find the Jappix Mini addon settings. Scroll down until you find the Jappix Mini addon settings.

10
doc/Improve-Performance.md
View File

@ -29,7 +29,7 @@ Active the following addons:
rendertime rendertime
###rendertime ### rendertime
This addon doesn't speed up your system. This addon doesn't speed up your system.
It helps to analyze your bottlenecks. It helps to analyze your bottlenecks.
@ -52,7 +52,7 @@ Apache Webserver
The following Apache modules are recommended: The following Apache modules are recommended:
###Cache-Control ### Cache-Control
This module tells the client to cache the content of static files so that they aren't fetched with every request. This module tells the client to cache the content of static files so that they aren't fetched with every request.
Enable the module "mod_expires" by typing in "a2enmod expires" as root. Enable the module "mod_expires" by typing in "a2enmod expires" as root.
@ -62,7 +62,7 @@ Please add the following lines to your site configuration in the "directory" con
Also see the Apache [2.2](http://httpd.apache.org/docs/2.2/mod/mod_expires.html) / [2.4](https://httpd.apache.org/docs/2.4/mod/mod_expires.html) documentation. Also see the Apache [2.2](http://httpd.apache.org/docs/2.2/mod/mod_expires.html) / [2.4](https://httpd.apache.org/docs/2.4/mod/mod_expires.html) documentation.
###Compress content ### Compress content
This module compresses the traffic between the web server and the client. This module compresses the traffic between the web server and the client.
Enable the module "mod_deflate" by typing in "a2enmod deflate" as root. Enable the module "mod_deflate" by typing in "a2enmod deflate" as root.
@ -72,14 +72,14 @@ Also see the Apache [2.2](http://httpd.apache.org/docs/2.2/mod/mod_deflate.html)
PHP PHP
-------- --------
###FCGI ### FCGI
When using Apache think about using FCGI. When using Apache think about using FCGI.
In a Debian-based distribution you will need to install the packages named "php5-cgi" and "libapache2-mod-fcgid". In a Debian-based distribution you will need to install the packages named "php5-cgi" and "libapache2-mod-fcgid".
Please refer to external documentation for a more detailed explanation how to set up a system based upon FCGI. Please refer to external documentation for a more detailed explanation how to set up a system based upon FCGI.
###Database ### Database
There are scripts like [tuning-primer.sh](http://www.day32.com/MySQL/) and [mysqltuner.pl](http://mysqltuner.pl) that analyze your database server and give hints on values that could be changed. There are scripts like [tuning-primer.sh](http://www.day32.com/MySQL/) and [mysqltuner.pl](http://mysqltuner.pl) that analyze your database server and give hints on values that could be changed.

6
doc/Installing-Connectors.md
View File

@ -32,7 +32,7 @@ Twitter Addon for Friendica
* tobias.diekershoff@gmx.net * tobias.diekershoff@gmx.net
* License: 3-clause BSD license * License: 3-clause BSD license
###Configuration ### Configuration
To use this addon you need a OAuth Consumer key pair (key & secret). To use this addon you need a OAuth Consumer key pair (key & secret).
You can get it from [Twitter](https://twitter.com/apps). You can get it from [Twitter](https://twitter.com/apps).
@ -46,7 +46,7 @@ Add this key pair to your global .htconfig.php:
After this, your users can configure their Twitter account settings from "Settings -> Connector Settings". After this, your users can configure their Twitter account settings from "Settings -> Connector Settings".
###More documentation ### More documentation
Find the author's documentation here: [http://diekershoff.homeunix.net/redmine/wiki/friendikaplugin/Twitter_Plugin](http://diekershoff.homeunix.net/redmine/wiki/friendikaplugin/Twitter_Plugin) Find the author's documentation here: [http://diekershoff.homeunix.net/redmine/wiki/friendikaplugin/Twitter_Plugin](http://diekershoff.homeunix.net/redmine/wiki/friendikaplugin/Twitter_Plugin)
@ -58,7 +58,7 @@ GNU Social Addon for Friendica
* tobias.diekershoff@gmx.net * tobias.diekershoff@gmx.net
* License: 3-clause BSD license * License: 3-clause BSD license
###Configuration ### Configuration
When the addon is activated the user has to acquire the following in order to connect to the GNU Social account of choice. When the addon is activated the user has to acquire the following in order to connect to the GNU Social account of choice.

8
doc/Making-Friends.md
View File

@ -50,7 +50,7 @@ This will take you through a similar process.
Connect to users of alternate networks Connect to users of alternate networks
--- ---
###Across the Federation and Fedivese ### Across the Federation and Fedivese
You can also use your Identity Address or other people's Identity Addresses to become friends across the so-called Federation/Fedivese of open source social media. You can also use your Identity Address or other people's Identity Addresses to become friends across the so-called Federation/Fedivese of open source social media.
Currently, Friendica supports connections with people on diaspora*, Red, Hubzilla, GNU Social, StatusNet, Mastodon, Pleroma, socialhome, and ganggo platforms. Currently, Friendica supports connections with people on diaspora*, Red, Hubzilla, GNU Social, StatusNet, Mastodon, Pleroma, socialhome, and ganggo platforms.
@ -60,13 +60,13 @@ Note: Some versions of GNU Social software may require the full URL to your prof
People on these networks can also initiate contact with you, if they know your contact details. People on these networks can also initiate contact with you, if they know your contact details.
###Other social media ### Other social media
If you server provides this functionality, you can also connect with people one If you server provides this functionality, you can also connect with people one
Twitter or important feeds from Tumblr, Wordpress, and many more. Twitter or important feeds from Tumblr, Wordpress, and many more.
To connect, enter their contact details in the "connect" box on your "Contacts" page. To connect, enter their contact details in the "connect" box on your "Contacts" page.
###Email ### Email
If you have supplied your mailbox connection information on your Settings page, you can enter the email address of anybody that has sent you a message recently and have their email messages show up in your social stream. If you have supplied your mailbox connection information on your Settings page, you can enter the email address of anybody that has sent you a message recently and have their email messages show up in your social stream.
You can also reply to them from within Friendica. You can also reply to them from within Friendica.
@ -76,7 +76,7 @@ In order to avoid abuse or spam, you must have an email from Alice with the corr
Subscribing to mailing lists is done in the same way, but without the use of the "mailto:" prefix. Subscribing to mailing lists is done in the same way, but without the use of the "mailto:" prefix.
To subscribe to a mailing list, enter the email in following example format "mailling-list@list-server.net". To subscribe to a mailing list, enter the email in following example format "mailling-list@list-server.net".
###Syndication feeds ### Syndication feeds
You can "follow" almost anybody or any website that produces a syndication feed (RSS/Atom,etc.). You can "follow" almost anybody or any website that produces a syndication feed (RSS/Atom,etc.).
If we can find an information stream and a name to attach to the contact, we'll try to connect with them. If we can find an information stream and a name to attach to the contact, we'll try to connect with them.

376
doc/de/Addons.md
View File

@ -191,184 +191,300 @@ Komplette Liste der Hook-Callbacks
Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Apr-2018 generiert): Bitte schau in die Quellcodes für Details zu Hooks, die oben nicht dokumentiert sind. Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Apr-2018 generiert): Bitte schau in die Quellcodes für Details zu Hooks, die oben nicht dokumentiert sind.
index.php: Addon::callHooks('init_1'); ### index.php
index.php: Addon::callHooks('app_menu', $arr);
index.php: Addon::callHooks('page_content_top', $a->page['content']);
index.php: Addon::callHooks($a->module.'_mod_init', $placeholder);
index.php: Addon::callHooks($a->module.'_mod_init', $placeholder);
index.php: Addon::callHooks($a->module.'_mod_post', $_POST);
index.php: Addon::callHooks($a->module.'_mod_afterpost', $placeholder);
index.php: Addon::callHooks($a->module.'_mod_content', $arr);
index.php: Addon::callHooks($a->module.'_mod_aftercontent', $arr);
index.php: Addon::callHooks('page_end', $a->page['content']);
include/api.php: Addon::callHooks('logged_in', $a->user); Addon::callHooks('init_1');
include/api.php: Addon::callHooks('authenticate', $addon_auth); Addon::callHooks('app_menu', $arr);
include/api.php: Addon::callHooks('logged_in', $a->user); Addon::callHooks('page_content_top', $a->page['content']);
Addon::callHooks($a->module.'_mod_init', $placeholder);
Addon::callHooks($a->module.'_mod_init', $placeholder);
Addon::callHooks($a->module.'_mod_post', $_POST);
Addon::callHooks($a->module.'_mod_afterpost', $placeholder);
Addon::callHooks($a->module.'_mod_content', $arr);
Addon::callHooks($a->module.'_mod_aftercontent', $arr);
Addon::callHooks('page_end', $a->page['content']);
include/enotify.php: Addon::callHooks('enotify', $h); ### include/api.php
include/enotify.php: Addon::callHooks('enotify_store', $datarray);
include/enotify.php: Addon::callHooks('enotify_mail', $datarray);
include/enotify.php: Addon::callHooks('check_item_notification', $notification_data);
include/conversation.php: Addon::callHooks('conversation_start', $cb); Addon::callHooks('logged_in', $a->user);
include/conversation.php: Addon::callHooks('render_location', $locate); Addon::callHooks('authenticate', $addon_auth);
include/conversation.php: Addon::callHooks('display_item', $arr); Addon::callHooks('logged_in', $a->user);
include/conversation.php: Addon::callHooks('display_item', $arr);
include/conversation.php: Addon::callHooks('item_photo_menu', $args);
include/conversation.php: Addon::callHooks('jot_tool', $jotplugins);
include/security.php: Addon::callHooks('logged_in', $a->user); ### include/enotify.php
include/text.php: Addon::callHooks('contact_block_end', $arr); Addon::callHooks('enotify', $h);
include/text.php: Addon::callHooks('poke_verbs', $arr); Addon::callHooks('enotify_store', $datarray);
include/text.php: Addon::callHooks('prepare_body_init', $item); Addon::callHooks('enotify_mail', $datarray);
include/text.php: Addon::callHooks('prepare_body_content_filter', $hook_data); Addon::callHooks('check_item_notification', $notification_data);
include/text.php: Addon::callHooks('prepare_body', $hook_data);
include/text.php: Addon::callHooks('prepare_body_final', $hook_data);
include/items.php: Addon::callHooks('page_info_data', $data); ### include/conversation.php
mod/directory.php: Addon::callHooks('directory_item', $arr); Addon::callHooks('conversation_start', $cb);
Addon::callHooks('render_location', $locate);
Addon::callHooks('display_item', $arr);
Addon::callHooks('display_item', $arr);
Addon::callHooks('item_photo_menu', $args);
Addon::callHooks('jot_tool', $jotplugins);
mod/xrd.php: Addon::callHooks('personal_xrd', $arr); ### include/security.php
mod/ping.php: Addon::callHooks('network_ping', $arr); Addon::callHooks('logged_in', $a->user);
mod/parse_url.php: Addon::callHooks("parse_link", $arr); ### include/text.php
mod/manage.php: Addon::callHooks('home_init', $ret); Addon::callHooks('contact_block_end', $arr);
Addon::callHooks('poke_verbs', $arr);
Addon::callHooks('prepare_body_init', $item);
Addon::callHooks('prepare_body_content_filter', $hook_data);
Addon::callHooks('prepare_body', $hook_data);
Addon::callHooks('prepare_body_final', $hook_data);
mod/acl.php: Addon::callHooks('acl_lookup_end', $results); ### include/items.php
mod/network.php: Addon::callHooks('network_content_init', $arr); Addon::callHooks('page_info_data', $data);
mod/network.php: Addon::callHooks('network_tabs', $arr);
mod/friendica.php: Addon::callHooks('about_hook', $o); ### mod/directory.php
mod/subthread.php: Addon::callHooks('post_local_end', $arr);
mod/profiles.php: Addon::callHooks('profile_post', $_POST); Addon::callHooks('directory_item', $arr);
mod/profiles.php: Addon::callHooks('profile_edit', $arr);
mod/settings.php: Addon::callHooks('addon_settings_post', $_POST); ### mod/xrd.php
mod/settings.php: Addon::callHooks('connector_settings_post', $_POST);
mod/settings.php: Addon::callHooks('display_settings_post', $_POST);
mod/settings.php: Addon::callHooks('settings_post', $_POST);
mod/settings.php: Addon::callHooks('addon_settings', $settings_addons);
mod/settings.php: Addon::callHooks('connector_settings', $settings_connectors);
mod/settings.php: Addon::callHooks('display_settings', $o);
mod/settings.php: Addon::callHooks('settings_form', $o);
mod/photos.php: Addon::callHooks('photo_post_init', $_POST); Addon::callHooks('personal_xrd', $arr);
mod/photos.php: Addon::callHooks('photo_post_file', $ret);
mod/photos.php: Addon::callHooks('photo_post_end', $foo);
mod/photos.php: Addon::callHooks('photo_post_end', $foo);
mod/photos.php: Addon::callHooks('photo_post_end', $foo);
mod/photos.php: Addon::callHooks('photo_post_end', $foo);
mod/photos.php: Addon::callHooks('photo_post_end', intval($item_id));
mod/photos.php: Addon::callHooks('photo_upload_form', $ret);
mod/profile.php: Addon::callHooks('profile_advanced', $o); ### mod/ping.php
mod/home.php: Addon::callHooks('home_init', $ret); Addon::callHooks('network_ping', $arr);
mod/home.php: Addon::callHooks("home_content", $content);
mod/poke.php: Addon::callHooks('post_local_end', $arr); ### mod/parse_url.php
mod/contacts.php: Addon::callHooks('contact_edit_post', $_POST); Addon::callHooks("parse_link", $arr);
mod/contacts.php: Addon::callHooks('contact_edit', $arr);
mod/tagger.php: Addon::callHooks('post_local_end', $arr); ### mod/manage.php
mod/lockview.php: Addon::callHooks('lockview_content', $item); Addon::callHooks('home_init', $ret);
mod/uexport.php: Addon::callHooks('uexport_options', $options); ### mod/acl.php
mod/register.php: Addon::callHooks('register_post', $arr); Addon::callHooks('acl_lookup_end', $results);
mod/register.php: Addon::callHooks('register_form', $arr);
mod/item.php: Addon::callHooks('post_local_start', $_REQUEST); ### mod/network.php
mod/item.php: Addon::callHooks('post_local', $datarray);
mod/item.php: Addon::callHooks('post_local_end', $datarray);
mod/editpost.php: Addon::callHooks('jot_tool', $jotplugins); Addon::callHooks('network_content_init', $arr);
Addon::callHooks('network_tabs', $arr);
src/Network/FKOAuth1.php: Addon::callHooks('logged_in', $a->user); ### mod/friendica.php
src/Render/FriendicaSmartyEngine.php: Addon::callHooks("template_vars", $arr); Addon::callHooks('about_hook', $o);
src/Model/Item.php: Addon::callHooks('post_local', $item); ### mod/subthread.php
src/Model/Item.php: Addon::callHooks('post_remote', $item);
src/Model/Item.php: Addon::callHooks('post_local_end', $posted_item);
src/Model/Item.php: Addon::callHooks('post_remote_end', $posted_item);
src/Model/Item.php: Addon::callHooks('tagged', $arr);
src/Model/Item.php: Addon::callHooks('post_local_end', $new_item);
src/Model/Contact.php: Addon::callHooks('contact_photo_menu', $args); Addon::callHooks('post_local_end', $arr);
src/Model/Contact.php: Addon::callHooks('follow', $arr);
src/Model/Profile.php: Addon::callHooks('profile_sidebar_enter', $profile); ### mod/profiles.php
src/Model/Profile.php: Addon::callHooks('profile_sidebar', $arr);
src/Model/Profile.php: Addon::callHooks('profile_tabs', $arr);
src/Model/Profile.php: Addon::callHooks('zrl_init', $arr);
src/Model/Event.php: Addon::callHooks('event_updated', $event['id']); Addon::callHooks('profile_post', $_POST);
src/Model/Event.php: Addon::callHooks("event_created", $event['id']); Addon::callHooks('profile_edit', $arr);
src/Model/User.php: Addon::callHooks('register_account', $uid); ### mod/settings.php
src/Model/User.php: Addon::callHooks('remove_user', $user);
src/Content/Text/BBCode.php: Addon::callHooks('bbcode', $text); Addon::callHooks('addon_settings_post', $_POST);
src/Content/Text/BBCode.php: Addon::callHooks('bb2diaspora', $text); Addon::callHooks('connector_settings_post', $_POST);
Addon::callHooks('display_settings_post', $_POST);
Addon::callHooks('settings_post', $_POST);
Addon::callHooks('addon_settings', $settings_addons);
Addon::callHooks('connector_settings', $settings_connectors);
Addon::callHooks('display_settings', $o);
Addon::callHooks('settings_form', $o);
src/Content/Text/HTML.php: Addon::callHooks('html2bbcode', $message); ### mod/photos.php
src/Content/Smilies.php: Addon::callHooks('smilie', $params); Addon::callHooks('photo_post_init', $_POST);
Addon::callHooks('photo_post_file', $ret);
Addon::callHooks('photo_post_end', $foo);
Addon::callHooks('photo_post_end', $foo);
Addon::callHooks('photo_post_end', $foo);
Addon::callHooks('photo_post_end', $foo);
Addon::callHooks('photo_post_end', intval($item_id));
Addon::callHooks('photo_upload_form', $ret);
src/Content/Feature.php: Addon::callHooks('isEnabled', $arr); ### mod/profile.php
src/Content/Feature.php: Addon::callHooks('get', $arr);
src/Content/ContactSelector.php: Addon::callHooks('network_to_name', $nets); Addon::callHooks('profile_advanced', $o);
src/Content/ContactSelector.php: Addon::callHooks('gender_selector', $select);
src/Content/ContactSelector.php: Addon::callHooks('sexpref_selector', $select);
src/Content/ContactSelector.php: Addon::callHooks('marital_selector', $select);
src/Content/OEmbed.php: Addon::callHooks('oembed_fetch_url', $embedurl, $j); ### mod/home.php
src/Content/Nav.php: Addon::callHooks('page_header', $a->page['nav']); Addon::callHooks('home_init', $ret);
src/Content/Nav.php: Addon::callHooks('nav_info', $nav); Addon::callHooks("home_content", $content);
src/Worker/Directory.php: Addon::callHooks('globaldir_update', $arr); ### mod/poke.php
src/Worker/Notifier.php: Addon::callHooks('notifier_end', $target_item);
src/Worker/Queue.php: Addon::callHooks('queue_predeliver', $r);
src/Worker/Queue.php: Addon::callHooks('queue_deliver', $params);
src/Module/Login.php: Addon::callHooks('authenticate', $addon_auth); Addon::callHooks('post_local_end', $arr);
src/Module/Login.php: Addon::callHooks('login_hook', $o);
src/Module/Logout.php: Addon::callHooks("logging_out");
src/Object/Post.php: Addon::callHooks('render_location', $locate); ### mod/contacts.php
src/Object/Post.php: Addon::callHooks('display_item', $arr);
src/Core/ACL.php: Addon::callHooks('contact_select_options', $x); Addon::callHooks('contact_edit_post', $_POST);
src/Core/ACL.php: Addon::callHooks($a->module.'_pre_'.$selname, $arr); Addon::callHooks('contact_edit', $arr);
src/Core/ACL.php: Addon::callHooks($a->module.'_post_'.$selname, $o);
src/Core/ACL.php: Addon::callHooks($a->module.'_pre_'.$selname, $arr);
src/Core/ACL.php: Addon::callHooks($a->module.'_post_'.$selname, $o);
src/Core/ACL.php: Addon::callHooks('jot_networks', $jotnets);
src/Core/Worker.php: Addon::callHooks("proc_run", $arr); ### mod/tagger.php
src/Util/Emailer.php: Addon::callHooks('emailer_send_prepare', $params); Addon::callHooks('post_local_end', $arr);
src/Util/Emailer.php: Addon::callHooks("emailer_send", $hookdata);
src/Util/Map.php: Addon::callHooks('generate_map', $arr); ### mod/lockview.php
src/Util/Map.php: Addon::callHooks('generate_named_map', $arr);
src/Util/Map.php: Addon::callHooks('Map::getCoordinates', $arr);
src/Util/Network.php: Addon::callHooks('avatar_lookup', $avatar); Addon::callHooks('lockview_content', $item);
src/Util/ParseUrl.php: Addon::callHooks("getsiteinfo", $siteinfo); ### mod/uexport.php
src/Protocol/DFRN.php: Addon::callHooks('atom_feed_end', $atom); Addon::callHooks('uexport_options', $options);
src/Protocol/DFRN.php: Addon::callHooks('atom_feed_end', $atom);
### mod/register.php
Addon::callHooks('register_post', $arr);
Addon::callHooks('register_form', $arr);
### mod/item.php
Addon::callHooks('post_local_start', $_REQUEST);
Addon::callHooks('post_local', $datarray);
Addon::callHooks('post_local_end', $datarray);
### mod/editpost.php
Addon::callHooks('jot_tool', $jotplugins);
### src/Network/FKOAuth1.php
Addon::callHooks('logged_in', $a->user);
### src/Render/FriendicaSmartyEngine.php
Addon::callHooks("template_vars", $arr);
### src/Model/Item.php
Addon::callHooks('post_local', $item);
Addon::callHooks('post_remote', $item);
Addon::callHooks('post_local_end', $posted_item);
Addon::callHooks('post_remote_end', $posted_item);
Addon::callHooks('tagged', $arr);
Addon::callHooks('post_local_end', $new_item);
### src/Model/Contact.php
Addon::callHooks('contact_photo_menu', $args);
Addon::callHooks('follow', $arr);
### src/Model/Profile.php
Addon::callHooks('profile_sidebar_enter', $profile);
Addon::callHooks('profile_sidebar', $arr);
Addon::callHooks('profile_tabs', $arr);
Addon::callHooks('zrl_init', $arr);
### src/Model/Event.php
Addon::callHooks('event_updated', $event['id']);
Addon::callHooks("event_created", $event['id']);
### src/Model/User.php
Addon::callHooks('register_account', $uid);
Addon::callHooks('remove_user', $user);
### src/Content/Text/BBCode.php
Addon::callHooks('bbcode', $text);
Addon::callHooks('bb2diaspora', $text);
### src/Content/Text/HTML.php
Addon::callHooks('html2bbcode', $message);
### src/Content/Smilies.php
Addon::callHooks('smilie', $params);
### src/Content/Feature.php
Addon::callHooks('isEnabled', $arr);
Addon::callHooks('get', $arr);
### src/Content/ContactSelector.php
Addon::callHooks('network_to_name', $nets);
Addon::callHooks('gender_selector', $select);
Addon::callHooks('sexpref_selector', $select);
Addon::callHooks('marital_selector', $select);
### src/Content/OEmbed.php
Addon::callHooks('oembed_fetch_url', $embedurl, $j);
### src/Content/Nav.php
Addon::callHooks('page_header', $a->page['nav']);
Addon::callHooks('nav_info', $nav);
### src/Worker/Directory.php
Addon::callHooks('globaldir_update', $arr);
### src/Worker/Notifier.php
Addon::callHooks('notifier_end', $target_item);
### src/Worker/Queue.php
Addon::callHooks('queue_predeliver', $r);
Addon::callHooks('queue_deliver', $params);
### src/Module/Login.php
Addon::callHooks('authenticate', $addon_auth);
Addon::callHooks('login_hook', $o);
### src/Module/Logout.php
Addon::callHooks("logging_out");
### src/Object/Post.php
Addon::callHooks('render_location', $locate);
Addon::callHooks('display_item', $arr);
### src/Core/ACL.php
Addon::callHooks('contact_select_options', $x);
Addon::callHooks($a->module.'_pre_'.$selname, $arr);
Addon::callHooks($a->module.'_post_'.$selname, $o);
Addon::callHooks($a->module.'_pre_'.$selname, $arr);
Addon::callHooks($a->module.'_post_'.$selname, $o);
Addon::callHooks('jot_networks', $jotnets);
### src/Core/Worker.php
Addon::callHooks("proc_run", $arr);
### src/Util/Emailer.php
Addon::callHooks('emailer_send_prepare', $params);
Addon::callHooks("emailer_send", $hookdata);
### src/Util/Map.php
Addon::callHooks('generate_map', $arr);
Addon::callHooks('generate_named_map', $arr);
Addon::callHooks('Map::getCoordinates', $arr);
### src/Util/Network.php
Addon::callHooks('avatar_lookup', $avatar);
### src/Util/ParseUrl.php
Addon::callHooks("getsiteinfo", $siteinfo);
### src/Protocol/DFRN.php
Addon::callHooks('atom_feed_end', $atom);
Addon::callHooks('atom_feed_end', $atom);

4
doc/de/Chats.md
View File

@ -8,7 +8,7 @@ Du hast derzeit zwei Möglichkeiten, einen Chat auf Deiner Friendica-Seite zu be
* IRC - Internet Relay Chat * IRC - Internet Relay Chat
* Jappix * Jappix
##IRC Addon ## IRC Addon
Sobald das Addon aktiviert ist, kannst Du den Chat unter [deineSeite.de/irc](../irc) finden. Sobald das Addon aktiviert ist, kannst Du den Chat unter [deineSeite.de/irc](../irc) finden.
Beachte aber, dass dieser Chat auch ohne Anmeldung auf Deiner Seite zugänglich ist und somit auch Fremde diesen Chat mitnutzen können. Beachte aber, dass dieser Chat auch ohne Anmeldung auf Deiner Seite zugänglich ist und somit auch Fremde diesen Chat mitnutzen können.
@ -27,7 +27,7 @@ Unten hast Du ein Eingabefeld, um Beiträge zu schreiben.
Weiter Informationen zu IRC findest Du zum Beispiel auf <a href="http://wiki.ubuntuusers.de/IRC" target="_blank">ubuntuusers.de</a>, in <a href="https://de.wikipedia.org/wiki/Internet_Relay_Chat" target="_blank">Wikipedia</a> oder bei <a href="http://www.irchelp.org/" target="_blank">icrhelp.org</a> (in Englisch). Weiter Informationen zu IRC findest Du zum Beispiel auf <a href="http://wiki.ubuntuusers.de/IRC" target="_blank">ubuntuusers.de</a>, in <a href="https://de.wikipedia.org/wiki/Internet_Relay_Chat" target="_blank">Wikipedia</a> oder bei <a href="http://www.irchelp.org/" target="_blank">icrhelp.org</a> (in Englisch).
##Jappix Mini ## Jappix Mini
Das Jappix Mini Addon erlaubt das Erstellen einer Chatbox für Jabber/XMPP-Kontakte. Das Jappix Mini Addon erlaubt das Erstellen einer Chatbox für Jabber/XMPP-Kontakte.
Ein Jabber/XMPP Account sollte vor der Installation bereits vorhanden sein. Ein Jabber/XMPP Account sollte vor der Installation bereits vorhanden sein.

10
doc/de/Improve-Performance.md
View File

@ -35,7 +35,7 @@ Aktiviere die folgenden Addons:
rendertime rendertime
###rendertime ### rendertime
**Beschreibung** **Beschreibung**
@ -60,7 +60,7 @@ Webserver
Wenn du einen Apache-Webserver nutzt, aktiviere bitte die folgenden Module: Wenn du einen Apache-Webserver nutzt, aktiviere bitte die folgenden Module:
###Cache-Control ### Cache-Control
**Beschreibung** **Beschreibung**
@ -74,7 +74,7 @@ ExpiresActive on ExpiresDefault "access plus 1 week"
Weitere Informationen findest du hier: http://httpd.apache.org/docs/2.2/mod/mod_expires.html. Weitere Informationen findest du hier: http://httpd.apache.org/docs/2.2/mod/mod_expires.html.
###Compress content ### Compress content
**Beschreibung** **Beschreibung**
@ -85,7 +85,7 @@ Aktiviere das Modul "mod_deflate" durch die Eingabe "a2enmod deflate" als root.
Weitere Informationen findest du hier: http://httpd.apache.org/docs/2.2/mod/mod_deflate.html Weitere Informationen findest du hier: http://httpd.apache.org/docs/2.2/mod/mod_deflate.html
###PHP ### PHP
**FCGI** **FCGI**
@ -93,7 +93,7 @@ Wenn du Apache nutzt, dann denk darüber nach, FCGI zu nutzen.
Wenn du eine Debian-basierte Distribution nutzt, dann wirst du die Pakete "php5-cgi" und "libapache2-mod-fcgid" benötigen. Wenn du eine Debian-basierte Distribution nutzt, dann wirst du die Pakete "php5-cgi" und "libapache2-mod-fcgid" benötigen.
Nutze externe Dokumente, um eine detailiertere Erklärung für die Einrichtung eines Systems auf FCGI-Basis zu erhalten. Nutze externe Dokumente, um eine detailiertere Erklärung für die Einrichtung eines Systems auf FCGI-Basis zu erhalten.
###Database ### Database
Es gibt Skripte wie [tuning-primer.sh](http://www.day32.com/MySQL/) und [mysqltuner.pl](http://mysqltuner.pl), die den Datenbankserver analysieren und Hinweise darauf geben, welche Werte verändert werden könnten. Es gibt Skripte wie [tuning-primer.sh](http://www.day32.com/MySQL/) und [mysqltuner.pl](http://mysqltuner.pl), die den Datenbankserver analysieren und Hinweise darauf geben, welche Werte verändert werden könnten.

25
src/Model/Item.php
View File

@ -862,12 +862,33 @@ class Item extends BaseObject
} }
unset($item['id']); unset($item['id']);
unset($item['parent']);
unset($item['mention']);
unset($item['wall']);
unset($item['origin']);
unset($item['global']);
unset($item['starred']);
unset($item['rendered-hash']);
unset($item['rendered-html']);
$condition = ["`nurl` IN (SELECT `nurl` FROM `contact` WHERE `id` = ?) AND `uid` != 0 AND NOT `blocked` AND `rel` IN (?, ?)", $users = [];
$condition = ["`nurl` IN (SELECT `nurl` FROM `contact` WHERE `id` = ?) AND `uid` != 0 AND NOT `blocked` AND NOT `readonly` AND `rel` IN (?, ?)",
$parent['owner-id'], CONTACT_IS_SHARING, CONTACT_IS_FRIEND]; $parent['owner-id'], CONTACT_IS_SHARING, CONTACT_IS_FRIEND];
$contacts = dba::select('contact', ['uid'], $condition); $contacts = dba::select('contact', ['uid'], $condition);
while ($contact = dba::fetch($contacts)) { while ($contact = dba::fetch($contacts)) {
self::storeForUser($itemid, $item, $contact['uid']); $users[$contact['uid']] = $contact['uid'];
}
if ($item['uri'] != $item['parent-uri']) {
$parents = dba::select('item', ['uid'], ["`uri` = ? AND `uid` != 0", $item['parent-uri']]);
while ($parent = dba::fetch($parents)) {
$users[$parent['uid']] = $parent['uid'];
}
}
foreach ($users as $uid) {
self::storeForUser($itemid, $item, $uid);
} }
} }

2
src/Model/Profile.php
View File

@ -950,7 +950,7 @@ class Profile
]; ];
} }
if ((!$is_owner) && ((count($a->profile)) || (!$a->profile['hide-friends']))) { if (!$is_owner && empty($a->profile['hide-friends'])) {
$tabs[] = [ $tabs[] = [
'label' => L10n::t('Contacts'), 'label' => L10n::t('Contacts'),
'url' => System::baseUrl() . '/viewcontacts/' . $nickname, 'url' => System::baseUrl() . '/viewcontacts/' . $nickname,